-
Notifications
You must be signed in to change notification settings - Fork 0
/
IDB3.log
1410 lines (959 loc) · 40.1 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 8be7792f69407b40db52d46e88f26b85b5bc3d01
Author: Weston Selleck <[email protected]>
Date: Thu Apr 20 20:30:10 2017 -0500
laksjdflaksdjflaksdjflaksdjflaksdjflkasjdflkajd
commit 17aa69a473460d1eec0e527f6aaa79132cdfaba3
Author: Weston Selleck <[email protected]>
Date: Thu Apr 20 20:28:08 2017 -0500
hmmmasdfmasdlfdsfkljdjkl
commit aef550805653617711b25950a9b13dfde2cabf2d
Author: Weston Selleck <[email protected]>
Date: Thu Apr 20 20:20:47 2017 -0500
remove thingy ma jiggy
commit 9d91bdcb51e07be8089b6203a3070df697fa6b12
Author: Weston Selleck <[email protected]>
Date: Thu Apr 20 20:18:57 2017 -0500
Show all search results
commit 9686f2164e6219fa436e638353f215bec7643742
Merge: 8b85167 19835e7
Author: Nikita Zamwar <[email protected]>
Date: Thu Apr 20 20:16:17 2017 -0500
Merge branch 'dev' of https://github.com/brianqvpham/cs373-idb into dev
commit 8b8516748ee5ac2422485753330315a59d82458c
Author: Nikita Zamwar <[email protected]>
Date: Thu Apr 20 20:16:10 2017 -0500
clean up search
commit 19835e72fecb4a7574137d9b49923893d1d226c0
Author: Weston Selleck <[email protected]>
Date: Thu Apr 20 20:13:54 2017 -0500
Whitespace stuffffffffalskdjfalksdjflkj
commit 0f1a9097433e0d26720f30f57f80cf2890a61f12
Merge: 1120218 bd4549f
Author: Nikita Zamwar <[email protected]>
Date: Thu Apr 20 20:09:42 2017 -0500
Merge branch 'dev' of https://github.com/brianqvpham/cs373-idb into dev
commit 1120218a6cffc231ef60de48fd4d6e6df858153b
Author: Nikita Zamwar <[email protected]>
Date: Thu Apr 20 20:09:32 2017 -0500
The Duck
commit bd4549f6f8ce65ba9c84a46eb54cff9453bf9a4e
Author: Brian <[email protected]>
Date: Thu Apr 20 20:02:29 2017 -0500
Fixed game name in table to not be hyperlink
commit 095cfeb15a8a524c8f4fbdf677a8b3cba3aed729
Merge: d960790 9f7ecb6
Author: Brian <[email protected]>
Date: Thu Apr 20 19:58:33 2017 -0500
Merge branch 'dev' of github.com:brianqvpham/cs373-idb into dev
commit d960790046e63542dfb2619592bfdfd945f5920c
Author: Brian <[email protected]>
Date: Thu Apr 20 19:58:23 2017 -0500
Fixed querying of game data
commit 9f7ecb60ee4b390e3093bfbbc28a4aff46a2c3ef
Merge: 34fe244 1d6720f
Author: Nikita Zamwar <[email protected]>
Date: Thu Apr 20 19:57:51 2017 -0500
Merge branch 'dev' of https://github.com/brianqvpham/cs373-idb into dev
commit 34fe2441116b3394884be27bee3c6d63c4edbbbc
Author: Nikita Zamwar <[email protected]>
Date: Thu Apr 20 19:57:43 2017 -0500
explicitly differ between AND and OR
commit 1d6720f91b3dda9c34dc33484477df2c34950e19
Author: Brian <[email protected]>
Date: Thu Apr 20 19:49:42 2017 -0500
Fixed templating in wishlist.html
commit a12d9351a42ba8dfb5af653306bd80bbe72d71fc
Merge: e4da9a7 ca4f6a2
Author: pikachu94 <[email protected]>
Date: Thu Apr 20 19:44:33 2017 -0500
Merge branch 'dev' of https://github.com/brianqvpham/cs373-idb into dev
commit e4da9a73bcd66244404234e598eda9701ad9f1a2
Author: pikachu94 <[email protected]>
Date: Thu Apr 20 19:44:24 2017 -0500
adding data to table
commit ca4f6a265123b22e917ab248277f8df1da00676c
Author: Brian <[email protected]>
Date: Thu Apr 20 19:36:41 2017 -0500
Fixed querying of game data
commit 07f767d334c20ab5307eaf307982c522ae068bca
Merge: fe4365f ab797c3
Author: Weston Selleck <[email protected]>
Date: Thu Apr 20 19:31:35 2017 -0500
Merge branch 'dev' of https://github.com/brianqvpham/cs373-idb into dev
commit fe4365fe5dfcbaf9c94d8bfd9a514bd0ac66a044
Author: Weston Selleck <[email protected]>
Date: Thu Apr 20 19:31:28 2017 -0500
Page stuff
commit ab797c3b2990589e9272077942a2a8144094559c
Merge: 713a988 200f388
Author: pikachu94 <[email protected]>
Date: Thu Apr 20 19:30:42 2017 -0500
Merge branch 'dev' of https://github.com/brianqvpham/cs373-idb into dev
commit 713a988b9a868672a7915e1250e8dbe1f7c6188b
Author: pikachu94 <[email protected]>
Date: Thu Apr 20 19:30:35 2017 -0500
table for new page
commit 200f3887a1bb30b74ca7529a1e9486a9eecb8fbf
Merge: 2370b5b 19e564e
Author: Brian <[email protected]>
Date: Thu Apr 20 19:27:39 2017 -0500
Wishlist progress
commit 2370b5bcbc5ccc30a8dc9bcc03ec7dbfa875f091
Author: Brian <[email protected]>
Date: Thu Apr 20 19:25:02 2017 -0500
Setup retrieval of select menu fields
commit 19e564e56fc53485126c192007a7515c24fba42a
Merge: e95dc6c 718f385
Author: Nikita Zamwar <[email protected]>
Date: Thu Apr 20 19:18:20 2017 -0500
Merge branch 'dev' of https://github.com/brianqvpham/cs373-idb into dev
commit e95dc6c556d0cdfe1326013d2f497f7fb6f540ea
Author: Nikita Zamwar <[email protected]>
Date: Thu Apr 20 19:18:11 2017 -0500
Search logic between and/or
commit 718f38556f24eb0166e3a05a859ad44471e17b80
Author: pikachu94 <[email protected]>
Date: Thu Apr 20 19:09:47 2017 -0500
set up table
commit 9de8540d32871d7a6062b5174afeea041d0b1bb0
Merge: dbb058c 58cb7cf
Author: Nikita Zamwar <[email protected]>
Date: Thu Apr 20 19:08:11 2017 -0500
Merge branch 'dev' of https://github.com/brianqvpham/cs373-idb into dev
commit dbb058c71f6364f9746cfc71421bdb908efceb0c
Author: Nikita Zamwar <[email protected]>
Date: Thu Apr 20 19:08:04 2017 -0500
Page numbers
commit 58cb7cf5cc3cba6f522c20e09940b5ef60d0c29f
Author: Weston Selleck <[email protected]>
Date: Thu Apr 20 18:48:25 2017 -0500
search thigns
commit 221d9fc72e5ccf663d0988b7eff81ae992025ba3
Merge: b687864 1db0148
Author: Weston Selleck <[email protected]>
Date: Thu Apr 20 18:36:09 2017 -0500
Merge branch 'dev' of https://github.com/brianqvpham/cs373-idb into dev
commit b6878641456311868045ff5ec0893cae595a86e1
Author: Weston Selleck <[email protected]>
Date: Thu Apr 20 18:36:05 2017 -0500
No duplicates in search
commit 1db01489e35cbe4f91fb6e46618e7d0b5ac4fec1
Author: Brian <[email protected]>
Date: Thu Apr 20 18:25:22 2017 -0500
Added code to parse args in show_wishlist
commit cb5349a0b3cd7f8e664922db7db849a18ee58741
Author: pikachu94 <[email protected]>
Date: Thu Apr 20 18:24:12 2017 -0500
updating page
commit a7a7244a77b4322d17e1348acaa1383c93b74cd1
Merge: 383ba4b af126ee
Author: pikachu94 <[email protected]>
Date: Thu Apr 20 17:21:56 2017 -0500
Merge branch 'dev' of https://github.com/brianqvpham/cs373-idb into dev
commit 383ba4b57c2cdeacf6a394b65c525679c0293eaa
Author: pikachu94 <[email protected]>
Date: Thu Apr 20 17:21:45 2017 -0500
implemented dropdown wfor themes and ratings
commit af126eed5f8f5c55ca607f85017f9d68b4c18534
Merge: ff96f2f 7d18c29
Author: Nikita Zamwar <[email protected]>
Date: Thu Apr 20 16:58:25 2017 -0500
Merge branch 'dev' of https://github.com/brianqvpham/cs373-idb into dev
commit ff96f2f81394bc8437d9464a157411ad1bf0b74b
Author: Nikita Zamwar <[email protected]>
Date: Thu Apr 20 16:58:17 2017 -0500
Fixed search to include both and/or results
commit 7d18c29749342e1af30400bb1fc9f5fd19f87252
Merge: 30f742a ac64968
Author: paola jara <[email protected]>
Date: Thu Apr 20 16:29:43 2017 -0500
Merge branch 'dev' of https://github.com/brianqvpham/cs373-idb into dev
commit 30f742afc112b7ab09b91a07de98fd324b421105
Author: paola jara <[email protected]>
Date: Thu Apr 20 16:29:34 2017 -0500
fixing wishlist page
commit ac649685468507d7b198424f6cad51d0cc0115b5
Author: Weston Selleck <[email protected]>
Date: Thu Apr 20 15:34:11 2017 -0500
Case insensitive search
commit a6499b64f62fd3f523da383f6c9e6c34cc7dab44
Author: paola jara <[email protected]>
Date: Thu Apr 20 13:53:04 2017 -0500
fixing other page group
commit 4f2b3268ceb2d2cc4099d5ef519e24f73e770a05
Author: Brian Pham <[email protected]>
Date: Thu Apr 20 12:26:05 2017 -0500
Added query_games function
commit 2f7832fa2d00ba867802c1e84582be3e44b27451
Author: Brian Pham <[email protected]>
Date: Thu Apr 20 12:03:11 2017 -0500
Populated ratings select menu,
commit a8e350846e7d28e42c1146c12a5d4e20c7cb55d3
Merge: 4d441fb fd2c300
Author: Brian Pham <[email protected]>
Date: Thu Apr 20 11:56:53 2017 -0500
Merge branch 'dev' of github.com:brianqvpham/cs373-idb into dev
commit 4d441fba95803092ff62718f4342e36dfb4b19c9
Author: Brian Pham <[email protected]>
Date: Thu Apr 20 11:56:41 2017 -0500
Cleaned up wishlist.py and populated select menus
commit fd2c30099b7a972fa93b203333b3860ad31feb2e
Author: Weston Selleck <[email protected]>
Date: Thu Apr 20 10:45:21 2017 -0500
Search API endpoint
commit 21b61fa09de08362a1105082b14c5d70c5158a78
Author: paola jara <[email protected]>
Date: Thu Apr 20 01:57:33 2017 -0500
setting up dropdowns
commit 0312affac6b900eff5f5f290324391f8d87f03bb
Author: paola jara <[email protected]>
Date: Thu Apr 20 01:51:31 2017 -0500
delete un necessary stuff
commit 6fba2f763da4e78574dc2a7b24a2a63cb163cbe8
Merge: ec5d058 d68fc62
Author: paola jara <[email protected]>
Date: Thu Apr 20 01:38:29 2017 -0500
Merge branch 'dev' of https://github.com/brianqvpham/cs373-idb into dev
commit ec5d058a24dd8af83b20908ed94b4446ded1e388
Author: paola jara <[email protected]>
Date: Thu Apr 20 01:37:59 2017 -0500
setting up others group page
commit d68fc62edcd282956d89a3f03ecaf6effee00858
Merge: 702ab9b ebfd6b3
Author: Jaime Munoz <[email protected]>
Date: Wed Apr 19 23:33:01 2017 -0500
Merge branch 'dev' of https://github.com/brianqvpham/cs373-idb into dev
commit 702ab9bbc5bf4d9c38c8000e1d1ceeaa638310d5
Author: Jaime Munoz <[email protected]>
Date: Wed Apr 19 23:32:30 2017 -0500
Game retrieval and storage
commit ebfd6b3c720f753d59dfadf2b22cf7361d5ebfce
Author: Nikita Zamwar <[email protected]>
Date: Wed Apr 19 22:25:40 2017 -0500
Search bar functionality
commit fadef9260918b84ff9352e67ba271460f7a40a64
Author: Nikita Zamwar <[email protected]>
Date: Wed Apr 19 21:37:27 2017 -0500
change table background to white
commit bfcbd82ad9cc41e984cd38d1014e43d5ef6ea10d
Author: Nikita Zamwar <[email protected]>
Date: Wed Apr 19 21:18:58 2017 -0500
make search bar longer
commit 25ceeb03458fb8908dc0fe47647acc2080260840
Merge: 0954ec9 8baa02e
Author: Nikita Zamwar <[email protected]>
Date: Wed Apr 19 21:13:03 2017 -0500
Merge branch 'dev' of https://github.com/brianqvpham/cs373-idb into dev
commit 0954ec921f7a5f7d3d3d19da137969954b2e0ef7
Author: Nikita Zamwar <[email protected]>
Date: Wed Apr 19 21:12:49 2017 -0500
added search bar
commit 8baa02e2e086d275eb3d873f55bd93cc5bbbbc3e
Author: Weston <[email protected]>
Date: Wed Apr 19 20:43:40 2017 -0500
Transferring API Description file from Apiary.io
commit e630fd3856a32a3519df0f1d3b456460c53f902e
Merge: b0975fe 872ddb2
Author: Nikita Zamwar <[email protected]>
Date: Wed Apr 19 20:26:32 2017 -0500
Merge branch 'dev' of https://github.com/brianqvpham/cs373-idb into dev
commit 872ddb257cbb5ee1466c559892365e07c69c22f3
Author: Brian <[email protected]>
Date: Wed Apr 19 19:49:33 2017 -0500
Set up wishlist blueprint
commit b8686abd0dc2051d618fb0c67f14f800b41e8b3c
Merge: d19b097 68683c2
Author: Weston Selleck <[email protected]>
Date: Tue Apr 18 23:27:24 2017 -0500
Merge branch 'dev' of https://github.com/brianqvpham/cs373-idb into dev
commit d19b0978dec4764bb9ec784897464c789f965a1d
Author: Weston Selleck <[email protected]>
Date: Tue Apr 18 23:27:14 2017 -0500
Search
commit 68683c272081a6c1a3f5f9f6f962e63afa9dd910
Author: Brian <[email protected]>
Date: Mon Apr 17 19:44:35 2017 -0500
Fixed duplicate News links in about page.
commit ec6b5da9d7bdb309f66f58f2d797e8684f9a0bb7
Merge: 698af99 ade5e41
Author: Brian <[email protected]>
Date: Thu Apr 6 21:51:16 2017 -0500
Merge branch 'master' of github.com:brianqvpham/cs373-idb
commit 698af99b4abb64577cd839cef71b6f9ea166a5c3
Author: Nikita Zamwar <[email protected]>
Date: Thu Apr 6 21:36:24 2017 -0500
fix background
commit ade5e41f97e28ff7892641cc48ec1257b70b3113
Merge: 4f79793 237fac0
Author: pikachu94 <[email protected]>
Date: Thu Apr 6 21:34:01 2017 -0500
fixing font
commit b0975fed76b480579767547089f3dc6edd10a585
Merge: 64ac679 237fac0
Author: Nikita Zamwar <[email protected]>
Date: Thu Apr 6 21:28:58 2017 -0500
Merge branch 'dev' of https://github.com/brianqvpham/cs373-idb into dev
commit 237fac0cbc575b1647fe0dc22a468182af56d37d
Author: pikachu94 <[email protected]>
Date: Thu Apr 6 21:26:39 2017 -0500
color dont
commit 4f79793e051a62ccf15095f9a8dea6615eaf7e73
Author: pikachu94 <[email protected]>
Date: Thu Apr 6 21:23:25 2017 -0500
changing font again
commit 64ac6799626ceb934f1ed796411f02fa4be30b2b
Merge: f46c598 8343932
Author: Nikita Zamwar <[email protected]>
Date: Thu Apr 6 21:17:43 2017 -0500
removed nohup.out
commit f46c59860b7e40f33e53451e68d706cc6602846f
Author: Nikita Zamwar <[email protected]>
Date: Thu Apr 6 21:16:44 2017 -0500
merging
commit 8343932ed775ef9908dca9bc98656869f93db3d6
Author: pikachu94 <[email protected]>
Date: Thu Apr 6 21:11:23 2017 -0500
fixing font
commit 6dedc3a1522f4b7e9d556603f30d53859c8334a1
Author: Brian <[email protected]>
Date: Thu Apr 6 20:54:30 2017 -0500
Updated about page stats.
commit 3363567ef4196d7565936846846b70437db7eb15
Author: Brian <[email protected]>
Date: Thu Apr 6 20:42:22 2017 -0500
Made tests on about page run without redirecting.
commit d02d3d963a19f258b1fcd312535a50eaf6fec71f
Author: Brian <[email protected]>
Date: Thu Apr 6 17:52:28 2017 -0500
Removed extra character on about page.
commit a5808c0a8b55f05b997bbfeba6b17e24cd5d7290
Author: pikachu94 <[email protected]>
Date: Thu Apr 6 17:43:37 2017 -0500
updating
commit c8322fd8dbfea411197d7a29347924bae7d4e6d8
Author: pikachu94 <[email protected]>
Date: Thu Apr 6 17:42:33 2017 -0500
changing font color
commit f683229b94e68d70626e782bca5931364744c537
Author: pikachu94 <[email protected]>
Date: Thu Apr 6 17:10:17 2017 -0500
unit tests popover
commit e8e4c103f2a35801cb09df0529697b1b92db6091
Author: Nikita Zamwar <[email protected]>
Date: Thu Apr 6 15:56:36 2017 -0500
changed background
commit 5364496641325358e5067cd0584fa50b23b0b450
Author: Brian Pham <[email protected]>
Date: Thu Apr 6 12:09:36 2017 -0500
Fixed apiary documentation and removed extra files.
commit 76c0beee7608a2d8864ee35d650ca1eb5379485a
Author: Brian Pham <[email protected]>
Date: Thu Apr 6 11:50:24 2017 -0500
Added navbar to individual article/country/org page.
commit 60ee855a22c66a8a5d7e4be8e4302f4c272a7c8d
Author: Brian Pham <[email protected]>
Date: Thu Apr 6 11:20:41 2017 -0500
Fixed publish date not being displayed correctly and navbar issue on org page.
commit 209be1022cb5219bc73108f8993d8a878909c7e8
Author: Pikachu94 <[email protected]>
Date: Thu Apr 6 01:58:42 2017 -0500
updating home page
commit 4de11246c7df7926fd45f0fb7088c2c9a325f71b
Author: Brian <[email protected]>
Date: Wed Apr 5 21:32:33 2017 -0500
Updated models.html
commit 78dafacb4d3c9c192b3a6c3efcb8c096b28f917c
Author: Brian <[email protected]>
Date: Wed Apr 5 21:30:14 2017 -0500
Removed expand from API
commit e730aa20f278956e43c48f2fd2ea5f56c8c61268
Merge: 364f376 0e83943
Author: jaimemunz <[email protected]>
Date: Wed Apr 5 21:24:44 2017 -0500
Adding to tables
commit 364f3764c4eae29bbe4d4fe84b6d23242ff7b835
Author: jaimemunz <[email protected]>
Date: Wed Apr 5 21:19:46 2017 -0500
Made article country relations
commit 0e839437b87b1a53b737c80f3a792b65be47ced6
Author: Weston Selleck <[email protected]>
Date: Wed Apr 5 21:18:18 2017 -0500
Fix template
commit d95ce6f186ad3e5ec89af822cb43df9945f9f381
Author: Weston Selleck <[email protected]>
Date: Wed Apr 5 21:14:02 2017 -0500
More API THINGS IT WORKS
commit 16e7e09ac4dc4a9d3e98069d46d40993f537c846
Merge: a2c6045 39ffe79
Author: Weston Selleck <[email protected]>
Date: Wed Apr 5 20:43:10 2017 -0500
Merge branch 'dev' of https://github.com/brianqvpham/cs373-idb into dev
commit a2c6045ac52e3977702f97ecbd4d48185ce379a4
Author: Weston Selleck <[email protected]>
Date: Wed Apr 5 20:43:06 2017 -0500
More API things
commit 39ffe793af01b595c6a666750efe6a2ad9756f56
Merge: c36346b 32efe89
Author: Brian <[email protected]>
Date: Wed Apr 5 19:22:54 2017 -0500
Merge branch 'dev' of github.com:brianqvpham/cs373-idb into dev
commit c36346bf8f6da2784c42c5298731d1656e4e8adf
Author: Brian <[email protected]>
Date: Wed Apr 5 19:22:43 2017 -0500
Updated makefile to create correct log
commit 32efe89f76b467aab116d5e9771b584f00d5dc77
Author: Weston Selleck <[email protected]>
Date: Wed Apr 5 18:38:59 2017 -0500
requirements.txt
commit 5a68a2608c2aacaaceb4b66c7ee8714baf4a4590
Author: Weston Selleck <[email protected]>
Date: Wed Apr 5 18:17:58 2017 -0500
more model stuff
commit a1854e02ae719e34de4eba591f343aa1039ecca7
Author: Weston Selleck <[email protected]>
Date: Wed Apr 5 18:12:17 2017 -0500
Use actual DB
commit e4d8f50cd69cfcb806a77ac8c3a40217984c2a48
Merge: 89497aa ac796ea
Author: jaimemunz <[email protected]>
Date: Wed Apr 5 14:21:44 2017 -0500
Merge branch 'dev' of https://github.com/brianqvpham/cs373-idb into dev
commit 89497aa71fd4fc03132828e097e2eba7c66f56c4
Author: jaimemunz <[email protected]>
Date: Wed Apr 5 14:17:51 2017 -0500
Getting relationship error when creating article table
commit ac796eab4cb1394a37bba67f1c522077f2a63188
Author: Weston Selleck <[email protected]>
Date: Wed Apr 5 12:24:19 2017 -0500
Readd layout.html
commit febb546840ebc3bb78e63e6e578141ed00312a41
Author: Pikachu94 <[email protected]>
Date: Wed Apr 5 10:12:26 2017 -0500
fixing carousel
commit c6d856d6c763092f490e81f4c41b6178168ccf81
Author: Pikachu94 <[email protected]>
Date: Wed Apr 5 02:09:45 2017 -0500
trying to add carousel
commit 75d60b30913c60034c1d5a103b8691232487161b
Merge: a0a133a 9b94e87
Author: Weston Selleck <[email protected]>
Date: Tue Apr 4 20:57:05 2017 -0500
Merge branch 'dev' of https://github.com/brianqvpham/cs373-idb into dev
commit a0a133a5a6df4a09080c488250147ccc78758122
Author: Weston Selleck <[email protected]>
Date: Tue Apr 4 20:57:02 2017 -0500
Mostly pagination stuff
commit 9b94e87799d6c9170e0fc8d5014169d9c1a91a57
Author: Brian <[email protected]>
Date: Tue Apr 4 20:39:09 2017 -0500
Removed extraneous code breaking unit tests.
commit 677cdc498cbdba46a05a3c8243d7057f1ad73897
Merge: 2784479 f8fd0aa
Author: Brian <[email protected]>
Date: Tue Apr 4 20:33:45 2017 -0500
Merge branch 'dev' of github.com:brianqvpham/cs373-idb into dev
commit 2784479c37e582dee0837adaed7d5cc6bf925d88
Author: Brian <[email protected]>
Date: Tue Apr 4 20:33:33 2017 -0500
Fixed unit tests.
commit f8fd0aab79370a9de240701266d6ec55e883a3f6
Merge: d77a568 8950903
Author: Weston Selleck <[email protected]>
Date: Tue Apr 4 20:07:36 2017 -0500
Merge branch 'dev' of https://github.com/brianqvpham/cs373-idb into dev
commit d77a5687cb4d6c95f5bfa561e2f9df0cf87c23d1
Author: Weston Selleck <[email protected]>
Date: Tue Apr 4 20:07:32 2017 -0500
Template things
commit 8950903f937d6c61ba65577619387d8484418db8
Author: Brian <[email protected]>
Date: Tue Apr 4 19:26:04 2017 -0500
Added unit tests endpoint to API
commit 32474dc4b4740b3132ca69451e2893ca4bc26706
Merge: 0ffe002 8e3d02b
Author: jaimemunz <[email protected]>
Date: Tue Apr 4 18:43:49 2017 -0500
Merge branch 'dev' of https://github.com/brianqvpham/cs373-idb into dev
commit 0ffe002380bed97f1ec59e3140dfd07f7d2c75c6
Author: jaimemunz <[email protected]>
Date: Tue Apr 4 18:42:51 2017 -0500
More name changes
commit 8e3d02b5905e9b4c739287f23e565d00f19da863
Merge: c1a0448 9dadc29
Author: Weston Selleck <[email protected]>
Date: Tue Apr 4 18:38:47 2017 -0500
Merge branch 'dev' of https://github.com/brianqvpham/cs373-idb into dev
commit c1a044811daa9add7350dd697af30c84ff2e24d9
Author: Weston Selleck <[email protected]>
Date: Tue Apr 4 18:38:43 2017 -0500
More API things
commit 9dadc29a74ee778e5d1a76e3ecb7b62ba3ab34ac
Author: jaimemunz <[email protected]>
Date: Tue Apr 4 18:09:03 2017 -0500
Changed sources to organization
commit dc2540d05a516aaeb0c98108c560b69d9fb760fb
Author: Weston Selleck <[email protected]>
Date: Mon Apr 3 22:57:35 2017 -0500
More API things
commit 0af44ded88f70f74b6db628a1a08fb53ea1b3737
Author: Weston Selleck <[email protected]>
Date: Mon Apr 3 17:50:41 2017 -0500
More expand stuff
commit 0aaa7968230a5991e7fd8adf386598a998b44604
Author: Weston Selleck <[email protected]>
Date: Mon Apr 3 17:27:45 2017 -0500
Add expand to API
commit b248db3a5fe1f8de5124a9fd30b431438a56cc63
Author: Weston Selleck <[email protected]>
Date: Sun Apr 2 01:47:05 2017 -0500
More data pickley stuff
commit 64edfa7d0ad5bb9387b28af2d58c3de8ceae5263
Merge: c8fbff0 d2466b9
Author: Weston Selleck <[email protected]>
Date: Sun Apr 2 00:06:50 2017 -0500
Merge branch 'dev' of https://github.com/brianqvpham/cs373-idb into dev
commit c8fbff06a3d87323fbcfa27ca3d9a7ea465f52d5
Author: Weston Selleck <[email protected]>
Date: Sun Apr 2 00:06:24 2017 -0500
Generate pickle file with connections between models
commit d2466b9ee6a40fe1ecdcacfd5d47c57f43416150
Author: Brian <[email protected]>
Date: Fri Mar 31 20:57:25 2017 -0500
Removed duplicate import
commit 544665d85bdbb5f37658763d9ff6e9db6c9f05da
Merge: 25a77a0 1b428db
Author: Weston Selleck <[email protected]>
Date: Fri Mar 31 20:14:23 2017 -0500
Merge branch 'dev' of https://github.com/brianqvpham/cs373-idb into dev
commit 25a77a0140fe260a480404c85ee542dcb6c94c69
Author: Weston Selleck <[email protected]>
Date: Fri Mar 31 20:14:18 2017 -0500
Add initial repo file
commit 1b428db30d893ac577b2ac0f4e8448ef9877a1de
Author: Brian <[email protected]>
Date: Fri Mar 31 20:01:53 2017 -0500
Readded import line in app.py
commit 49de628bfafae05087a9e7effd2621cddbbb7f56
Author: Brian <[email protected]>
Date: Fri Mar 31 18:12:19 2017 -0500
Renamed db connection to db_string
commit 4ad2fe0c7316b4a09e80f5568c55e115a1a776f9
Author: Brian <[email protected]>
Date: Fri Mar 31 18:06:41 2017 -0500
Added link to database in app.py
commit 00f70f4e14847306ef4e9fbf7e5a6ab40acfed6e
Author: Brian <[email protected]>
Date: Fri Mar 31 15:42:59 2017 -0500
Added route to /tests/ to run unit tests.
commit a6460b3b77091a9ed42161520a127ae965523954
Author: Brian <[email protected]>
Date: Fri Mar 31 14:39:26 2017 -0500
Fixed formatting of API
commit e084e706e4e980831ec61f93984117b404caef81
Author: Brian <[email protected]>
Date: Fri Mar 31 14:34:26 2017 -0500
Extended REST API documentation
commit 09fb5887c0c5983c2b02ae1bf1a99e62de2dc832
Author: Brian <[email protected]>
Date: Thu Mar 23 21:24:26 2017 -0500
Added git log
commit 09e7c8760c20aebda6f9aedd3096eec670272abf
Author: Brian <[email protected]>
Date: Thu Mar 23 21:22:08 2017 -0500
Updated aggregate stats
commit d0dd1ac562d7e400cad52e7a9afcb907948cc840
Merge: 124d4e9 eda25c4
Author: Weston Selleck <[email protected]>
Date: Thu Mar 23 21:13:44 2017 -0500
Merge branch 'dev' of https://github.com/brianqvpham/cs373-idb into dev
commit 124d4e9d03c4d2bc1c3e76260dbd2273bc16a077
Author: Weston Selleck <[email protected]>
Date: Thu Mar 23 21:13:39 2017 -0500
update makefile
commit eda25c483bbf7fd86f0bfd72b94dc02b218f71f7
Merge: bacf3a6 76ad64a
Author: Pikachu94 <[email protected]>
Date: Thu Mar 23 21:11:20 2017 -0500
Merge branch 'dev' of https://github.com/brianqvpham/cs373-idb into dev
commit bacf3a620b599ef9ab0f209c7da50c0637472b20
Author: Pikachu94 <[email protected]>
Date: Thu Mar 23 21:11:05 2017 -0500
update team stats
commit 76ad64a0aecacfbb8dc910d64317d5a8bdac21e5
Merge: 695d637 b801d32
Author: Nikita Zamwar <[email protected]>
Date: Thu Mar 23 21:10:15 2017 -0500
Merge branch 'dev' of https://github.com/brianqvpham/cs373-idb into dev
commit 695d637b71cfada288bbf815894f138c33c87188
Author: Nikita Zamwar <[email protected]>
Date: Thu Mar 23 21:10:00 2017 -0500
updated stats
commit b801d324d7a1be8d5047a07bffb3b43e4ef24987
Author: Pikachu94 <[email protected]>
Date: Thu Mar 23 20:49:38 2017 -0500
about update
commit 9a714d2a888b42c9a0f7b8e66f26b2e72aff9932
Merge: 88910b3 936ac35
Author: Weston Selleck <[email protected]>
Date: Thu Mar 23 20:32:56 2017 -0500
Merge branch 'dev' of https://github.com/brianqvpham/cs373-idb into dev
commit 88910b39437a3ce03dcf02e280074681a45dfdfc
Author: Weston Selleck <[email protected]>
Date: Thu Mar 23 20:32:54 2017 -0500
Makefile change
commit 936ac35f8a38538bed54b3f8e56ea88b55e9de13
Author: Pikachu94 <[email protected]>
Date: Thu Mar 23 20:32:30 2017 -0500
finished about page
commit 48a10df72ab5e914dd72ad0286b40d2cf64877da
Author: Weston Selleck <[email protected]>
Date: Thu Mar 23 20:32:00 2017 -0500
Sortable tables
commit 42478e30357a7df3b22879f3de034ffced42b452
Author: Brian <[email protected]>
Date: Thu Mar 23 20:08:24 2017 -0500
Changed make html to use python3
commit 08d60ea0540f66e4f45b0c9cff47a17f78836df5
Author: Weston Selleck <[email protected]>
Date: Thu Mar 23 20:00:41 2017 -0500
Fix broken link
commit b8b4623c5430b2311773c9bdf05fb9e8b87c9e0f
Author: Weston Selleck <[email protected]>
Date: Thu Mar 23 19:31:32 2017 -0500
Remove prints
commit 391fef142e1d37d8691baff5ea28ac90910a710e
Author: Weston Selleck <[email protected]>
Date: Thu Mar 23 19:29:25 2017 -0500
Add URL to article page
commit 89c96d4dd01fd0f9463c6d9f8438a174abfc478a
Author: Weston Selleck <[email protected]>
Date: Thu Mar 23 19:15:48 2017 -0500
remove bad script tags
commit b9be38645821a60e8fa4e36ccd942ffc6e54d6ea
Author: Weston Selleck <[email protected]>
Date: Thu Mar 23 19:14:39 2017 -0500
Instance pages
commit 49b71d09e36e84f39e777e397dea4362fbc8b983
Author: Weston Selleck <[email protected]>
Date: Thu Mar 23 18:49:29 2017 -0500
A bunch of template stuff
commit eeaaf113ebc10639be92c1b9d5629da874989769
Author: Brian <[email protected]>
Date: Thu Mar 23 18:33:38 2017 -0500
Added Brian about info.
commit a662a9eab0cc491d3baab8191bb5f9f3fbbbda3a
Merge: 94dd032 4428be9
Author: Nikita Zamwar <[email protected]>
Date: Thu Mar 23 17:41:10 2017 -0500
Merge branch 'dev' of https://github.com/brianqvpham/cs373-idb into dev
commit 94dd032bd78300b0eb549958617dd31c79365253
Author: Nikita Zamwar <[email protected]>
Date: Thu Mar 23 17:40:21 2017 -0500
Add data to tables on html page
commit 4428be99996b5c35383d4331f0ef437c0ede7056
Author: Weston Selleck <[email protected]>
Date: Thu Mar 23 17:33:19 2017 -0500
Added my about stuff
commit a8f2ee9b691d601a7c9fb0e4cb6280394bae9913
Merge: 8f63f40 8a80a0b
Author: Brian <[email protected]>
Date: Thu Mar 23 16:42:40 2017 -0500
Merge branch 'dev' of github.com:brianqvpham/cs373-idb into dev
commit 8f63f40b980348a57bba1ace2ae4b9c5b24d6ea7
Author: Brian <[email protected]>
Date: Thu Mar 23 16:42:30 2017 -0500
Fixed issue with articles and countries pages not showing.
commit 8a80a0b8f49882b9560f911bf43963e2012c0df5
Author: jaimemunz <[email protected]>
Date: Thu Mar 23 16:37:20 2017 -0500
updated my info in the bio
commit 284e0f1d1904e2a564e27a851ea846ab92807aeb
Author: jaimemunz <[email protected]>
Date: Thu Mar 23 16:25:38 2017 -0500
Add files via upload
commit 83cb74b9d842df5d32aa6914b01b29a1bdfa3753
Author: Nikita Zamwar <[email protected]>
Date: Thu Mar 23 16:24:16 2017 -0500
added bio in about and deleted extra templates directory
commit 76db48fc479f0ee332eea390cded9f78ab748904
Author: Brian <[email protected]>
Date: Thu Mar 23 15:13:21 2017 -0500
Linking apiary to repo