forked from eventoL/eventoL
-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy pathchangelog
2578 lines (1716 loc) · 73.7 KB
/
changelog
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
commit a99f1bd0be90ff1aa15b1e60a458f13c1c9b3f88 (HEAD, origin/master, origin/HEAD, master)
Author: Xombra <xombra.com@gmail.com>
Date: Thu Jan 28 22:01:22 2016 -0430
* cambio
commit 3bb45fd44c7d5b586eb3d62aa5f64e9cb03e22fc
Merge: 710e582 49f599c
Author: Xombra <xombra.com@gmail.com>
Date: Wed Dec 2 23:53:13 2015 -0430
Merge branch 'master' of https://github.com/Flisol-VE/eventoL
commit 49f599c74ee1d9ca3b4fb7bd9b43c6c457f0dc86
Author: Hector A. Mantellini <xombra@users.noreply.github.com>
Date: Wed Dec 2 09:39:07 2015 -0430
Traducción al español
commit 2b9a0b57cc7faa130e094c9607e098712fbb390e
Author: Hector A. Mantellini <xombra@users.noreply.github.com>
Date: Tue Dec 1 18:35:16 2015 -0430
Traduciendo al español el readme
commit 710e58213eaf9adfa8ae0ae0c23146ef8bf0d901
Merge: fa17f32 2b4f27d
Author: Xombra <xombra.com@gmail.com>
Date: Sat Nov 28 14:05:43 2015 -0430
Merge branch 'master' of https://github.com/Flisol-VE/eventoL
commit 2b4f27d0ef7b07ede5d4af242d48b848d8fe679b
Author: Hector A. Mantellini <xombra@users.noreply.github.com>
Date: Sat Nov 28 14:04:57 2015 -0430
Update README.md
commit e9faa862069b2e0869c7128bf53787b0f53f3dff
Author: Hector A. Mantellini <xombra@users.noreply.github.com>
Date: Sat Nov 28 14:04:04 2015 -0430
Update README.md
commit 16fa164e128bcbea310ffdd94ae9338b8059d3fa
Author: Hector A. Mantellini <xombra@users.noreply.github.com>
Date: Sat Nov 28 14:02:27 2015 -0430
Inclusión de travis
commit fa17f32d79d4af3bafdce3feafd0a0bb83b14e24
Author: Xombra <xombra.com@gmail.com>
Date: Sat Nov 28 13:53:21 2015 -0430
* changelog
commit eb8742ae1b6d749db167a9056b14adb06fe1a926
Author: Xombra <xombra.com@gmail.com>
Date: Sat Nov 28 13:52:36 2015 -0430
* cambio de modismo a palabras genericas
commit f3f8688036ee65f368cc3691f25cf0fea694f373
Author: Federico Gonzalez <federicogonzalez761@gmail.com>
Date: Tue Oct 27 20:30:19 2015 -0300
Add waffle status (issues)
commit 1ac0502994af86b9e3c818d0e8a1437134f921a8
Author: Federico Gonzalez <federicogonzalez761@gmail.com>
Date: Tue Oct 27 20:25:01 2015 -0300
Update README.md
commit 64149895deb8d45240e08d05a98e704fa9dbc266
Author: Sergio Orbe <reyiyo@gmail.com>
Date: Thu Oct 22 22:16:26 2015 -0300
Transfer ownership
commit ff08f93223fd68250107c5806e6673faf4b0bfc9
Author: Sergio Orbe <sergioo@exo.com.ar>
Date: Wed Jun 24 17:31:15 2015 -0300
fix error with filter
commit eb9fe4dc66879a98e090127fbdb720acb3183874
Author: Sergio Orbe <sergioo@exo.com.ar>
Date: Wed Jun 24 17:28:51 2015 -0300
Reporte full para una sede
commit 0552a01c156d097a5fbbdf5145883ba3d2376b23
Merge: c06ae27 8ca4c3f
Author: Sergio Orbe <sergioo@exo.com.ar>
Date: Wed Jun 24 17:19:53 2015 -0300
Merge branch 'master' of github.com:reyiyo/eventoL
Conflicts:
manager/api/views.py
commit c06ae273e94d0211362e7d3f9d087b06150baba8
Author: Sergio Orbe <sergioo@exo.com.ar>
Date: Wed Jun 24 17:18:43 2015 -0300
reporte de charlas y staff por sede
commit 8ca4c3fd8e40a29cf6a5c90360327ef0009d5502
Author: Sergio Orbe <sergioo@exo.com.ar>
Date: Wed Jun 24 17:16:26 2015 -0300
reporte de charlas y staff por sede
commit 0a03bb3228ac30b2b595427fe2ac74ad075eff75
Merge: 3ddfeb6 2cc643c
Author: Sergio Orbe <reyiyo@gmail.com>
Date: Wed Jun 24 17:01:00 2015 -0300
Merge pull request #117 from FedeG/master
Fix error de filtrado por sede en los reportes
commit 2cc643cab1c3524c4cb6ff345f19cf2104421c25
Author: FedeG <federicog@exo.com.ar>
Date: Wed May 27 12:50:23 2015 -0300
#115 - Fix error de filtrado por sede (Mejorado) + migraciones del modelo
commit 68c52e14ddf742bf50809a0b2d9e73c4fc38a96f
Author: FedeG <federicog@exo.com.ar>
Date: Wed May 27 12:45:29 2015 -0300
#115 - Deshboard con datos de attendee actuales
commit ccc8ab790bdb14f9d1c5989926b69412f92934e8
Author: FedeG <federicog@exo.com.ar>
Date: Wed May 27 12:44:48 2015 -0300
#115 - Fix error de filtrado por sede
Error de filtrado de datos
commit 3ddfeb68eab0809a93287d2f73196eabd2bab90d
Merge: 6a4d1bd 29ce846
Author: Sergio Orbe <reyiyo@gmail.com>
Date: Tue May 26 14:41:25 2015 -0300
Merge pull request #116 from FedeG/master
Solución a los errores de reportes #115
commit 29ce846759fb0bdf9a2cbd3074693f50f94bff39
Author: FedeG <federicog@exo.com.ar>
Date: Tue May 26 14:36:03 2015 -0300
#115 - Fix error de reportes ( closes #115 )
commit 6a4d1bd66049554025f1f2f17264e749a6773bb9
Merge: 038d1cf d0c21cd
Author: Sergio Orbe <reyiyo@gmail.com>
Date: Mon May 18 15:05:58 2015 -0300
Merge pull request #111 from FedeG/develop
Traducciones para la parte de presentaciones
commit d0c21cd1e51eaed251fb7acd47ff84b3455c6f28
Author: FedeG <federicog@exo.com.ar>
Date: Wed May 6 14:01:44 2015 -0300
Traducciones para las presentaciones (#17)
commit 270563a4089e6a97dfd3f7ade933cd00bf715de9
Merge: ff42472 038d1cf
Author: FedeG <federicog@exo.com.ar>
Date: Wed May 6 13:58:05 2015 -0300
Merge branch 'master' of github.com:reyiyo/eventoL into develop
commit 038d1cf8ef90ef9e3c83061ff59643787eead128
Merge: 11bf711 91d3bcf
Author: Sergio Orbe <reyiyo@gmail.com>
Date: Wed May 6 13:47:43 2015 -0300
Merge pull request #109 from FedeG/presentation_and_edit_talks
Presentaciones y edición de charlas confirmadas
commit 91d3bcfa92935765ba32a787d1cb250499cdda2c
Merge: 6703c4d 11bf711
Author: FedeG <federicog@exo.com.ar>
Date: Sun May 3 19:50:52 2015 -0300
Merge branch 'master' of github.com:reyiyo/eventoL into presentation_and_edit_talks
commit ff42472627b0ed87245d08de3c07ff4cd044b368
Merge: 0517a58 11bf711
Author: FedeG <federicog@exo.com.ar>
Date: Sun May 3 19:49:58 2015 -0300
Merge branch 'master' of github.com:reyiyo/eventoL into develop
commit 11bf71163f8fa11afedceffd58ef9bec58d6a700
Merge: 5ae8de9 79a137f
Author: Sergio Orbe <reyiyo@gmail.com>
Date: Sat May 2 21:12:17 2015 -0300
Merge pull request #108 from FedeG/develop
Api 2.0
commit 0517a5883abf98034ec8002d6b9d99b101ac4729
Merge: e04d4cb 5ae8de9
Author: FedeG <federicog@exo.com.ar>
Date: Tue Apr 28 05:38:40 2015 -0300
Merge branch 'master' of github.com:reyiyo/eventoL into develop
commit 6703c4db8fd91407ca71a0e9514a3d0adb00ac18
Merge: 130488e 5ae8de9
Author: FedeG <federicog@exo.com.ar>
Date: Tue Apr 28 05:38:16 2015 -0300
Merge branch 'master' of github.com:reyiyo/eventoL into presentation_and_edit_talks
commit 130488ea712bb2d0fe1fa3a998a70b4d432018db
Author: FedeG <federicog@exo.com.ar>
Date: Tue Apr 28 00:38:11 2015 -0300
Votos solo cuando todavia el evento no paso
commit f21ba42608ac81ce4d4eb413ad3c46c60d763876
Author: FedeG <federicog@exo.com.ar>
Date: Tue Apr 28 00:33:39 2015 -0300
Links limitados por si ya paso el evento
commit 774cbc164f3fbba8f0f1b5f5af2eab25dd73d3b0
Author: FedeG <federicog@exo.com.ar>
Date: Tue Apr 28 00:28:09 2015 -0300
Links para desconfirmar charla
commit 2d37c80d4d42194cebc41c9dd44501375c6e4648
Author: FedeG <federicog@exo.com.ar>
Date: Tue Apr 28 00:28:02 2015 -0300
Vista para desconfirmar charla
commit e26be40413885079c580a88f36a0c03c3296f7ee
Author: FedeG <federicog@exo.com.ar>
Date: Tue Apr 28 00:27:53 2015 -0300
Url para desconfirmar charla
commit 16d576c03d7fa290ea68c3a9cc974b69f1b81d5d
Author: FedeG <federicog@exo.com.ar>
Date: Tue Apr 28 00:10:56 2015 -0300
Link para edición de propuesta
commit 58132595c4bd984a6bdee4a1caa393857aaabab2
Author: FedeG <federicog@exo.com.ar>
Date: Tue Apr 28 00:10:42 2015 -0300
Vista para edición de propuesta
commit 155a65b7e811122dccfe079983dc612379ad1603
Author: FedeG <federicog@exo.com.ar>
Date: Tue Apr 28 00:10:31 2015 -0300
Url para edición de propuesta
commit e04d4cb8e76ea0a42f9a349a9d430e4d03842c85
Author: FedeG <federicog@exo.com.ar>
Date: Mon Apr 27 23:53:56 2015 -0300
Cambio de template para por subir, descargar y ver presentación y ademas editar los datos de las charlas confirmadas
commit 55504f2f48e8969b7e8b3222077b2399d22087a8
Author: FedeG <federicog@exo.com.ar>
Date: Mon Apr 27 23:52:39 2015 -0300
Vista para subir presentación
commit a52216a5cbb11e8c44b81fe3ebe07f5fd87ac48a
Author: FedeG <federicog@exo.com.ar>
Date: Mon Apr 27 23:51:39 2015 -0300
Uso de presentation form para subir a las charlas
commit f15b0403756664436efbc2e9d5cf76d1868a8739
Author: FedeG <federicog@exo.com.ar>
Date: Mon Apr 27 23:51:11 2015 -0300
url para subir presentaciones
commit 11a3114ffa3ddf6fb2290c3e4dffc207d5c1a359
Author: FedeG <federicog@exo.com.ar>
Date: Mon Apr 27 23:51:03 2015 -0300
template de formulario para subir presentaciones
commit 5963e3628c00cce25e28462ef528ff88ea26db0f
Author: FedeG <federicog@exo.com.ar>
Date: Mon Apr 27 23:50:47 2015 -0300
Formulario para subir presentaciones
commit 7f9cd18a5e8d6d3e5cf633ddbc1a4068746e13a6
Author: FedeG <federicog@exo.com.ar>
Date: Mon Apr 27 23:50:30 2015 -0300
Ignore de /media para prueba de archivos subidos
commit 79a137f19fd0f61ad0806f8f079038a3a9e762d1
Author: FedeG <federicog@exo.com.ar>
Date: Mon Apr 27 18:11:04 2015 -0300
Uso de la api en la template de reportes
commit e7fba0235c9aec71a58ac32c80bc4078942e87a8
Author: FedeG <federicog@exo.com.ar>
Date: Mon Apr 27 18:10:53 2015 -0300
Reduccion de vista para uso de la api en la template
commit bd91f80b29bbda63c8fbc03a0698b81e40ed4ad5
Author: FedeG <federicog@exo.com.ar>
Date: Mon Apr 27 18:10:25 2015 -0300
Metodo importado desde el builder y generalizado en ese modulo
commit bbcdf91b7acdbd3dd028e7fa639cc312c2d206c5
Author: FedeG <federicog@exo.com.ar>
Date: Mon Apr 27 18:09:39 2015 -0300
Modulo con los reduces de cada modelo que lo requiera
commit a91a4df78fa0197c7e939374e117f7c7f2f7502b
Author: FedeG <federicog@exo.com.ar>
Date: Mon Apr 27 18:08:11 2015 -0300
Segundo metodo generico en builder para contar por algun elemento en particular
commit 89190e886ca3e3b2b5aff910bbd8bb8cf13ab003
Author: FedeG <federicog@exo.com.ar>
Date: Mon Apr 27 18:07:43 2015 -0300
Primero metodo en el builder para contar cuantos elementos de una lista cumplen las condiciónes enviadas
commit de796938a67006d0b59f8493869d109c96059be7
Author: FedeG <federicog@exo.com.ar>
Date: Mon Apr 27 18:05:27 2015 -0300
Modulo de View Sets para el admin (usando el ViewSetBuilder magico :D)
commit dfa399d1b7f84391c6d227776f028d768c8e5992
Author: FedeG <federicog@exo.com.ar>
Date: Mon Apr 27 18:03:21 2015 -0300
Cambio de modulo importado en url para el uso del nuevo modulo de rutas
commit 0d3e95a289b2e3ea5bc148b4bc02f1d0db2f4119
Author: FedeG <federicog@exo.com.ar>
Date: Mon Apr 27 18:03:03 2015 -0300
Modulo para rutas de la API
commit ccc6d1fb296e8145eae5a3ae7f468ba4d7799a70
Author: FedeG <federicog@exo.com.ar>
Date: Mon Apr 27 18:02:43 2015 -0300
Elimino modulo centralizado para dividirlo en modulos mas atomicos
commit a20a83f40f046ff53a84258a150ed2db413d7192
Author: FedeG <federicog@exo.com.ar>
Date: Mon Apr 27 18:01:39 2015 -0300
Cambio la funcion por default para el uso del queryset
commit 6852adaa02bc37d8077248ab925a745e810c70bd
Author: FedeG <federicog@exo.com.ar>
Date: Mon Apr 27 18:01:10 2015 -0300
Cambio de envió de datos. Para un mejor filtro en lugar de mandar la data directamente mando el queryset para poder aprovechar el ORM
commit dd9c409e76bde35b9465abaf5ca6822593053de3
Author: FedeG <federicog@exo.com.ar>
Date: Mon Apr 27 17:59:46 2015 -0300
Borrado de importación extra
commit 5ae8de900ce46490e2d231d074c8317ed1e9113a
Merge: 15be601 ddd19e9
Author: Sergio Orbe <reyiyo@gmail.com>
Date: Fri Apr 24 21:55:42 2015 -0300
Merge pull request #107 from FedeG/develop
Cambio de template de cronograma
commit ddd19e97ccefc9480775e16389063225d46c40e0
Author: FedeG <federicog@exo.com.ar>
Date: Fri Apr 24 19:58:45 2015 -0300
Cambio de template de cronograma, la columna de horas y las charlas dummys no se ven en sm o xs de bootstrap.
commit 15be601faf41b280d5b35ba41979f88216edd09e
Merge: 4b70c2b 042f700
Author: Federico Gonzalez <federicogonzalez761@gmail.com>
Date: Fri Apr 24 15:17:48 2015 -0300
Merge pull request #106 from FedeG/develop
URL sin case sensitive
commit 042f7000ffa31f80e047895009cf0c4d363c96dd
Author: FedeG <federicog@exo.com.ar>
Date: Fri Apr 24 15:15:55 2015 -0300
URL sin case sensitive
commit 4b70c2bcd1e9ed997129e7fd137aa9dd7498109b
Merge: 99b8c5a 390b123
Author: Federico Gonzalez <federicogonzalez761@gmail.com>
Date: Fri Apr 24 15:12:54 2015 -0300
Merge pull request #105 from FedeG/develop
Votes for talks por sede
commit 390b12379c908d2f4e700250869efd162cac7fee
Merge: c07772d 99b8c5a
Author: FedeG <federicog@exo.com.ar>
Date: Fri Apr 24 14:50:33 2015 -0300
Merge branch 'master' of github.com:reyiyo/eventoL into develop
commit c07772d948653c3c34dee04dfac7c03d2c5257d3
Author: FedeG <federicog@exo.com.ar>
Date: Fri Apr 24 14:50:23 2015 -0300
Solucion de bug, los votos por charla mostraban de todas las sede y no de la sede actual
commit 99b8c5a04b2ddeae152b3918a212a4c6cbfafd38
Merge: 14e1573 3dad5e4
Author: Sergio Orbe <reyiyo@gmail.com>
Date: Fri Apr 24 13:39:02 2015 -0300
Merge pull request #104 from FedeG/develop
Detalles del reporte
commit 3dad5e47ae820f2724b033cf3a5aabc0a2cb1ded
Author: FedeG <federicog@exo.com.ar>
Date: Fri Apr 24 13:35:16 2015 -0300
Prueba en views por error 500 en reportes
commit 32acbf2857d6d68bd2b8517f44e01818869b0113
Author: FedeG <federicog@exo.com.ar>
Date: Fri Apr 24 13:35:00 2015 -0300
Correcciones de la template de dashboard
commit 14e1573d1e5d5a9e0f9282be50ee3da9893b630c
Merge: 4c752f5 451f665
Author: Sergio Orbe <reyiyo@gmail.com>
Date: Fri Apr 24 13:01:38 2015 -0300
Merge pull request #103 from FedeG/develop
Api + Reportes
commit 451f665857fa17aadb7107a5abeb6291dc6ae30f
Author: FedeG <federicog@exo.com.ar>
Date: Fri Apr 24 12:14:20 2015 -0300
Traduccion mergeada
commit b6388deeb8b052dfe475b7ef0d6273f1daf84e38
Merge: 2c2c976 4c752f5
Author: FedeG <federicog@exo.com.ar>
Date: Fri Apr 24 12:11:44 2015 -0300
Merge branch 'master' of github.com:reyiyo/eventoL into develop
Conflicts:
conf/locale/es/LC_MESSAGES/django.po
commit 2c2c9767d99649a84060566ba0c99e3b8ea4468f
Author: FedeG <federicog@exo.com.ar>
Date: Fri Apr 24 12:08:23 2015 -0300
Link en colaborador para ver reportes
commit 21eeadcae4c3a3a714364fbc1a0508f2910bb3a8
Author: FedeG <federicog@exo.com.ar>
Date: Fri Apr 24 12:08:14 2015 -0300
Traducciones para reportes y api
commit df11f13c874e50e34d8d3b4b50a1ef2d25a77364
Author: FedeG <federicog@exo.com.ar>
Date: Fri Apr 24 11:58:55 2015 -0300
Vista de la api para reporte general de la sede
commit 683cf71c12e1800d6e19ea162b709a73847728e7
Author: FedeG <federicog@exo.com.ar>
Date: Fri Apr 24 11:58:44 2015 -0300
Uso de builder para crear las apis de varios modelos
commit c813511540022769e7b96a40e17d344937eb47f0
Author: FedeG <federicog@exo.com.ar>
Date: Fri Apr 24 11:58:27 2015 -0300
Rest builder para django-rest
commit 84d944103328f98fa1795f0a759b5d5456a68d55
Author: FedeG <federicog@exo.com.ar>
Date: Fri Apr 24 11:58:16 2015 -0300
Nuevas url's para la api
commit 53622f0a9a59456d5905ce650c72c5c09996f2b7
Author: FedeG <federicog@exo.com.ar>
Date: Fri Apr 24 11:57:38 2015 -0300
Detalles de mas en forms
commit 53fb9b8b3b79bcb34961c3d8516cb54a5c2f8322
Author: FedeG <federicog@exo.com.ar>
Date: Fri Apr 24 11:57:15 2015 -0300
Mejora por error en la vista de celular
commit 4ad5b357bbacf9447182984a8ba8453e6f272037
Author: FedeG <federicog@exo.com.ar>
Date: Fri Apr 24 11:56:55 2015 -0300
URL para reportes
commit 4b62e3e2371a7cc29421448f3932265c0dce6112
Author: FedeG <federicog@exo.com.ar>
Date: Fri Apr 24 11:56:46 2015 -0300
Vista para reporte
commit 152069965e1586782c4d7736e198025264c51325
Author: FedeG <federicog@exo.com.ar>
Date: Fri Apr 24 11:56:34 2015 -0300
Nuevos paquetes para uso de la api rest
commit c4b6151c7aacb098ca6e3294bc5211267a0f19cb
Author: FedeG <federicog@exo.com.ar>
Date: Fri Apr 24 11:53:33 2015 -0300
Nueva aplicacion para uso de api rest en EventoL
commit 7f6190e2104326453f5049851c468c63685be876
Author: FedeG <federicog@exo.com.ar>
Date: Fri Apr 24 11:53:00 2015 -0300
Nuevos paquetes MorrisJs (graficos para reportes) y q (manejo de promesas JS)
commit 2d117cb090e962370a11aea42165d29f51901048
Author: FedeG <federicog@exo.com.ar>
Date: Fri Apr 24 11:52:00 2015 -0300
Dashboard de reportes
commit 4c752f50ca9d7e630c3439af52bdba74eb25b55e
Author: Sergio Orbe <sergioo@exo.com.ar>
Date: Thu Apr 23 22:12:29 2015 -0300
Fix error 500 al cargar una instalación ("eventoL/manager/views.py", line 311, in installation
if installation is not None:
UnboundLocalError: local variable 'installation' referenced before assignment)
commit 27e7351682311e541146e831c29f63e4de802644
Merge: f8dcfda 485d16d
Author: Sergio Orbe <sergioo@exo.com.ar>
Date: Wed Apr 22 14:57:17 2015 -0300
Merge branch 'master' of github.com:reyiyo/eventoL
commit 485d16d750741b6a80771c4543ff59d2a49b7c2e
Merge: 78de526 4e84a81
Author: Sergio Orbe <reyiyo@gmail.com>
Date: Wed Apr 22 14:57:08 2015 -0300
Merge pull request #100 from reyiyo/export
letra para cuando hay muchas aulas
commit f8dcfda3dd6396e13ffb8cae459f51bb5b6ade65
Merge: 78de526 4e84a81
Author: Sergio Orbe <sergioo@exo.com.ar>
Date: Wed Apr 22 14:56:29 2015 -0300
Merge branch 'export'
commit 4e84a81ae30767c13358203dd3420afdfe86d733
Author: Sergio Orbe <sergioo@exo.com.ar>
Date: Wed Apr 22 14:54:42 2015 -0300
letra para cuando hay muchas aulas
commit 78de526e1daa32915d63a16fcc6b481d381e759a
Merge: 521e9c1 95d4220
Author: Sergio Orbe <reyiyo@gmail.com>
Date: Wed Apr 22 12:10:38 2015 -0300
Merge pull request #98 from FedeG/develop
Solución para el bug de formularios de confirmación de charlas
commit 95d4220faa66b14b444825fb68ca47a8dc552600
Author: FedeG <federicog@exo.com.ar>
Date: Wed Apr 22 10:43:59 2015 -0300
Bug de formularios de confirmacion de charlas, closes #97
commit 521e9c1bcc2854897647372ef9bf3d1409bb16e5
Merge: e71d927 4a733cf
Author: Sergio Orbe <reyiyo@gmail.com>
Date: Mon Apr 20 10:30:16 2015 -0300
Merge pull request #95 from FedeG/develop
mergeo con cronograma y detalles de error encontrado
commit 4a733cf2503e3b99ccf87ee0f84a743a942d365e
Author: FedeG <federicog@exo.com.ar>
Date: Mon Apr 20 10:28:45 2015 -0300
Cambios de lineas
commit 898ec7d85fd0a7803e3fbddda108d5a8069b3759
Author: FedeG <federicog@exo.com.ar>
Date: Mon Apr 20 10:18:03 2015 -0300
Borrado de sort porque la query ya retorna ordenado
commit d8cbeb5c91ca04c820a0d4fd99669699369954ed
Author: FedeG <federicog@exo.com.ar>
Date: Mon Apr 20 01:23:45 2015 -0300
Validators, closes #73
commit 7ec4393ff232fad0a9e537971730cdc0d789f382
Author: FedeG <federicog@exo.com.ar>
Date: Mon Apr 20 01:11:18 2015 -0300
Cambio para no uso de url en edificio, closes #82
commit f364ce07c0b467ac6291ed05ca432ecb09fce01d
Author: FedeG <federicog@exo.com.ar>
Date: Mon Apr 20 00:29:47 2015 -0300
Agrego dato faltante, closes #85
commit 893214c3d0c7c28c47ed90e07bbecc4ad3eeacbb
Author: FedeG <federicog@exo.com.ar>
Date: Mon Apr 20 00:18:27 2015 -0300
Nuevas traducciones para los botones nuevos
commit 585f356389d666fc2e1d8ee163d3e5f059ed4727
Author: FedeG <federicog@exo.com.ar>
Date: Mon Apr 20 00:18:10 2015 -0300
Cambios de botones para la lista de charlas
commit 227b129c57305132d0f16e2cb53eeed4f733b375
Merge: 8bd3d90 ebc66d6
Author: FedeG <federicog@exo.com.ar>
Date: Sun Apr 19 23:08:14 2015 -0300
Merge branch 'master' of github.com:FedeG/eventoL into develop
commit ebc66d6841f67e67dbcd7590a070f4c8c53e03b0
Author: FedeG <federicog@exo.com.ar>
Date: Sun Apr 19 23:07:21 2015 -0300
Sort rooms
commit 8bd3d90c1f10071f5321905a329a37ef60ebf3fe
Author: FedeG <federicog@exo.com.ar>
Date: Sun Apr 19 22:59:14 2015 -0300
Datos perdidos en merge
commit ad342d28928b36af642e8ea1b9bdf997fbf5e004
Author: FedeG <federicog@exo.com.ar>
Date: Sun Apr 19 20:55:23 2015 -0300
Fix error de horarios y cambio de link de mas
commit dbc86283c02c6b64e508294eebf71600daaaef2e
Author: FedeG <federicog@exo.com.ar>
Date: Sun Apr 19 19:08:15 2015 -0300
Ver el listado de charlas cuando el cronograma ya esta confirmado, closes #93
commit 702cb81403a014d7554b71c0278e7fcb8f94ec95
Merge: e71d927 16d5411
Author: FedeG <federicog@exo.com.ar>
Date: Sun Apr 19 13:57:33 2015 -0300
Merge branch 'cronograma' of github.com:reyiyo/eventoL into develop
Conflicts:
manager/models.py
commit e71d9277b40b2c701b1e7364d700fa62560f4293
Merge: 4098ec4 92eec1c
Author: Sergio Orbe <reyiyo@gmail.com>
Date: Sun Apr 19 11:53:39 2015 -0300
Merge pull request #92 from reyiyo/export
Export
commit 92eec1cf6c308ed753e873c23dfb6aae644b21a6
Author: Sergio Orbe <sergioo@exo.com.ar>
Date: Sun Apr 19 11:50:48 2015 -0300
Export for Talk Proposals
commit 15d0326762a8b01e57f28ba57fba44c6db235df1
Author: Sergio Orbe <sergioo@exo.com.ar>
Date: Sun Apr 19 11:41:25 2015 -0300
Export for Installers
commit aa1a783592a8c0a9ab7e01725f8415fd504cc140
Author: Sergio Orbe <sergioo@exo.com.ar>
Date: Sun Apr 19 11:25:32 2015 -0300
Export for Installations
commit de666cf2ea5ff4304be9a4066161ab24f6af44f2
Author: Sergio Orbe <sergioo@exo.com.ar>
Date: Sun Apr 19 11:18:05 2015 -0300
Export for collaborators
commit 1a15628804e9aadff0b8cf50337e7f9cd39bc36a
Author: Sergio Orbe <sergioo@exo.com.ar>
Date: Sun Apr 19 10:53:46 2015 -0300
Attendee export
commit 4098ec4a7dd5d08e4a1fb51ebc765252fcd88205
Author: Sergio Orbe <sergioo@exo.com.ar>
Date: Sun Apr 19 10:05:18 2015 -0300
typo, agrego un espacio
commit 736c35987e4ed7dfe6a4598c5bca24ced9131c12
Author: Sergio Orbe <sergioo@exo.com.ar>
Date: Sun Apr 19 10:03:43 2015 -0300
Fix for charlas de menos de 15 minutos
commit 6a0fa1299b0c0045774d88b269cb1851c1a6dccf
Merge: 6953e9e 02f32c1
Author: Sergio Orbe <reyiyo@gmail.com>
Date: Sun Apr 19 08:36:08 2015 -0300
Merge pull request #88 from reyiyo/cronograma2
Cronograma2
commit 02f32c162abe6dde61d392ffbd2592f26c8c2a6f
Merge: a0e6034 6953e9e
Author: Sergio Orbe <sergioo@exo.com.ar>
Date: Sun Apr 19 08:33:59 2015 -0300
Merge branch 'master' into cronograma2
commit a0e603419d81f976116a649be82c932fb9ea8c3d
Author: Sergio Orbe <sergioo@exo.com.ar>
Date: Sun Apr 19 08:24:18 2015 -0300
Cronograma!
commit 6953e9ec98353a11f140131fd3dfcbb10298b3d5
Author: Sergio Orbe <sergioo@exo.com.ar>
Date: Sat Apr 18 10:36:02 2015 -0300
fix de que las fechas límites sean para ese día inclusive
commit 16d541139b05407f2d247721f3c9a027356023b6
Author: Sergio Orbe <sergioo@exo.com.ar>
Date: Sat Apr 18 10:34:16 2015 -0300
fix de un error bobo
commit 7df1d677e61be80a50a08e3e3e2105baf62fdb5e
Author: FedeG <federicog@exo.com.ar>
Date: Thu Apr 16 16:40:21 2015 -0300
Translate
commit 31208743cd609ff197afb3ff885014873801aa65
Author: FedeG <federicog@exo.com.ar>
Date: Thu Apr 16 16:38:29 2015 -0300
Traduccion
commit e66f1f9e8b8b5ab6cc09b0b9031501364abd5fa3
Merge: aab527a 5227f49
Author: FedeG <federicog@exo.com.ar>
Date: Thu Apr 16 16:35:10 2015 -0300
Merge branch 'master' of github.com:reyiyo/eventoL into develop
commit aab527a29a3cc3e0ae0c06b7c6ecac4e06206448
Author: FedeG <federicog@exo.com.ar>
Date: Thu Apr 16 16:34:53 2015 -0300
Uso de Schedule class para poder manejo del cronograma en la vista de cronograma
commit 095ef426239a19b81a7038d608bf18c60ad38b1a
Author: FedeG <federicog@exo.com.ar>
Date: Thu Apr 16 16:34:09 2015 -0300
Filtro de columnas de bootstrap
commit 4aad6b1d9c9de90c0c1f14dff67bd20451bdfbae
Author: FedeG <federicog@exo.com.ar>
Date: Thu Apr 16 16:33:50 2015 -0300
Template para el cronograma
commit efed0cf2c4c70d3cce3c2ff18c6f69d4e5d7b2bb
Author: FedeG <federicog@exo.com.ar>
Date: Thu Apr 16 16:33:11 2015 -0300
Schedule class para poder manejo del cronograma
commit 25ce77c8a78d75e15fb49a47c9830b3d19070f46
Author: FedeG <federicog@exo.com.ar>
Date: Thu Apr 16 16:32:33 2015 -0300
Migrate para el color en la clase de tipo de charla
commit 50112e6fd5238996a39e6c51f18596816cd34f6d
Author: FedeG <federicog@exo.com.ar>
Date: Thu Apr 16 16:32:26 2015 -0300
Color en la clase de tipo de charla
commit 5227f498ccf7a9e85d4acfce9ed5c78ecd4cf262
Merge: e9efb99 c1a9315
Author: Sergio Orbe <reyiyo@gmail.com>
Date: Thu Apr 16 10:00:45 2015 -0300
Merge pull request #86 from reyiyo/attendee_registration_by_collaborator
Se cambia el redirect de attendee_registration_by_collaborator de /SEDE ...
commit c1a93156fc98ae41d6027be7d7d837ffe6a2ffc3
Author: Agustin Ignacio Guido Croce Villanustre <agustinc@exo.com.ar>
Date: Wed Apr 15 17:33:17 2015 -0300
Cambio a la url de search
commit c7d41772cc9b309412d0cab0f310782d9d3fca56
Author: Agustin Ignacio Guido Croce Villanustre <agustinc@exo.com.ar>
Date: Wed Apr 15 16:40:16 2015 -0300
Se cambia el hardcodeo de la redireccion a usar la funcion de la vista.
commit 2d027503cb396e333306c438e9552292820680ad
Author: Agustin Ignacio Guido Croce Villanustre <agustinc@exo.com.ar>
Date: Wed Apr 15 15:57:52 2015 -0300
Se cambia el redirect de attendee_registration_by_collaborator de /SEDE a /registration/attendee/search
commit 6a57932acca06be46c45affc1bcc65e580cde3f7
Author: Sergio Orbe <sergioo@exo.com.ar>
Date: Mon Apr 13 17:34:07 2015 -0300
Api para charlas en JSON
commit e9efb999d1d6417992b914b1a0e7c3d2c8445bb7
Author: Sergio Orbe <sergioo@exo.com.ar>
Date: Sat Apr 11 18:54:27 2015 -0300
updated translations file
commit c8a7b877f1be0bacf0ada9943aefe5afe693d2a5
Author: Sergio Orbe <sergioo@exo.com.ar>
Date: Sat Apr 11 18:49:16 2015 -0300
update installations image
commit 24ed5283982d1fb98d36e293cc64379cce0b2916
Author: Sergio Orbe <sergioo@exo.com.ar>
Date: Sat Apr 11 18:44:02 2015 -0300
Fecha en la página principal de la sede. closes #76
commit 042c0de43907a6706396b6fdc8bf525594d2a22b
Author: Sergio Orbe <sergioo@exo.com.ar>
Date: Sat Apr 11 18:07:46 2015 -0300
Deleted installers group as it was empty. Add collaborators permissions to installers, add is_staff=True for installers, fix some flow where if the form was not valid, the there was no exception and the user and collaborator were not deleted. closes #75
commit 16dbee09accfcad25363a302064932de65d24dd0
Author: Sergio Orbe <sergioo@exo.com.ar>
Date: Sat Apr 11 11:31:51 2015 -0300
Downgrade image_cropping version. closes #74
commit fc69c7f127dccafe03ce58e3d8af0bb7d4c25800
Author: Sergio Orbe <sergioo@exo.com.ar>
Date: Fri Apr 10 18:37:36 2015 -0300
Posibilidad de que las sedes usen un sitio externo. closes #71
commit dd1d745efc75adc1127b182fbd2e62e00c3eb0f6
Author: Sergio Orbe <sergioo@exo.com.ar>
Date: Wed Apr 8 11:40:46 2015 -0300
fix #70. Errores en traducción de strings multiline
commit 327e284c42c35e4dfafee489fe202fee8141d699
Author: Sergio Orbe <sergioo@exo.com.ar>
Date: Wed Apr 8 08:01:43 2015 -0300
Imagen por default cuando una propuesta no tiene home_image. closes #69
commit af5eb835fef494b994745f60f38b671abd2cd0cc
Merge: 50af311 2533ed3
Author: Sergio Orbe <reyiyo@gmail.com>
Date: Tue Apr 7 15:11:50 2015 -0300
Merge pull request #67 from FedeG/develop
Mapa de homepage
commit 2533ed3587fa61c075f87ab02dca580d7b7f0476
Merge: cb8bbbe 50af311
Author: FedeG <federicog@exo.com.ar>
Date: Tue Apr 7 14:58:04 2015 -0300
Merge branch 'master' of github.com:reyiyo/eventoL into develop
commit cb8bbbed4ff250af04e5b62b007124f6108b1700
Author: FedeG <federicog@exo.com.ar>
Date: Tue Apr 7 14:57:57 2015 -0300
Cambio de configuración del mapa. closes #65
commit 12c14895d7d4cb32f6916fc55ca5fe43eb45a3e3
Author: FedeG <federicog@exo.com.ar>
Date: Tue Apr 7 14:51:54 2015 -0300
Cambio de tamaño del mapa para que este dentro del well donde estaba. closes #65
commit 50af311d457c198d7e6efe84c472f7c71f91af79
Merge: 5a070ff 0a7bdb4
Author: Sergio Orbe <reyiyo@gmail.com>
Date: Tue Apr 7 12:27:33 2015 -0300
Merge pull request #66 from FedeG/develop
Cambio de link
commit 0a7bdb42abd1d1c78d84dc439b1d3ced56718e5c
Merge: 9156dcb 5a070ff
Author: FedeG <federicog@exo.com.ar>
Date: Tue Apr 7 12:21:13 2015 -0300
Merge branch 'master' of github.com:reyiyo/eventoL into develop
commit 9156dcb495da070e920a91c5a9082a72597c6405
Author: FedeG <federicog@exo.com.ar>
Date: Tue Apr 7 12:20:59 2015 -0300
Link a /, closes #64
commit 5a070ff94c1486de8a050538b746b4df2e5010ee
Author: Sergio Orbe <sergioo@exo.com.ar>
Date: Tue Apr 7 11:33:17 2015 -0300
Limpieza!
commit 3c76843532df942bcd88290e40671a7fa1bb6384
Merge: 60cb008 ee4d5c4