-
Notifications
You must be signed in to change notification settings - Fork 4
/
Copy pathWCDB3.log
3616 lines (2464 loc) · 105 KB
/
WCDB3.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 5a869200a012138e734a1bd08cfdc7a73eadbd3e
Merge: 31f3982 65d5b9c
Author: bblee1002 <bblee1002@utexas.edu>
Date: Thu Aug 8 19:09:55 2013 -0500
Merge branch 'phase3' of https://github.com/eddies5/cs373-wcdb into phase3
commit 31f3982f0760a84d2ca60ccdc97e1546681b98a5
Author: bblee1002 <bblee1002@utexas.edu>
Date: Thu Aug 8 19:08:28 2013 -0500
modified makefile for phase3
commit 65d5b9c0a33cb8d14568bf38e47d3ffaec052a35
Author: Olga <osaprych@gmail.com>
Date: Thu Aug 8 18:44:47 2013 -0500
renamed files for submitting
commit 15030802330bde2a52db02a0f97c58e82a458a8a
Merge: c5dc4d9 dba2ec4
Author: Olga <osaprych@gmail.com>
Date: Thu Aug 8 18:21:00 2013 -0500
Merge branch 'phase3' of https://github.com/eddies5/cs373-wcdb into phase3
commit dba2ec4e3c657cefef562ec61ce2bf95777ddb5e
Author: bblee1002 <bblee1002@utexas.edu>
Date: Thu Aug 8 18:11:13 2013 -0500
removed obsolete html files
commit 0c288194640eb653a27f37ac2f9cd06aac3f2bcb
Author: bblee1002 <bblee1002@utexas.edu>
Date: Thu Aug 8 18:08:40 2013 -0500
resolved issue #118
commit c5dc4d986260aab43dc6996c8bf010a23ac1f647
Merge: fe51d1b 1b53805
Author: Olga <osaprych@gmail.com>
Date: Thu Aug 8 17:53:42 2013 -0500
resolved merge conflict with search
commit fe51d1b93f03f00195f49e105361b81e3d0468be
Author: Olga <osaprych@gmail.com>
Date: Thu Aug 8 17:51:07 2013 -0500
search minor changes
commit d999e8958aecb673dff5ea2a31a5b21f345e288c
Merge: 0031a3f 1b53805
Author: bblee1002 <bblee1002@utexas.edu>
Date: Thu Aug 8 17:47:45 2013 -0500
Merge branch 'phase3' of https://github.com/eddies5/cs373-wcdb into phase3
commit 1b538050df0f0b60ac2c6eab0c6a29d954b95c6f
Author: Shan Gupta <srg538@cs.utexas.edu>
Date: Thu Aug 8 17:47:27 2013 -0500
Fixing documentation
commit 0031a3f8bde9f565d3779a7dcf5f9cf7f8513799
Author: bblee1002 <bblee1002@utexas.edu>
Date: Thu Aug 8 17:47:11 2013 -0500
debugging epytext errors
commit a1002e7920ebf336c0e7ba85f7bbc9101d2fa201
Merge: de40ea4 6740887
Author: Shan Gupta <srg538@cs.utexas.edu>
Date: Thu Aug 8 17:07:25 2013 -0500
Merge branch 'phase3' of https://github.com/eddies5/cs373-wcdb into phase3
commit de40ea43a289428d16cb18ec4c58e8d783f37f52
Author: Shan Gupta <srg538@cs.utexas.edu>
Date: Thu Aug 8 17:07:19 2013 -0500
Removed unnecessary copy of urls.py
commit 67408873fd920f967fb54ba679f015ba3536b2b8
Author: Paul Carroll <p.v.carroll@gmail.com>
Date: Thu Aug 8 17:02:34 2013 -0500
documentation for getDbModel.py
commit 06e9613a704252efd66df11340a38c5f4308ae81
Author: Shan Gupta <srg538@cs.utexas.edu>
Date: Thu Aug 8 17:01:27 2013 -0500
Documentation for Views.py and models.py is Complete
commit e95dd021fd93577b50bf72e6eb25e62273059948
Merge: 8017c5b f1b7dfc
Author: bblee1002 <bblee1002@utexas.edu>
Date: Thu Aug 8 17:00:16 2013 -0500
Merge branch 'phase3' of https://github.com/eddies5/cs373-wcdb into phase3
commit 8017c5bb47611d4187fd48be84b5b290b3607404
Author: bblee1002 <bblee1002@utexas.edu>
Date: Thu Aug 8 16:59:47 2013 -0500
Updated documentation in loadModels.py and search.py using the Epytext markup Language
commit f1b7dfc19feaee191c2108b777086e3732bf3e60
Author: Paul Carroll <p.v.carroll@gmail.com>
Date: Thu Aug 8 16:37:21 2013 -0500
unloadModels documentation
commit c0f532c868914d83410adc9ab70ebf2744d813c5
Author: Shan Gupta <srg538@cs.utexas.edu>
Date: Thu Aug 8 16:07:57 2013 -0500
Views.py Documentation slightly updated
commit 9c61e4a02f8e6ee599ef7f3427fd027bf3aacca1
Author: Shan Gupta <srg538@cs.utexas.edu>
Date: Thu Aug 8 16:05:49 2013 -0500
Documented Views.py:
commit cbf63413b4571d8c6a3b9f3bc86de09b319ca3b3
Merge: 8f792e7 543194c
Author: Shan Gupta <srg538@cs.utexas.edu>
Date: Thu Aug 8 15:49:19 2013 -0500
Merge branch 'phase3' of https://github.com/eddies5/cs373-wcdb into phase3
commit 8f792e701e3acead07011221887d5eae0dd0858d
Author: Shan Gupta <srg538@cs.utexas.edu>
Date: Thu Aug 8 15:49:02 2013 -0500
Adding documentation
commit 543194cc17165c643e880fb24d652b0b979578e3
Author: bblee1002 <bblee1002@utexas.edu>
Date: Wed Aug 7 19:05:18 2013 -0500
Added documentation for search
commit 438b163b4d1b753234c7cd972cb2256d3fca3c67
Merge: 4fc3c15 dc8348c
Author: Olga <osaprych@gmail.com>
Date: Wed Aug 7 16:50:46 2013 -0500
Merge branch 'phase3' of https://github.com/eddies5/cs373-wcdb into phase3
commit 4fc3c15610f96a193f9dbc9c50dc750a8e742fe6
Author: Olga <osaprych@gmail.com>
Date: Wed Aug 7 16:50:41 2013 -0500
rempoved print statements in search
commit dc8348c34b14d47dcf084869a8c63b17094ade85
Author: Shan Gupta <srg538@cs.utexas.edu>
Date: Wed Aug 7 16:44:09 2013 -0500
Unit Tests Fixed
commit ff46e4fb4d3bc4a70d12f090351922f4f00659ec
Merge: ee14c60 e26d50e
Author: Shan Gupta <srg538@cs.utexas.edu>
Date: Wed Aug 7 16:41:18 2013 -0500
Merge branch 'phase3' of https://github.com/eddies5/cs373-wcdb into phase3
commit ee14c60aec88095232f9a9bb142536381b9a8e6e
Author: Shan Gupta <srg538@cs.utexas.edu>
Date: Wed Aug 7 16:41:07 2013 -0500
Tests.py Updated
commit e26d50eef677d1dfe68fa780e725e5eb341a2648
Author: bblee1002 <bblee1002@utexas.edu>
Date: Wed Aug 7 16:17:00 2013 -0500
fixed search unit tests
commit 20209f5b1029654a371b7bd675866076e59c18ff
Merge: 675f562 01213f0
Author: bblee1002 <bblee1002@utexas.edu>
Date: Wed Aug 7 16:13:18 2013 -0500
Merge branch 'phase3' of https://github.com/eddies5/cs373-wcdb into phase3
commit 675f562924b8a18afc146c2df851c234e0db7f2c
Author: bblee1002 <bblee1002@utexas.edu>
Date: Wed Aug 7 16:13:15 2013 -0500
updated unloadmodels to pull
commit 01213f0a418c27cc6e98037c3d642ccd388b8e90
Author: Shan Gupta <srg538@cs.utexas.edu>
Date: Wed Aug 7 16:04:01 2013 -0500
Videos and Maps From Aaron Stacy Add Properly Now
commit 077251d30542634d99b0b46faf3092e1dfb17c8d
Author: Shan Gupta <srg538@cs.utexas.edu>
Date: Wed Aug 7 12:41:56 2013 -0500
Unidecode facility added, Export/Import Bug Fixed, Resulting UnitTest issues fixed
commit d6eaab01187cd1afbaa66d753fbd63a8a1540abd
Author: Shan Gupta <srg538@cs.utexas.edu>
Date: Tue Aug 6 20:37:54 2013 -0500
Import Video issue Fixed
commit ec8b68a92c57301ff10602795254f21822f323e7
Merge: 98df8d2 93e027a
Author: bblee1002 <bblee1002@utexas.edu>
Date: Tue Aug 6 20:24:06 2013 -0500
Merge branch 'phase3' of https://github.com/eddies5/cs373-wcdb into phase3
commit 98df8d217441b527be889661886ef525a72cdb3e
Author: bblee1002 <bblee1002@utexas.edu>
Date: Tue Aug 6 20:23:54 2013 -0500
finished unit tests for search
commit 93e027ac8fd627b9987aedd1689e51d07d489097
Author: Eddie <saenzeddie5@gmail.com>
Date: Tue Aug 6 20:04:21 2013 -0500
front-end fixes for general pages
commit e865447a992b918163e6a621c4887531dff692a2
Author: Eddie <saenzeddie5@gmail.com>
Date: Tue Aug 6 20:03:23 2013 -0500
changed left margin on span in users-list table
commit 2025e40a5c3a513f8d0f7864ab66d5802a993420
Merge: 276b234 009928d
Author: Shaelyn Watson <shaelyn@cs.utexas.edu>
Date: Tue Aug 6 19:51:49 2013 -0500
Merge branch 'phase3' of https://github.com/eddies5/cs373-wcdb into phase3
commit 276b2348f28736cdb0f05a62760b66061d588c46
Author: Shaelyn Watson <shaelyn@cs.utexas.edu>
Date: Tue Aug 6 19:51:29 2013 -0500
javascript added to drop subtext summary in category pages
commit 009928d39eaedf105a2515ee74820534e629fad6
Merge: 70fdd76 28ca097
Author: bblee1002 <bblee1002@utexas.edu>
Date: Tue Aug 6 19:34:51 2013 -0500
merged search tests
commit 70fdd7671042b3f689000743f0035b167394a4fd
Author: bblee1002 <bblee1002@utexas.edu>
Date: Tue Aug 6 19:29:22 2013 -0500
added more tests for search
commit 28ca097934abd7302c167927e604bdae2677688c
Author: Olga <osaprych@gmail.com>
Date: Tue Aug 6 18:33:14 2013 -0500
added test for searchLi
commit 40e6e9b04ac8d037957a29255dfc2765fee4d6f0
Author: Olga <osaprych@gmail.com>
Date: Tue Aug 6 18:21:53 2013 -0500
added tests for search Person, Crisis, and Org
commit 0ebad3a73496f2871ef05bfed8f2bb74ca4cd144
Author: Olga <osaprych@gmail.com>
Date: Tue Aug 6 17:48:23 2013 -0500
resolved merge conflict 2
commit 477a894a8668196bce91e11e4218bfb8e5004939
Merge: 2672a4d 3ccbb53
Author: Olga <osaprych@gmail.com>
Date: Tue Aug 6 17:45:01 2013 -0500
resolved merge conflict for tests
commit 2672a4d87e664b64758281320329aa67ebd88f51
Author: Olga <osaprych@gmail.com>
Date: Tue Aug 6 17:41:23 2013 -0500
working on unit tests for search
commit 3ccbb53d5412b4d2746855ed9b725520c6b2cb29
Merge: bcf0e24 67dfe09
Author: bblee1002 <bblee1002@utexas.edu>
Date: Tue Aug 6 17:32:06 2013 -0500
Merge branch 'phase3' of https://github.com/eddies5/cs373-wcdb into phase3
commit bcf0e24d38a48b2816a67cfcadb6842ac0e07db1
Author: bblee1002 <bblee1002@utexas.edu>
Date: Tue Aug 6 17:31:56 2013 -0500
added some tests for search
commit 67dfe095bd6f0d47fcc05aca1f216c0db2bd43dc
Author: Shan Gupta <srg538@cs.utexas.edu>
Date: Tue Aug 6 17:25:11 2013 -0500
Documentation Added
commit 02837db959a003f70832b5b59c9e73618f4cf13a
Author: Shaelyn Watson <shaelyn@cs.utexas.edu>
Date: Tue Aug 6 17:17:57 2013 -0500
updated common_summary to have longer length, but import for tmtorres still fails
commit ce315e7ebd5a71d4823536450293d5892c6fe606
Author: Paul Carroll <p.v.carroll@gmail.com>
Date: Tue Aug 6 17:12:43 2013 -0500
getTypeNameImage() tests
commit b7537248d527985f7e1922dba06d2be1054819ae
Merge: bf9a243 20a8aea
Author: Olga <osaprych@gmail.com>
Date: Tue Aug 6 17:02:14 2013 -0500
Merge branch 'phase3' of https://github.com/eddies5/cs373-wcdb into phase3
commit bf9a243dafb1c437fe993d0d3147b42169a0778a
Author: Olga <osaprych@gmail.com>
Date: Tue Aug 6 17:02:11 2013 -0500
search
commit 20a8aeaf7fc13abf3b5c66118b451c7117bcdcfa
Merge: e391a4e d7e8f71
Author: Shaelyn Watson <shaelyn@cs.utexas.edu>
Date: Tue Aug 6 16:50:57 2013 -0500
Merge branch 'phase3' of https://github.com/eddies5/cs373-wcdb into phase3
commit e391a4e98d3c48db2bf0bc6a861e3028c3c4e3fc
Author: Shaelyn Watson <shaelyn@cs.utexas.edu>
Date: Tue Aug 6 16:49:15 2013 -0500
updated max lengths of model imports
commit d7e8f71c6a8fdeb48f2a722b10b4cbcb444aac90
Merge: c4bc22a 7be86f2
Author: Shan Gupta <srg538@cs.utexas.edu>
Date: Tue Aug 6 16:41:36 2013 -0500
Merge branch 'phase3' of https://github.com/eddies5/cs373-wcdb into phase3
commit c4bc22a1c90581f425cfda2bd966e53b52a207af
Author: Shan Gupta <srg538@cs.utexas.edu>
Date: Tue Aug 6 16:41:20 2013 -0500
updating Import
commit 7be86f2937f65a9d4c34601e46961fc3c51ed4c2
Author: Paul Carroll <p.v.carroll@gmail.com>
Date: Tue Aug 6 16:40:31 2013 -0500
moved populate_common tests from models class to load models class
commit c54225bf10768546200679db0172756884dc2f17
Author: Paul Carroll <p.v.carroll@gmail.com>
Date: Tue Aug 6 16:34:54 2013 -0500
make_attribute_string() tests
commit 5d046a737a639080ab1a967dcda02134fa9a24c4
Author: Paul Carroll <p.v.carroll@gmail.com>
Date: Tue Aug 6 16:00:25 2013 -0500
models.py getID() tests
commit 036825bda0aa8db486c7d8844cb4b271e7570d82
Merge: 6869800 129ed7d
Author: bblee1002 <bblee1002@utexas.edu>
Date: Tue Aug 6 15:25:24 2013 -0500
Merge branch 'phase3' of https://github.com/eddies5/cs373-wcdb into phase3
commit 68698002af5b58a9541a09e1f5543aba9b2929f7
Author: bblee1002 <bblee1002@utexas.edu>
Date: Tue Aug 6 15:25:01 2013 -0500
started search tests
commit 129ed7d522a5732fc95cf5533055a445031c290b
Author: Paul Carroll <p.v.carroll@gmail.com>
Date: Mon Aug 5 21:26:02 2013 -0500
searchView, queriesView tests
commit af48e8eae299cef1e8669883d81bba483777db52
Author: Paul Carroll <p.v.carroll@gmail.com>
Date: Mon Aug 5 20:53:45 2013 -0500
crisesPage, orgPage, pplPage tests
commit 6fb17864916971484a2e74d5632e1e68faff5263
Author: bblee1002 <bblee1002@utexas.edu>
Date: Mon Aug 5 18:49:10 2013 -0500
Added getID method to models and addressed issue #108
commit e64cffccbcccd6ba0d10f5293d3032add6069a53
Author: Olga <osaprych@gmail.com>
Date: Mon Aug 5 16:55:25 2013 -0500
fixing search bugs
commit cea271a4b741df96a8e24c29b9df473f6a18299a
Merge: 9296011 e6b378b
Author: Olga <osaprych@gmail.com>
Date: Mon Aug 5 16:26:58 2013 -0500
Merge branch 'phase3' of https://github.com/eddies5/cs373-wcdb into phase3
commit 92960113ee0414593111793ba8f9d7a4085cfd29
Author: Olga <osaprych@gmail.com>
Date: Mon Aug 5 16:26:44 2013 -0500
trying to fix double search bug for single words
commit e6b378badbff07cf62c11bf130152a4650f538f3
Merge: d042ae6 539547a
Author: Paul Carroll <p.v.carroll@gmail.com>
Date: Mon Aug 5 15:57:42 2013 -0500
Merge branch 'phase3' of github.com:eddies5/cs373-wcdb into phase3
commit d042ae6cae1801dea863aa9b21e0f21c8fa4c78f
Author: Paul Carroll <p.v.carroll@gmail.com>
Date: Mon Aug 5 15:57:25 2013 -0500
working on views unittests
commit 539547a97289a9dd63e1733bf2cfbc45d6e407f6
Author: Shan Gupta <srg538@cs.utexas.edu>
Date: Mon Aug 5 15:56:54 2013 -0500
Search HTML page Implemented, Search.py needs fixing
commit 62a330f395242e4aad8533fa03c9e4f3a2557dec
Merge: 03a4e07 9d3338c
Author: Shan Gupta <srg538@cs.utexas.edu>
Date: Mon Aug 5 15:39:44 2013 -0500
Merge branch 'phase3' of https://github.com/eddies5/cs373-wcdb into phase3
commit 9d3338c985044e06f97ac44e8551375044e33525
Author: Paul Carroll <p.v.carroll@gmail.com>
Date: Mon Aug 5 14:49:58 2013 -0500
changed margins, fixed typo in tests(getDdModelTest to getDbModelTest)
commit 03a4e07acc6b851015f2d8ab8aabf47d219ea9c0
Author: Shan Gupta <srg538@cs.utexas.edu>
Date: Mon Aug 5 14:40:30 2013 -0500
Merged
commit c942d31c80210a4eec1ae4884bab4e432e65b929
Merge: b3f7152 58dc975
Author: Shan Gupta <srg538@cs.utexas.edu>
Date: Mon Aug 5 14:39:06 2013 -0500
Merge branch 'phase3' of https://github.com/eddies5/cs373-wcdb into phase3
commit b3f7152208b04ea69f9a6498c23617a0217bbad2
Author: Shan Gupta <srg538@cs.utexas.edu>
Date: Mon Aug 5 14:38:59 2013 -0500
ABout to Merge
commit 58dc975910cd1dc847eca5068c44ce21f609a00a
Merge: 71f2baa 99506b4
Author: Shaelyn Watson <shaelyn@cs.utexas.edu>
Date: Mon Aug 5 14:37:18 2013 -0500
Merge branch 'phase3' of https://github.com/eddies5/cs373-wcdb into phase3
commit 71f2baab9ce63f096e5683cd5199c389ec082df7
Author: Shaelyn Watson <shaelyn@cs.utexas.edu>
Date: Mon Aug 5 14:37:02 2013 -0500
added name to search page
commit 99506b4ab4bd56d634eb4f63ae0877d717553919
Author: Paul Carroll <p.v.carroll@gmail.com>
Date: Mon Aug 5 14:01:25 2013 -0500
passwordValidate() tests
commit 5d8587a9c5e1578ef901567c41c19716601cdb16
Author: Shaelyn Watson <shaelyn@cs.utexas.edu>
Date: Mon Aug 5 13:58:58 2013 -0500
made font size consistent among page headers
commit abb576cd68129c9d46dad953ec0f49833a399465
Author: Paul Carroll <p.v.carroll@gmail.com>
Date: Mon Aug 5 13:50:43 2013 -0500
fixed failing tests
commit d166704a1a626b6da77cc93d682cfb72a544d663
Merge: ab05992 bdea266
Author: Shaelyn Watson <shaelyn@cs.utexas.edu>
Date: Mon Aug 5 13:01:46 2013 -0500
Merge branch 'phase3' of https://github.com/eddies5/cs373-wcdb into phase3
commit ab0599242d5938e63ffdb89943c6a872c8ee2c05
Author: Shaelyn Watson <shaelyn@cs.utexas.edu>
Date: Mon Aug 5 13:01:30 2013 -0500
beginning implementation of the search page
commit bdea266ce61580c416f4c7407ac6d78eff6acee7
Author: bblee1002 <bblee1002@utexas.edu>
Date: Mon Aug 5 12:16:21 2013 -0500
commented out prints in search
commit 5a4b9039abc1a9417240fd5be215deb684070130
Merge: 7aedb84 659c426
Author: bblee1002 <bblee1002@utexas.edu>
Date: Mon Aug 5 12:13:12 2013 -0500
Merge branch 'phase3' of https://github.com/eddies5/cs373-wcdb into phase3
commit 7aedb84c8923520d3378346e03facd367c57a62e
Author: bblee1002 <bblee1002@utexas.edu>
Date: Mon Aug 5 12:13:06 2013 -0500
Fixed error where org contexts were incorrectly searched for
commit 659c4269d9671501f93f71f61429c4e3d9dfb182
Author: Paul Carroll <p.v.carroll@gmail.com>
Date: Mon Aug 5 12:03:49 2013 -0500
fixed unit tests errors
commit e1a62ce1e2f3713a20a6ef5c14d964e965155b66
Author: Shan Gupta <srg538@cs.utexas.edu>
Date: Sun Aug 4 23:18:34 2013 -0500
Carousel Size Change Issue and Export Issue Fixed
commit bdf67c6ade3b54086c07dc2c7be1d3c704347edf
Author: Shan Gupta <srg538@cs.utexas.edu>
Date: Sun Aug 4 19:28:36 2013 -0500
Kind's Are Now Horizontally Displayed, Facebook/Twitter Links Checked
commit f1dadccc91cf824f1045747b07c8a14a4bb7a135
Merge: 3fdce87 4e8dfd8
Author: Shan Gupta <srg538@cs.utexas.edu>
Date: Sun Aug 4 19:21:07 2013 -0500
Merge branch 'phase3' of https://github.com/eddies5/cs373-wcdb into phase3
commit 4e8dfd878830cdeb1bf51c422973c964ea5c10e7
Author: Paul Carroll <p.v.carroll@gmail.com>
Date: Sun Aug 4 19:14:37 2013 -0500
kinds displayed horizontally
commit 3fdce8729f22aff6aef562c5c59adca33a0b9f82
Merge: 8e067e0 7bb8716
Author: Shan Gupta <srg538@cs.utexas.edu>
Date: Sun Aug 4 19:03:19 2013 -0500
Merge branch 'phase3' of https://github.com/eddies5/cs373-wcdb into phase3
commit 8e067e0e49776d3b59c928c19367a977d50e5556
Author: Shan Gupta <srg538@cs.utexas.edu>
Date: Sun Aug 4 19:03:09 2013 -0500
Checking Facebook/Twitter Links
commit 7bb87169ec62d02e9d5f40d75d7ac1f5186a5811
Merge: 5664474 0687144
Author: bblee1002 <bblee1002@utexas.edu>
Date: Sun Aug 4 18:45:04 2013 -0500
Merge branch 'phase3' of https://github.com/eddies5/cs373-wcdb into phase3
commit 566447450ed5f3497a10798115671cc4a61d3adb
Author: bblee1002 <bblee1002@utexas.edu>
Date: Sun Aug 4 18:44:53 2013 -0500
Updated xml - removed some twitters
commit 0687144a8437df784c7d36b6dc041074bd5fc87c
Author: Shan Gupta <srg538@cs.utexas.edu>
Date: Sun Aug 4 17:57:23 2013 -0500
Fixed Citations and WaysToHelp to be able to handle not Having an HREF
commit 9beee2db84aff0f50ae59f35b6b77d449e708148
Merge: 18daba1 6d7bf98
Author: bblee1002 <bblee1002@utexas.edu>
Date: Sun Aug 4 17:43:10 2013 -0500
Merge branch 'phase3' of https://github.com/eddies5/cs373-wcdb into phase3
commit 18daba1c92d4211ede389387600381360d368a69
Author: bblee1002 <bblee1002@utexas.edu>
Date: Sun Aug 4 17:43:01 2013 -0500
Addressed issues #82, #90, #93
commit 6d7bf988988dee528de4dc74039c149421992358
Author: Shan Gupta <srg538@cs.utexas.edu>
Date: Sun Aug 4 16:54:04 2013 -0500
Twitter Embeds Done
commit 1d10dd1db1d50576e914cb0259eb81f591513ea2
Merge: 5335f64 9493e0d
Author: bblee1002 <bblee1002@utexas.edu>
Date: Sun Aug 4 15:39:15 2013 -0500
Merge branch 'phase3' of https://github.com/eddies5/cs373-wcdb into phase3
commit 5335f6439e79833f5c0393544685937f42680e18
Author: bblee1002 <bblee1002@utexas.edu>
Date: Sun Aug 4 15:39:04 2013 -0500
Resolved issue #95
commit 9493e0dd248f6c0448f5e4d439ea13fa8ee9eed9
Merge: c4bc12d d8fbe92
Author: Shan Gupta <srg538@cs.utexas.edu>
Date: Sun Aug 4 14:28:37 2013 -0500
XML Update Merge Images Added to NucDis
commit c4bc12d2e615bfea04d34a510821757adc839532
Author: Shan Gupta <srg538@cs.utexas.edu>
Date: Sun Aug 4 14:25:25 2013 -0500
XML Update
commit d8fbe92874debd922de31dbf86645ff49fe6cf98
Author: Shaelyn Watson <shaelyn@cs.utexas.edu>
Date: Sun Aug 4 14:22:57 2013 -0500
fixed nuclear crisis pics
commit 8470e92642a83de46ec7b1333fea000909c80610
Merge: e67bc28 6f2b741
Author: Shaelyn Watson <shaelyn@cs.utexas.edu>
Date: Sun Aug 4 14:08:08 2013 -0500
Merge branch 'phase3' of https://github.com/eddies5/cs373-wcdb into phase3
commit e67bc28adf0b734e85b1978e8ec3c86f0a6829d3
Author: Shaelyn Watson <shaelyn@cs.utexas.edu>
Date: Sun Aug 4 14:07:37 2013 -0500
reformatted external links and ways to help
commit 6f2b741727f9ab0d2d18bdd60e5cdf1fc148cf27
Author: Shan Gupta <srg538@cs.utexas.edu>
Date: Sun Aug 4 14:02:18 2013 -0500
Both Imports Functional Now - Separate Passwords
commit 3ec987928f2d8270b72941e9fef1cba9f0ed5281
Author: Shaelyn Watson <shaelyn@cs.utexas.edu>
Date: Sun Aug 4 13:59:56 2013 -0500
updated webpage format
commit 027479a1279c237179e0a012321aa08d1b179eaa
Author: Shaelyn Watson <shaelyn@cs.utexas.edu>
Date: Sun Aug 4 11:50:34 2013 -0500
updated homepage
commit e1fd5fed1ac7ceb43c96e203c0f73428fcad210b
Author: Shaelyn Watson <shaelyn@cs.utexas.edu>
Date: Sun Aug 4 11:31:44 2013 -0500
cleaned tab category pages and updated xml org info
commit 51e3f9850805ddc9648e3fe4bac58d96deb56955
Author: Shaelyn Watson <shaelyn@cs.utexas.edu>
Date: Sun Aug 4 10:53:15 2013 -0500
updated homepage and crisispage dev continued
commit f1c464dc190bde31e55ff612193a6f1620d6269a
Author: Shaelyn Watson <shaelyn@cs.utexas.edu>
Date: Sun Aug 4 10:28:02 2013 -0500
modified crisis tab page
commit 908f196006661367500d0e62a7633b5bf401dd1d
Author: Shaelyn Watson <shaelyn@cs.utexas.edu>
Date: Sun Aug 4 10:20:55 2013 -0500
images for the homepage
commit 67f2458cfed3b308e187ebb79ecf45f9c7dc003e
Author: Shan Gupta <srg538@cs.utexas.edu>
Date: Sat Aug 3 20:29:01 2013 -0500
Changed Facebook Feeds to EMBED's instead of HREF's
commit 9d122e0b8678a78b6c952159f9f15c0c8f720832
Author: Shan Gupta <srg538@cs.utexas.edu>
Date: Sat Aug 3 20:10:34 2013 -0500
XML Updated again, more info added
commit 084d6abc87165c2f1964deab6b8e6561f9750581
Author: Shan Gupta <srg538@cs.utexas.edu>
Date: Sat Aug 3 19:37:53 2013 -0500
XML Updated - Embed for Twitter Feeds, HREF for Facebook Feeds
commit 711b2813d2825ec27ef21f8e90bb721d2e9217da
Author: Olga <osaprych@gmail.com>
Date: Sat Aug 3 18:57:05 2013 -0500
added working li to context search
commit 20bf70331937df6f4ed1a4aae2659aa889d74c60
Merge: 5fc0e22 ecd8108
Author: bblee1002 <bblee1002@utexas.edu>
Date: Sat Aug 3 17:42:01 2013 -0500
Merge branch 'phase3' of https://github.com/eddies5/cs373-wcdb into phase3
commit 5fc0e22013f707fb71c29fcc34004b50bff755cd
Author: bblee1002 <bblee1002@utexas.edu>
Date: Sat Aug 3 17:41:44 2013 -0500
correctly retrieving contexts from Crises
commit ecd81089f512528d739994084d1b603b07df235a
Author: Paul Carroll <p.v.carroll@gmail.com>
Date: Sat Aug 3 17:01:22 2013 -0500
changed href to embed for feeds
commit 2bb43ace93ec9f8ee2c74926803e231a10d09351
Merge: b04f28a 42133a5
Author: Shan Gupta <srg538@cs.utexas.edu>
Date: Sat Aug 3 16:25:16 2013 -0500
Merge branch 'phase3' of https://github.com/eddies5/cs373-wcdb into phase3
commit b04f28a5d9ef7eee0f588025fc9fe45a282460fc
Author: Shan Gupta <srg538@cs.utexas.edu>
Date: Sat Aug 3 16:25:06 2013 -0500
Queries Page Complete
commit 42133a525f884f8cdbd191972eb6d3235b7916da
Author: Paul Carroll <p.v.carroll@gmail.com>
Date: Sat Aug 3 16:03:19 2013 -0500
page margins, box-shadows
commit 2ba2d8590da1e7b2da6fc69cbe6643994c204569
Merge: 1711ebc 34b2426
Author: bblee1002 <bblee1002@utexas.edu>
Date: Sat Aug 3 15:32:31 2013 -0500
Merge branch 'phase3' of https://github.com/eddies5/cs373-wcdb into phase3
commit 1711ebc32704d19e33fed8d4c29ed852d6a2a6be
Author: bblee1002 <bblee1002@utexas.edu>
Date: Sat Aug 3 15:32:28 2013 -0500
took out temp variable in search
commit 34b242603cf7d5a7bb2cf669b4ee47a57a18c506
Author: Olga <osaprych@gmail.com>
Date: Sat Aug 3 15:31:15 2013 -0500
sketch for getContext in search
commit de854767450d51c90ea35f31a1da4c0e8e56fd8f
Merge: b2f7bdb b2707b3
Author: bblee1002 <bblee1002@utexas.edu>
Date: Sat Aug 3 14:35:39 2013 -0500
Merge branch 'phase3' of https://github.com/eddies5/cs373-wcdb into phase3
commit b2f7bdb9431a0a363e031fde804fe6368066e2f1
Author: bblee1002 <bblee1002@utexas.edu>
Date: Sat Aug 3 14:35:29 2013 -0500
resolved issue 92
commit b2707b3b4cb040298d3193c3a91a9497caa96ea3
Author: Paul Carroll <p.v.carroll@gmail.com>
Date: Sat Aug 3 14:25:06 2013 -0500
unit tests for getLi()
commit 719ca1100a749211ce3cd76ce7df96a9d29f6ba5
Author: bblee1002 <bblee1002@utexas.edu>
Date: Sat Aug 3 14:02:31 2013 -0500
Fixed duplicate exact bug
commit 2758abfc0db6bef62c24d1eaa55a6026fc806ff6
Merge: 03e260b f660e54
Author: bblee1002 <bblee1002@utexas.edu>
Date: Fri Aug 2 15:55:23 2013 -0500
Merge branch 'phase3' of https://github.com/eddies5/cs373-wcdb into phase3
commit 03e260b68d150772384a2d79881d804f649d570c
Author: bblee1002 <bblee1002@utexas.edu>
Date: Fri Aug 2 15:55:03 2013 -0500
Refactored search a bit
commit f660e54684800ea311da6f07872e0bd946c7e4b7
Merge: 9ceaf99 8fa168d
Author: Shaelyn Watson <shaelyn@cs.utexas.edu>
Date: Fri Aug 2 13:37:19 2013 -0500
Merge branch 'phase3' of https://github.com/eddies5/cs373-wcdb into phase3
commit 9ceaf995c27c520690d7804a210283c21811395c
Author: Shaelyn Watson <shaelyn@cs.utexas.edu>
Date: Fri Aug 2 13:37:00 2013 -0500
updated xml and homepage
commit 8fa168d2fcedf332953d9c9d9dd8389177fd1821
Merge: c23ff0e fd45447
Author: bblee1002 <bblee1002@utexas.edu>
Date: Fri Aug 2 13:34:34 2013 -0500
merge conflict resolved
commit fd454477125fa8b6e20a8e4dc847e3e10f6c435b
Merge: 4372851 5c30051
Author: Olga <osaprych@gmail.com>
Date: Fri Aug 2 13:29:58 2013 -0500
Merge branch 'phase3' of https://github.com/eddies5/cs373-wcdb into phase3
commit 437285116c84e8520c796071d2743ee6be0b2eae
Author: Olga <osaprych@gmail.com>
Date: Fri Aug 2 13:29:36 2013 -0500
modified search by adding a dictionary; results are sorted by the number of terms they match
commit 5c3005165cc5fd956ff47b2a7b448f9788f24ce3
Author: Shaelyn Watson <shaelyn@cs.utexas.edu>
Date: Fri Aug 2 13:22:09 2013 -0500
updated homepage further
commit 6cb3fc7ec2d13caeba284f4489a7c52ff901d2ee
Author: Shaelyn Watson <shaelyn@cs.utexas.edu>
Date: Fri Aug 2 13:10:14 2013 -0500
changed layout of homepage
commit 70a42aa4cc08dbd12406880df1495ecdf7663ad8
Author: Shaelyn Watson <shaelyn@cs.utexas.edu>
Date: Fri Aug 2 12:25:23 2013 -0500
updated people to have common kind names
commit c23ff0e65d874902f871491dbcb67ec7cbc41a0b
Author: bblee1002 <bblee1002@utexas.edu>
Date: Fri Aug 2 12:23:29 2013 -0500
updated search
commit db92cd1e463f06e66b1e0cacaf99a2cffd77e305
Merge: 47fe4ce 7c9513a
Author: Shan Gupta <srg538@cs.utexas.edu>
Date: Thu Aug 1 19:47:19 2013 -0500
Merge Completed
commit 47fe4ce79f5e2e552e8e6004f62b0c069b322eef
Author: Shan Gupta <srg538@cs.utexas.edu>
Date: Thu Aug 1 19:42:17 2013 -0500
Got Filtering By Kind to Work, as well as WhiteSpace Image
commit 7c9513abb297eea01341bb9a599b580859b78bb9
Author: Paul Carroll <p.v.carroll@gmail.com>
Date: Thu Aug 1 19:06:34 2013 -0500
working on orgpage display where org has no image
commit a24cff702629ebf065fe9195a143db274b099d2a
Author: Paul Carroll <p.v.carroll@gmail.com>
Date: Thu Aug 1 17:55:22 2013 -0500
added images, summaries to orgpage, pplpage
commit f81a2499e72e27cc4a34380b8701720a9af64c83
Merge: 7edae35 9837760
Author: Shan Gupta <srg538@cs.utexas.edu>
Date: Thu Aug 1 17:42:02 2013 -0500
Merged My Work With Paul's Work - Kinds and Images/Summary
commit 7edae35120606dac9d99d8439ee8ec05820c8467
Author: Shan Gupta <srg538@cs.utexas.edu>
Date: Thu Aug 1 17:37:59 2013 -0500
Filtering Crises by Kind almost done
commit 983776096379e7d12e7876c91bd5e4cd47423b6a
Author: Paul Carroll <p.v.carroll@gmail.com>
Date: Thu Aug 1 17:14:20 2013 -0500
images, summaries on crisespage
commit 69329aee3123870a3d1255bad190e061c21e67cc
Merge: 6671d59 98cb49f
Author: Paul Carroll <p.v.carroll@gmail.com>
Date: Thu Aug 1 17:00:20 2013 -0500
added images, summaries to crisis page
commit 6671d59eaa57acab5ba703bf294320368294d845
Author: Paul Carroll <p.v.carroll@gmail.com>
Date: Thu Aug 1 16:56:00 2013 -0500
added images, summary to crisis dict for front end
commit 98cb49f8fb6c039f4ff567906b9ac3aa556da62c
Merge: c031bd2 1d56a59
Author: Olga <osaprych@gmail.com>
Date: Thu Aug 1 16:53:43 2013 -0500
Merge branch 'phase3' of https://github.com/eddies5/cs373-wcdb into phase3
commit c031bd26e2c7c89980cffdae86e97ae878bbdfca
Author: Olga <osaprych@gmail.com>
Date: Thu Aug 1 16:53:31 2013 -0500
modified search; gives weird long result
commit 1d56a592646e442676a66bc88696de48392f23c2
Merge: 9876f1a 9670fec
Author: Shan Gupta <srg538@cs.utexas.edu>
Date: Thu Aug 1 15:57:48 2013 -0500
Merged Shaelyn's UI Work With My Query Work
commit 9876f1a5d6fc56cac28d6cb0ac1574fb8d8f0321
Author: Shan Gupta <srg538@cs.utexas.edu>
Date: Thu Aug 1 15:55:14 2013 -0500
Queries Written
commit 9670feccaa2d962b1bea4985cac60af187da458e
Author: Shaelyn Watson <shaelyn@cs.utexas.edu>
Date: Thu Aug 1 15:52:52 2013 -0500
redesigned crises, people, and orgs tab lists to include sized pictures, blank image included in this commit
commit d2cad34a7626c5a914d78720cf53176d3c7937e8
Author: Shaelyn Watson <shaelyn@cs.utexas.edu>
Date: Thu Aug 1 15:12:35 2013 -0500
added crises, orgs, and ppl tabs with corresponding html pages to list import
commit 7ec9d8193802203189ab1b5e634e73c4c511ec79
Author: Paul Carroll <p.v.carroll@gmail.com>
Date: Thu Aug 1 14:26:05 2013 -0500
getLi()
commit 5d391d530f15b8349aabdb017abfd836cc4673ae
Author: bblee1002 <bblee1002@utexas.edu>
Date: Wed Jul 31 15:00:26 2013 -0500
added some li stuff to search