/
IDB3.log
2835 lines (1921 loc) · 83.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 74d01e9dc35c793b90496f92f31b61399ae0c778
Merge: ed886a4 f7d9d2b
Author: Didi Crous <didicrous@gmail.com>
Date: Thu Nov 17 21:49:04 2016 -0600
Merge branch 'master' of https://github.com/kethomas/SWEetOutdoors-dev
commit f7d9d2b1ba932037c98c250286f2465199d8c059
Merge: a79c6ac 9d49e82
Author: Rambo Wu <wurambo@utexas.edu>
Date: Thu Nov 17 21:48:33 2016 -0600
Merge branch 'master' of https://github.com/kethomas/SWEetOutdoors-dev
commit ed886a4a3be1d800005914f88da5ef387a13304e
Author: Didi Crous <didicrous@gmail.com>
Date: Thu Nov 17 21:48:31 2016 -0600
fixed search bars
commit a79c6ac65dc65c6493cd99023726932a5ec1d480
Author: Rambo Wu <wurambo@utexas.edu>
Date: Thu Nov 17 21:48:28 2016 -0600
fixed instances search bar
commit 9d49e826eb636eca892e9b27ab571f01f2e9cca3
Author: Matthew Rosenbaum <matthew.rosenbaum@utexas.edu>
Date: Thu Nov 17 21:48:05 2016 -0600
about
commit 0061e7da659067c80b3843d7436f39c68974e26c
Author: Matthew Rosenbaum <matthew.rosenbaum@utexas.edu>
Date: Thu Nov 17 21:46:20 2016 -0600
about update
commit a7991ab676be03432c5a5b6cd3bfb2c627c7b256
Merge: 16d078a 50da042
Author: Matthew Rosenbaum <matthew.rosenbaum@utexas.edu>
Date: Thu Nov 17 21:45:56 2016 -0600
Merge branch 'master' of https://github.com/kethomas/SWEetOutdoors-dev
commit 50da042efb8ac5720679c418763574b732e5c697
Author: Kirsten Thomas <kirsten.thomas@utexas.edu>
Date: Thu Nov 17 21:43:47 2016 -0600
search
commit 16d078a03615db0cd90d3e60b7d618312999e03e
Merge: 372620a 765c993
Author: Matthew Rosenbaum <matthew.rosenbaum@utexas.edu>
Date: Thu Nov 17 21:42:21 2016 -0600
Merge branch 'master' of https://github.com/kethomas/SWEetOutdoors-dev
commit 765c993d08e8d21076e52c9f1851858fac872119
Merge: 787246a 3c91ea2
Author: Didi Crous <didicrous@gmail.com>
Date: Thu Nov 17 21:37:13 2016 -0600
Merge branch 'master' of https://github.com/kethomas/SWEetOutdoors-dev
commit 3c91ea23e0d934fb939d9848d4f24d635552c318
Author: Kirsten Thomas <kirsten.thomas@utexas.edu>
Date: Thu Nov 17 21:32:55 2016 -0600
populating lists
commit 787246a1cbf140ac70203fc37292d4852a6eaaa6
Author: Didi Crous <didicrous@gmail.com>
Date: Thu Nov 17 21:32:42 2016 -0600
fixed photourl going outside margins
commit 1ecdeacf97d1e2ab18456168b661fee5929852c3
Merge: 10399e8 764b8d8
Author: Didi Crous <didicrous@gmail.com>
Date: Thu Nov 17 21:25:55 2016 -0600
Merge branch 'master' of https://github.com/kethomas/SWEetOutdoors-dev
commit 10399e8462d98bdaf7411014c8202f4d05a0da47
Author: Didi Crous <didicrous@gmail.com>
Date: Thu Nov 17 21:25:36 2016 -0600
or + and search working
commit 764b8d89343a73b9d50008d2b4e84c6d317f31e0
Author: Rambo Wu <wurambo@utexas.edu>
Date: Thu Nov 17 21:14:06 2016 -0600
fixed about page
commit c1f0e3cdfbc1d253d14cce63d7aff457b5f1aed1
Merge: 4c88bfc cc338f1
Author: Rambo Wu <wurambo@utexas.edu>
Date: Thu Nov 17 21:06:20 2016 -0600
added all
commit 4c88bfc37a6112f5e16371077b2c0d4ed5329d31
Author: Rambo Wu <wurambo@utexas.edu>
Date: Thu Nov 17 21:05:39 2016 -0600
fixed merge conflict?
commit cc338f172ea28c26fa8a20d679aca03c937dcd6b
Author: Kirsten Thomas <kirsten.thomas@utexas.edu>
Date: Thu Nov 17 21:04:30 2016 -0600
adding on search stuff
commit 372620ab7952e133a8171acb4be3f2a21c0f2ecd
Author: Matthew Rosenbaum <matthew.rosenbaum@utexas.edu>
Date: Thu Nov 17 21:02:35 2016 -0600
rename file for turnin
commit 401fc12463564136141d9e52885c4515b48469df
Merge: b6e7057 a0c5698
Author: Rambo Wu <wurambo@utexas.edu>
Date: Thu Nov 17 20:55:13 2016 -0600
Merge branch 'master' of https://github.com/kethomas/SWEetOutdoors-dev
commit b6e70574baba4bb68a075c1efe962fba13027526
Merge: d1f85b7 16d9794
Author: Rambo Wu <wurambo@utexas.edu>
Date: Thu Nov 17 20:55:07 2016 -0600
merged?
commit a0c56989b6bb4a8b940f04f48df187ab5b5cb746
Author: root <root@ip-172-31-0-146.us-west-2.compute.internal>
Date: Fri Nov 18 02:54:20 2016 +0000
coverage file
commit 1ed0114c3bcf7ba9d25bc800b197d663b3fa02a4
Merge: 85f83b6 d1f85b7
Author: Ali Darwiche <darwiche2005@utexas.edu>
Date: Thu Nov 17 20:50:55 2016 -0600
Merge branch 'master' of https://github.com/kethomas/SWEetOutdoors-dev
commit 85f83b6cd5f0918e61a434d305ac90ca9f3c0a3b
Author: Ali Darwiche <darwiche2005@utexas.edu>
Date: Thu Nov 17 20:50:29 2016 -0600
about page
commit d1f85b758888bb38a1b2f797cb88f9843666abad
Merge: a230418 8be7f62
Author: root <root@ip-172-31-0-146.us-west-2.compute.internal>
Date: Fri Nov 18 02:50:03 2016 +0000
Merge branch 'master' of https://github.com/kethomas/SWEetOutdoors-dev
commit 8be7f628cec15c90544ddcce604af13ea0d309b0
Author: Kirsten Thomas <kirsten.thomas@utexas.edu>
Date: Thu Nov 17 20:42:12 2016 -0600
reformatting search results
commit a230418db01836af2a375946261a2d67048a4960
Merge: be3bbc2 bc7ff3b
Author: root <root@ip-172-31-0-146.us-west-2.compute.internal>
Date: Fri Nov 18 02:35:29 2016 +0000
Merge branch 'master' of https://github.com/kethomas/SWEetOutdoors-dev
commit be3bbc25fa2f51100efeb38d1a110a563c6c09ef
Author: root <root@ip-172-31-0-146.us-west-2.compute.internal>
Date: Fri Nov 18 02:35:19 2016 +0000
fixed loading centered
commit bc7ff3ba680d2449bf70b8b9a04953258d14f006
Author: Kirsten Thomas <kirsten.thomas@utexas.edu>
Date: Thu Nov 17 20:28:13 2016 -0600
changing format of search results to list
commit f50e27c9773793f0f52a77d5fdae548d6053c4de
Author: Rambo Wu <wurambo@utexas.edu>
Date: Thu Nov 17 20:20:43 2016 -0600
change loading size
commit c95c7bb5a7082753bf2446b726893bec92658e13
Author: Rambo Wu <wurambo@utexas.edu>
Date: Thu Nov 17 20:14:10 2016 -0600
added img
commit 93528aba8091cb246d5a231ac78ab89f9389dd29
Merge: 6bc8eed e24b51e
Author: Rambo Wu <wurambo@utexas.edu>
Date: Thu Nov 17 20:10:14 2016 -0600
Merge branch 'master' of https://github.com/kethomas/SWEetOutdoors-dev
commit 6bc8eed3155a1eb7f09b3f8a3ddaf8637a558b2e
Author: Rambo Wu <wurambo@utexas.edu>
Date: Thu Nov 17 20:10:10 2016 -0600
added loading table gif
commit e24b51e5c3025dc85c49a07c0a14d5cefe7dffb6
Merge: 4ac2397 bd5ab7e
Author: Elizabeth Haynes <ej2h@cs.utexas.edu>
Date: Thu Nov 17 20:01:25 2016 -0600
Merge branch 'master' of https://github.com/kethomas/SWEetOutdoors-dev
commit 4ac23979498d2754d53b132240512a8a6dd32d86
Author: Elizabeth Haynes <ej2h@cs.utexas.edu>
Date: Thu Nov 17 20:01:14 2016 -0600
added descriptions to apis on about page
commit bd5ab7ecd2a07e049c13fbd76e5d245800f22e04
Merge: 3b7856d f6f29cd
Author: Didi Crous <didicrous@gmail.com>
Date: Thu Nov 17 19:56:08 2016 -0600
fixed the conflicts yeah
commit 3b7856d14f8075e31cb276b04d64bcc835031d6d
Author: Didi Crous <didicrous@gmail.com>
Date: Thu Nov 17 19:54:41 2016 -0600
redoing search
commit f6f29cd02b68000be65a28cfc8b0a9f4ea73ccf9
Author: asadmahdi <syed.asad.mahdi@utexas.edu>
Date: Thu Nov 17 19:51:34 2016 -0600
Add files via upload
commit f70d16ceb7bc0e5d866fdd629745064b76f6a641
Author: asadmahdi <syed.asad.mahdi@utexas.edu>
Date: Thu Nov 17 19:48:57 2016 -0600
Delete IDB.pdf
commit 15ac4886356041c3e4b8dfec86032fba6fbebf2d
Merge: d4ba181 1539df8
Author: Rambo Wu <wurambo@utexas.edu>
Date: Thu Nov 17 19:32:38 2016 -0600
Merge branch 'master' of https://github.com/kethomas/SWEetOutdoors-dev
commit d4ba1815cc7848afff2a21919a8b3df8dfbeb28f
Author: Rambo Wu <wurambo@utexas.edu>
Date: Thu Nov 17 19:32:34 2016 -0600
changed background and stuff
commit 1539df88f30d0353379ab4fd547645b6be1f6ae5
Merge: 22fa4e4 cc51bd5
Author: Kirsten Thomas <kirsten.thomas@utexas.edu>
Date: Thu Nov 17 19:02:44 2016 -0600
Merge branch 'master' of https://github.com/kethomas/SWEetOutdoors-dev
commit 22fa4e4f8c5367b17bcfd5e49f52ac6643fdda32
Author: Kirsten Thomas <kirsten.thomas@utexas.edu>
Date: Thu Nov 17 19:02:27 2016 -0600
fixing search button to actually work
commit cc51bd5857bac96ee70ee37cf121ee93ab7f6682
Author: Rambo Wu <wurambo@utexas.edu>
Date: Thu Nov 17 18:57:02 2016 -0600
fixed search?
commit 72f3d7c678d49387b1b67547e54e289ee52a439e
Author: Rambo Wu <wurambo@utexas.edu>
Date: Thu Nov 17 18:52:16 2016 -0600
fixed init
commit a0cfd6c8ca2af433be14b36e29234542c0ae820a
Author: Kirsten Thomas <kirsten.thomas@utexas.edu>
Date: Thu Nov 17 17:59:09 2016 -0600
should be fully fixed on mobile nowgit add app/templates/index.html
commit 3f908b9a40ab045b84f4380a38f0c6666f4ddbf2
Author: Kirsten Thomas <kirsten.thomas@utexas.edu>
Date: Thu Nov 17 17:50:36 2016 -0600
fixed index on mobile, nav bar looks weird on chrome
commit fea63247cb5b940f584c350aa98a1a1aca77e4f5
Author: Kirsten Thomas <kirsten.thomas@utexas.edu>
Date: Thu Nov 17 17:44:36 2016 -0600
making instance page nav bar look better, still has issues
commit 4b3bda08aba93879f7415bd33fa17d04945b5bf5
Author: Kirsten Thomas <kirsten.thomas@utexas.edu>
Date: Thu Nov 17 17:25:38 2016 -0600
fixing margins on nav bar
commit 832e3dd7f3973f303fb5a9605a9868f3f9a3c12c
Author: Kirsten Thomas <kirsten.thomas@utexas.edu>
Date: Thu Nov 17 17:07:11 2016 -0600
fixing title on events tab, added description on about page, fixed typo in init
commit ea2874905583af58ea01b443b69d3f2c5d8c6714
Author: Elizabeth Haynes <ej2h@cs.utexas.edu>
Date: Thu Nov 17 16:44:03 2016 -0600
restructured css so instance pages are styled the same- only difference is background image
commit e820bc94a53600cc3ef2e7b43bebabc12ff9e8c4
Author: Rambo Wu <wurambo@utexas.edu>
Date: Thu Nov 17 16:36:38 2016 -0600
word wrap for paragraphs
commit 63cf1b7c27dfe9396f0583a56d8889bd845251f1
Author: Elizabeth Haynes <ej2h@cs.utexas.edu>
Date: Thu Nov 17 16:23:40 2016 -0600
navbar now collapses site-wide
commit 53e1c8e3d51d0715c3b1d95f6d6ac32d71ed8b4f
Author: Kirsten Thomas <kirsten.thomas@utexas.edu>
Date: Thu Nov 17 14:38:42 2016 -0600
adding back in titles for tabs
commit 3cc1d12949bb07a7acf7f72331a2963c9ccf4244
Author: Rambo Wu <wurambo@utexas.edu>
Date: Thu Nov 17 14:36:45 2016 -0600
added white box around title
commit d7dea63486c9b37f66db248811ed3fcaf7578882
Merge: a16a0d2 40dfd04
Author: root <root@ip-172-31-0-146.us-west-2.compute.internal>
Date: Thu Nov 17 20:35:36 2016 +0000
Merge branch 'master' of https://github.com/kethomas/SWEetOutdoors-dev
commit a16a0d23aceab703960dad30e1e44e6a5598934b
Author: root <root@ip-172-31-0-146.us-west-2.compute.internal>
Date: Thu Nov 17 20:35:27 2016 +0000
fixed no event nearby
commit 40dfd045e0869439b544780e02d276ebbea016bc
Merge: aa24407 340ea44
Author: Didi Crous <didicrous@example.com>
Date: Thu Nov 17 14:26:55 2016 -0600
Merge branch 'master' of https://github.com/kethomas/SWEetOutdoors-dev
commit aa2440704b9537236ce4ef23067882df2d2a1e8d
Author: Didi Crous <didicrous@example.com>
Date: Thu Nov 17 14:26:49 2016 -0600
added or/and tab thing to search
commit 340ea445ad1112539f3b92dafa8491d93c2c4f97
Author: Rambo Wu <wurambo@utexas.edu>
Date: Thu Nov 17 14:08:58 2016 -0600
fixed all instance pages added bg pics
commit e2601cf704b4b76027e72a21fdf3e37b61997873
Author: Rambo Wu <wurambo@utexas.edu>
Date: Thu Nov 17 14:07:31 2016 -0600
added stylesheet and another pic
commit 4fe3abdca31fd908d2720621281464941cf1a18b
Author: Rambo Wu <wurambo@utexas.edu>
Date: Thu Nov 17 13:48:45 2016 -0600
added a pic
commit b97fd0f93f744485b575640ef248cad375d17abc
Author: Rambo Wu <wurambo@utexas.edu>
Date: Thu Nov 17 13:37:32 2016 -0600
fixed state instance horizontal scrolling
commit 69b8f93cf5d4c40153adc49eefc3e4ae48621b6e
Author: Rambo Wu <wurambo@utexas.edu>
Date: Thu Nov 17 13:05:40 2016 -0600
fixed index page and changed background for campground instances
commit 3005c251347f9f2394ff9024538137a86ca2ae26
Author: Matthew Rosenbaum <mat.g.rosen@gmail.com>
Date: Thu Nov 17 12:52:34 2016 -0600
Update Things to do
commit 18775bd77d443f1d7d6c5d063613a8c26a311fd9
Author: root <root@ip-172-31-0-146.us-west-2.compute.internal>
Date: Thu Nov 17 18:52:04 2016 +0000
fixed park --> event link in parks table
commit 8092f5fc6f467baa36901c4586e0e65db7b5c946
Author: Matthew Rosenbaum <mat.g.rosen@gmail.com>
Date: Thu Nov 17 12:38:20 2016 -0600
Update Things to do
commit d2166b0ce8172d791be50672d148a0e26cb1cbf4
Author: Matthew Rosenbaum <mat.g.rosen@gmail.com>
Date: Thu Nov 17 12:35:42 2016 -0600
Update Things to do
removed fixed items from the list
commit 26c97c8068767c7145ffdbb969d2262c4490bde5
Author: root <root@ip-172-31-0-146.us-west-2.compute.internal>
Date: Thu Nov 17 18:02:06 2016 +0000
run test html should now be fixed
commit 5e21bedf71f814ec476f82b5fac904c359a7583f
Author: Matthew Rosenbaum <matthew.rosenbaum@utexas.edu>
Date: Thu Nov 17 11:53:27 2016 -0600
forgot to update file paths
commit 4909e66b1092ac8909279d47beafb4c5157f5e2a
Author: Matthew Rosenbaum <matthew.rosenbaum@utexas.edu>
Date: Thu Nov 17 11:49:48 2016 -0600
fixing run test page
commit e9e486cb8cbd00c8dd422324782fe523a86f7d28
Author: Matthew Rosenbaum <mat.g.rosen@gmail.com>
Date: Thu Nov 17 10:39:35 2016 -0600
Update .travis.yml
Slack integration
commit 9af2867da06aef587c61bbdfb97a05a0ff9c065f
Author: Matthew Rosenbaum <mat.g.rosen@gmail.com>
Date: Thu Nov 17 10:22:56 2016 -0600
Update README.md
testing travis ci integration on slack
commit 368c82c79f3587e5b71b3803dfa0cf66a2b38df0
Author: root <root@ip-172-31-0-146.us-west-2.compute.internal>
Date: Thu Nov 17 16:17:05 2016 +0000
pylint errors fixed, make turnin works
commit 0786abb261f40311d3cce97f9c009225df02cf23
Author: root <root@ip-172-31-0-146.us-west-2.compute.internal>
Date: Thu Nov 17 15:48:06 2016 +0000
log is now easier to read
commit 72a82748c4af58513e4edcf670fc3e8f5793af35
Author: root <root@ip-172-31-0-146.us-west-2.compute.internal>
Date: Thu Nov 17 15:43:10 2016 +0000
fixing makefile, autopep8'd py files
commit fed9021f4cdc8427c407b89c203c9a33f5f5c0e1
Author: Didi Crous <didicrous@example.com>
Date: Thu Nov 17 01:24:05 2016 -0600
accidentally pushed broken code, fixed now, sorryyyyyy
commit 5bec3c4a1137ad354fdeee9f747908527443de42
Author: Didi Crous <didicrous@example.com>
Date: Thu Nov 17 01:16:54 2016 -0600
or search working on index.html, will get and working tomorrow
commit 11f8bcabb88f31bafe4c1e5e84cee4e6217837a4
Author: Didi Crous <didicrous@example.com>
Date: Thu Nov 17 01:15:09 2016 -0600
style for search
commit e8b65f1d34404cb47eae08de1161735fa984fd3e
Author: Matthew Rosenbaum <mat.g.rosen@gmail.com>
Date: Wed Nov 16 21:00:55 2016 -0600
Update README.md
commit 16d9794b48733e32aea510dffadb72e91b6c4f6e
Merge: 9b4e976 88bf097
Author: Elizabeth Haynes <ejjhaynes@users.noreply.github.com>
Date: Wed Nov 16 19:55:47 2016 -0600
Merge pull request #88 from kethomas/nav_fix
Nav fix
commit 88bf0974961863892de7a5c964488b8b2972a715
Author: Elizabeth Haynes <ej2h@cs.utexas.edu>
Date: Wed Nov 16 19:53:50 2016 -0600
made nav bar change everywhere
commit 3905552d0cd164833df46be1f0e9f877e0e3c943
Author: Matthew Rosenbaum <matthew.rosenbaum@utexas.edu>
Date: Wed Nov 16 19:44:08 2016 -0600
added pylintrc to remove pylint errors and updated make turnin target to provide the SHA of HEAD
commit be09bba81f8e14bb1701bb87829d45a45cdbaff5
Merge: 87e4fff 1f6bfe1
Author: Elizabeth Haynes <ej2h@cs.utexas.edu>
Date: Wed Nov 16 19:06:57 2016 -0600
Merge branch 'master' of https://github.com/kethomas/SWEetOutdoors-dev
commit 87e4fff322793b8fbd645a3f5ec73bcabc356734
Merge: 2a55f75 b7243f4
Author: Elizabeth Haynes <ej2h@cs.utexas.edu>
Date: Wed Nov 16 19:06:43 2016 -0600
Merge branch 'master' of https://github.com/kethomas/SWEetOutdoors-dev
commit 1f6bfe11811af48e11d39d05c618de167957a5f3
Author: Rambo Wu <wurambo@utexas.edu>
Date: Wed Nov 16 19:06:37 2016 -0600
hello
commit 2a55f75fdd21009f94a1e80da3bee2e9317a4bd3
Author: Elizabeth Haynes <ej2h@cs.utexas.edu>
Date: Wed Nov 16 19:06:30 2016 -0600
add collapsing to nav bar
commit b7243f4786788eea8f8fd7d1ae6069c3eb6d5495
Merge: 518581a e5aa20b
Author: Rambo Wu <wurambo@utexas.edu>
Date: Wed Nov 16 18:51:39 2016 -0600
Merge branch 'master' of https://github.com/kethomas/SWEetOutdoors-dev
commit 518581a112e6ae6afc81615726c117fba0a82a1c
Author: Rambo Wu <wurambo@utexas.edu>
Date: Wed Nov 16 18:51:35 2016 -0600
fixed css for parkinstance
commit e5aa20bfa7da76c4b4590247e50517a46f859a5e
Author: Matthew Rosenbaum <matthew.rosenbaum@utexas.edu>
Date: Wed Nov 16 18:44:21 2016 -0600
makefile now supports 'make turnin' target, still have pylint errors that need to be fixed
commit fb8232ea91e2c085300cecb3723cf87909205547
Merge: 72887bf 244402e
Author: Rambo Wu <wurambo@utexas.edu>
Date: Wed Nov 16 18:34:23 2016 -0600
Merge branch 'master' of https://github.com/kethomas/SWEetOutdoors-dev
commit 72887bf03134d1a7d3b8431f409437e7627d9dab
Author: Rambo Wu <wurambo@utexas.edu>
Date: Wed Nov 16 18:34:18 2016 -0600
changed state template and stylesheets
commit 244402e9c1e0c3871b7ec5d2f39d6d6a04a490fd
Author: Matthew Rosenbaum <matthew.rosenbaum@utexas.edu>
Date: Wed Nov 16 18:30:39 2016 -0600
fixing pylint errors
commit ee94f80e93302d7a678158cb008899591e5b26f4
Merge: f9dc467 dc37df3
Author: Didi Crous <didicrous@gmail.com>
Date: Wed Nov 16 16:57:04 2016 -0600
Merge branch 'master' of https://github.com/kethomas/SWEetOutdoors-dev
commit f9dc46776c3452f480f5322fb8f5e76538ee5618
Author: Didi Crous <didicrous@gmail.com>
Date: Wed Nov 16 16:56:54 2016 -0600
some search functionality on index.html
commit dc37df39d4dfb4c889304bf1c81221beeed63c00
Author: Matthew Rosenbaum <matthew.rosenbaum@utexas.edu>
Date: Wed Nov 16 16:13:13 2016 -0600
Updated 'make test' make target to run pylint on app/models.py-this will cause the build to fail until the pylint error messages are delt with
commit 5a11d146c84808bec0025d3278f7de37770cf6bb
Author: Elizabeth Haynes <ej2h@cs.utexas.edu>
Date: Wed Nov 16 14:50:16 2016 -0600
added other tables to search page
commit 461a8faa0b72983bcc85698c8fbe405c3f69f1c3
Merge: 3652c25 f5bf2c1
Author: Didi Crous <didicrous@gmail.com>
Date: Wed Nov 16 13:56:48 2016 -0600
Merge branch 'master' of https://github.com/kethomas/SWEetOutdoors-dev
commit 3652c25c2fa7bcc3ce12550e32a902fd8cde822f
Author: Didi Crous <didicrous@gmail.com>
Date: Wed Nov 16 13:56:36 2016 -0600
implementing passing search words to back end
commit f5bf2c1da95646ee419d3ddd632494460fb76051
Author: Matthew Rosenbaum <matthew.rosenbaum@utexas.edu>
Date: Wed Nov 16 13:54:59 2016 -0600
updating coverage again
commit ee3aeae8b073550ad4dc61e74028022bf2b0faa8
Author: Matthew Rosenbaum <matthew.rosenbaum@utexas.edu>
Date: Wed Nov 16 13:45:15 2016 -0600
fixing coverage part 2
commit 839adefcf3f786bbc293c00239196c3003f0b5b7
Author: Matthew Rosenbaum <matthew.rosenbaum@utexas.edu>
Date: Wed Nov 16 13:38:40 2016 -0600
fixing coverage to actually run the test.py file
commit a7da478c7976ed708c726c616a25f704aab978cd
Author: Matthew Rosenbaum <matthew.rosenbaum@utexas.edu>
Date: Wed Nov 16 13:30:42 2016 -0600
added coverage to makefile and travis
commit fc5f96f4ef3e32b487bb0fc9af705977ce463b82
Author: Matthew Rosenbaum <matthew.rosenbaum@utexas.edu>
Date: Wed Nov 16 13:12:51 2016 -0600
really tho
commit e5910ed4b3ab977bbd9a8d5b7be20f33a0ced86b
Merge: b99746f df20756
Author: Rambo Wu <wurambo@utexas.edu>
Date: Wed Nov 16 13:10:21 2016 -0600
Merge branch 'master' of https://github.com/kethomas/SWEetOutdoors-dev
commit b99746f8b1aeaf35f88d55e9ca980683c9ae2a6d
Author: Rambo Wu <wurambo@utexas.edu>
Date: Wed Nov 16 13:10:16 2016 -0600
added no image pic
commit df20756c0c99324a287ef71fe70425649479083f
Author: Matthew Rosenbaum <matthew.rosenbaum@utexas.edu>
Date: Wed Nov 16 13:08:54 2016 -0600
jk on that last one, this one will work
commit e01c9f46b380038b21c6af62de92e7e45127bb3c
Author: Matthew Rosenbaum <matthew.rosenbaum@utexas.edu>
Date: Wed Nov 16 13:05:08 2016 -0600
This one will work for sure
commit 7342115cab1bd3738e958aaf60165325ee892d97
Author: Matthew Rosenbaum <matthew.rosenbaum@utexas.edu>
Date: Wed Nov 16 13:01:56 2016 -0600
hopefully fixing travis.yml
commit f056f83c01bf54a9dd097a814763607d67dde3b8
Author: Matthew Rosenbaum <matthew.rosenbaum@utexas.edu>
Date: Wed Nov 16 12:56:29 2016 -0600
udated travis file, cross your fingers
commit 47dc8d2c91e35f580da84559bb675735aaa0c853
Merge: 5083f82 89de6da
Author: Didi Crous <didicrous@gmail.com>
Date: Wed Nov 16 12:46:49 2016 -0600
asdf
commit 89de6da9310395392cdbd03779fd5db9f82fa5ef
Merge: f28ad6e c4541b5
Author: Rambo Wu <wurambo@utexas.edu>
Date: Wed Nov 16 12:45:45 2016 -0600
Merge branch 'master' of https://github.com/kethomas/SWEetOutdoors-dev
commit 5083f828331c5bfb9ba4d60662c2c54e280b2f50
Author: Didi Crous <didicrous@gmail.com>
Date: Wed Nov 16 12:45:42 2016 -0600
starting to add search functionality to __init__.py
commit f28ad6e70f7d30be16ca69608c70b7eb1bd2963d
Author: Rambo Wu <wurambo@utexas.edu>
Date: Wed Nov 16 12:45:39 2016 -0600
fixed tables
commit c4541b506749a7c21725fbdd33e04868b0622076
Merge: 185c749 b80dacb
Author: Matthew Rosenbaum <matthew.rosenbaum@utexas.edu>
Date: Wed Nov 16 12:43:56 2016 -0600
Merge branch 'master' of https://github.com/kethomas/SWEetOutdoors-dev
commit 185c749e888aaf5a39040f968fecd09be556b421
Author: Matthew Rosenbaum <matthew.rosenbaum@utexas.edu>
Date: Wed Nov 16 12:43:33 2016 -0600
travis requirements
commit b80dacbbd3b394fdc0bf6fd6e26a4fcf34fbbce7
Author: Kirsten Thomas <kirsten.thomas@utexas.edu>
Date: Wed Nov 16 12:43:32 2016 -0600
adding link to presentation
commit b02691c3b9f58b2eeba781bcba13a86086c21601
Author: root <root@ip-172-31-0-146.us-west-2.compute.internal>
Date: Wed Nov 16 18:37:33 2016 +0000
added route to visualization page
commit aad25f6b3f673d45139d65bddbe2dd32c93b6251
Merge: 8eeb949 cda3791
Author: Kirsten Thomas <kirsten.thomas@utexas.edu>
Date: Wed Nov 16 12:29:35 2016 -0600
Merge branch 'master' of https://github.com/kethomas/SWEetOutdoors-dev
commit 8eeb9493ba926ca33cf38ff47b8435acf83d2046
Author: Kirsten Thomas <kirsten.thomas@utexas.edu>
Date: Wed Nov 16 12:29:24 2016 -0600
updated Campground API link, added visualization page
commit cda3791c3f3364029c3dd2b31b2652e8db8df11e
Author: root <root@ip-172-31-0-146.us-west-2.compute.internal>
Date: Wed Nov 16 18:26:48 2016 +0000
fixed makefile to reflect new file structure
commit c8f94a0d055f8aac3938b964577ddff87e3ed133
Author: Rambo Wu <wurambo@utexas.edu>
Date: Wed Nov 16 12:21:18 2016 -0600
made changes
commit 4328908fb2cb95de9d90268be5c0d31f226cb56d
Merge: 63c2b74 99faf57
Author: Rambo Wu <wurambo@utexas.edu>
Date: Wed Nov 16 12:18:03 2016 -0600
Merge branch 'master' of https://github.com/kethomas/SWEetOutdoors-dev
commit 63c2b741cd3d034bd1bb6238fd6586845723762c
Author: Rambo Wu <wurambo@utexas.edu>
Date: Wed Nov 16 12:17:54 2016 -0600
fixed default phone number for camp table
commit 99faf57dd1ffa6dd367b9ad0bcd8e1a785a5d287
Author: root <root@ip-172-31-0-146.us-west-2.compute.internal>
Date: Wed Nov 16 06:48:15 2016 +0000
'make log' make target creates IDB3.log, removed logs from old projects
commit 4734169569c4dbf014cc39bfabda6f04c90b1baa
Merge: cbe49b2 b562c31
Author: root <root@ip-172-31-0-146.us-west-2.compute.internal>
Date: Wed Nov 16 06:32:01 2016 +0000
Merge branch 'master' of https://github.com/kethomas/SWEetOutdoors-dev
commit cbe49b28fb8258ecc08fc739ec9989fba96456b4
Author: root <root@ip-172-31-0-146.us-west-2.compute.internal>
Date: Wed Nov 16 06:31:44 2016 +0000
'make html' make target creates IDB3.html from app/models.py
commit b562c313f8c893242264ae9cc8cf9701362eecea
Merge: 2f6e1c5 1627d17
Author: Didi Crous <didicrous@example.com>
Date: Wed Nov 16 00:06:23 2016 -0600
Merge branch 'master' of https://github.com/kethomas/SWEetOutdoors-dev
commit 2f6e1c5b0ee520044c6b28870469efcdd0d9c2ea
Author: Didi Crous <didicrous@example.com>
Date: Wed Nov 16 00:06:13 2016 -0600
backend for search functionality
commit 1627d17bc90bce06b75ea91eb7491ea24587f0c7
Author: root <root@ip-172-31-0-146.us-west-2.compute.internal>
Date: Wed Nov 16 05:56:22 2016 +0000
gitignore update
commit 2d37f13f91b7959dbf5f9e19533dfd0019b7a168
Author: root <root@ip-172-31-0-146.us-west-2.compute.internal>
Date: Wed Nov 16 05:55:55 2016 +0000
Re-created testmodels.py, 'make test' makefile target works
commit 6a4e3ea0c54ce78e111759bb3e9d22bcb626e834
Author: Rambo Wu <wurambo@utexas.edu>
Date: Tue Nov 15 20:54:25 2016 -0600
fefe
commit 9165d50af1f8c656e1e78aa44565940a19308a40
Author: root <root@ip-172-31-0-146.us-west-2.compute.internal>
Date: Wed Nov 16 02:11:08 2016 +0000
deleted aws key wtf was i thinking
commit 1dfb2609b5a5fc5dc07ab702b11793d0a51be301
Author: Rambo Wu <wurambo@utexas.edu>
Date: Tue Nov 15 20:03:18 2016 -0600
deleted final stuff
commit b00264385c9e947d586f048135fb156580f69fb2
Author: Rambo Wu <wurambo@utexas.edu>
Date: Tue Nov 15 20:02:25 2016 -0600
deleted stuff
commit d4402f92fd32d1a9cdd8dfe1f1844f5347a35e00
Author: Rambo Wu <wurambo@utexas.edu>
Date: Tue Nov 15 19:52:13 2016 -0600
deleted stylesheets bruh
commit 0542f75235cf75ec162a93f2ccab7c467fc5814e
Author: Rambo Wu <wurambo@utexas.edu>
Date: Tue Nov 15 19:09:39 2016 -0600
did stuff i think
commit 46aa0b5eecc4090d5ac5edb97831b1d39c9b94ec
Author: Rambo Wu <wurambo@utexas.edu>
Date: Tue Nov 15 02:06:23 2016 -0600
f
commit bc5e5fa4da60dabfa03de5e9fe4309b7760ee3c0
Author: Rambo Wu <wurambo@utexas.edu>
Date: Tue Nov 15 02:04:49 2016 -0600
f
commit 8c82a39e9126c466b1c7b3da041f7bb7b369d95c
Author: Rambo Wu <wurambo@utexas.edu>
Date: Tue Nov 15 02:01:54 2016 -0600
some changes b4 i sleep
commit 43f83edfe269492279103750e469afb26515555c
Author: root <root@ip-172-31-0-146.us-west-2.compute.internal>
Date: Tue Nov 15 07:58:03 2016 +0000
added no nearby to parks
commit 317536b679387359037122b5b9860b3285d983e3
Merge: 7804b50 4143565
Author: root <root@ip-172-31-0-146.us-west-2.compute.internal>
Date: Tue Nov 15 07:20:21 2016 +0000
Merge branch 'master' of https://github.com/kethomas/SWEetOutdoors-dev
commit 41435655bcee37c15cc12b481453fd6368b13938
Author: Rambo Wu <wurambo@utexas.edu>
Date: Tue Nov 15 01:20:04 2016 -0600
test
commit 7804b508565f2facf8b59a1cc075dc6729623015
Merge: 01dd68a 7297d16
Author: root <root@ip-172-31-0-146.us-west-2.compute.internal>
Date: Tue Nov 15 07:16:36 2016 +0000
Merge branch 'master' of https://github.com/kethomas/SWEetOutdoors-dev
commit 7297d1626aee3ce302cce4428c373394523f8fb5
Author: Rambo Wu <wurambo@utexas.edu>
Date: Tue Nov 15 01:15:40 2016 -0600
testing parks table
commit 3843356a8105e362029677344f79c0bfa78e9651
Author: Rambo Wu <wurambo@utexas.edu>
Date: Tue Nov 15 01:02:56 2016 -0600
events table done i think its kinda clumpy but idk dawg
commit c9f1262990b816110a76e1322f6c99cca8825158
Author: Rambo Wu <wurambo@utexas.edu>
Date: Tue Nov 15 00:56:42 2016 -0600
campgrounds done fosho i think
commit 17e9c3d42d911a692b670842ede426fb7b0f301c
Merge: c70f8e7 5f04e7d
Author: Didi Crous <didicrous@gmail.com>
Date: Mon Nov 14 17:53:40 2016 -0600
Merge branch 'master' of https://github.com/kethomas/SWEetOutdoors-dev
commit c70f8e73bd7845c088bff68214f3482723b9fd74
Author: Didi Crous <didicrous@gmail.com>
Date: Mon Nov 14 17:53:11 2016 -0600
added search.html
commit 5f04e7d1129acd68b0ea701e928769ff042f672e
Merge: 445763c 89cb8b0
Author: Elizabeth Haynes <ej2h@cs.utexas.edu>
Date: Mon Nov 14 17:37:02 2016 -0600
Merge branch 'master' of https://github.com/kethomas/SWEetOutdoors-dev
commit 445763c9d8c094a10b29dfc3d3c1665da4347e1c
Author: Elizabeth Haynes <ej2h@cs.utexas.edu>
Date: Mon Nov 14 17:36:52 2016 -0600
fixed small thing on about page for mobile, added comments to __init__.py and made pydoc file
commit 89cb8b007500e88384e9e3894d2d3ba3b6849fd2
Author: Rambo Wu <wurambo@utexas.edu>
Date: Mon Nov 14 16:37:37 2016 -0600
fixed state stuff
commit 01dd68a1b7a7b61003e2c3d44a45758efe702315
Merge: 571a89d b64c372
Author: root <root@ip-172-31-0-146.us-west-2.compute.internal>
Date: Mon Nov 14 22:17:42 2016 +0000
Merge branch 'master' of https://github.com/kethomas/SWEetOutdoors-dev
commit b64c372191d5ada6415a5cbd173e715f3ae99560
Merge: b6a389b 723e2b0
Author: Rambo Wu <wurambo@utexas.edu>
Date: Mon Nov 14 16:17:16 2016 -0600
Merge branch 'master' of https://github.com/kethomas/SWEetOutdoors-dev
commit b6a389be240ffcfce2a8bf4654ee17a1e467be8b
Author: Rambo Wu <wurambo@utexas.edu>
Date: Mon Nov 14 16:17:10 2016 -0600
added stuff
commit 571a89dee0c3b6e1c3be350c22f72555e913b7eb
Merge: dd559ed 723e2b0
Author: root <root@ip-172-31-0-146.us-west-2.compute.internal>
Date: Mon Nov 14 22:15:53 2016 +0000
Merge branch 'master' of https://github.com/kethomas/SWEetOutdoors-dev
commit dd559edfbc7b71d39d3d893ac0c761195f0aae73
Author: Ubuntu <ubuntu@ip-172-31-0-146.us-west-2.compute.internal>
Date: Mon Nov 14 22:15:19 2016 +0000
added make file
commit 723e2b09914373b2b9a7c226e4d02f8910f3ea5f
Author: Ali Darwiche <darwiche2005@utexas.edu>
Date: Mon Nov 14 15:43:50 2016 -0600
added angularjs to all templates
commit 77b78110260cb20441b9ec0a9eb5c77a7ddf0fd9
Merge: 0b39152 0f7ed97
Author: Ali Darwiche <darwiche2005@utexas.edu>