-
Notifications
You must be signed in to change notification settings - Fork 0
/
q
3867 lines (2709 loc) · 129 KB
/
q
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
[33mcommit 99701e6e6711e804e45bfad3e87a1be2d04bec17[m
Author: VonRaefels <jorgemadridportillo@gmail.com>
Date: Mon Nov 4 19:55:52 2013 +0100
Minor changes regarding UUID
[33mcommit 1e5471c654ba87bbbc5491f9e03ebc6e2c8c868d[m
Author: VonRaefels <jorgemadridportillo@gmail.com>
Date: Mon Nov 4 19:54:52 2013 +0100
Minor changes regarding UUID
[33mcommit 3b600a5575b6d5ed0aa8ba40886859d33cff89bb[m
Author: VonRaefels <jorgemadridportillo@gmail.com>
Date: Mon Oct 28 17:31:44 2013 +0100
Modificado gitignore para que no suba los ficheros del proyecto de NetBeans y borrados los ficheros actuales.
[33mcommit c913c2273f0827c2217e3a7617290b0584fd28ae[m
Author: VonRaefels <jorgemadridportillo@gmail.com>
Date: Mon Oct 28 17:22:09 2013 +0100
Mejorada funcionalidad para log4j
[33mcommit a7af2c76706601b52f4599b35e819b312a555d6e[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Sun Oct 27 02:20:04 2013 +0100
añadido la key para generar apk para produccion
[33mcommit 66674de2bcccfa64abaeb715f2edd50865e489a9[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Sun Oct 27 02:17:31 2013 +0100
añadido el apk de la subida de la version 1.3
[33mcommit d48b08332eaf3c96adf1c012fbfbaf327f8fbb29[m
Author: Fancisco Javier Arribas Fernández <mdo@arribasjavier.com>
Date: Sat Oct 26 21:38:52 2013 +0200
Ultimos arreglos de version
[33mcommit ecbb3ebdb9f42d728fd415bcaae8ed61726f3a8d[m
Author: Fancisco Javier Arribas Fernández <mdo@arribasjavier.com>
Date: Sat Oct 26 20:52:00 2013 +0200
Todo funciona
Funcionando todo con el nuevo servidor, el puerto ahora es el 2244.
[33mcommit 86094f708aca05534c85ca6e2f4db321fb525813[m
Author: Fancisco Javier Arribas Fernández <mdo@arribasjavier.com>
Date: Sat Oct 26 19:11:57 2013 +0200
Cambiado el puerto del bridge al 2244
[33mcommit 696bbbb038e0dcf40678560bbade6524f9a01e25[m
Author: Fancisco Javier Arribas Fernández <mdo@arribasjavier.com>
Date: Sat Oct 26 18:45:55 2013 +0200
Quitada la entrada del directorio 'dist' gitignor
[33mcommit 16cb918c79984a71dab93843e7e467030fb0d63f[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Fri Oct 25 17:54:37 2013 +0200
debug cambio de emergencia
[33mcommit e24caf4ca6b2856a8a0bc73cd15a929fc9703989[m
Author: Fancisco Javier Arribas Fernández <mdo@arribasjavier.com>
Date: Fri Oct 25 16:30:04 2013 +0200
Revert "Creo que no le estaba aztualizando el .jar"
This reverts commit 5ea542f215afbf715ba9be466f0df546cc3173f2.
[33mcommit 5ea542f215afbf715ba9be466f0df546cc3173f2[m
Author: Fancisco Javier Arribas Fernández <mdo@arribasjavier.com>
Date: Fri Oct 25 16:28:32 2013 +0200
Creo que no le estaba aztualizando el .jar
[33mcommit 21cbc953e4bd5e62f1491062f82e280bf17e2f60[m
Author: Fancisco Javier Arribas Fernández <mdo@arribasjavier.com>
Date: Fri Oct 25 16:21:51 2013 +0200
Y sigo
[33mcommit 106dda55dc362aa4c1ebb8cbbfc2dcae4f064b94[m
Author: Fancisco Javier Arribas Fernández <mdo@arribasjavier.com>
Date: Fri Oct 25 16:17:51 2013 +0200
Y sigo probando
[33mcommit b887e92a1f0b3fb13802964a76a46b55001037a6[m
Author: Fancisco Javier Arribas Fernández <mdo@arribasjavier.com>
Date: Fri Oct 25 16:10:25 2013 +0200
Sigo arreglandolo
[33mcommit 630b027f4631c1ebaf665b09a83f6c73363230df[m
Author: Fancisco Javier Arribas Fernández <mdo@arribasjavier.com>
Date: Fri Oct 25 15:57:52 2013 +0200
Arreglando Bridge
El error consistia en que a la funcion serverAlreadyExist se le pasaba
el nick en vez del id.
[33mcommit 551f4e518c7fd2f0914653eb5f6e418bfb63771b[m
Merge: e0201a3 9624ffe
Author: tumpi <tumpi@tumpi-server.(none)>
Date: Fri Oct 25 15:45:19 2013 +0200
No se quien ha hecho esto...
[33mcommit e0201a3d2d1cd893c9de11026d555bd7f34fdf05[m
Author: tumpi <tumpi@tumpi-server.(none)>
Date: Fri Oct 25 15:28:12 2013 +0200
No se quien ha hecho esto...
[33mcommit 9624ffefbb909cc00901a3e070a30217a8141f8f[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Fri Oct 25 14:35:16 2013 +0200
arreglado el bug de la "doble" conexion
[33mcommit 9c5d0f896714b3a6c413fc23c26e7f3476aad23e[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Fri Oct 25 12:12:44 2013 +0200
arreglado el bug en el que aparecia la ventana añadir canciones sin lista ^^
[33mcommit 7752e8b4f8e172e9a984148674996cced9581f77[m
Author: VonRaefels <jorgemadridportillo@gmail.com>
Date: Fri Oct 25 10:55:27 2013 +0200
Corregido bug que permitia conectarse con el mismo nombre
[33mcommit d2d88f110bb2d9ae17d21576ccea1ef4e074fa49[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Tue Oct 22 12:38:22 2013 +0200
cambido manifest, y subido el apk del market
[33mcommit f6d47d6f146d72e30b822b0fd1f71938f162a03c[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Tue Oct 22 10:55:40 2013 +0200
cambiado tamaño logo y apk generado
[33mcommit 7a26432ddcebba29fd3839ae870fabb0b6b97ccd[m
Merge: ffb1149 83dbaa1
Author: VonRaefels <jorgemadridportillo@gmail.com>
Date: Mon Oct 21 23:36:00 2013 +0200
Merge branch 'master' of https://github.com/djin/Tumpi
[33mcommit ffb11496bf93d1ad7c91766d2c821c37319ff1c5[m
Author: VonRaefels <jorgemadridportillo@gmail.com>
Date: Mon Oct 21 23:35:29 2013 +0200
Subida de logs
[33mcommit 83dbaa1e8a0962b645b233b653e984a93e9a7cf4[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Fri Oct 18 15:44:33 2013 +0200
Modificado un rotulo de SocialDj, oculto boton de settings, creacion apk moviles antiguos
[33mcommit 4b66d211a784e68a38a14a22b9c5db30524e165f[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Fri Oct 18 12:36:30 2013 +0200
Cambios de los rotulos y el icono de la App
[33mcommit 07552e548fe3e24a7487d1e02470ff1d6f178bf3[m
Author: mdo2 <arribasjavier@gmail.com>
Date: Tue Oct 8 22:28:38 2013 +0200
Arreglado el funcionamiento basico
Hay un problema con la gestion de canciones votadas por los clientes al
desconectarse y volverse a conectar. Se quedan los votos en el servidor
pero al cliente no le aparecen cuando se vuelve a conectar.
[33mcommit 2044b74af2fc5669358e3d917f4ca02b25b0290e[m
Author: mdo2 <arribasjavier@gmail.com>
Date: Tue Oct 8 17:09:26 2013 +0200
Puesta en produccion en el TumpiServer de Arribas
[33mcommit f9e044f5235590c2d3747a5d6bfcb927d01be509[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Thu Aug 1 11:21:53 2013 +0200
imagenes nuevas
[33mcommit 00738021c45f19eec71a204b971ef067354d2107[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Wed Jul 31 17:40:48 2013 +0200
completados los tutoriales
[33mcommit 3299efaa5e06472033341b13a8c895c960ad80bb[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Wed Jul 31 14:04:33 2013 +0200
cambio color y pagina web
[33mcommit 3127379f304c661b54afea4d7c4bf5c6fc18e495[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Tue Jul 2 10:04:13 2013 +0200
meh
[33mcommit 880f32d11dd919d937a769109ee483e52677ebaf[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Wed Jun 12 17:59:43 2013 +0200
colors
[33mcommit 32beced38901a843f49f884f0598dccbbe76889b[m
Author: Carlos Gomez <superdjin@gmail.com>
Date: Wed Jun 12 15:49:28 2013 +0200
ajgjasdgjasdg
[33mcommit 3cbdd33df5df4c363bdba2a391ac6cff7df39b11[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Wed Jun 12 15:39:00 2013 +0200
guardado diseño azul
[33mcommit a7f37ccd06faa1891824555e7a12b443741a5d0a[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Wed Jun 12 15:20:15 2013 +0200
modified: "colores Tumpi app/dise\303\261o naranja/colores.xml"
modified: tumpiApp/gen/R.java.d
modified: tumpiApp/res/values/colores.xml
[33mcommit 516af3bb04c5ec7528d7df0d9913de1c3c95a039[m
Author: Carlos Gomez <superdjin@gmail.com>
Date: Wed Jun 12 12:47:55 2013 +0200
cambio algunos nombres
[33mcommit a5600c16718ccd41186f91be6e912746db57be16[m
Author: Carlos Gomez <superdjin@gmail.com>
Date: Wed Jun 12 12:11:20 2013 +0200
Cambio nombre interfaz
[33mcommit 9c8b5208bb504ec3619e145bca4cc3b91d8c4209[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Wed Jun 12 12:06:04 2013 +0200
cambiado funcionamiento del modo seleccion
[33mcommit 33b32f33d74d91fb5fbf0173e435004fd5722559[m
Author: Carlos Gomez <superdjin@gmail.com>
Date: Wed Jun 12 12:03:10 2013 +0200
Texto de estado de la conexion en TumpiServer
[33mcommit 5f7044ff4289e03838a9091e038a4d79063a7134[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Wed Jun 12 11:53:30 2013 +0200
icono desaparece al entrar en modo seleccion
[33mcommit fb78d70b0f089e52415b59e4a2457b5c404cc1a3[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Wed Jun 12 11:38:36 2013 +0200
arreglados algunos colores e interfaz
[33mcommit b374fab741ceb5aba324750fb70447c8b8858ee8[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Wed Jun 12 10:38:09 2013 +0200
completado eliminacion total de cosas no usadas
[33mcommit 2bd2b468a9c0348708177cc9b8821e9fcd6dda6e[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Wed Jun 12 10:25:34 2013 +0200
xml de actividades sin usar eliminados
[33mcommit 6894a5ff4d6762840f3646036c7900fa75748880[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Wed Jun 12 10:11:31 2013 +0200
eliminadas .java actividades innecesarias
[33mcommit d01c279a1be4fa016adecffa98ce69e04868ef01[m
Author: Fancisco Javier Arribas Fernández <mdo@arribasjavier.com>
Date: Tue Jun 11 17:39:06 2013 +0200
Instalando Less
[33mcommit c05165baa27989f8ee0a92da9c3f0ba4122a3c84[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Tue Jun 11 17:29:15 2013 +0200
cambados textos
[33mcommit 2b7d97a981d62e6af519a7e1f267d95f8ae00a27[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Tue Jun 11 16:00:02 2013 +0200
parseador de caracteres extraños
[33mcommit 92d5cd96cae1f864434b0b9b3f0784d755d1773a[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Tue Jun 11 12:43:28 2013 +0200
asd
[33mcommit b5d0aeed9baecf6776c6d3c907f08b3fc0211458[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Tue Jun 11 12:20:02 2013 +0200
salto directamente a apliacion cliente
[33mcommit 1cd49b5e76814a6c4e021e48c0df5879ee04a720[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Tue Jun 11 11:58:44 2013 +0200
diseño negro verde completado con dos variables
[33mcommit 41ba3ae9b3d6d4b21010b22964335a84d57cb2c7[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Tue Jun 11 10:34:35 2013 +0200
asdfgh
[33mcommit 608aedaa2ea38192a249a8ed33d785cd0ae978c7[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Tue Jun 11 09:54:19 2013 +0200
ad
[33mcommit d2e042ac5276af106f24ce38c74958aab18de539[m
Author: Jorge Madrid Portillo <jorgemadridportillo@gmail.com>
Date: Mon Jun 10 17:54:44 2013 +0200
Refactor bridge.
-> Sustituida la lista de servidores en el manager por un mapa
concurrente,
para evitar condiciones de carrera y mejorar el rendimiento, ya que
hashmap
indexa por clave.
-> Renombradas algunas clases y variables y cambio en la jerarquía de
paquetes.
[33mcommit daae896e61160d6601727720c0c5711e3aec87dd[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Mon Jun 10 17:46:46 2013 +0200
fichero colores mas comprensible
[33mcommit 4e75bfbf3d62dd65f6290da9547deb0378253c44[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Mon Jun 10 17:36:03 2013 +0200
diseño verde y diseño negro naranja completado
[33mcommit faf286d8b72d0be02e2cfcda22478ea327292520[m
Author: Fancisco Javier Arribas Fernández <mdo@arribasjavier.com>
Date: Mon Jun 10 17:23:53 2013 +0200
Obligado
[33mcommit 188be92e8b77cec332722487d999d4846464a260[m
Author: Jorge Madrid Portillo <jorgemadridportillo@gmail.com>
Date: Mon Jun 10 16:55:27 2013 +0200
Refactor bridge.
-> Sustituida la lista de TumpiServer por un mapa.
-> Implementado patrón iterator en TumpiServer.
-> Refactor de métodos de ServerManager.
[33mcommit ceeda7a8f70dcd6a3b967abf9bd0eab45d87ba85[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Mon Jun 10 16:42:34 2013 +0200
DISEÑO ROSA COMPLETADO
[33mcommit 627810cfb620d52abc4cbccf8fd59f9449394113[m
Author: Tumpi Server <dev@tumpi.net>
Date: Mon Jun 10 16:27:41 2013 +0200
wtf
[33mcommit bc055ec6fca0a065c7e66a1228bde873525acde9[m
Author: Fancisco Javier Arribas Fernández <mdo@arribasjavier.com>
Date: Mon Jun 10 16:23:01 2013 +0200
renamed: PaginaWeb/icons/slide-01.jpg -> PaginaWeb/imgs/carrousell_home/slide-01.jpg
renamed: PaginaWeb/icons/slide-02.jpg -> PaginaWeb/imgs/carrousell_home/slide-02.jpg
renamed: PaginaWeb/icons/slide-03.jpg -> PaginaWeb/imgs/carrousell_home/slide-03.jpg
renamed: PaginaWeb/icons/slide-04.jpg -> PaginaWeb/imgs/carrousell_home/slide-04.jpg
new file: PaginaWeb/imgs/general/pause.png
new file: PaginaWeb/imgs/general/play.png
new file: PaginaWeb/imgs/google/google_play.png
renamed: PaginaWeb/css/style.css -> PaginaWeb/inc/css/global.css
new file: PaginaWeb/inc/footer.php
new file: PaginaWeb/inc/header.php
modified: PaginaWeb/index.php
deleted: PaginaWeb/less/styles.less
renamed: PaginaWeb/bootstrap/css/bootstrap-responsive.css -> PaginaWeb/libs/bootstrap/css/bootstrap-responsive.css
renamed: PaginaWeb/bootstrap/css/bootstrap-responsive.min.css -> PaginaWeb/libs/bootstrap/css/bootstrap-responsive.min.css
renamed: PaginaWeb/bootstrap/css/bootstrap.css -> PaginaWeb/libs/bootstrap/css/bootstrap.css
renamed: PaginaWeb/bootstrap/css/bootstrap.min.css -> PaginaWeb/libs/bootstrap/css/bootstrap.min.css
renamed: PaginaWeb/bootstrap/img/glyphicons-halflings-white.png -> PaginaWeb/libs/bootstrap/img/glyphicons-halflings-white.png
renamed: PaginaWeb/bootstrap/img/glyphicons-halflings.png -> PaginaWeb/libs/bootstrap/img/glyphicons-halflings.png
renamed: PaginaWeb/bootstrap/js/bootstrap-alert.js -> PaginaWeb/libs/bootstrap/js/bootstrap-alert.js
renamed: PaginaWeb/bootstrap/js/bootstrap-button.js -> PaginaWeb/libs/bootstrap/js/bootstrap-button.js
renamed: PaginaWeb/bootstrap/js/bootstrap-carousel.js -> PaginaWeb/libs/bootstrap/js/bootstrap-carousel.js
renamed: PaginaWeb/bootstrap/js/bootstrap-collapse.js -> PaginaWeb/libs/bootstrap/js/bootstrap-collapse.js
renamed: PaginaWeb/bootstrap/js/bootstrap-dropdown.js -> PaginaWeb/libs/bootstrap/js/bootstrap-dropdown.js
renamed: PaginaWeb/bootstrap/js/bootstrap-modal.js -> PaginaWeb/libs/bootstrap/js/bootstrap-modal.js
renamed: PaginaWeb/bootstrap/js/bootstrap-popover.js -> PaginaWeb/libs/bootstrap/js/bootstrap-popover.js
renamed: PaginaWeb/bootstrap/js/bootstrap-scrollspy.js -> PaginaWeb/libs/bootstrap/js/bootstrap-scrollspy.js
renamed: PaginaWeb/bootstrap/js/bootstrap-tab.js -> PaginaWeb/libs/bootstrap/js/bootstrap-tab.js
renamed: PaginaWeb/bootstrap/js/bootstrap-tooltip.js -> PaginaWeb/libs/bootstrap/js/bootstrap-tooltip.js
renamed: PaginaWeb/bootstrap/js/bootstrap-transition.js -> PaginaWeb/libs/bootstrap/js/bootstrap-transition.js
renamed: PaginaWeb/bootstrap/js/bootstrap-typeahead.js -> PaginaWeb/libs/bootstrap/js/bootstrap-typeahead.js
renamed: PaginaWeb/bootstrap/js/bootstrap.js -> PaginaWeb/libs/bootstrap/js/bootstrap.js
renamed: PaginaWeb/bootstrap/js/bootstrap.min.js -> PaginaWeb/libs/bootstrap/js/bootstrap.min.js
renamed: PaginaWeb/javaScript/holder.js -> PaginaWeb/libs/holder.js
renamed: PaginaWeb/javaScript/jQuery.js -> PaginaWeb/libs/jquery/jQuery.js
renamed: PaginaWeb/javaScript/less-1.3.3.min.js -> PaginaWeb/libs/less/less-1.3.3.min.js
renamed: PaginaWeb/html/clienteAndroid.html -> PaginaWeb/tumpi/clienteAndroid.html
new file: PaginaWeb/tumpi/home.html
renamed: PaginaWeb/html/quienesSomos.html -> PaginaWeb/tumpi/quienesSomos.html
renamed: PaginaWeb/html/reproductorAndroid.html -> PaginaWeb/tumpi/reproductorAndroid.html
renamed: PaginaWeb/html/reproductorPc.html -> PaginaWeb/tumpi/reproductorPc.html
[33mcommit 0dc38d6e9f66db32129c1ee647780646a1f63dd4[m
Merge: b677457 ee30547
Author: Carlos Gomez <superdjin@gmail.com>
Date: Mon Jun 10 16:07:06 2013 +0200
Merge branch 'master' of https://github.com/djin/Tumpi
[33mcommit b6774576cafb5e03a711db6da5180ffd9f7e8c75[m
Author: Carlos Gomez <superdjin@gmail.com>
Date: Mon Jun 10 16:04:56 2013 +0200
Primera limpieza del repo
[33mcommit ee30547ccb0a323c741b24f2ea4ef8cbe6e62e51[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Mon Jun 10 16:03:54 2013 +0200
diseño morado completado
[33mcommit 6705a818c9630451c15dd0d6c845241d8bbb12d5[m
Merge: 47eb6ec cceb1f8
Author: Jorge Madrid Portillo <jorgemadridportillo@gmail.com>
Date: Mon Jun 10 14:57:20 2013 +0200
Me olbliga a commitear para poder sincronizar.
[33mcommit 47eb6ec864fa1322b83fba57d407a8be0545148e[m
Author: Jorge Madrid Portillo <jorgemadridportillo@gmail.com>
Date: Mon Jun 10 14:56:29 2013 +0200
Me obliga a commitear por un cambio de jdk en el properties de netBeans.
[33mcommit cceb1f8ab8f513c1779e8a7cbe43025caffd2403[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Mon Jun 10 14:45:25 2013 +0200
diseño naranja completado
[33mcommit 9e69d892f464902b5723f7752114b071b5303551[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Mon Jun 10 12:06:50 2013 +0200
añadido xml degradado
[33mcommit 3e1d8397001863321a158cc016b64495d2bc38ab[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Mon Jun 10 11:26:49 2013 +0200
poniedo colores
[33mcommit 4b371b5dd9306766b1e4b5386ef1d664559338ed[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Mon Jun 10 11:22:18 2013 +0200
cambiado a jdk7
[33mcommit c7333d6249617065d57f27da5e33ebd7e4ca2856[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Mon Jun 10 11:20:11 2013 +0200
AWESOME
[33mcommit 31a3404b06515e114e6abe36357ebe632e6d51e2[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Mon Jun 10 11:17:37 2013 +0200
todos los colores pasados a colores.xml
[33mcommit dbf0969d77f1951e853610582052729c4e65fd5b[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Mon Jun 10 10:48:10 2013 +0200
cambiados colores xml en colores.xml
[33mcommit 72b214a9dadaac0e7a106a00dd228b2fb9c325c4[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Mon Jun 10 10:17:50 2013 +0200
conexon nuevo tumpiserver
[33mcommit 3f881c616aae04947f4abe5b88cb819525cb3d22[m
Author: Tumpi Server <dev@tumpi.net>
Date: Mon Jun 10 09:37:26 2013 +0200
caca en la web
[33mcommit cc07e2eb2ea0fab51a6b21f2e2db84d63ea669c8[m
Merge: 852f2d2 de77653
Author: Jorge Madrid Portillo <jorgemadridportillo@gmail.com>
Date: Sat Jun 8 17:22:22 2013 +0200
Merge branch 'master' of https://github.com/djin/socialDj
[33mcommit 852f2d2171534f68e6fe188e819ccfb8fc4b8bdc[m
Author: Jorge Madrid Portillo <jorgemadridportillo@gmail.com>
Date: Sat Jun 8 17:21:52 2013 +0200
modified: PaginaWeb/html/index.html
[33mcommit de776538a7995515687b602ef572bc8b74ed1073[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Thu Jun 6 16:12:33 2013 +0200
caca
[33mcommit 40eb813318b5edc238b83c03a54f256bfa0ba407[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Thu Jun 6 11:42:30 2013 +0200
asd
[33mcommit 1c1df4087974b3a2616aa61829eca44132bc0dac[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Thu Jun 6 11:01:15 2013 +0200
fichero guardado en carpeta Tumpi
[33mcommit 633a9fb2b55e391c6681f35b4a3b71db14085a3d[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Wed Jun 5 17:55:34 2013 +0200
hadvbsgfbszdv
[33mcommit decfd68adc4d52ad41ee563e5f0c57215d328f22[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Wed Jun 5 14:09:46 2013 +0200
cambio nombre
[33mcommit caafe749ee6afb15f0fce2e234cc35f2c62b697b[m
Author: Carlos Gomez <superdjin@gmail.com>
Date: Tue Jun 4 16:45:19 2013 +0200
Chuleta Git
[33mcommit e5c6d99a0da9eef1baabda72a7ba6d1de3fb5645[m
Author: Carlos Gomez <superdjin@gmail.com>
Date: Tue Jun 4 10:52:06 2013 +0200
Arreglado proyecto InterfazServidor
[33mcommit 0f2ad1214553f1088f6ba01e8ee100b3e886b634[m
Author: Carlos Gomez <superdjin@gmail.com>
Date: Tue Jun 4 10:43:56 2013 +0200
Revert "ñlñl"
This reverts commit b92292ee0d28ba30a8cf997928d8d0cfecbe5cd7.
[33mcommit 18f69c25edc57eed2f5bfd7bc3c27fa9809b940a[m
Author: Carlos Gomez <superdjin@gmail.com>
Date: Tue Jun 4 10:41:03 2013 +0200
Borrada tontada
aasafaf
[33mcommit 11fe24d549b7ecba518f6f507c50d6abb35a7af3[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Tue Jun 4 09:43:29 2013 +0200
cambiado texto
[33mcommit 8d39034131fcc411a77fb892cc81a67109ff5654[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Mon Jun 3 17:56:11 2013 +0200
demas
[33mcommit a1a831004ed4c368889526afc86cfdcd4af1dd04[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Mon Jun 3 14:02:41 2013 +0200
cambiado texto pagina web
[33mcommit a95b36fb235986bad0d09440af252f2685a590af[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Mon Jun 3 12:46:12 2013 +0200
minor bugs fixed
[33mcommit a873f2190ecfc5a72ab0a1b77bc0c9b3b691c584[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Mon Jun 3 12:45:01 2013 +0200
oldTumpi
[33mcommit dd8d5d7c20da0f43ab4f3ebf0d75a76fd5cb93b9[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Sat Jun 1 17:21:08 2013 +0200
diseño pntalla incial
[33mcommit 45778a4339ac55a9edd5f84f471147f8e6ff0ccf[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Sat Jun 1 16:27:57 2013 +0200
diseño patnalla inicial
[33mcommit bf10a384644a801b15b3e72b70f139511d45fab5[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Sat Jun 1 15:15:56 2013 +0200
añadida app fusionada y funcionando
[33mcommit 68c46127ab09c102c311a19fab41de986a870b2b[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Thu May 30 12:55:16 2013 +0200
cambiado nombre
[33mcommit 091d25fdcf8ba74448927b44cf9dfd19e4119bd6[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Wed May 29 13:34:43 2013 +0200
icono tumpi
[33mcommit 3d120ee0359d89cd3a9ba7b5db38640e0bbd3199[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Tue May 28 17:57:35 2013 +0200
cambiando texto
[33mcommit 6c78c19bde9f9f54424f7dafcdf3c47c57f869e5[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Tue May 28 16:52:15 2013 +0200
añadidas todas las paginas
[33mcommit 27181f6e89b5b315af0443df5e03366964d86433[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Tue May 28 15:32:59 2013 +0200
cambio nombre definitivo
[33mcommit c6e36e9d3fa3636973be0cc2c1b91dcc945d18b0[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Tue May 28 12:55:20 2013 +0200
cambio
[33mcommit 9ccf6990d0108ff97918eeb42b4097c57a0fb465[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Tue May 28 12:16:34 2013 +0200
arreglando contenido
[33mcommit 34a20cc07a7a54708b19f42b6a84459db628e74c[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Tue May 28 11:24:46 2013 +0200
arreglado degradado firefox
[33mcommit a91c9b659d3b356d8b8ffa23d69bc5cd80d67171[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Tue May 28 11:20:48 2013 +0200
texto cambiado
[33mcommit 7be1a34301f40f74666304b44419562b97c3d410[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Tue May 28 11:11:28 2013 +0200
barra navegacion finalizada
[33mcommit b8f235eda13ac7711bfaf88995654ce964f8fe6a[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Mon May 27 17:59:25 2013 +0200
imagenes
[33mcommit 370434e32a3f862504a01993227947d8679b2fd4[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Mon May 27 17:42:28 2013 +0200
index predefinido
[33mcommit 288aabb2422bc925bdaf29303c721c6bffdb5f89[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Mon May 27 16:59:43 2013 +0200
mior bugs fixed
[33mcommit b434ae0a54671b7d23ad875042765005361cc760[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Mon May 27 16:32:34 2013 +0200
pagina ejemplo
[33mcommit 71637adf10d435bdcb585b6e8f2e448b27b67dde[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Mon May 27 16:14:51 2013 +0200
web
[33mcommit 2f60e806d5bcbe738d6b0fd8782d71fef404ebac[m
Merge: b92e4bd 14e77f0
Author: zellyalgo <zell.y.algo@gmail.com>
Date: Sun May 26 12:41:31 2013 +0200
Merge branch 'master' of https://github.com/djin/socialDj
[33mcommit b92e4bd9bde8d2dd8e7e9ada075f68ace2a29d7f[m
Author: zellyalgo <zell.y.algo@gmail.com>
Date: Sun May 26 12:41:27 2013 +0200
agregadas librerias perdidas
[33mcommit 14e77f03ba619db5832ab6281a954b62557a85c8[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Fri May 24 17:43:43 2013 +0200
pagina web incluyendo bootstrap y less
[33mcommit 3a03172f51ef3c87f4baaca59e04119003895fe0[m
Author: Francisco Javier Arribas Fernández <arribasjavier@gmail.com>
Date: Fri May 24 22:02:08 2013 +0200
asfasf
[33mcommit 8d1d21933181379ef3d7faff38fbbab50af3fd69[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Thu May 23 17:28:09 2013 +0200
minor bugs fixed
[33mcommit d447fa93390e874bd3dc7f06e4131d533042c1b0[m
Author: nerthul <nerthul_13@hotmail.com>
Date: Wed May 22 11:51:32 2013 +0200
lib jetty
[33mcommit 3e30a01f5e8133c02475371341ccdd68afb596a2[m
Author: nerthul <nerthul_13@hotmail.com>
Date: Mon May 20 19:58:22 2013 +0200
Añadida clases de websockets y primeras pruebas
[33mcommit b92292ee0d28ba30a8cf997928d8d0cfecbe5cd7[m
Author: nerthul <nerthul_13@hotmail.com>
Date: Sun May 19 18:50:10 2013 +0200
ñlñl
[33mcommit 37de875972c0cc11a1f05268ced47affa531a130[m
Author: Juan Frances <juanfrancesgg@gmail.com>
Date: Thu May 16 11:56:23 2013 +0200
Minor bug fixes
[33mcommit a08d5e7f301c2ff10495ea11016d5a5c48bb1c52[m
Author: Juan Frances <juanfrancesgg@gmail.com>
Date: Thu May 16 11:47:49 2013 +0200
Guardado terminado
[33mcommit aba117e52937c0ce9c179f199eaa1463f1b59110[m
Author: Juan Frances <juanfrancesgg@gmail.com>
Date: Thu May 16 11:21:33 2013 +0200
Guardado no terminado
[33mcommit a60e6a8673d2cf6d7fecbb2b4435ecc520615762[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Thu May 16 10:59:36 2013 +0200
commit blabal
[33mcommit 6604d8f21f106b3372e026e3ae442c0126df102a[m
Author: Fancisco Javier Arribas Fernández <mdo@arribasjavier.com>
Date: Wed May 15 13:48:49 2013 +0200
Arreglando conexión en servidor movil
[33mcommit 6d665a49545812a2cfc3b185772178576f23baab[m
Author: Fancisco Javier Arribas Fernández <mdo@arribasjavier.com>
Date: Wed May 15 12:34:21 2013 +0200
arregando conexion y demas
[33mcommit c66deff25e0b697486b16e1a9c07bee73ab03559[m
Author: Fancisco Javier Arribas Fernández <mdo@arribasjavier.com>
Date: Wed May 15 12:30:17 2013 +0200
modified: InterfazLista/bin/AndroidManifest.xml.d
modified: InterfazLista/bin/classes/lista/android/AdaptadorLista$ClickListener.class
modified: InterfazLista/bin/classes/lista/android/AdaptadorLista.class
modified: InterfazLista/bin/classes/lista/android/Cancion.class
modified: InterfazLista/bin/classes/lista/android/PantallaPrincipal$1.class
modified: InterfazLista/bin/classes/lista/android/PantallaPrincipal.class
modified: InterfazLista/bin/classes/lista/android/conexion/SocketConnector.class
modified: InterfazLista/gen/R.java.d
modified: InterfazLista/gen/lista/android/R.java
new file: InterfazLista/res/drawable/gif_desvotando.xml
new file: InterfazLista/res/drawable/gif_votando.xml
new file: InterfazLista/res/raw/estrella_casi_llena.png
new file: InterfazLista/res/raw/estrella_medio_llena.png
new file: InterfazLista/res/raw/estrella_nada_llena.png
new file: InterfazLista/res/raw/estrella_poco_llena.png
modified: InterfazLista/src/lista/android/AdaptadorLista.java
modified: InterfazLista/src/lista/android/Cancion.java
modified: InterfazLista/src/lista/android/ListaCanciones.java
modified: InterfazLista/src/lista/android/PantallaPrincipal.java
modified: InterfazLista/src/lista/android/conexion/SocketConnector.java
modified: ServidorSocialDj/src/modelo/datos/ListasManager.java
[33mcommit 9d892e45eb9e1c280743a86b67851ade33228629[m
Author: Juan Frances <juanfrancesgg@gmail.com>
Date: Wed May 15 02:19:15 2013 +0200
detalles
[33mcommit 044a2fcdf0519b1b571d2d33e160142c3abfeeb2[m
Author: Juan Frances <juanfrancesgg@gmail.com>
Date: Tue May 14 19:15:08 2013 +0200
refactor terminado, carga canciones instantánea
[33mcommit c81fa7b1a46e37c42811aad919d9584a2953e28e[m
Author: Juan Frances <juanfrancesgg@gmail.com>
Date: Tue May 14 11:58:37 2013 +0200
listaspendientes terminado(problema actualizando)
[33mcommit d8d5fb50fa0671baed31efe4c1abdb1ba7c8a2ec[m
Author: Juan Frances <juanfrancesgg@gmail.com>
Date: Tue May 14 08:48:55 2013 +0200
modified: InterfazServidor/fich_selector
modified: InterfazServidor/test/modelos/ListasCancionesManagerTest.java
[33mcommit 9434ec18f1780a1a5f7a82eb371dd49ca2f3c66c[m
Author: Juan Frances <juanfrancesgg@gmail.com>
Date: Mon May 13 23:35:09 2013 +0200
JTabbedPane de listas pendientes migrado
[33mcommit 5e98322b536b477d6685085b8f5010421b4f7d0d[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Mon May 13 17:53:41 2013 +0200
añadido has de votos para los clientes
[33mcommit 80b950a4ef18cb10d72b8b7ba9d10a1272d80633[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Mon May 13 17:10:17 2013 +0200
arreglado mensaje reproducida
[33mcommit 0a771024652bc5d53bda04f894210d6c842b3269[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Mon May 13 16:44:05 2013 +0200
todo comletado,falta que se guarden los votos
[33mcommit 9975ab88527c54e142b17965282a9a31c17ff022[m
Author: Juan Frances <juanfrancesgg@gmail.com>
Date: Mon May 13 09:50:34 2013 +0200
Establecer nombre servidor creado
[33mcommit 40373f846c85339ef9f0ec53787759b661a7d073[m
Author: Juan Frances <juanfrancesgg@gmail.com>
Date: Mon May 13 09:17:32 2013 +0200
Creacion listeners listas pendientes
[33mcommit 92520e323c2d0b686b18157eb8a01262f5c44023[m
Author: Juan Frances <juanfrancesgg@gmail.com>
Date: Sun May 12 23:44:16 2013 +0200
Todo lo referente a lista sonando refactorizado.
[33mcommit c4fa00490f72cc6d0e0caf6e2b04d4c2770e1492[m
Author: Juan Frances <juanfrancesgg@gmail.com>
Date: Sun May 12 17:46:28 2013 +0200
arsdg
[33mcommit 51c614585ca432e666a45882a3c7d575ab1658a9[m
Author: Carlos Gomez <superdjin@gmail.com>
Date: Fri May 10 14:25:42 2013 +0200
modified: InterfazReproductorBasico/nbproject/genfiles.properties
[33mcommit 6aa65292dcee0e3a2edacd324d4115dcbfed36df[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Thu May 9 17:52:06 2013 +0200
conexion con bridge conseguida
[33mcommit cc2768cf711e1d2ae7644f0f643bcff5e5457ab8[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Tue Apr 30 11:54:00 2013 +0200
cambio estilo cliente
[33mcommit 21e6e862c72eb2dd3e92a332c772731961252294[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Mon Apr 29 18:00:19 2013 +0200
minor bugs fixed
[33mcommit 142b58744812c0ed4eaf64bca16410841e99cf24[m
Author: Juan Frances <juanfrancesgg@gmail.com>
Date: Mon Apr 29 11:39:50 2013 +0200
Hiellous
[33mcommit 5717bf22ac376654300d3e283caae42e58a0c102[m
Author: Sergio Redondo <zell.y.algo@gmail.com>
Date: Mon Apr 29 11:36:50 2013 +0200
minor bug fixed
[33mcommit 260d0cc4a07a8b1e74ca920a5f595bc3beb786ee[m
Author: Juan Frances <juanfrancesgg@gmail.com>
Date: Mon Apr 29 01:11:06 2013 +0200
borrado caca que se colo
sgsdg
[33mcommit 72ecea2da458beecdc422b409d8eb29e3385bdbc[m
Author: Juan Frances <juanfrancesgg@gmail.com>
Date: Mon Apr 29 01:09:35 2013 +0200
Thread duraciones creado, refactor interfaz en avanze
[33mcommit b49ad3cd8c192f2cac32198c285d194fc3883983[m
Author: Juan Frances <juanfrancesgg@gmail.com>
Date: Mon Apr 29 01:08:46 2013 +0200
modified: InterfazServidor/fich_selector
deleted: InterfazServidor/src/ModuloLogico/ThreadAddCancion.java
modified: InterfazServidor/src/elementosInterfaz/FramePrincipal.java
modified: InterfazServidor/src/modelos/ListasCancionesManager.java
modified: InterfazServidor/src/reproductor/PlayerReproductor.java
new file: InterfazServidor/src/reproductor/ThreadGetDuraciones.java
InterfazServidor/src/elementosInterfaz/PanelTablasPendientes.java
InterfazServidor/src/elementosInterfaz/TablaPendiente.java
InterfazServidor/src/elementosInterfaz/TablaSonando.java
InterfazServidor/src/modelos/ConjuntoListas.java
[33mcommit 37081fac37406a70feb967ebc6a12a94f658e5cb[m
Author: Fancisco Javier Arribas Fernández <mdo@arribasjavier.com>
Date: Sat Apr 27 22:01:03 2013 +0200
Ya funciona lo básico por 3g.
Hay cosas que controlar de las conexiones y paquetes que bueno, en otras
palabras, que le den y lo hare en otro momento.
[33mcommit 72e5fec1e7690afbceeb91b8baa5a05109cd5205[m
Author: Francisco Javier Arribas Fernández <arribasjavier@gmail.com>
Date: Sat Apr 27 21:59:48 2013 +0200