-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy pathIDB3.log
1664 lines (1118 loc) · 45.7 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 a9c95cbcc126d33341b7c35f481b39f6a5cfbf7a
Merge: b266f46 43dc9d4
Author: Chuchu <chuchu.ma@utexas.edu>
Date: Thu Nov 19 18:26:22 2015 -0600
Merge pull request #107 from pikachuchu/update-about
Update about page
commit 43dc9d4d48f7fcb0bd550dd9aad735315ce8775f
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Fri Nov 20 00:24:39 2015 +0000
Update about page
commit b266f46f44f01780c66fc2e01519986952cfa57f
Merge: b7aa8ac 36b561f
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Fri Nov 20 00:16:08 2015 +0000
Merge branch 'master' of github.com:pikachuchu/cs373-idb
commit b7aa8ac92d3474155ac9a213f9551e78ccb78846
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Fri Nov 20 00:15:51 2015 +0000
Update server side for react revert
commit 36b561f3a0673576fc7f171439f1bfb7ec8a4721
Merge: b8abafd 4c2d4b5
Author: Andreas Sudihardjo <andreas@cs.utexas.edu>
Date: Thu Nov 19 18:15:01 2015 -0600
Merge branch 'master' of https://github.com/pikachuchu/cs373-idb
commit 4c2d4b5f86260bf6afa014b953d5035348072d71
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Fri Nov 20 00:07:10 2015 +0000
Revert pages back to React
commit b8abafd7a8b06b90bf4245958035ac8afcb7a932
Author: Andreas Sudihardjo <andreas@cs.utexas.edu>
Date: Thu Nov 19 18:05:21 2015 -0600
removing console.log
commit 62598fb4b51bfe5ec74021c1894eef8ec2b0af08
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Fri Nov 20 00:03:31 2015 +0000
Update marvel url
commit 52158f73f86a4dcc46b6acbe769ce59d974d85d9
Merge: c072800 cbd2626
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Fri Nov 20 00:01:51 2015 +0000
Merge branch 'comics'
Conflicts:
app.py
commit cbd2626e2489500783eb956307285fb6e7c0669b
Author: dsc995 <dsc694@utexas.edu>
Date: Thu Nov 19 17:57:10 2015 -0600
added picture and colors to comic
commit b52a736ae2d0339f8f83fa9c4c108d5438f58972
Author: dsc995 <dsc694@utexas.edu>
Date: Thu Nov 19 17:44:06 2015 -0600
changed comics page
commit c0728008acb19efd34f03739953b0a9e319eb874
Author: Andreas Sudihardjo <andreas@cs.utexas.edu>
Date: Thu Nov 19 17:23:28 2015 -0600
1 new unit test
commit 218bbb14c1002dafe95999ea60b0f188fd5e1aec
Merge: 879b11d 566eb40
Author: Andreas Sudihardjo <andreas@cs.utexas.edu>
Date: Thu Nov 19 17:13:31 2015 -0600
Merge branch 'master' of https://github.com/pikachuchu/cs373-idb
commit 879b11d5fe07daebad60d70b150b3e3fb2bc4bef
Author: Andreas Sudihardjo <andreas@cs.utexas.edu>
Date: Thu Nov 19 17:13:07 2015 -0600
add or/and in search title
commit 566eb4023a69d45f02e1fc6222cde9ce865cdc87
Merge: 143e534 a58541a
Author: xhmf <lawrence.ying@utexas.edu>
Date: Thu Nov 19 17:03:58 2015 -0600
Merge pull request #106 from pikachuchu/lawrence_tests
added 2 more tests
commit 143e53423ffec1a29c012191c914bc80fe067b6b
Merge: ba24407 477a899
Author: andreassudihardjo <andreas_sudi@hotmail.com>
Date: Thu Nov 19 16:55:47 2015 -0600
Merge pull request #105 from pikachuchu/andreasUnitTest
2 new unit tests
commit ba24407fc59fefd904bb06a72fe1027e2ef7143d
Merge: 79b132e 0d307e0
Author: andreassudihardjo <andreas_sudi@hotmail.com>
Date: Thu Nov 19 16:52:48 2015 -0600
Merge pull request #104 from pikachuchu/search
Search Bar
commit 477a899363718e9b13831b9bb7b1ff8d7bb85fba
Author: Andreas Sudihardjo <andreas@cs.utexas.edu>
Date: Thu Nov 19 16:51:52 2015 -0600
changed Attribute Name
commit a58541a26ff73e9efa969a9941112232915b4172
Author: xhmf <lawrence.ying@utexas.edu>
Date: Thu Nov 19 16:33:52 2015 -0600
added 2 more tests
commit 410636a8d451c7e78ba31da7f239e4ff82ebbcd1
Author: xhmf <lawrence.ying@utexas.edu>
Date: Thu Nov 19 15:58:06 2015 -0600
fixed tab spacing
commit 9ec983740f171817b9939d6e5693ed2f8f8bb677
Author: xhmf <lawrence.ying@utexas.edu>
Date: Thu Nov 19 15:53:21 2015 -0600
fixed marvel get url to use server instead of localhost
commit 3f760df4f70472e92ed2ba8e055143c0455afa88
Author: xhmf <lawrence.ying@utexas.edu>
Date: Thu Nov 19 15:52:09 2015 -0600
updated so that series are displayed as list, also added filter so button actually works
commit a7d35cb360a1f9c9191864699e2e666b3214dbef
Author: Andreas Sudihardjo <andreas@cs.utexas.edu>
Date: Thu Nov 19 13:24:26 2015 -0600
add all() attribute
commit 0ccc264c8db0c6a3156fe73e2cf87348ce237787
Author: Andreas Sudihardjo <andreas@cs.utexas.edu>
Date: Thu Nov 19 13:18:48 2015 -0600
fix typo
commit 2baab6eee6dacc25c0a205212de5c75afcb2af71
Author: andreas <andreas_sudi@hotmail.com>
Date: Thu Nov 19 04:15:29 2015 -0600
2 new unit tests
commit 0d307e021f2a4ddab0ab94bbc01e6d2bee475840
Author: andreas <andreas_sudi@hotmail.com>
Date: Thu Nov 19 03:58:24 2015 -0600
only allow switch search for multiple queries
commit 69a9de415310d95d858447dc06ffa5158e4d3020
Author: andreas <andreas_sudi@hotmail.com>
Date: Thu Nov 19 03:54:48 2015 -0600
allow switch between or & and searches
commit 15649da8fb7a24f634c98898816f6dce811fa49e
Author: andreas <andreas_sudi@hotmail.com>
Date: Thu Nov 19 03:39:10 2015 -0600
optional search 'or' or 'and'
commit 5dad85d907ae05019a9c5ba3aec8c503f2db64ab
Author: xhmf <lawrence.ying@utexas.edu>
Date: Wed Nov 18 23:52:00 2015 -0600
removed unecessary call to list
commit 3f57b7ad9938d1a9a96c35c2469f2d84c9eb5564
Author: xhmf <lawrence.ying@utexas.edu>
Date: Wed Nov 18 23:46:17 2015 -0600
first get 200 series data from marvel api on serverside and pass to frontend
commit 23bdebba6375350c4ab0a060a3ba21fa415e841c
Author: Andreas Sudihardjo <andreas@cs.utexas.edu>
Date: Wed Nov 18 13:19:50 2015 -0600
changed to 'and' fix highlight bug
commit 4bc941e798e1d58e18562fceeddecdad9ddd4c54
Author: Andreas Sudihardjo <andreas@cs.utexas.edu>
Date: Wed Nov 18 12:48:53 2015 -0600
add style to result table
commit e202d08c4fd7a73c6ec05becf90adb0550a5835d
Author: Andreas Sudihardjo <andreas@cs.utexas.edu>
Date: Wed Nov 18 12:38:30 2015 -0600
fix pagination bug
commit 28b53d7f93fe7b936a94dd22f3330656dc3e1972
Author: Andreas Sudihardjo <andreas@cs.utexas.edu>
Date: Tue Nov 17 21:36:35 2015 -0600
preventDefault when clicking on empty link
commit 4db2de5aedef9974a0dee764d60db5207da5abcd
Author: Andreas Sudihardjo <andreas@cs.utexas.edu>
Date: Tue Nov 17 21:36:04 2015 -0600
add links to pagination closes #101
commit 9c694e9f5fc078a1ebd5cab9da4902011ad00c3d
Author: Andreas Sudihardjo <andreas@cs.utexas.edu>
Date: Tue Nov 17 21:29:48 2015 -0600
add links to prev and next buttons
commit 7e56018ad5325f1cb4aac94e7b951c0678da1441
Author: Andreas Sudihardjo <andreas@cs.utexas.edu>
Date: Tue Nov 17 21:29:07 2015 -0600
add parameter for page
commit 9f1a7ce705999debb6c763300ff8924aebd8aa99
Author: Andreas Sudihardjo <andreas@cs.utexas.edu>
Date: Tue Nov 17 20:59:57 2015 -0600
set max number of pages for pagination closes #103
commit 79b132efbc6f2f1b52baacfa53bf25c54b40f29d
Merge: 91a7709 a8bfe95
Author: xhmf <lawrence.ying@utexas.edu>
Date: Tue Nov 17 20:34:54 2015 -0600
Merge pull request #102 from pikachuchu/lawrence_tests
Lawrence tests
commit 84492ddfc1d98490e29aa83ad801ce791d6c54da
Author: Andreas Sudihardjo <andreas@cs.utexas.edu>
Date: Tue Nov 17 20:33:48 2015 -0600
dynamic pagination
commit 975b8cfb2c2e3e182ce288c3da87a0ef9781c80b
Author: Andreas Sudihardjo <andreas@cs.utexas.edu>
Date: Tue Nov 17 20:24:41 2015 -0600
initial pagination
commit faf0347013ce40c5b0cae9c75e28e036aed811af
Author: Andreas Sudihardjo <andreas@cs.utexas.edu>
Date: Tue Nov 17 20:20:20 2015 -0600
able to search using multile queries
commit 6883711670b439143b70f2885089aabd5199eab7
Author: Andreas Sudihardjo <andreas@cs.utexas.edu>
Date: Tue Nov 17 20:19:29 2015 -0600
search using swiftype api
commit fa94bfa7a6495e0f1d69e15c813df0fd7b3811af
Author: Andreas Sudihardjo <andreas@cs.utexas.edu>
Date: Tue Nov 17 20:17:40 2015 -0600
create search layout using static data closes #97
commit ee0f22ca88bf6eafe4b0ed7f69d49c1a980f5fe1
Author: dsc995 <dsc694@utexas.edu>
Date: Tue Nov 17 19:58:46 2015 -0600
added stupid unit tests
commit a8bfe95b414bcfca18e09c224d1280bccd8a8e4e
Author: xhmf <lawrence.ying@utexas.edu>
Date: Tue Nov 17 19:57:59 2015 -0600
added additional write unit test
commit 2457f8fbacba886457a1411ca158b55762a24511
Merge: 91a7709 276cad9
Author: xhmf <lawrence.ying@utexas.edu>
Date: Tue Nov 17 18:45:03 2015 -0600
Merge branch 'seo' of https://github.com/pikachuchu/cs373-idb
commit 91a77098033a9bfedef0c8a3081818a89da2503a
Merge: 81f9e58 401485f
Author: xhmf <lawrence.ying@utexas.edu>
Date: Tue Nov 17 18:28:28 2015 -0600
Merge pull request #96 from pikachuchu/green_table
removed green table header fixes #93
commit 401485f6aa11dd796ffbeba1ddf329939c2eaa70
Author: xhmf <lawrence.ying@utexas.edu>
Date: Tue Nov 17 18:24:06 2015 -0600
removed green table header fixes #93
commit 276cad928922231f42458222366c92fa20132103
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Tue Nov 17 23:40:56 2015 +0000
Fix gender
commit b4f73ea3e1d83e78c3a3c18d8dc2a496a624f161
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Mon Nov 16 18:37:36 2015 +0000
SEO website
commit 81f9e5885942aee2005e3b24d869646f4afa6ac8
Merge: 7c56471 19d2a0e
Author: Chuchu <chuchu.ma@utexas.edu>
Date: Mon Nov 16 00:05:08 2015 -0600
Merge pull request #94 from pikachuchu/catch-db-errors
Catch db errors to prevent 500
commit 9d135c2d3a0c38e0816d79cb13dd44d17826587d
Author: dsc995 <dsc694@utexas.edu>
Date: Sun Nov 15 18:12:04 2015 -0600
stuck on external api removed green color on tables
commit 8375c6438a4907b52a4fea802b31ebf761342c8e
Author: Andreas Sudihardjo <andreas@cs.utexas.edu>
Date: Sun Nov 15 16:50:12 2015 -0600
initial search
commit fd4e0228345b25922fe32ba8a12453088830eb8c
Author: dsc995 <dsc694@utexas.edu>
Date: Sun Nov 15 16:47:56 2015 -0600
added comics integration page and drop down of congress males
commit 7c56471c86ffb4061bd110f1c88e1cb7654d5261
Author: Brian Chenault <brian.chenault@utexas.edu>
Date: Sun Nov 15 16:26:03 2015 -0600
api calls for importMarvel, fixes #92
commit 19d2a0ebaee5bf98a2261169c22f8ab5c34dd1d2
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Sun Nov 15 20:50:12 2015 +0000
Catch db errors to prevent 500
commit 1cc68cc78d6e206bd27986049770b93563123ee1
Author: Chuchu <chuchu.ma@utexas.edu>
Date: Fri Nov 13 16:45:51 2015 -0600
Update host in apiary
commit 0667b4424a04511a63a0c4e253447361c07f500b
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Fri Nov 6 00:29:46 2015 +0000
Add log for IDB2
commit 636a06427e22ed907715b3f5d5aad7da93454f66
Merge: 0e13a92 61ddac0
Author: Daniel Coonan <dsc694@utexas.edu>
Date: Thu Nov 5 18:28:01 2015 -0600
Merge pull request #91 from pikachuchu/react-pages
React pages
commit 61ddac0ea400e3f6afb5c893434261b42a3e7a55
Author: dsc995 <dsc694@utexas.edu>
Date: Thu Nov 5 18:25:20 2015 -0600
added loading screen to all main pages
commit 0e13a92f32cb0a30a60fedf5ec389bd760808c9e
Merge: f47b3d7 9f2b5b5
Author: Chuchu <chuchu.ma@utexas.edu>
Date: Thu Nov 5 18:16:52 2015 -0600
Merge pull request #90 from pikachuchu/update-about-page
Update about page. This closes #62
commit 3adbec45c9deb9b8105c351c991aed618764bc93
Author: dsc995 <dsc694@utexas.edu>
Date: Thu Nov 5 18:15:39 2015 -0600
adding loading screen
commit 9f2b5b5b65a15050a3e0ae565e106c63a3c732b5
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Fri Nov 6 00:14:51 2015 +0000
Update about page. This closes #62
commit f47b3d7463bde0230cba3782f5436cad3e4119de
Merge: b1f4571 8db9301
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Thu Nov 5 23:44:15 2015 +0000
Merge branch 'master' of github.com:pikachuchu/cs373-idb
commit b1f4571953022f4b9ace4fbe1111b4a13f1e5208
Author: Lawrence Ying <lawrence.ying@utexas.edu>
Date: Thu Nov 5 23:40:04 2015 +0000
added coverage to test fixes #88
commit 8db9301b4a69310464af7ef55fc08db4e1653c12
Merge: 48d9518 f689d26
Author: xhmf <lawrence.ying@utexas.edu>
Date: Thu Nov 5 17:43:22 2015 -0600
Merge pull request #89 from pikachuchu/testcov
added coverage to test fixes #88
commit f689d264998166026ab846b9579099d5cdb86642
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Thu Nov 5 23:40:04 2015 +0000
added coverage to test fixes #88
commit 48d95183c8edbfd88ff36327b4f098b7286c41a2
Merge: 79050a7 e343633
Author: Chuchu <chuchu.ma@utexas.edu>
Date: Thu Nov 5 17:28:37 2015 -0600
Merge pull request #86 from pikachuchu/add-get-obj-tests
Add tests for get_obj
commit e3436333fab9cbbefd1039a891885b85523c9bcf
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Thu Nov 5 23:17:38 2015 +0000
Add tests for get_obj
commit 79050a7a8ce5cb2ab6e26d0216123df23f1dbdae
Merge: 091057e f7e00d5
Author: andreassudihardjo <andreas_sudi@hotmail.com>
Date: Thu Nov 5 12:23:35 2015 -0600
Merge pull request #85 from pikachuchu/react-pages
React pages completed
commit f7e00d5783c2334b680ae6d356b86538d5b14f64
Author: Andreas Sudihardjo <andreas@cs.utexas.edu>
Date: Thu Nov 5 12:19:22 2015 -0600
finished dynamic individual bills page which closes #67
commit bf7bb42aca46e86949163f84b989bc304807fc03
Author: andreas <andreas_sudi@hotmail.com>
Date: Thu Nov 5 04:29:26 2015 -0600
initial bills page
commit 0828cdfb465dc4cb0ae5ff590bd0f75a30b1d2d6
Author: andreas <andreas_sudi@hotmail.com>
Date: Thu Nov 5 04:21:34 2015 -0600
react for committee. closes #66
commit 12f4cd3323f54433fdcd1882b02c4ef30660fce8
Merge: 5a91012 091057e
Author: andreas <andreas_sudi@hotmail.com>
Date: Thu Nov 5 03:27:00 2015 -0600
Merge branch 'master' of https://github.com/pikachuchu/cs373-idb into react-pages
commit 091057ef83aa48823240b7391dba6323001eafba
Merge: 35f754a 5fcccfd
Author: Chuchu <chuchu.ma@utexas.edu>
Date: Wed Nov 4 20:23:25 2015 -0600
Merge pull request #84 from pikachuchu/tests
Tests
commit 5fcccfd662abc237e2c7c78b19ecd33271cd00e1
Merge: 0f5ff90 86c80f8
Author: Chuchu Ma <chuchu.ma@utexas.edu>
Date: Wed Nov 4 20:18:30 2015 -0600
Merge branch 'tests' of github.com:pikachuchu/cs373-idb into tests
commit 0f5ff90abad2db24e2f0964bcc0aac5bbf6d9d84
Author: Lawrence Ying <lawrence.ying@utexas.edu>
Date: Thu Nov 5 00:35:54 2015 +0000
added button to run and display unit tests fixes #83
commit 35f754abd2e1aaf1f013a4beaea07c1f8f5d5ff9
Merge: c9b45b5 34d3eab
Author: Chuchu Ma <chuchu.ma@utexas.edu>
Date: Wed Nov 4 20:17:11 2015 -0600
Merge branch 'master' of github.com:pikachuchu/cs373-idb
commit c9b45b533e3a71672ae4dfa9553a5236a621d0f5
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Wed Nov 4 21:28:22 2015 +0000
Update make test
commit a263ad55fedc6f199c888d394e8d0f9c66f6f8cb
Author: Chuchu Ma <chuchu.ma@utexas.edu>
Date: Wed Nov 4 15:24:53 2015 -0600
Update models doc
commit d24ade272a0d7cd330d829a85e1950b3b5a0cbf9
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Wed Nov 4 20:05:20 2015 +0000
Delete copy
commit d366217a183d35d6eb5130ba447238dbf91424b3
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Wed Nov 4 20:03:06 2015 +0000
Create db in travis
commit 59ce9bd271c926d8065cb1fe55aa32421002c5bc
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Wed Nov 4 19:53:35 2015 +0000
Update pip install requirements
commit b71cfec7e20382213c1eadac5207e68693508562
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Wed Nov 4 19:34:56 2015 +0000
Add make test to travis.yml
commit cf455c9663ff628201b1c142d1dbfa88b19c325f
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Wed Nov 4 19:33:30 2015 +0000
Add tests for votes and bill_committees
commit 7f66b10ebb2a235e4754c0d0710e5ec54637a146
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Wed Nov 4 19:05:11 2015 +0000
Update database
commit 5bada39ecf6c4be8aeaf4a82f37a296b57da0d6a
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Wed Nov 4 19:04:44 2015 +0000
Get legislator with verbose flag
commit 89cd47104289f7900ff059a412c0adba3e02136c
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Wed Nov 4 18:37:22 2015 +0000
Remove duplicate committees
commit 255dc7caca1360f602ae05b117ab5e981455100a
Author: Lawrence Ying <lawrence.ying@utexas.edu>
Date: Wed Nov 4 01:36:56 2015 +0000
tests passing for test database, fixes #56
commit 86c80f8761465027818cecc9082a4c93f648dc58
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Thu Nov 5 00:35:54 2015 +0000
added button to run and display unit tests fixes #83
commit 5a910129be4a37bb5aa806b4139c792b796ee9d1
Author: Andreas Sudihardjo <andreas@cs.utexas.edu>
Date: Wed Nov 4 16:52:48 2015 -0600
initial committee file
commit bb633e48b3c7ba0f198bb8526350ab7ca259466d
Author: Andreas Sudihardjo <andreas@cs.utexas.edu>
Date: Wed Nov 4 16:41:10 2015 -0600
add table for votes
commit b1671d470f25a9a231f5b755af13d05101ddc25c
Author: Andreas Sudihardjo <andreas@cs.utexas.edu>
Date: Wed Nov 4 16:26:27 2015 -0600
add link to committees from legislator
commit b129d5c89bc17936d566690341dc42c66b0aaa42
Author: Andreas Sudihardjo <andreas@cs.utexas.edu>
Date: Wed Nov 4 16:20:13 2015 -0600
fix sponsor name for bills
commit 34d3eab46e528ae54345dc837084d438f13cbdd1
Merge: 4e1d4b4 5a0314f
Author: Chuchu <chuchu.ma@utexas.edu>
Date: Wed Nov 4 15:29:45 2015 -0600
Merge pull request #81 from pikachuchu/update-makefile
Update make test
commit 5a0314f4412565a75f4198ae76de30de5d6277af
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Wed Nov 4 21:28:22 2015 +0000
Update make test
commit 4e1d4b44d48854dea09c93398589371f8d360c80
Merge: b46c1c2 15d8f49
Author: Chuchu <chuchu.ma@utexas.edu>
Date: Wed Nov 4 15:27:20 2015 -0600
Merge pull request #80 from pikachuchu/update-documentation
Update models doc
commit 15d8f49a1c9d2474a0389ba7741680e8c7f1fc9a
Author: Chuchu Ma <chuchu.ma@utexas.edu>
Date: Wed Nov 4 15:24:53 2015 -0600
Update models doc
commit 966d4738b99919ef81c9e03aae5f20f0018d0b08
Author: Andreas Sudihardjo <andreas@cs.utexas.edu>
Date: Wed Nov 4 15:22:37 2015 -0600
add style to legislator page
commit 2042bcae78f47ce64340bbd848dd918fa50ecebf
Merge: 4feda90 4b8dcf7
Author: dsc995 <dsc694@utexas.edu>
Date: Wed Nov 4 14:49:48 2015 -0600
Merge branch 'react-pages' of https://github.com/pikachuchu/cs373-idb into react-pages
commit 4feda90bcda88694bd8eb25f8a7957da9f5c9dca
Author: dsc995 <dsc694@utexas.edu>
Date: Wed Nov 4 14:49:31 2015 -0600
added chair to committee
commit 4b8dcf732501dc942774d3c91dd86c17d291256c
Merge: 6fef09c 03944f8
Author: Andreas Sudihardjo <andreas@cs.utexas.edu>
Date: Wed Nov 4 14:46:54 2015 -0600
Merge branch 'react-pages' of https://github.com/pikachuchu/cs373-idb into react-pages
commit 6fef09c10d64448eee3316fb9923a3df3723021e
Author: Andreas Sudihardjo <andreas@cs.utexas.edu>
Date: Wed Nov 4 14:46:10 2015 -0600
set default twitter widget
commit 03944f8ff719cdf0915ff88281c955ad0ae3bbf5
Author: dsc995 <dsc694@utexas.edu>
Date: Wed Nov 4 14:29:13 2015 -0600
finished bills
commit d4a939ab88cc4732f45e1f76a4ca72373c875b6e
Author: Andreas Sudihardjo <andreas@cs.utexas.edu>
Date: Wed Nov 4 14:27:09 2015 -0600
finished committee react
commit b46c1c28071d430e64cd130eed5c4de09d6f2ab7
Merge: 9dc2094 13af206
Author: Chuchu <chuchu.ma@utexas.edu>
Date: Wed Nov 4 14:13:32 2015 -0600
Merge pull request #74 from pikachuchu/finish-tests
Finish tests
commit 13af206483bc16890bf43babc55aaf1abc3eb3cb
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Wed Nov 4 20:05:20 2015 +0000
Delete copy
commit d15f754c0be5bac3b12bce9ca38caebd3af9791b
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Wed Nov 4 20:03:06 2015 +0000
Create db in travis
commit bd2ab6ba223cadbd6ab3694a59450f55c1e9ecd4
Author: dsc995 <dsc694@utexas.edu>
Date: Wed Nov 4 13:59:50 2015 -0600
merged
commit 54644b5bd97ab69f323bb7d89655143cdf2de356
Merge: 7a56a16 0861da0
Author: dsc995 <dsc694@utexas.edu>
Date: Wed Nov 4 13:58:25 2015 -0600
Merge branch 'react-pages' of https://github.com/pikachuchu/cs373-idb into react-pages
commit 0861da040ad7a1f98f3e90a70f689d979df807f0
Author: Andreas Sudihardjo <andreas@cs.utexas.edu>
Date: Wed Nov 4 13:57:08 2015 -0600
dynamic legislator page
commit 4c030c1d2433b3f68fad8c78ecc1217a69ff3c75
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Wed Nov 4 19:53:35 2015 +0000
Update pip install requirements
commit 4252475fe0b2ce9809c8c3903086c98e90cb752b
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Wed Nov 4 19:34:56 2015 +0000
Add make test to travis.yml
commit f6527a29e38f483fa493578145f09b8511bf4465
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Wed Nov 4 19:33:30 2015 +0000
Add tests for votes and bill_committees
commit 9dc2094d05d6151de5662385897e4df30c40e006
Merge: 91d959b e7ff69f
Author: Chuchu <chuchu.ma@utexas.edu>
Date: Wed Nov 4 13:10:15 2015 -0600
Merge pull request #72 from pikachuchu/fix-data
Fix data
commit e7ff69f1a1c732c3252fd13506d1b3a377719398
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Wed Nov 4 19:05:11 2015 +0000
Update database
commit c1ce71b3a3a9b2b207d920fba27a4656a85c7c82
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Wed Nov 4 19:04:44 2015 +0000
Get legislator with verbose flag
commit 7a56a167502284320859d7332e73f11131e5fe58
Author: dsc995 <dsc694@utexas.edu>
Date: Wed Nov 4 13:01:07 2015 -0600
reactified committee, waiting on updated api to add chairperson data
commit 9746e34de0859ce9fff4e9cdfc55d8b3e36a266c
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Wed Nov 4 18:37:22 2015 +0000
Remove duplicate committees
commit f54bdcd53eb05ef20841f5db17837fe813050e20
Author: Andreas Sudihardjo <andreas@cs.utexas.edu>
Date: Tue Nov 3 22:22:16 2015 -0600
remove senator1r
commit d59e2ee9f8ecc86b933b185c092f5fe97216c2a3
Author: Andreas Sudihardjo <andreas@cs.utexas.edu>
Date: Tue Nov 3 22:17:42 2015 -0600
make bills dynamic but not finished
commit dc5e6eb07c23f2716114b14c766182e8902d3f00
Author: Andreas Sudihardjo <andreas@cs.utexas.edu>
Date: Tue Nov 3 22:02:00 2015 -0600
committees is dynamic but not finished
commit 133ae3cb31f8e0550514866fc4ec7713c5ee57e1
Author: Andreas Sudihardjo <andreas@cs.utexas.edu>
Date: Tue Nov 3 21:12:11 2015 -0600
dynamic house page finished. Added age which closes #63
commit c3a1046cc7a94a90dad7d8fd1136815941de74d5
Author: Andreas Sudihardjo <andreas@cs.utexas.edu>
Date: Tue Nov 3 20:58:21 2015 -0600
dynamic senate page finished
commit e1f598a34b4163a8e5946c3292cd2d9589d45542
Author: dsc995 <dsc694@utexas.edu>
Date: Tue Nov 3 19:43:45 2015 -0600
added bills to senate page
commit 91d959b98168a5e7d9815f45cb35ca13d3f031a7
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Wed Nov 4 01:36:56 2015 +0000
tests passing for test database, fixes #56
commit 8dd6d081bbbee8899fd1769dd0f6f5eabe19f5f9
Merge: 8a78125 4178600
Author: Chuchu <chuchu.ma@utexas.edu>
Date: Tue Nov 3 19:35:01 2015 -0600
Merge pull request #61 from pikachuchu/allow-cors
Allow CORS
commit 4178600735d20c940e559c553ec797989c5b1ec2
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Wed Nov 4 01:33:43 2015 +0000
Allow CORS
commit 1f0bdb581e4f390007f519a8e175fed469e1bbf8
Author: dsc995 <dsc694@utexas.edu>
Date: Tue Nov 3 19:21:31 2015 -0600
converting individual senator to react
commit 8a78125c537bcdeff25efde5a570b09f46a5f2b6
Author: Chuchu <chuchu.ma@utexas.edu>
Date: Tue Nov 3 19:16:46 2015 -0600
Add query args to API blueprint
commit 4a512b52e4cb5850d9df0d82bee883e1c09f33cd
Author: Chuchu <chuchu.ma@utexas.edu>
Date: Tue Nov 3 19:02:24 2015 -0600
Transferring blueprint from apiary.io
commit 655edf33afdd65afdb0b261e53873a4893a81f57
Merge: 7f91857 1bbdb1d
Author: Chuchu <chuchu.ma@utexas.edu>
Date: Tue Nov 3 18:28:12 2015 -0600
Merge pull request #60 from pikachuchu/make-api-filterable
Make API filterable by its fields. This closes #59
commit 1bbdb1dfe335e372e3d42e29772073f59f4484b8
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Wed Nov 4 00:26:22 2015 +0000
Make API filterable by its fields. This closes #59
commit 7f91857657fa3946311fd329e1b7889c751c3246
Author: joe <joe@localhost.localdomain>
Date: Tue Nov 3 18:18:15 2015 -0600
compressed flag video
commit 43bf7771ad00ffba487139348294c86a8a78849d
Merge: 1b1ffb7 2d0da99
Author: andreassudihardjo <andreas_sudi@hotmail.com>
Date: Wed Nov 4 06:22:27 2015 +0700
Merge pull request #58 from pikachuchu/react-pages
React pages
commit 1b1ffb73672a7a54339ea3d11396f70eb824e333
Merge: 5b525ba 4a44e8d
Author: Chuchu <chuchu.ma@utexas.edu>
Date: Tue Nov 3 13:39:25 2015 -0600
Merge pull request #57 from pikachuchu/get-legislator-verbose
Get legislator for chair and sponsor if verbose
commit 4a44e8de8f2486b57b9721ae548853668dd6d282
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Tue Nov 3 19:37:17 2015 +0000
Get legislator for chair and sponsor if verbose
commit 5b525bab0573627fd33e05d126bb0dae13d2d4ad
Merge: dfeef7b 62d073d
Author: Chuchu <chuchu.ma@utexas.edu>
Date: Mon Nov 2 23:58:36 2015 -0600
Merge pull request #55 from pikachuchu/add-verbose
Get data for foreign keys when verbose=true.
commit 62d073d880908e38d15bceaf5554af005f4ab5ad
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Tue Nov 3 05:56:33 2015 +0000
Get data for foreign keys when verbose=true.
This closes #54
commit dfeef7b81fd1fdf27e7992d63332ae7fc639e447
Merge: b980829 22c85df
Author: Chuchu <chuchu.ma@utexas.edu>
Date: Mon Nov 2 23:31:38 2015 -0600
Merge pull request #53 from pikachuchu/database/get-legislators
Database/get legislators
commit 22c85df0a6861baf37f63454750bcba457b9485b
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Tue Nov 3 05:29:24 2015 +0000
Update api to call database. This closes #41
commit 6a4dcab80eed1a8db092d9725f871232d105d9e0
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Tue Nov 3 00:43:36 2015 +0000
Get bills and committees from database
commit 4a15b3ca4af2e8a15767967b33c3fe27e4fc8f7b
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Tue Nov 3 00:34:04 2015 +0000
Use dictionary for votes data collection
commit cd3f40ff9e54ffff368bff0480f94a075102a69c
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Tue Nov 3 00:27:22 2015 +0000
Have unique votes
commit 4b5093e7b542269318349c9bf79b29bc52f461e5
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Tue Nov 3 00:22:42 2015 +0000
Update json data
commit 29bf87073a1e98e2d90367f2b8b8c3c41cac3789
Merge: 4af2772 b980829
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Mon Nov 2 23:50:33 2015 +0000
Merge branch 'master' into database/get-legislators
commit b980829ccb57aa9bf8c41e9fcddc7dcaa68c9e76
Merge: 859f11d c539d01
Author: Chuchu <chuchu.ma@utexas.edu>
Date: Mon Nov 2 17:50:06 2015 -0600
Merge pull request #52 from pikachuchu/add-data-to-db
finish adding data to db. This closes #39
commit c539d01235c033345f25811a3549a5b1a04f5c10
Author: Chuchu Ma <sarahma88@gmail.com>
Date: Mon Nov 2 23:09:49 2015 +0000
finish adding data to db. This closes #39
commit 2d0da99067bedcd09b8396c450b40446ddd75e65
Author: Andreas Sudihardjo <andreas@cs.utexas.edu>
Date: Mon Nov 2 14:40:56 2015 -0600
converted bills page into react. Remove unnecessary variable in other pages. closes #48. Also finished sorting and pagination which closes #49
commit 5509a9512f9e7ba360b264e0c0652271d5d78211
Author: Andreas Sudihardjo <andreas@cs.utexas.edu>
Date: Mon Nov 2 12:24:54 2015 -0600
convert committee page to react. This closes #47
commit b084eb82c92f066fa2b0e8dca557a5f50892e9d5
Author: andreas <andreas_sudi@hotmail.com>
Date: Mon Nov 2 05:06:31 2015 -0600