forked from c4k9c0/cs373-idb
-
Notifications
You must be signed in to change notification settings - Fork 0
/
IDB3.log
1407 lines (955 loc) · 39.3 KB
/
IDB3.log
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 23f8e2aff209990ecfa6c25184d68de94edbdf1d
Author: Andy Medina <[email protected]>
Date: Thu Apr 21 13:36:00 2016 -0500
travis fix
commit 4f5f3b011a5f4f330f51aef31aedcc8e0766d0f3
Author: Andy Medina <[email protected]>
Date: Thu Apr 21 13:26:52 2016 -0500
update project 5 log
commit b6edfc5c80ad5d3216fc455b93025088350f181e
Merge: 91e25fb 87f92ed
Author: Andy Medina <[email protected]>
Date: Thu Apr 21 13:21:33 2016 -0500
fix charlie dev merge conflict
commit 87f92eda91167939ff90bf66b6a0fb9b89adf74e
Author: Andy Medina <[email protected]>
Date: Thu Apr 21 13:18:08 2016 -0500
remove debugging
commit de5887ba5cbb6cf775a9ad5da0f21e0066a8e301
Author: c4k9c0 <[email protected]>
Date: Wed Apr 20 21:56:14 2016 -0500
Improved search on link attributes
commit ff9269ee8203e02b8682bd13c374d1384bd9e08a
Author: c4k9c0 <[email protected]>
Date: Wed Apr 20 21:49:30 2016 -0500
Adding filters.js
commit 7256bd3e07483ad39553ae69ac9489a7db5a5997
Author: c4k9c0 <[email protected]>
Date: Wed Apr 20 21:39:28 2016 -0500
Made search actually contextualized
commit 91e25fb1663b57373847c6ab04e95645d816d0c6
Merge: 2b16449 30bfc56
Author: Hunter DeGroot <[email protected]>
Date: Wed Apr 20 14:15:42 2016 -0500
Merge remote-tracking branch 'origin/dev' into dev
commit 2b1644925f1da4515a2da1b2dece7d1446e526a0
Merge: 01f2ee1 fe90c27
Author: Hunter DeGroot <[email protected]>
Date: Wed Apr 20 14:15:38 2016 -0500
Merge branch 'hunter' into dev
commit fe90c27078807b158a06d0e57175adf520152032
Author: Hunter DeGroot <[email protected]>
Date: Wed Apr 20 14:15:18 2016 -0500
Countries with multiple metrics
commit 8044fddbf3a5ef379c472e816160d753a7d11119
Author: c4k9c0 <[email protected]>
Date: Tue Apr 19 22:59:55 2016 -0500
Made results prettier
commit 0df53415876f2d94fec7cc52287c5d4a2693551f
Author: c4k9c0 <[email protected]>
Date: Tue Apr 19 21:19:41 2016 -0500
Implemented search. Highlited the matches
commit 3852352560f61f0310f10fe0109cbd1f5f72d9a5
Author: c4k9c0 <[email protected]>
Date: Tue Apr 19 12:03:46 2016 -0500
Close search drop down when click model
commit 46c2547da724fc93b16b0feb6a5e6eb93fbb2252
Author: c4k9c0 <[email protected]>
Date: Tue Apr 19 00:22:30 2016 -0500
Started to fix the overwrite bug %58
commit 75c1915ae2b224f5943a0bcc1bfb0f66f4806e80
Author: c4k9c0 <[email protected]>
Date: Mon Apr 18 21:50:19 2016 -0500
allowed for single word search
commit a71651092de62883b5a9c0c6e10d4cd803477d69
Author: c4k9c0 <[email protected]>
Date: Mon Apr 18 21:44:46 2016 -0500
Manually did search
commit 30bfc56f1576e1f3fd073aacb20c024189484063
Author: Gabriel Gontijo Moreira <[email protected]>
Date: Mon Apr 18 19:51:44 2016 -0500
created critiques on fresh branch
commit d2c6e1553e58782334bed96c016b7203ec220cd8
Author: c4k9c0 <[email protected]>
Date: Sun Apr 17 21:49:01 2016 -0500
Implemented search and formated the results #55 #56
commit 01f2ee1e633ccd4e34b13fccb3697195725a14a1
Merge: 491ff28 65cb241
Author: Hunter DeGroot <[email protected]>
Date: Sun Apr 17 17:29:05 2016 -0500
Merge branch 'hunter' into dev
commit 65cb2419734e153359aea29a5934b1227f2f8edc
Author: Hunter DeGroot <[email protected]>
Date: Sun Apr 17 17:28:42 2016 -0500
Using countries api
commit d5a5d0da28b07dbc666c63c9554ff064d912b4f1
Merge: 1b6107b 2d0f73f
Author: Hunter DeGroot <[email protected]>
Date: Sun Apr 17 13:46:04 2016 -0500
Merge branch 'master' into hunter
commit 7471ea4c0ddc536287845fd11a76b64f3fa396f7
Author: c4k9c0 <[email protected]>
Date: Sat Apr 16 23:15:10 2016 -0500
implemented search in the back end
commit 6c694761e2878e33f5a263af723b80a86b08b1aa
Author: c4k9c0 <[email protected]>
Date: Sat Apr 16 18:08:04 2016 -0500
Adding search template
commit d61498b187896e3cb96bd6c29b9d488eb5e3f390
Author: c4k9c0 <[email protected]>
Date: Sat Apr 16 16:48:53 2016 -0500
fixed search to show original search term
commit f4d2869b3dbab93d89086a72d7d971a4ede1c815
Author: c4k9c0 <[email protected]>
Date: Wed Apr 13 22:51:00 2016 -0500
Set up Search end point and Angular service
commit a338cbf7b1bf47199e1efa2e3c29a0e64845ac20
Author: c4k9c0 <[email protected]>
Date: Wed Apr 13 20:49:54 2016 -0500
Change nav bar closes #57
commit 4c5267e91ee417cb44b113cff5ead98fe66ec074
Author: c4k9c0 <[email protected]>
Date: Wed Apr 13 19:34:48 2016 -0500
Added search bar, connected it to modal #53 #56
commit 05bad25c6218acd193c66bb3dc78c50a8979d3a9
Merge: 49c06f3 2d0f73f
Author: c4k9c0 <[email protected]>
Date: Tue Apr 12 22:46:53 2016 -0500
Merge branch 'master' into charlie
commit 49c06f3646483320d194dbdb8441ed87cedb9fe6
Author: c4k9c0 <[email protected]>
Date: Tue Apr 12 22:42:23 2016 -0500
Updating app.py
commit e32062fe5c5275dbdadf8962ffaa6cfec960e0cd
Author: c4k9c0 <[email protected]>
Date: Tue Apr 12 22:35:38 2016 -0500
undoing pops
commit 1d34a1a8741221b530bc0a98d88f767be92223f2
Merge: 8a167e7 9cbd567
Author: c4k9c0 <[email protected]>
Date: Tue Apr 12 22:28:02 2016 -0500
Merge branch 'master' into charlie
commit 8a167e72492b7717dae16c45a3a400ee208332ee
Merge: b5890a3 661944a
Author: c4k9c0 <[email protected]>
Date: Tue Apr 12 17:04:03 2016 -0500
Merge remote-tracking branch 'origin/andy' into charlie
Conflicts:
app/tests.py
commit 2d0f73fea0a6327ababc02d733cf47f1311b5944
Author: Andy Medina <[email protected]>
Date: Wed Apr 6 22:46:52 2016 -0500
travis fix
commit f7a2f8f69703f91cf2a125fb71e137b5e8983dd5
Author: Andy Medina <[email protected]>
Date: Wed Apr 6 22:44:17 2016 -0500
coverage in tests; fixed travis
commit 9098086f1fbe788d04aa707921e53c5e0cd2643e
Author: Andy Medina <[email protected]>
Date: Wed Apr 6 22:39:15 2016 -0500
pydoc for model.html
commit f79e09a0528bb3c3c4a8d1d903d70c7530a941c7
Author: Andy Medina <[email protected]>
Date: Wed Apr 6 22:25:23 2016 -0500
final changes
commit c3adb9b04b2822c1b8f247c358078e07b7ae44a6
Author: Andy Medina <[email protected]>
Date: Wed Apr 6 21:31:08 2016 -0500
successful travis build
commit d16fdc2b15c67675e858116594012141ff67a38d
Author: Andy Medina <[email protected]>
Date: Wed Apr 6 21:28:26 2016 -0500
travis mysql take 5 coverage 1
commit e27f3137bf09fd894504c4a0ac7d9d20f887f566
Author: Andy Medina <[email protected]>
Date: Wed Apr 6 21:25:46 2016 -0500
travis mysql take 5
commit 56736261d15bfbaf7f7ca6efc0555e26f98bd544
Author: Andy Medina <[email protected]>
Date: Wed Apr 6 21:21:16 2016 -0500
travis mysql take 4
commit be17eaf2723850ba516ec1c6038031d8d5a2f1f1
Author: Andy Medina <[email protected]>
Date: Wed Apr 6 21:14:32 2016 -0500
travis mysql take 3
commit 3fd3528a4f5d2c438a71b1e75be6ca98030ac485
Author: Andy Medina <[email protected]>
Date: Wed Apr 6 21:12:57 2016 -0500
travis mysql take 2
commit 32ba00683aaedd8babc0bf54351c69bcf39f5f5d
Author: Andy Medina <[email protected]>
Date: Wed Apr 6 21:11:17 2016 -0500
travis mysql take 1
commit 6cbcd44bc5b3864bfcf5653d202b0cb3817fac8f
Author: Andy Medina <[email protected]>
Date: Wed Apr 6 20:44:04 2016 -0500
travis fix take 20 coverage attempt 2
commit 324fa4089c6042752c12de8ced24d178138229af
Author: Andy Medina <[email protected]>
Date: Wed Apr 6 20:40:03 2016 -0500
travis fix take 20 coverage attempt
commit 659036130cac8320ee5582e3b5a91741d3f9dfcd
Author: Andy Medina <[email protected]>
Date: Wed Apr 6 20:36:40 2016 -0500
travis fix take 20
commit e705e5d8bf779bbd66d5921e44832437b9a0c334
Author: Andy Medina <[email protected]>
Date: Wed Apr 6 20:33:13 2016 -0500
travis fix take 19
commit 4ed1ce45229f967604f157641650daaf51be93b9
Author: Andy Medina <[email protected]>
Date: Wed Apr 6 20:31:44 2016 -0500
travis fix take 18
commit 4fc10b972826af305b51c7058837127f5bb6dfb6
Author: Andy Medina <[email protected]>
Date: Wed Apr 6 20:28:43 2016 -0500
travis fix take 17
commit c6cb9c4f6c12100c41c826d83d9d4acd044d341b
Author: Andy Medina <[email protected]>
Date: Wed Apr 6 20:16:55 2016 -0500
travis fix take 16
commit abbfdb9f1f5dc8ca3b07cbb51476ff43c0457b13
Author: Andy Medina <[email protected]>
Date: Wed Apr 6 20:11:05 2016 -0500
travis fix take 15
commit bf2bf412a70492e75adb39dbda18c342bc05f206
Author: Andy Medina <[email protected]>
Date: Wed Apr 6 20:09:37 2016 -0500
travis fix take 15
commit 3808f8d3cd32063756d7d8fbb9799a77239e6221
Author: Andy Medina <[email protected]>
Date: Wed Apr 6 20:00:40 2016 -0500
travis fix take 14
commit 19a82fb6a64d75792dcfc0e2f0e51b2788d72bbd
Author: Andy Medina <[email protected]>
Date: Wed Apr 6 19:56:26 2016 -0500
travis fix take 13
commit 9eaf679ed3b36a0cad4da5172951b4fc4a48c189
Author: Andy Medina <[email protected]>
Date: Wed Apr 6 19:54:24 2016 -0500
travis fix take 12
commit 09a8133f6f6b602c3d8919bcaa2b5ed74ecac9ab
Author: Andy Medina <[email protected]>
Date: Wed Apr 6 19:48:01 2016 -0500
travis fix take 11
commit 25ce6d76e6da50062ab21e741fdfb505e326d46d
Author: Andy Medina <[email protected]>
Date: Wed Apr 6 19:43:20 2016 -0500
travis fix take 10
commit eed1a14b4db5e56ac926fa98e66037a49711cac3
Author: Andy Medina <[email protected]>
Date: Wed Apr 6 14:49:58 2016 -0500
travis fix take 9
commit 9cd3ca09ff4fd6b3a31f98ee3a76a210215640cf
Author: Andy Medina <[email protected]>
Date: Wed Apr 6 14:43:54 2016 -0500
travis fix take 8
commit b02eab7e2f0fd6483e1eb50fffcf7c1a8a62b9b0
Author: Andy Medina <[email protected]>
Date: Wed Apr 6 14:41:01 2016 -0500
travis fix take 7
commit 8d62bebecfd7486727e2487b96366b79b2b4d35b
Author: Andy Medina <[email protected]>
Date: Wed Apr 6 14:37:47 2016 -0500
travis fix take 6
commit 6ff637327f91a873a46a35ec74ed498c51644c4d
Author: Andy Medina <[email protected]>
Date: Wed Apr 6 14:32:25 2016 -0500
travis fix take 5
commit b5e43af97275419887eb80e58e39040986af6aa5
Author: Andy Medina <[email protected]>
Date: Wed Apr 6 14:26:43 2016 -0500
travis fix take 4
commit eee60ef87f315bed5a20d5c5117eadd2cf6259ed
Author: Andy Medina <[email protected]>
Date: Wed Apr 6 14:23:35 2016 -0500
travis fix take 3
commit 12d567a357072ecb817b1a030f1778b0f4985a29
Author: Andy Medina <[email protected]>
Date: Wed Apr 6 13:50:34 2016 -0500
travis fix take 2
commit fdf58c3e36eefbfbee0ee11208e4442c2e95d9b0
Author: Andy Medina <[email protected]>
Date: Wed Apr 6 13:49:40 2016 -0500
travis fix
commit 6b5389235aa8a9b6b06d83ce2f8091a7d695632a
Merge: d7a071f 491ff28
Author: Andy Medina <[email protected]>
Date: Wed Apr 6 13:45:59 2016 -0500
Merge branch 'dev' of https://github.com/c4k9c0/cs373-idb into andy
commit 491ff28a3dd99ddd7a7f0485cb662061a5a1704a
Merge: df6059b d9271ff
Author: Hunter DeGroot <[email protected]>
Date: Wed Apr 6 13:06:06 2016 -0500
Merge remote-tracking branch 'origin/dev' into dev
commit df6059b83a2ff89d84bc8454ded1fc010395bd49
Merge: 40ef885 1c641a8
Author: Hunter DeGroot <[email protected]>
Date: Wed Apr 6 13:05:51 2016 -0500
Merge branch 'master' into dev
commit d7a071fb5753db61158a391929d54fd6de340363
Author: Andy Medina <[email protected]>
Date: Wed Apr 6 06:36:01 2016 -0500
updated gitignore
commit 661944afb24bf683d8111294e8d8ba49870d1098
Author: Andy Medina <[email protected]>
Date: Wed Apr 6 05:52:51 2016 -0500
test css update
commit 7fad4130f02d8a00da3ceec8bb8d398232fcdb30
Merge: 4c15a3d e8729d8
Author: Andy Medina <[email protected]>
Date: Wed Apr 6 04:33:58 2016 -0500
Merge branch 'charlie' into andy
commit e8729d84b2f441c433857462f94024cc27eece90
Author: Andy Medina <[email protected]>
Date: Wed Apr 6 04:30:53 2016 -0500
successful test changes
commit 4e47a7d73b7a3c8a2dd565145735cd530c3664a6
Author: Andy Medina <[email protected]>
Date: Wed Apr 6 04:15:29 2016 -0500
fixed tests
commit b5890a3e51e86f8c2f1ca010a53eb5163cb51f6b
Author: Charlie Cox <[email protected]>
Date: Tue Apr 5 22:37:31 2016 -0500
Updated tests to insert and delete #27
commit 788e55c58d4d21b5d186eea90240242a60698073
Author: Andy Medina <[email protected]>
Date: Tue Apr 5 21:15:30 2016 -0500
most tests running
commit 1c641a89098943005b95596978e39d0d3f957a3b
Merge: 9cbd567 1b6107b
Author: Hunter DeGroot <[email protected]>
Date: Mon Apr 4 21:10:35 2016 -0500
Merge branch 'hunter'
commit 1b6107b5a4bdc92345ab1b2e33cfd93b774de445
Author: Hunter DeGroot <[email protected]>
Date: Mon Apr 4 21:10:20 2016 -0500
Fixed individual player page team logo
commit 4c15a3db1ef27ec62e3f0526ed2f08b65b8a4a71
Merge: 9f6ac1e d9271ff
Author: Andy Medina <[email protected]>
Date: Mon Apr 4 20:52:53 2016 -0500
Merge branch 'dev' of https://github.com/c4k9c0/cs373-idb into andy
commit d9271ff212819d31ec23227d84816737e96805bd
Author: c4k9c0 <[email protected]>
Date: Mon Apr 4 20:51:34 2016 -0500
Updated endpoint in the service
commit 503065b4bd5a47d0eb1db3a9f463040eee5a60a0
Author: c4k9c0 <[email protected]>
Date: Mon Apr 4 20:50:12 2016 -0500
Changed route name
commit 4f72a4ab7985bf8dfd6b0bde0d8160088cec30b9
Author: c4k9c0 <[email protected]>
Date: Mon Apr 4 20:48:46 2016 -0500
Adding test route
commit 9f6ac1eba80f9577b76c4f68d6568c788894a6cd
Merge: 005a6d6 0e57ff4
Author: Andy Medina <[email protected]>
Date: Mon Apr 4 20:36:53 2016 -0500
Merge branch 'dev' of https://github.com/c4k9c0/cs373-idb into andy
commit 0e57ff43c923722e16d14b3bdd9ea8d6dc46075c
Author: c4k9c0 <[email protected]>
Date: Mon Apr 4 20:35:09 2016 -0500
Updated makefile and wrote tests #27, #28, #43
commit bb3f2adbef967c874c07388d676fc1f081b2f607
Author: Hunter DeGroot <[email protected]>
Date: Mon Apr 4 13:06:37 2016 -0500
Fixed Title Stats
commit 9cbd56776f3c65638090c5394c39412233e6e83c
Merge: 65db1b4 483491e
Author: c4k9c0 <[email protected]>
Date: Sun Apr 3 17:23:58 2016 -0500
Merge branch 'master' of https://github.com/c4k9c0/cs373-idb
commit 65db1b4a5cc5a7dcfd9b8eae91e522b80ec4869b
Author: c4k9c0 <[email protected]>
Date: Sun Apr 3 17:23:44 2016 -0500
Adding png version of UML
commit 713d8b388f0b3fc1d5c88f33f016a1e94144d928
Author: c4k9c0 <[email protected]>
Date: Sun Apr 3 17:22:15 2016 -0500
Adding png version of UML
commit 005a6d659380dbf8a2df2c45d84cc47058ba628f
Merge: e2b161c 977b5e7
Author: Andy Medina <[email protected]>
Date: Sat Apr 2 21:33:42 2016 -0500
API pushed to production
commit 977b5e705a310acdba482405fed575a7b8395c43
Merge: 8f2daab 40ef885
Author: Andy Medina <[email protected]>
Date: Sat Apr 2 16:15:15 2016 -0500
Merge branch 'dev' of https://github.com/c4k9c0/cs373-idb into charlie
commit 8f2daab3e351228dea6b14675ab260caa5b49d92
Author: Andy Medina <[email protected]>
Date: Sat Apr 2 16:15:00 2016 -0500
API working w/ Docker
commit 40ef885343605d9f9971253113a3bc03d9d87be9
Merge: 54fcca9 eff6ad0
Author: Hunter DeGroot <[email protected]>
Date: Sat Apr 2 13:39:22 2016 -0500
Merge remote-tracking branch 'origin/dev' into dev
commit 54fcca9de4934ed9126091c0b72b2834b0538163
Merge: fb7cfc2 298660f
Author: Hunter DeGroot <[email protected]>
Date: Sat Apr 2 13:38:17 2016 -0500
Merge branch 'hunter' into dev
commit 298660f689a8e2463b615487138c3f0f1aae1320
Author: Hunter DeGroot <[email protected]>
Date: Sat Apr 2 13:37:58 2016 -0500
Tests on about page
commit 557bfb40c35fe81deb5a5eb735f9e96650995fb5
Author: c4k9c0 <[email protected]>
Date: Sat Apr 2 13:07:23 2016 -0500
Finished API based on sqlite
commit a76575168fc26c1aba71f9b777dbe1f748687e4f
Merge: 4b8d553 41df09a
Author: c4k9c0 <[email protected]>
Date: Sat Apr 2 12:24:42 2016 -0500
Merge branch 'charlie' into hunter
commit 4b8d553f9bab215778865ef5a2277d60f32cdebe
Author: Hunter DeGroot <[email protected]>
Date: Sat Apr 2 12:23:39 2016 -0500
Pulling from db instead of json
commit 41df09aa02f3336e81b196cc1bcdc6701aac3ffe
Author: c4k9c0 <[email protected]>
Date: Sat Apr 2 12:23:27 2016 -0500
Implemented easy API endpoints #32
commit 2e66ea4e83b124130603f5285895c292a8f87817
Author: c4k9c0 <[email protected]>
Date: Sat Apr 2 11:07:01 2016 -0500
Got crimes push in #39
commit 0e3537c785116eb530a79f7d469097be3eaf9558
Author: c4k9c0 <[email protected]>
Date: Sat Apr 2 11:00:15 2016 -0500
Working on populating crimes #39
commit 483491e31ffd25380a34482b81e197151a231aee
Author: Hunter DeGroot <[email protected]>
Date: Sat Apr 2 10:55:23 2016 -0500
Formatted Pie Graph closes #40
commit d43c31d81652873bb04dca199ed641b82701e652
Author: c4k9c0 <[email protected]>
Date: Fri Apr 1 21:40:31 2016 -0500
Inserted data for players and teams. Half done with crimes #39
commit 13f3704cddff421063704eea7a68e33b9dcc4e58
Author: c4k9c0 <[email protected]>
Date: Fri Apr 1 17:01:09 2016 -0500
Hacky fix to #38
commit 20f635c7fac884ed1bee2d418bc7bdd78b7e4791
Author: c4k9c0 <[email protected]>
Date: Fri Apr 1 15:06:45 2016 -0500
Created a version of models that is stable #32
commit e2b161ce83aa02263841c183ac6c4236eab54105
Author: Andy Medina <[email protected]>
Date: Fri Apr 1 13:59:37 2016 -0500
app.py mods
commit 7a36bc15c4d20ed3ccdc18c324b00e7f39e4aa98
Author: c4k9c0 <[email protected]>
Date: Fri Apr 1 10:27:42 2016 -0500
Playing around with a sample API
commit d4149549325878f7ba2358f9d0d45255fa04aeaa
Merge: 6fdf3a3 eff6ad0
Author: Andy Medina <[email protected]>
Date: Fri Apr 1 01:01:19 2016 -0500
Merge branch 'dev' of https://github.com/c4k9c0/cs373-idb into andy
commit 6fdf3a3a2863e3d0bb4cfa8d2c4db47c831021c4
Author: Andy Medina <[email protected]>
Date: Fri Apr 1 00:59:30 2016 -0500
mysql working now
commit 48bf02228304dc6ead55a5ad51dff70494717342
Merge: 3394cd8 526690a
Author: c4k9c0 <[email protected]>
Date: Thu Mar 31 21:28:22 2016 -0500
Merge remote-tracking branch 'origin/andy' into charlie
commit eff6ad0ac6e9d21ebe2c13b34992dc7c8974df88
Merge: b6e7191 fb7cfc2
Author: c4k9c0 <[email protected]>
Date: Thu Mar 31 20:13:56 2016 -0500
Merge branch 'dev' of https://github.com/c4k9c0/cs373-idb into dev
commit b6e719167532a094f8508e037a99249c50c4a64e
Merge: b36cccc 3394cd8
Author: c4k9c0 <[email protected]>
Date: Thu Mar 31 20:13:45 2016 -0500
Merge branch 'charlie' into dev
commit 3394cd8d2a2d4a859ab97e60da81366ee56b5c78
Author: c4k9c0 <[email protected]>
Date: Thu Mar 31 20:13:24 2016 -0500
final sample db
commit 34e0a356d74c4e1f41948943d8a22224ac2cdb52
Author: c4k9c0 <[email protected]>
Date: Thu Mar 31 19:45:27 2016 -0500
Adding relations to sample db
commit 2ae7e7bf39e6b57c8f2d08636e7635ff761c25d7
Author: c4k9c0 <[email protected]>
Date: Thu Mar 31 19:10:06 2016 -0500
Sample database`
commit 8237d01fc35ba5286750c76a68c683b24e96c0f2
Author: c4k9c0 <[email protected]>
Date: Thu Mar 31 19:09:35 2016 -0500
Added a du
commit 526690a77d1e4590eafd4ec4dead080eccdb8815
Author: Andy Medina <[email protected]>
Date: Wed Mar 30 21:49:41 2016 -0500
conceptual progress
commit fb7cfc2311f64cf8f9e82497264c5ad4aeb59026
Author: Gabriel Gontijo Moreira <[email protected]>
Date: Wed Mar 30 17:46:01 2016 -0500
Changed location of the image to be displayed on the side of the crime name
commit 5089632516fabaea9215b17b75c5abb997b61291
Author: Gabriel Gontijo Moreira <[email protected]>
Date: Wed Mar 30 17:39:26 2016 -0500
deleted all jpgs
commit 1394a502152388cd0c66c51413026bfa0b0c48fc
Author: Gabriel Gontijo Moreira <[email protected]>
Date: Wed Mar 30 17:30:23 2016 -0500
Changed crontroller and single crime page so it now it displays the image of that specific crime
commit 951a98f819220f6f40fa228851e1b13c4c64d53b
Author: Gabriel Gontijo Moreira <[email protected]>
Date: Wed Mar 30 17:22:43 2016 -0500
convereted all to png and made their white background transparent
commit 99b52f266346d88e162a4e8a41ef5eff8b63ec8d
Author: Gabriel Gontijo Moreira <[email protected]>
Date: Wed Mar 30 16:53:25 2016 -0500
Donwloaded all the crime category stock images
commit 7268c1cda22d418d3dfe3c6bc98019109c9bd9c5
Author: Gabriel Gontijo Moreira <[email protected]>
Date: Wed Mar 30 16:37:31 2016 -0500
Downloaded stock images for most of the crimes
commit e45b4e4681cd2e024918e5f4f9941b00b0f25168
Author: Gabriel Gontijo Moreira <[email protected]>
Date: Wed Mar 30 16:03:02 2016 -0500
created script to get the name and frequency of every crime category
commit 35ed947c22897c96c6d4d731f3788a1da78d7b80
Merge: 73f6458 b36cccc
Author: Gabriel Gontijo Moreira <[email protected]>
Date: Wed Mar 30 14:11:11 2016 -0500
Merge branch 'dev' into gabriel
commit b36ccccda931e5fdbc82f7dd6d5f608dbd701972
Author: c4k9c0 <[email protected]>
Date: Thu Mar 24 00:23:17 2016 -0500
updated README
commit 270b09c9f57b06f8c8616806fb5a8565a2d2bf74
Author: Andy Medina <[email protected]>
Date: Wed Mar 23 19:23:14 2016 -0500
finalizing about page
commit a9d93e17e3e7e0ce9fe819ec8463e3515a3b45b4
Author: Andy Medina <[email protected]>
Date: Wed Mar 23 19:17:48 2016 -0500
updated about with counts
commit d79ed7eb442da69177b1a43613a86e2a9b3b47a8
Author: c4k9c0 <[email protected]>
Date: Wed Mar 23 19:03:55 2016 -0500
Updated models.html and git log
commit 14b40a1524a73ad2f0612dc1220c12788d13aa99
Merge: 9ad35ee 0dc1667
Author: c4k9c0 <[email protected]>
Date: Wed Mar 23 18:56:35 2016 -0500
Merge branch 'dev' of https://github.com/c4k9c0/cs373-idb into dev
commit 9ad35ee5c038a9f4ed34428a06eee081980d643a
Author: c4k9c0 <[email protected]>
Date: Wed Mar 23 18:56:08 2016 -0500
Changed about page #14
commit 0dc1667f481c5c6f2a2aa18ab93ed2925ee98817
Merge: 47f970d e18eaa9
Author: jlciam <[email protected]>
Date: Wed Mar 23 18:50:56 2016 -0500
Merge branch 'dev' of https://github.com/c4k9c0/cs373-idb into dev
Conflicts:
app/templates/about.html
commit 47f970d4caf7bce64fd83433bd329f2e4c6e4089
Author: jlciam <[email protected]>
Date: Wed Mar 23 18:46:31 2016 -0500
bio and responsibilities added -Jena
commit e18eaa94b15a167678382d0957b93b298fd00927
Author: c4k9c0 <[email protected]>
Date: Wed Mar 23 18:39:50 2016 -0500
Updated about page #14
commit 73f6458675b54ae19fe1fbb917db44d27cd3f12a
Author: Gabriel Gontijo Moreira <[email protected]>
Date: Wed Mar 23 14:38:28 2016 -0500
Eddited my about information
commit 3646428ef4e8fed701043d667ff2e34bdb732840
Author: Andy Medina <[email protected]>
Date: Tue Mar 22 22:18:51 2016 -0500
css clean up
commit 0d1ffab432b060e86a14d4c2962c763963da8bf5
Author: Andy Medina <[email protected]>
Date: Tue Mar 22 22:17:25 2016 -0500
turned debugging off
commit 09900afca9aa1e628834eee5cb578fee1a6216cc
Author: Andy Medina <[email protected]>
Date: Tue Mar 22 22:10:08 2016 -0500
update jenas pic
commit 7826372581b9d8444b459421539df0dfe9fe8d90
Author: Andy Medina <[email protected]>
Date: Tue Mar 22 21:58:52 2016 -0500
update hunters pic
commit 5b022c753b54122004bdcaf514003f63eb152074
Author: Andy Medina <[email protected]>
Date: Tue Mar 22 21:49:44 2016 -0500
added andy bio
commit 12385bbea8d2a54178b53467c6080c4382968b04
Merge: 5762fab b8871f5
Author: Andy Medina <[email protected]>
Date: Tue Mar 22 21:22:32 2016 -0500
Merge branch 'dev' of https://github.com/c4k9c0/cs373-idb into andy
commit 5762fab89b398db98a20f6f1a6c2585622203c67
Merge: 798d4e2 32bd606
Author: Andy Medina <[email protected]>
Date: Tue Mar 22 21:18:01 2016 -0500
Merge remote-tracking branch 'origin' into andy
commit 798d4e2f53f50617e9dbb4afb5f2d3bf41e0b703
Author: Andy Medina <[email protected]>
Date: Tue Mar 22 21:16:44 2016 -0500
added favicon
commit b8871f51b36c5047a6bcc356ae47ef97c8ef818a
Author: c4k9c0 <[email protected]>
Date: Tue Mar 22 20:58:49 2016 -0500
removed unused html
commit 0feb71dbf05e9b3a388bbf29f303f53c032bf4db
Merge: 402e6bc 51a63cc
Author: c4k9c0 <[email protected]>
Date: Tue Mar 22 20:55:25 2016 -0500
Merge branch 'dev' into charlie
commit 402e6bcf9ba53e86ee75bdc38d461edddb1ee6e3
Author: c4k9c0 <[email protected]>
Date: Tue Mar 22 20:48:57 2016 -0500
made datatables more responsive, still not great though. #19
commit 51a63ccff984741b019c768c617ef212564da7ee
Merge: 787ad7c 263c1bf
Author: c4k9c0 <[email protected]>
Date: Tue Mar 22 20:11:53 2016 -0500
Merge branch 'charlie' into dev
commit 263c1bf3378c40523915713c9cf35bce75151b64
Author: c4k9c0 <[email protected]>
Date: Tue Mar 22 20:04:15 2016 -0500
Wrote unit tests #7
commit 45d8d0d8469df5af2036d4daf7dbf2825cf4777b
Author: c4k9c0 <[email protected]>
Date: Tue Mar 22 19:08:21 2016 -0500
Removing install pymssql since we don't need it in part 1 #25
commit 7f2fd2ae1aac0f11a958692862ec6c349e0a677a
Author: c4k9c0 <[email protected]>
Date: Tue Mar 22 19:00:11 2016 -0500
Adding models and pydoc #24
commit ee04687886a90ca42f61bcda54a2b8b3037fd2f4
Merge: 74f9aa6 787ad7c
Author: Andy Medina <[email protected]>
Date: Tue Mar 22 13:28:39 2016 -0500
updating andy branch
commit 74f9aa66636b686cc07f6f7f39d4a75721cd8205
Author: Andy Medina <[email protected]>
Date: Tue Mar 22 13:27:49 2016 -0500
css and docker yml updates
commit 294c46bf621d8ebe97058601636072f71badb042
Author: c4k9c0 <[email protected]>
Date: Mon Mar 21 22:09:59 2016 -0500
Moved UML to correct place #8
commit c2e09252ce2c63abd2c3a15a81a7ee54a546ffe6
Merge: e7f0829 4367999
Author: c4k9c0 <[email protected]>
Date: Mon Mar 21 22:05:08 2016 -0500
Merge branch 'dev' into charlie
commit e7f0829c988d9125f049fa170b896e7d0f6f174e
Author: c4k9c0 <[email protected]>
Date: Mon Mar 21 22:01:56 2016 -0500
Adding make and travis files #11
commit 787ad7c0ca04dbe124a89b6d6ae4953900dcf181
Merge: 60e537b bff3cbc
Author: Gabriel Gontijo Moreira <[email protected]>
Date: Mon Mar 21 21:13:46 2016 -0500
Merge branch 'gabriel' into dev
commit bff3cbcaf7f22c6e3f2c59b68b8b10bc02c5045a
Author: Gabriel Gontijo Moreira <[email protected]>
Date: Mon Mar 21 21:13:36 2016 -0500
fixed the apiary link to point to our actual api link
commit 60e537b0e9a8033e1ad5b3bfb09fc81fe8e20581
Merge: 4367999 280417f
Author: Gabriel Gontijo Moreira <[email protected]>
Date: Mon Mar 21 21:07:03 2016 -0500
Merge branch 'gabriel' into dev
commit 280417fe6182afdcd0fab89eb8aacad4581764ee
Author: Gabriel Gontijo Moreira <[email protected]>
Date: Mon Mar 21 21:06:45 2016 -0500
Now when on an individual crime page the second table column (team) is now a link that leads you to the right team individual page
commit 29341f6b0682f439b5c11547b70b88cf117727d3
Author: Gabriel Gontijo Moreira <[email protected]>
Date: Mon Mar 21 20:56:17 2016 -0500
Individual Teams Page now shows all the infor about that individual team before the table and pie chart
commit 50d022064caa9c766c4fff732f9470657f7f8185
Author: Gabriel Gontijo Moreira <[email protected]>
Date: Mon Mar 21 20:31:42 2016 -0500