forked from arraylikealligators/farmers-market-app
-
Notifications
You must be signed in to change notification settings - Fork 2
/
etq
1802 lines (1218 loc) · 53.3 KB
/
etq
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
[33mcommit 18505185547ccced76b380d61d95fa388b2eeae6[m
Author: Kevin Fung <kevinmcfung@gmail.com>
Date: Sat Feb 4 11:43:53 2017 -0500
user auth implemented, rating: somewhat hacky
[33mcommit d3ecdb09b724ab5a6e4e7eba8b09405469722e69[m
Author: Kevin Fung <kevinmcfung@gmail.com>
Date: Sat Feb 4 10:52:02 2017 -0500
persistent auth mostly working
[33mcommit 4cb677ca729c9ff8d608d74ba09945a2b5121757[m
Merge: cff3054 7ca66dc
Author: Kevin <kevinmcfung@gmail.com>
Date: Sat Feb 4 10:49:40 2017 -0500
Merge pull request #29 from rjmohammad/dev
Implemented Twilio client to send messages, and did bootstrap styling on accordion.
[33mcommit 7ca66dcccd4ff0c5ec7ba208164581e3dbbf5fc5[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Sat Feb 4 10:41:02 2017 -0500
more fixes
[33mcommit 200a6f1f335b3036c6f9debd5ffa1ffcf4139f46[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Sat Feb 4 10:40:27 2017 -0500
more styling
[33mcommit 5db24c073edefe80f6c44dfbba192807ea512b8b[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Sat Feb 4 10:33:28 2017 -0500
fixed styling
[33mcommit bbecb47d52cbf38551dd8fb19577bcb1705b8e51[m
Merge: ee43c66 30ff409
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Sat Feb 4 10:17:53 2017 -0500
Merge branch 'styling' into dev
[33mcommit 30ff409b4d17e45d61713842b543dce2931caf82[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Sat Feb 4 10:17:00 2017 -0500
small changes
[33mcommit c83e81f618e7c2684c03793f5a3c59d4f1bed973[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Sat Feb 4 02:01:43 2017 -0500
made changes to products array for more chips
[33mcommit d0371f10a3530e8cfd22cf2ec2a5c14f25461aee[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Sat Feb 4 01:41:04 2017 -0500
fixed prod list error
made filtering by products functional, using bootstrap accordion
[33mcommit c8865966de14fda157a171ee64cef4a520e4fbae[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Sat Feb 4 01:31:16 2017 -0500
fixing twilio
[33mcommit ee43c66924b73344d8dc6e68f8d782d561af4ab4[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Sat Feb 4 01:16:42 2017 -0500
fixed a minor issue with md-ripple
[33mcommit 00d9f21ebd37d1e4f773834d4e6707150b59f1a9[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Sat Feb 4 01:15:02 2017 -0500
styling
[33mcommit 65a27b0973f92dcb3dc3a73a53a0bb11a89097c9[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Fri Feb 3 20:14:17 2017 -0500
make the frontend send messages to user
[33mcommit ba8c37f54834dd767920ac6e08c8db995048f838[m
Merge: 2491666 3e72d1f
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Fri Feb 3 16:40:26 2017 -0500
Merge branch 'dev' into layout
[33mcommit 3e72d1f33a6a883dcac4c294c6dec57429148c2c[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Fri Feb 3 10:43:27 2017 -0500
made more itming adjustments
[33mcommit 614d7376c4d630f8fc0c6deddc6fcd00547fb6ad[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Fri Feb 3 10:42:09 2017 -0500
fixed timeing issues
[33mcommit 2491666d8bd80c91c176d4e20ce40ebb2abf4227[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Fri Feb 3 16:39:43 2017 -0500
making pop up
[33mcommit cff3054283ffd80d6ce2e3fde82ef549db10ed8a[m
Merge: c47fc1a 62bc614
Author: Kevin <kevinmcfung@gmail.com>
Date: Fri Feb 3 16:06:07 2017 -0500
Merge pull request #25 from mcfungster/dev
front-end linked to back-end AUTH
[33mcommit 62bc61466e5ad9b11ba09433d8097a5af6939e86[m
Author: Kevin Fung <kevinmcfung@gmail.com>
Date: Fri Feb 3 16:03:58 2017 -0500
front-end linked to back-end AUTH
[33mcommit 5498e50bf1049c0839e5766bb53b02b3254c09b6[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Fri Feb 3 15:48:27 2017 -0500
fixed tags
[33mcommit 96f63a02096390251a226a099af41081ccecca64[m
Merge: bba9425 03cbdfe
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Fri Feb 3 15:45:59 2017 -0500
Merge branch 'dev' into layout
[33mcommit 03cbdfe1d036b9241074a00af87f8b801d7a3c1e[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Fri Feb 3 10:43:27 2017 -0500
made more itming adjustments
[33mcommit 03fa8db9d608a0e1bb5a0b8a1231987a0ed41c8c[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Fri Feb 3 10:42:09 2017 -0500
fixed timeing issues
[33mcommit c47fc1a58d329205b99e9aa79266db426409eb46[m
Merge: 349831b 2f2a64c
Author: Kevin <kevinmcfung@gmail.com>
Date: Fri Feb 3 15:40:50 2017 -0500
Merge pull request #24 from peterschussheim/dev
add label to comment input
[33mcommit 2f2a64ca84e793b4390902592b89c3a95c50042f[m
Author: Peter Schussheim <peter@schussheim.com>
Date: Fri Feb 3 15:36:21 2017 -0500
add label to comment input
[33mcommit bba9425cc17c33a4a01959f2b671928a8c0bdb47[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Fri Feb 3 10:43:27 2017 -0500
made more itming adjustments
[33mcommit 7bb3fc3f85f47d4ef4e93b157e23fd39621920d4[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Fri Feb 3 10:42:09 2017 -0500
fixed timeing issues
[33mcommit 349831b4ffff08cdce810a7e202bd2e4b580b5ec[m
Merge: 3eb2654 a4d7f25
Author: Kevin <kevinmcfung@gmail.com>
Date: Fri Feb 3 14:16:40 2017 -0500
Merge pull request #23 from peterschussheim/dev
fix comment submit button
[33mcommit a4d7f253832b8152964d494554e1e4e8a3238da4[m
Author: Peter Schussheim <peter@schussheim.com>
Date: Fri Feb 3 14:14:20 2017 -0500
fix comment submit button
[33mcommit 3eb2654629e7ad26acfae134d6f8e56563334d5f[m
Merge: 270f06f a1c4ead
Author: Kevin <kevinmcfung@gmail.com>
Date: Fri Feb 3 13:48:04 2017 -0500
Merge pull request #22 from peterschussheim/dev
Dev
[33mcommit a1c4ead52215d75e29d46fb3f4de45adb397d725[m
Author: Peter Schussheim <peter@schussheim.com>
Date: Fri Feb 3 13:45:34 2017 -0500
accordian opens and closes by clicking on market name
[33mcommit 4d897312f0a1bc1923e02a767c1f9cf31c42596b[m
Author: Peter Schussheim <peter@schussheim.com>
Date: Fri Feb 3 10:12:50 2017 -0500
remove old code from map template
[33mcommit 093d362e5691d04a51a1f7d9ffa167b7dc9aa061[m
Author: Kevin Fung <kevinmcfung@gmail.com>
Date: Thu Feb 2 19:58:48 2017 -0500
fixing merge conflict?
[33mcommit 41f8f669dc0bb07f3f5182ab435cbea047f19cb0[m
Author: Kevin Fung <kevinmcfung@gmail.com>
Date: Thu Feb 2 17:03:36 2017 -0500
add user login page, not yet functional
[33mcommit 7bc07c126a385a4766fdc3b7c4de6dcbe55a6e25[m
Author: Kevin Fung <kevinmcfung@gmail.com>
Date: Thu Feb 2 14:06:00 2017 -0500
minor code cleanup
[33mcommit 270f06f79bc413720653c6c3446054403c0714d6[m
Merge: 8bbe599 7d01db8
Author: Kevin <kevinmcfung@gmail.com>
Date: Thu Feb 2 19:59:56 2017 -0500
Merge pull request #21 from peterschussheim/dev
accordion feature
[33mcommit 7d01db8659155f76a19b51cfd3795afb2c2d640a[m
Author: Peter Schussheim <peter@schussheim.com>
Date: Thu Feb 2 19:52:33 2017 -0500
add schedule, products and address to accordian
[33mcommit 68c0658a1c56b6950957d5c6ef3b90fa29e87ea8[m
Author: Peter Schussheim <peter@schussheim.com>
Date: Thu Feb 2 19:28:38 2017 -0500
accordian properly changes state
[33mcommit 480a01fe6c56c4ddeac897cf6f69ab3104320f59[m
Author: Peter Schussheim <peter@schussheim.com>
Date: Thu Feb 2 17:18:51 2017 -0500
add aria-label to search template
[33mcommit 9d2c13124f241714c7e31021cfe937e0ca737a51[m
Author: Peter Schussheim <peter@schussheim.com>
Date: Thu Feb 2 14:11:02 2017 -0500
add accordion controller
[33mcommit 8bbe599dd17a29ff627eee3c46fb9e725db208bb[m
Merge: 7b879cd 3f87be0
Author: Kevin <kevinmcfung@gmail.com>
Date: Thu Feb 2 19:47:44 2017 -0500
Merge pull request #20 from rjmohammad/dev
db caching + sms routes and scripts
[33mcommit 3f87be09ba20f846286f1edf349e3fe7053590fb[m
Merge: 3d0b6c8 d89a6eb
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Thu Feb 2 19:40:32 2017 -0500
Merge branch 'dev' of https://github.com/rjmohammad/farmers-market-app into dev
[33mcommit 3d0b6c8d5f87de38935eea50b82a355b44287b7d[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Thu Feb 2 19:37:40 2017 -0500
fixed
[33mcommit d89a6eb9a9900b8bc2a376af01f6410e766accc3[m
Author: Kevin <kevinmcfung@gmail.com>
Date: Thu Feb 2 19:34:04 2017 -0500
Update fetchFarmersMarketData.js
[33mcommit bd73b00ced31b935800509a6f9578f99f164a1c8[m
Merge: c80201b 064227b
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Thu Feb 2 19:30:20 2017 -0500
done
[33mcommit c80201b3898c40ec78c5a9410f9b98f7e904b65b[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Thu Feb 2 12:25:30 2017 -0500
working on refreshing db
[33mcommit 6b099aeba470bfa94f5cd9af396fa7c15a924b82[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Thu Feb 2 11:33:03 2017 -0500
made twilio controller
[33mcommit 07e15bb120072ed2ca3ea1ef440846666b566f84[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Thu Feb 2 11:12:51 2017 -0500
made basic twilio app
[33mcommit 2e9570bfccf950f7115a8abde0500b1544964f7c[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Thu Feb 2 11:33:03 2017 -0500
made twilio controller
[33mcommit 9bacffadf91b871ee179e341e638b0708bd67802[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Thu Feb 2 11:12:51 2017 -0500
made basic twilio app
[33mcommit 33718db7609668c331a4d37ef3f825ff4cf3c7f2[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Thu Feb 2 11:56:37 2017 -0500
finished route for twilio
[33mcommit ae704fbe94756d709a2fac69cb26851af2414dd1[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Thu Feb 2 11:33:03 2017 -0500
made twilio controller
[33mcommit fe96042f6421cd0c783ad84717228f400c96255d[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Thu Feb 2 11:12:51 2017 -0500
made basic twilio app
[33mcommit 8c43bdcb032f5e2faf2f5ca79e90f58e0d57d94b[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Thu Feb 2 11:33:03 2017 -0500
made twilio controller
[33mcommit 18a2980a792a1105a4a243e41e5f8736f0bbeb86[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Thu Feb 2 11:12:51 2017 -0500
made basic twilio app
[33mcommit 064227b1b34073eae4d72d1713b67c2ecd38c95a[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Thu Feb 2 19:28:44 2017 -0500
wrote refresh function
and scheduled to be run every 7 days
[33mcommit 2bf436dce330f9329da56c2e464a10a72f3a89f4[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Thu Feb 2 13:11:29 2017 -0500
refactor model to save ids of market
[33mcommit 63f2db3458636c8f8ba2b504ce6dd7b9b1f309fe[m
Merge: 05a19fa 7a840e2
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Thu Feb 2 12:27:38 2017 -0500
done
[33mcommit 05a19faed688a8ac5bebeace1aa44c09d4e3d394[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Thu Feb 2 12:25:30 2017 -0500
working on refreshing db
[33mcommit 80231eac8ec3e20e1603a1bbfbb2551dc100964a[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Thu Feb 2 11:56:37 2017 -0500
finished route for twilio
[33mcommit 9f98260d7be11351e8049d424fade5bf139e936f[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Thu Feb 2 11:33:03 2017 -0500
made twilio controller
[33mcommit 98ecf3b70aba4cd5e76f2040df20b89268085e7b[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Thu Feb 2 11:12:51 2017 -0500
made basic twilio app
[33mcommit b0508b548723b22cdbc8d7ece6b709fefd68bd7f[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Thu Feb 2 11:33:03 2017 -0500
made twilio controller
[33mcommit ccdd3d6a161ff1ad8902a2c982f50183bcba08bd[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Thu Feb 2 11:12:51 2017 -0500
made basic twilio app
[33mcommit 7b879cd8e891233914714fee7d3a3073b81131c1[m
Merge: 785055b 28f08de
Author: Kevin <kevinmcfung@gmail.com>
Date: Thu Feb 2 12:24:38 2017 -0500
Merge pull request #17 from mcfungster/dev
user login back-end complete
[33mcommit 28f08ded7d309b64790e65817a5e3c7f066a9d8f[m
Author: Kevin Fung <kevinmcfung@gmail.com>
Date: Thu Feb 2 12:23:07 2017 -0500
user login back-end complete
[33mcommit 7a840e218148613277dfa6d733d2555c5f086327[m
Merge: b617cd7 42b2606
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Thu Feb 2 11:57:10 2017 -0500
Merge branch 'dev' of https://github.com/rjmohammad/farmers-market-app into dev
[33mcommit b617cd7ff4976e7fd8c5e8bfab61d00039d89914[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Thu Feb 2 11:56:37 2017 -0500
finished route for twilio
[33mcommit 2d88185e93d738b354367dc957a9630fd3f9a323[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Thu Feb 2 11:33:03 2017 -0500
made twilio controller
[33mcommit e62ea08aa27e2ffe94bdb32f759a82a74f98d558[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Thu Feb 2 11:12:51 2017 -0500
made basic twilio app
[33mcommit 785055bc67cb981e1387d7fa283f556d7f0eb1db[m
Merge: 95db003 147f290
Author: Kevin <kevinmcfung@gmail.com>
Date: Thu Feb 2 11:49:54 2017 -0500
Merge pull request #15 from mcfungster/dev
user signup back-end complete
[33mcommit 147f2902ec0ee018d17e7db4ae9779968ff0d03f[m
Author: Kevin Fung <kevinmcfung@gmail.com>
Date: Thu Feb 2 11:46:01 2017 -0500
user signup back-end complete
[33mcommit 42b2606a0f63c7c6e1887e68ce68846cfd85ed14[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Thu Feb 2 11:33:03 2017 -0500
made twilio controller
[33mcommit 2b7b32aedceff5aced12d105a7a634a8971d4941[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Thu Feb 2 11:12:51 2017 -0500
made basic twilio app
[33mcommit 95db003cdb386b0e2ea46a70c9d473299d02dafc[m
Merge: f534352 de8acae
Author: Kevin <kevinmcfung@gmail.com>
Date: Thu Feb 2 11:34:34 2017 -0500
Merge pull request #14 from mcfungster/dev
Dev
[33mcommit de8acae7c2a23a68848ea3b72740865b4d31b38a[m
Author: Kevin Fung <kevinmcfung@gmail.com>
Date: Thu Feb 2 11:33:05 2017 -0500
developed user model and signup route
[33mcommit ba62dfec218577944fe4e48d0c243c922c54604d[m
Author: Kevin Fung <kevinmcfung@gmail.com>
Date: Thu Feb 2 11:08:53 2017 -0500
routes.js refactor complete
[33mcommit 6af5c5bba073d7c142029f2aa86ba50e8b8571bb[m
Author: Kevin Fung <kevinmcfung@gmail.com>
Date: Thu Feb 2 11:01:53 2017 -0500
routes.js refactor pre-commit
[33mcommit f534352480f2ff1cfbd1c93599ad8a07234d227d[m
Merge: ef6bbcb 817ed5f
Author: Kevin <kevinmcfung@gmail.com>
Date: Thu Feb 2 09:52:14 2017 -0500
Merge pull request #13 from rjmohammad/dev
Dev
[33mcommit 817ed5f7827b42c21ad658cb15a16000cc98add5[m
Merge: 453d90a 52114db
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Wed Feb 1 23:33:53 2017 -0500
Merge branch 'dev' of https://github.com/rjmohammad/farmers-market-app into dev
[33mcommit 453d90a2ee3d9d6aedc0f16aec5c38353c682d85[m
Merge: 84293c0 32a27b6
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Wed Feb 1 23:33:07 2017 -0500
Merge branch 'database' into dev
[33mcommit 84293c01713e123ca5cbe565327b3f5ede860ac4[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Tue Jan 31 12:06:56 2017 -0500
changed git ignore
[33mcommit 32a27b6d46fedecde5b8ab250cb324d22c6ba444[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Wed Feb 1 23:30:57 2017 -0500
cleaned up files
[33mcommit 59e992c33e3b92367a2ca0ae27560f826d12979f[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Wed Feb 1 23:29:03 2017 -0500
fixed some minor errors
[33mcommit 61fc240d657460980f3003dca4362b9803b5782d[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Wed Feb 1 22:58:15 2017 -0500
got th epage to update with new search of
address
[33mcommit c78cf87e43a39512d4012b8cb36f80baa13ffffd[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Wed Feb 1 17:39:03 2017 -0500
caching the data to database on a new
zipcode
[33mcommit 8feada83027e83ff1ca17ce530f701d9c47e66f5[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Wed Feb 1 16:15:23 2017 -0500
made the array of objects for markets from api
to cache into database when a new zipcode is entered
[33mcommit e08339690ee872fa34b63e88055a941648d2bfb0[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Wed Feb 1 14:27:49 2017 -0500
modularize code
[33mcommit 275a01d163e65c448a2b75988485046f1833ef5a[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Wed Feb 1 14:23:12 2017 -0500
made fetching zip codes more reliable
[33mcommit ef44faa79879aa399cc7761d4c8021b11f85f750[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Wed Feb 1 14:05:23 2017 -0500
add zip codes to zip documents
[33mcommit 6e125b4b54218eef3e76f0982d6df9b6bc716b05[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Tue Jan 31 12:06:56 2017 -0500
changed git ignore
[33mcommit ef6bbcb23d720d55def74cd0eed9812d25c9ebc5[m
Merge: 31861d6 84f02b7
Author: Kevin <kevinmcfung@gmail.com>
Date: Tue Jan 31 12:13:26 2017 -0500
Merge pull request #1 from peterschussheim/dev
Dev
[33mcommit 84f02b753972c49c51f0e340271efec81d300411[m
Merge: 019c244 01c94e7
Author: Peter Schussheim <peter@schussheim.com>
Date: Tue Jan 31 12:09:32 2017 -0500
Merge branch 'dev' of https://github.com/peterschussheim/farmers-market-app into dev
[33mcommit 019c244daa20426d2f7dc4fbf3f07ee5c0f119e4[m
Author: Peter Schussheim <peter@schussheim.com>
Date: Tue Jan 31 12:09:04 2017 -0500
add yarn lockfile
[33mcommit 4f47770de85fda0c13ccc0adc4c428751f5a8003[m
Author: Rishi Shah <shah.rishi05@gmail.com>
Date: Tue Jan 31 11:46:42 2017 -0500
Readme update
[33mcommit 52114db29b4a63124f9321316504beb9a61398ad[m
Author: RJ Mohammad <rjmohammad@outlook.com>
Date: Tue Jan 31 12:06:56 2017 -0500
changed git ignore
[33mcommit 01c94e7ff3f3fa31be06546b5a50d1962441b748[m
Merge: 31861d6 eb8a2de
Author: Rishi Shah <Bavarian05@users.noreply.github.com>
Date: Tue Jan 31 11:47:29 2017 -0500
Merge pull request #39 from Bavarian05/dev
Readme update
[33mcommit eb8a2def71548a72826631270a79a28409b1f045[m
Author: Rishi Shah <shah.rishi05@gmail.com>
Date: Tue Jan 31 11:46:42 2017 -0500
Readme update
[33mcommit 31861d688dba1fd6f85db455aa3da0b94675a4ff[m
Merge: 01c79a0 2ea56ca
Author: rekhviasN <rekhviasnino@gmail.com>
Date: Tue Jan 31 09:47:28 2017 -0500
Merge pull request #37 from xutopia/dev
Documentation, README, Instructions
[33mcommit 01c79a0f7013c58f1c8d8df6583ae0ca7a4a5be1[m
Merge: 8724f84 7acf837
Author: rekhviasN <rekhviasnino@gmail.com>
Date: Tue Jan 31 09:47:21 2017 -0500
Merge pull request #38 from Bavarian05/dev
Updated comments to code
[33mcommit 7acf837a5c5210fd8b08eda6f3f89da365a5b54a[m
Merge: e91182d bd9b343
Author: Rishi Shah <shah.rishi05@gmail.com>
Date: Tue Jan 31 00:41:23 2017 -0500
Merge branch 'comments' into dev
[33mcommit e91182d0cb32cf6a8dfc233124ddc73817c98511[m
Author: Rishi Shah <shah.rishi05@gmail.com>
Date: Tue Jan 31 00:39:41 2017 -0500
Add explanatory comments to code
[33mcommit bd9b343164e84bb0cff56ea754a59f23dd6b337e[m
Author: Rishi Shah <shah.rishi05@gmail.com>
Date: Tue Jan 31 00:39:41 2017 -0500
Add explanatory comments to code
[33mcommit 2ea56cabff29935b30f0ba92d8a3a3e6e5ed12e7[m
Merge: 1c1b0b6 3e9e720
Author: xutopia <xuology@gmail.com>
Date: Tue Jan 31 00:05:30 2017 -0500
resolve merge conflicts in README
[33mcommit 1c1b0b60e4e5f72d460355db22f9a6d19844eaa6[m
Author: xutopia <xuology@gmail.com>
Date: Mon Jan 30 13:51:25 2017 -0500
added template styling to admin login
[33mcommit b5e8ce79092e3308515bb52e96ceba4553448599[m
Author: xutopia <xuology@gmail.com>
Date: Mon Jan 30 13:41:17 2017 -0500
added a contributing.md file and updated README
[33mcommit 3e9e72037d9f2bb08db2fd03620ba0d8fc844e2c[m
Author: xutopia <xuology@gmail.com>
Date: Tue Jan 31 00:02:23 2017 -0500
add documentation and instructions for database setup/population
[33mcommit 8724f8405b1a94f5163dfe9ec072a6b24fa18673[m
Merge: 9565692 f436239
Author: rekhviasN <rekhviasnino@gmail.com>
Date: Mon Jan 30 19:44:14 2017 -0500
Merge pull request #36 from Bavarian05/dev
Reorganized client files
[33mcommit f436239f97b4836f0de30c326c3b9bf24da637f6[m
Author: Rishi Shah <shah.rishi05@gmail.com>
Date: Mon Jan 30 19:42:57 2017 -0500
Reorganized client files
[33mcommit 9565692689ebdc429cc999d664764866e44d7a9e[m
Merge: 2437ff1 25869b1
Author: rekhviasN <rekhviasnino@gmail.com>
Date: Mon Jan 30 14:23:00 2017 -0500
Merge pull request #35 from Bavarian05/dev
Styling, API Fix, Name Change & More!
[33mcommit 25869b17d503f4871eb0ee8d39d53d882fb8d52d[m
Merge: 8f4d847 617c8b5
Author: Rishi Shah <shah.rishi05@gmail.com>
Date: Mon Jan 30 14:21:03 2017 -0500
Merge branch 'resultsPage' into dev
[33mcommit 8f4d847d4e3cf054816dcef0dadbd120dcf6d340[m
Author: Rishi Shah <shah.rishi05@gmail.com>
Date: Mon Jan 30 14:19:20 2017 -0500
Modified autocomplete and styling
[33mcommit 9e661d46179f49ffb122a0022564cbc27bcb4079[m
Author: Rishi Shah <shah.rishi05@gmail.com>
Date: Mon Jan 30 14:10:26 2017 -0500
Updated search.html styling
[33mcommit 4356ecdb4006129b9f191831d3309c36f5889a8d[m
Author: Rishi Shah <shah.rishi05@gmail.com>
Date: Mon Jan 30 13:58:43 2017 -0500
Styling & Autocomplete
[33mcommit 617c8b5d5e5a9ff89b9d95df39c6e65174968b50[m
Author: Rishi Shah <shah.rishi05@gmail.com>
Date: Mon Jan 30 14:19:20 2017 -0500
Modified autocomplete and styling
[33mcommit 2437ff1c8a8ebdc0734700d05b90031081db8838[m
Merge: 691830a 6e191b9
Author: rekhviasN <rekhviasnino@gmail.com>
Date: Mon Jan 30 14:17:22 2017 -0500
Merge pull request #34 from rekhviasN/dev
Dev
[33mcommit 6e191b9f4a1e926af978bd439bedf61d0316f42e[m
Merge: a6bf11a 691830a
Author: rekhviasN <rekhviasnino@gmail.com>
Date: Mon Jan 30 14:17:16 2017 -0500
Merge branch 'dev' into dev
[33mcommit a6bf11aba07fc6db1ed87a9ad574b43bbdd2b9f0[m
Merge: 2e40e81 9b1bb46
Author: Nino <rekhviasnino@gmail.com>
Date: Mon Jan 30 14:14:40 2017 -0500
Merge branch 'adminUpdatePage' into dev
[33mcommit 9b1bb460fc477462e0328ae0ecc4bc7ebcf47b85[m
Author: Nino <rekhviasnino@gmail.com>
Date: Mon Jan 30 14:12:34 2017 -0500
add functionality of adding markets
[33mcommit 9e4e1b5c71b02e04ba3609c6c2550b6992776212[m
Author: Rishi Shah <shah.rishi05@gmail.com>
Date: Mon Jan 30 14:10:26 2017 -0500
Updated search.html styling
[33mcommit 877d0dc85a826f5c14d035fcbfea5baf638803ce[m
Merge: 64917a4 46b3d39
Author: Rishi Shah <shah.rishi05@gmail.com>
Date: Mon Jan 30 13:59:29 2017 -0500
Merge branch 'resultsPage' into dev
[33mcommit 64917a41a05967850d46ac71e334775c6d4ceab7[m
Author: Rishi Shah <shah.rishi05@gmail.com>
Date: Mon Jan 30 13:58:43 2017 -0500
Styling & Autocomplete
[33mcommit 46b3d39f91cd7fd94cd668f35003518af284ad4c[m
Author: Rishi Shah <shah.rishi05@gmail.com>
Date: Mon Jan 30 13:58:43 2017 -0500
Styling & Autocomplete
[33mcommit 59173641894e0de0232790e8cc0a651c7c973df4[m
Author: xutopia <xuology@gmail.com>
Date: Mon Jan 30 13:51:25 2017 -0500
added template styling to admin login
[33mcommit eb0079855d8ddd966c83f417613a14c533adbe0b[m
Author: xutopia <xuology@gmail.com>
Date: Mon Jan 30 13:41:17 2017 -0500
added a contributing.md file and updated README
[33mcommit 691830ad82d180317c6ef509826045efcf273c1f[m
Merge: d2ec754 447e66e
Author: rekhviasN <rekhviasnino@gmail.com>
Date: Mon Jan 30 13:10:39 2017 -0500
Merge pull request #33 from xutopia/dev
Admin Login Authentication Complete
[33mcommit 447e66ea035108fb0ca5592d1fcfd3447f4d99dd[m
Author: xutopia <xuology@gmail.com>
Date: Mon Jan 30 13:08:02 2017 -0500
fixed final merge conflicts. App works in normal mode. Still need to do tests
[33mcommit 742d06009da85651832a0dd23be8c9b280749b75[m
Merge: d2ec754 a64f526
Author: xutopia <xuology@gmail.com>
Date: Mon Jan 30 12:59:28 2017 -0500
fixed merge conflicts
[33mcommit a64f526d6232be0c765917cda3b9e6697d4a2527[m
Author: xutopia <xuology@gmail.com>
Date: Mon Jan 30 12:55:19 2017 -0500
complete server-side admin authentication. Will run tests if time allows
[33mcommit d2ec75409e53e986cc884181d032fcabc26a0282[m
Merge: 2e40e81 f17c1b9
Author: rekhviasN <rekhviasnino@gmail.com>
Date: Mon Jan 30 12:52:22 2017 -0500
Merge pull request #32 from Bavarian05/dev
Styling, API Fix, and Name Change
[33mcommit f17c1b95a483b099c34e3d8a3f2e583a950f88ba[m
Author: Rishi Shah <shah.rishi05@gmail.com>
Date: Mon Jan 30 12:49:16 2017 -0500
More styling updates
[33mcommit 415e77d9a367b483cac838010463bfd928266b11[m
Merge: 2e40e81 ad4154f
Author: Rishi Shah <shah.rishi05@gmail.com>
Date: Mon Jan 30 12:39:48 2017 -0500
resolve conflict
[33mcommit ad4154f6344acd417cbec8f68bad4af80f98fc69[m
Author: Rishi Shah <shah.rishi05@gmail.com>
Date: Mon Jan 30 12:29:25 2017 -0500
Fixed Google API error & changed app name
[33mcommit 2e40e811f13bea96dc240f10117eb097bfaaf898[m
Merge: bd341d2 26a656a
Author: rekhviasN <rekhviasnino@gmail.com>
Date: Mon Jan 30 01:16:02 2017 -0500
Merge pull request #30 from Bavarian05/dev
Fixed some styling & attempted to add autocomplete to the filter input
[33mcommit bd341d22888c0cefd51373735fc432ad5a9a6cb5[m
Merge: cf7c46e b9ce99a
Author: rekhviasN <rekhviasnino@gmail.com>
Date: Mon Jan 30 01:15:50 2017 -0500
Merge pull request #31 from rekhviasN/dev
adds ability to update and delete an existing farm
[33mcommit b9ce99a8870f7f396830671873f6686d98976488[m
Author: Nino <rekhviasnino@gmail.com>
Date: Mon Jan 30 01:14:24 2017 -0500
add ability to update and delete existing farms
[33mcommit 133f0919d40434d0c70fba30026a6593598134d1[m
Author: Nino <rekhviasnino@gmail.com>
Date: Mon Jan 30 01:10:48 2017 -0500
add function update farm form
[33mcommit d7354d6d3eec9e0df565cc86473d96df308d89a7[m
Author: xutopia <xuology@gmail.com>
Date: Mon Jan 30 00:45:41 2017 -0500
debugging... fixed all client-side bugs. Now just have to fix all server-side bugs. And to invoke setup so that an admin is in our DB
[33mcommit 4e446dbce86ff6ff5845a4bcef4461fb6f9e4ed3[m
Author: xutopia <xuology@gmail.com>
Date: Mon Jan 30 00:01:14 2017 -0500
fixed syntax errors, app is functional. Need to add a button for client to access login page
[33mcommit 750596e20352f6cf8f2587f4d90d13696d72a8dd[m
Author: xutopia <xuology@gmail.com>
Date: Sun Jan 29 23:57:14 2017 -0500
updated admin model to include a comparePassword method and a means for hasing/salting passwords
[33mcommit 26a656a01a7d078bd7d82d73a804fc92d347d757[m
Merge: cf7c46e db1758a
Author: Rishi Shah <shah.rishi05@gmail.com>
Date: Sun Jan 29 23:51:46 2017 -0500
Merge branch 'resultsPage' into dev
[33mcommit db1758ab2be8d0108ac4d6c565d4a002e210a036[m
Author: Rishi Shah <shah.rishi05@gmail.com>
Date: Sun Jan 29 23:49:16 2017 -0500
Add non-working autocomplete functionailty to filter
[33mcommit 9ef5bcb8ad640e87c7f0a50373ec74490ee7d590[m
Author: xutopia <xuology@gmail.com>
Date: Sun Jan 29 23:06:03 2017 -0500
create adminController on server-side, added login route
[33mcommit 46452868a596542c946915af678359a505c5c6bd[m
Author: xutopia <xuology@gmail.com>
Date: Sun Jan 29 21:40:20 2017 -0500
complete client side set-up for admin login. Included factory, controller, routeChange event listener, token storage in localStorage. Will need to finish authentication on server side
[33mcommit 7d996092d3a2e7661660d82275818594bb224a01[m
Author: Rishi Shah <shah.rishi05@gmail.com>
Date: Sun Jan 29 21:36:58 2017 -0500
Improve styling on main and results page
[33mcommit 0c2613f2dec030bc87dca4c98250d75c1c82d3cd[m
Author: xutopia <xuology@gmail.com>
Date: Sun Jan 29 19:30:07 2017 -0500
complete admin login html template
[33mcommit 83005dea488b43156568ad633336b87b50a3e642[m
Author: xutopia <xuology@gmail.com>
Date: Sun Jan 29 19:21:09 2017 -0500
set up admin login page and admin login controller and factory
[33mcommit 140ad280e2a8ea1dd2e5730567d1fb34abaf408f[m
Author: xutopia <xuology@gmail.com>
Date: Sun Jan 29 18:55:03 2017 -0500
set up back-end to receive login information. Will work on front-end to set up admin login page
[33mcommit da3551f3cae928cfecd30b1d53cdae4785477b24[m
Author: Nino <rekhviasnino@gmail.com>
Date: Sun Jan 29 18:43:44 2017 -0500
added alert functionality to farm search for invalid input
[33mcommit fdb00f2e63abfe91ce75bfe05617635998e370a4[m
Author: Rishi Shah <shah.rishi05@gmail.com>
Date: Sun Jan 29 17:55:23 2017 -0500
Remove redundant comments
[33mcommit 2cff0b7e1d480bfd367b71461408d3065bc4f50a[m
Author: xutopia <xuology@gmail.com>
Date: Sun Jan 29 14:48:19 2017 -0500