-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathq
More file actions
2316 lines (1562 loc) · 63 KB
/
Copy pathq
File metadata and controls
2316 lines (1562 loc) · 63 KB
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 d67880c927b4250660258cd46c65da74c69c6770[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Wed Jul 12 00:28:42 2017 +0530
Database Changed
[33mcommit 05dffebe4aa21e92ebdb0d370e5f5f6f89cc103e[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Mon Jul 10 14:19:18 2017 +0530
Migrations Deleted
[33mcommit ae1a5bedf1f8514e6e875607197a42cc30e6333d[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Mon Jul 10 13:54:11 2017 +0530
Backup Added
[33mcommit bef9380efc4a4288d7f5b3a96e9dac733560d0c2[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Sat Jul 8 14:46:20 2017 +0530
Bugs Fixed
[33mcommit 08737945b62751f9ab2510778dfb4cac4af661a8[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Sat Jul 8 14:45:52 2017 +0530
Bugs Fixed
[33mcommit 376a77d7467843e23eb0fdd031471393091e31d3[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Sat Jul 8 14:43:10 2017 +0530
Bugs Fixed
[33mcommit d369aa6088d388808578b668e24b5d94001a55f6[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Sat Jul 8 14:40:57 2017 +0530
Bugs Fixed
[33mcommit 8fb38bfda81906a588ebea59e02e23c0ce8e3cbd[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Sat Jul 8 14:39:23 2017 +0530
Bugs Fixed
[33mcommit 5966a3c40f90b1fe8fc2ded0724caece2738fbd5[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Sat Jul 8 13:24:49 2017 +0530
Some Changes
[33mcommit 44065326df690daaf0419e6bbf3cecadae2f32f0[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Sat Jul 8 13:19:45 2017 +0530
Some Changes
[33mcommit a204f39cad057799a0a357ba28fcdda47e15ef45[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Sat Jul 8 13:17:01 2017 +0530
Some Changes
[33mcommit ba60c23ea374ff5a54eff9b95baf56c729e076ad[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Sat Jul 8 13:08:50 2017 +0530
Some Changes
[33mcommit dc2ae0bb165ce53f5a9188d55afa1902d3899dbd[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Sat Jul 8 12:59:47 2017 +0530
Bugs Fixed
[33mcommit 5f253b590cb74dbd64828b6736c9397513a6a2fa[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Sat Jul 8 02:20:46 2017 +0530
Some Improvements
[33mcommit 3739cc03dc6fb616679076287cdb1bcb011917c9[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Sat Jul 8 02:16:13 2017 +0530
Improvents in Payment Module
[33mcommit d950c3db6bcf2e2d2de36c779fd1b3516370b4eb[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Wed Jun 28 21:56:50 2017 +0530
Some Changes
[33mcommit ce73e46cdc096dba588c675638b6167ddd72045b[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Wed Jun 28 21:51:55 2017 +0530
Some Changes
[33mcommit 0dbf3a7a313771283677fbe9d2aee32b996d2147[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Wed Jun 28 21:42:59 2017 +0530
Some Changes
[33mcommit 7f89262315c571c56572fa4952cf08716dafc94d[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Wed Jun 28 21:39:02 2017 +0530
Some Changes
[33mcommit 952b9f4d63ae5eed5411fce7510cbef26668e250[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Wed Jun 28 21:28:14 2017 +0530
Some Changes
[33mcommit c746ed6ffa10d36983f01c128860f0a0e9396e31[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Wed Jun 28 20:47:18 2017 +0530
Some Changes
[33mcommit 2d12908527d475a51e56c74f5c61a0d7bcc83563[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Wed Jun 28 20:14:41 2017 +0530
Some Changes
[33mcommit e235914286bb645b8d7a46b4327578dfd8ab72ab[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Wed Jun 28 20:13:43 2017 +0530
Some Changes
[33mcommit 9dc2d1249dbc55020a593ade5516de7c96c75142[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Wed Jun 28 20:11:52 2017 +0530
Some Changes
[33mcommit 99866062419d86a0381b4866a281f0dff3ee8168[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Wed Jun 28 20:07:11 2017 +0530
Some Changes
[33mcommit 4467095a8d9d009a9f83dfbeea374c98cc89a6cc[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Wed Jun 28 20:04:08 2017 +0530
Some Changes
[33mcommit 766b54ae8e36f8218841f714d20d4847a65d676c[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Wed Jun 28 19:36:11 2017 +0530
Some Changes
[33mcommit cb8a7055562e7c8ff7fc431a06486dc336112757[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Wed Jun 28 19:34:44 2017 +0530
Some Changes
[33mcommit 828871e93b67737be667eb678ec024f5094a9fb0[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Wed Jun 28 18:52:55 2017 +0530
Some Changes
[33mcommit 906117fa365305de9cd6f669e75375cff6a2f54c[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Wed Jun 28 18:49:11 2017 +0530
Some Changes
[33mcommit 5840066282c7599cb943dc61056bc55913a3cd12[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Wed Jun 28 18:45:53 2017 +0530
Some Changes
[33mcommit d8cbc13548c12ec3f7d037b26887b949c15f4544[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Wed Jun 28 18:38:13 2017 +0530
Conflicts Fixed
[33mcommit 7f0d1618c7895fd2b272e5100f2d3a331cf24cba[m
Author: Brand Store Server <meghal.nit@gmail.com>
Date: Thu Jun 22 21:41:15 2017 +0000
Migrating data to new server
[33mcommit e62f795fe2b1d8b0c2c6d3df7b81b9b0724fc768[m
Author: Brand Store Server <meghal.nit@gmail.com>
Date: Thu Jun 22 21:38:24 2017 +0000
Db sync
[33mcommit ef755d0491d04ac85906e9bf05d45527838a3210[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Wed Jun 21 16:36:15 2017 +0530
Description Added
[33mcommit b7ee6598b05d9c393b666fcbaf6ad3bef8f62bad[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Fri Jun 16 01:45:20 2017 +0530
Bug Fixed :Shop Module
[33mcommit d857a7fe1c8613b330ce3f33d0b4f085bfca47fe[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Fri Jun 16 01:35:52 2017 +0530
Bug Fixed :Shop Module
[33mcommit 5ce023c7eedc4b1f7ab7edae6dceae208f580205[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Fri Jun 16 01:34:31 2017 +0530
Bug Fixed :Shop Module
[33mcommit 29145f88e47d22e8878a882cd02c973edf1fa7aa[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Fri Jun 16 01:31:55 2017 +0530
Bug Fixed :Shop Module
[33mcommit 3a51503a8bf4c0b8e3ce92d07ff41e4958e6a6f8[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Fri Jun 16 01:14:41 2017 +0530
Improvents in User Shop Module
[33mcommit da7aa02af67f5bd20ac41f62f185a111c99b1d6c[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Wed Jun 14 03:11:02 2017 +0530
Improvements in User Category Module
[33mcommit 129d1161e223350146dcf4568f79bb532240e979[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Wed Jun 14 02:20:15 2017 +0530
Improvements in User Login Module
[33mcommit f5693f658864097731d00579c21bd0d5b4c7afaa[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Wed Jun 14 01:57:15 2017 +0530
Improvements in Shop Login Module
[33mcommit c33f1748782f323cdae45fd579f394b5ed1a3838[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Wed Jun 14 00:57:39 2017 +0530
Some Changes
[33mcommit 2c5879041953d8b475cc77b7b177d3e4b47c1275[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Wed Jun 14 00:56:24 2017 +0530
Some Changes
[33mcommit b33e73a2e32be54235ad3080da494067e1e0bd2b[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Wed Jun 14 00:42:50 2017 +0530
Some Changes
[33mcommit f9713660f77fdbff6660f51339937821e1131e23[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Wed Jun 14 00:38:03 2017 +0530
Database Changed
[33mcommit 483a60fc98d617b308e26e2da00521b31efab8e4[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Wed Jun 14 00:37:23 2017 +0530
Changes
[33mcommit 97636d5608caf69273b7c562f6a3abb0ecba3206[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Tue Jun 13 23:53:29 2017 +0530
Conflicts fixed
[33mcommit 5a17b99471d4b88a20f68dd23be92177d6cafd8b[m
Merge: b33a0cf 8c43f84
Author: Brand Store Server <meghal.nit@gmail.com>
Date: Tue Jun 13 18:17:57 2017 +0000
Resolving Commits
[33mcommit b33a0cfe6b4b69144208d0c5429a75512e56e662[m
Merge: 4172714 0f6ddc6
Author: Brand Store Server <meghal.nit@gmail.com>
Date: Tue Jun 13 17:57:48 2017 +0000
Server Pull
[33mcommit 8c43f84e569e5f3d3f174d9ca70c204c423f9943[m
Author: Meghal Agrawal <meghalagrawal@Meghals-MacBook-Pro.local>
Date: Tue Jun 13 23:22:59 2017 +0530
Changed db to mysql
[33mcommit da4a87194ba4803a7fef06174e7fa1caa4c31453[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Tue Jun 13 17:43:06 2017 +0530
Shop Verified feature added and bugs fixed
[33mcommit 41727147b0be0b0357fc797db6ad02a575f02d4f[m
Author: Brand Store Server <meghal.nit@gmail.com>
Date: Mon Jun 12 20:53:58 2017 +0000
Server backup
[33mcommit 0f6ddc65135bc73ec768b1476e42847cc4f8d045[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Tue Jun 13 02:22:41 2017 +0530
Static Files Added
[33mcommit 95135ff0d40ac0eaa2431080b70c1dee2a14aee5[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Mon Jun 12 22:06:06 2017 +0530
Some Changes
[33mcommit 3075ddcb749304995d7d337f2b5684317eb3163d[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Mon Jun 12 21:25:38 2017 +0530
Some Changes
[33mcommit 26ca4bbc0098740fb6001222c6956231793daebc[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Mon Jun 12 21:20:25 2017 +0530
Some Changes
[33mcommit a3f8e7d025ba19e3697838b5474e840da74ac2d3[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Mon Jun 12 21:17:55 2017 +0530
Some Changes
[33mcommit df90e568ab96fa4df099ffb940caf302da478eb3[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Mon Jun 12 21:13:48 2017 +0530
Some Changes
[33mcommit b9581a28cb3137d3cc610fa888b73e058cecd1d7[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Mon Jun 12 20:47:45 2017 +0530
Some Changes
[33mcommit a0f220376ff5f0ae78e1b0e3d447c4b54196a025[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Mon Jun 12 20:32:44 2017 +0530
Message debugged in get offers
[33mcommit c4d1811735300c4aed0439ef44a66348aab6f9be[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Mon Jun 12 19:55:58 2017 +0530
Message added in get offers
[33mcommit 68eeb72bf1bb2ff66ef6ec1b5152c5cd7c4ba032[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Mon Jun 12 18:53:52 2017 +0530
Categories added
[33mcommit 117cdf691bb361dedbe244a9260932325354b7af[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Sun Jun 11 00:32:35 2017 +0530
Changes in Forgot password
[33mcommit d102a4e6598e761cf8deffd666c92f1e5ee57fc1[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Sun Jun 11 00:25:13 2017 +0530
Some Improvements
[33mcommit df19e9de4f127015a2bbc63e2227931996b8e94c[m
Author: meghal.nit@gmail.com <meghal.nit@gmail.com>
Date: Sat Jun 10 18:44:17 2017 +0000
Added real virtual environment
[33mcommit 4bd028da9d58b281d9e39cc4bf0f8a11944803aa[m
Author: Meghal <meghal.nit@gmail.com>
Date: Sat Jun 10 18:20:24 2017 +0000
Added modules in virtual environment
[33mcommit b0998e7f8ad9b0a51c5c30766308ceb36f0abcaa[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Sat Jun 10 20:24:42 2017 +0530
Categories sorted according to city now
[33mcommit c73eb0e1d7039645b4df5ef8912ac9b182c0393e[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Sat Jun 10 16:04:10 2017 +0530
Changes in State and City Data
[33mcommit 1d54669fbef123d4db2be9062082d37973c3fe13[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Sat Jun 10 02:27:41 2017 +0530
State Table added in City App and reduced a lot of useless code
[33mcommit e8b6a149255cb2a275f6d25ea7bc8eea9c95ec80[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Fri Jun 9 04:00:03 2017 +0530
My Offers Module Improved
[33mcommit c988e0b4c2bef73f333de4b4d9b2dca235fe46e8[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Fri Jun 9 02:04:47 2017 +0530
Someme Changes
[33mcommit 15bd37a7ced336e87428031e81e1a3dc8a531385[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Fri Jun 9 01:53:59 2017 +0530
Some Changes
[33mcommit 8cbbcfa18c654a6a71fd929a82ac2ff232e43bcb[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Fri Jun 9 01:51:42 2017 +0530
Model changed in Offers
[33mcommit 3da89c61ebd18c19a928544159dcec93753d37f8[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Fri Jun 9 01:43:02 2017 +0530
Some Improvements
[33mcommit 2c608558b6b0e7659794b732bba6ab8ddd4a0076[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Fri Jun 9 01:13:18 2017 +0530
Bugs fixed
[33mcommit 20e00d40dd716f4feb9a4240c513f9fd4cd6e043[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Fri Jun 9 01:03:12 2017 +0530
Changes made in Offer Module
[33mcommit 68d88e7b5679a4b5aef2ba2738af69b42a73fdd1[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Fri Jun 9 00:56:18 2017 +0530
Some Changes
[33mcommit a15ef320d2f169e413dc46bfaa81695459301ba1[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Fri Jun 9 00:39:08 2017 +0530
Some Changes
[33mcommit 133cec2ef11e7e1163a2712a75e631be72b7bbb5[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Fri Jun 9 00:34:54 2017 +0530
Some Changes
[33mcommit fbc877f078ed6310634b3e7fa4d39ca7644882ff[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Thu Jun 8 19:08:17 2017 +0530
Bugs fixed:Edit Offer,Shop Details
[33mcommit 8e9c6506e395186e34e8976d6fba1012cf127838[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Thu Jun 8 16:52:09 2017 +0530
some Changes
[33mcommit 2c950315e7636f530f885f79247f3d5067423dd4[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Thu Jun 8 16:44:20 2017 +0530
Some Changes
[33mcommit 59d6f62805990d7dc4703606dcdd92bb441e82a7[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Thu Jun 8 13:16:55 2017 +0530
Virtualenv Added
[33mcommit 67eefd033ad69863ef692e3cad3087ee1a11672e[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Wed Jun 7 20:58:24 2017 +0530
Improved Shop Module
[33mcommit d3c54e5580bdce858633ec7b045ad1a42267dca5[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Wed Jun 7 19:14:55 2017 +0530
Some Improvements
[33mcommit fbda9e9fa70c5ad0d11b1b7294548f1b6cbf83b9[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Wed Jun 7 19:02:11 2017 +0530
Some Improvements
[33mcommit 56a9a7744d44c6ee4edbc2e3356342316fe17397[m
Merge: 6197a72 0692e32
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Wed Jun 7 01:41:20 2017 +0530
Merge branch 'master' of https://github.com/CodeNicely/OfferCartServer
[33mcommit 6197a7278b0c0f3ea335829aa853bd2b208abb8c[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Wed Jun 7 01:40:37 2017 +0530
Improvements
[33mcommit 0692e3223bf73a620cb4c902392bad7846bc50bb[m
Merge: b6ecf24 ca6cecd
Author: Meghal Agrawal <meghal.nit@gmail.com>
Date: Tue Jun 6 15:42:16 2017 +0530
Merge pull request #2 from CodeNicely/dev
Dev
[33mcommit ca6cecd73083ef69ab703bf28d39e8b8cd7338b3[m
Merge: 24a0e6d b6ecf24
Author: Meghal Agrawal <meghalagrawal@Meghals-MacBook-Pro.local>
Date: Tue Jun 6 15:41:13 2017 +0530
Mergrging dev with master
[33mcommit 24a0e6daac2fda8cb66f42441a69943665bda5e9[m
Merge: 766c49d f529c8a
Author: Grocery Server <m3gh4l@gmail.com>
Date: Tue Jun 6 10:08:26 2017 +0000
Merge branch 'dev' of https://github.com/CodeNicely/OfferCartServer into dev
[33mcommit 766c49d6a457d8f08ea9cfdd504132c97d0fee67[m
Author: Grocery Server <m3gh4l@gmail.com>
Date: Tue Jun 6 10:07:48 2017 +0000
Fixing merge conflicts
[33mcommit 283ce975f4257b36103dd1757ce97ccbe8ad6f92[m
Merge: 39a9456 170464f
Author: Grocery Server <m3gh4l@gmail.com>
Date: Tue Jun 6 10:07:35 2017 +0000
Fixing merge conflicts
[33mcommit b6ecf24e21365f55d42f2ed3dfd337c57573496e[m
Merge: 63f56cc f529c8a
Author: Meghal Agrawal <meghalagrawal@Meghals-MacBook-Pro.local>
Date: Tue Jun 6 15:36:08 2017 +0530
MErging master with dev
[33mcommit 63f56cc3a2677f0d75b0b919dc821e15865054e7[m
Merge: 033b2d0 c5c3ab1
Author: Meghal Agrawal <meghalagrawal@Meghals-MacBook-Pro.local>
Date: Tue Jun 6 15:35:30 2017 +0530
MErging master with dev
[33mcommit f529c8afdf9745b9326bfab56528a63aa2a66d4c[m
Merge: 170464f 033b2d0
Author: Meghal Agrawal <meghalagrawal@Meghals-MacBook-Pro.local>
Date: Tue Jun 6 15:34:40 2017 +0530
MErging master with dev
[33mcommit 39a945694316bef907bf44b420a56326dcfb34f0[m
Author: Grocery Server <m3gh4l@gmail.com>
Date: Tue Jun 6 10:00:39 2017 +0000
Merge conflicts
[33mcommit c5c3ab133202ed544fbdf6ea7afe71c1eefda85e[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Tue Jun 6 14:43:26 2017 +0530
Some Improvements
[33mcommit 3e769dec0675b7e90dbcba4044a2ba85613038f2[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Sat Jun 3 14:21:47 2017 +0530
Bugs Fixed :Edit Offer
[33mcommit 089d1c38ffb7ca27511b120cb534b22c1b514231[m
Merge: c834be1 69128dc
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Fri Jun 2 21:26:49 2017 +0530
Add Modules :2 Forgot Password Modules and Fixed Register Module
[33mcommit 170464fda91c074d19fe57aba5f29ea5dbc64378[m
Author: Meghal Agrawal <meghalagrawal@Meghals-MacBook-Pro.local>
Date: Fri Jun 2 17:34:17 2017 +0530
Added virtual environment to the project
[33mcommit 033b2d022638c110d56bf6d0dba5203748625738[m
Author: Meghal Agrawal <meghalagrawal@Meghals-MacBook-Pro.local>
Date: Fri Jun 2 17:31:04 2017 +0530
Added Virtual end in the proeject
[33mcommit 69128dc6283c56f837914d826e7b03358924e059[m
Author: Meghal Agrawal - Developer <meghal.nit@gmail.com>
Date: Thu Jun 1 17:04:26 2017 +0530
Added PAytm Serverend hash login
[33mcommit a6d38483b83fd16830c68bddea0b7b717e7a3f00[m
Author: Meghal Agrawal - Developer <meghal.nit@gmail.com>
Date: Thu Jun 1 16:47:59 2017 +0530
Added PAytm Serverend hash login
[33mcommit e574c78ffe70e78662f1e841babc1c53306dd9b9[m
Author: Meghal Agrawal - Developer <meghal.nit@gmail.com>
Date: Thu Jun 1 10:41:39 2017 +0530
changes in change password module
[33mcommit a8d29ac4fb7e0aaed00598ff961e0fe5a4300515[m
Author: Meghal Agrawal - Developer <meghal.nit@gmail.com>
Date: Wed May 31 23:48:46 2017 +0530
Improvements and bug fixes
[33mcommit 5c24bb35659658b66b020b97b8c89506c8212379[m
Author: Meghal Agrawal - Developer <meghal.nit@gmail.com>
Date: Wed May 31 23:47:50 2017 +0530
Improvements and bug fixes
[33mcommit 15e5558fa9837c096a72bf0bf8388d994be3f424[m
Author: Meghal Agrawal - Developer <meghal.nit@gmail.com>
Date: Sat May 20 19:02:10 2017 +0530
Added domain to host
[33mcommit b0ed3b0023bf9f21b7e1a9ba3423c3a2d39409f8[m
Author: Meghal Agrawal - Developer <meghal.nit@gmail.com>
Date: Sat May 20 18:50:28 2017 +0530
Worked on Change password, Delete offer
[33mcommit c834be1eafc4974c8348eac06c7740b15572ef55[m
Merge: 33c34fa 1f3a4a8
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Sat May 20 12:13:36 2017 +0530
Resolving conflicts
[33mcommit 33c34fa3ec195cf530a3be4961c15bfd2a866166[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Sat May 20 12:03:22 2017 +0530
...
[33mcommit 1f3a4a88c32e0bee8b00f32cff605a312b366231[m
Author: Meghal Agrawal - Developer <meghal.nit@gmail.com>
Date: Sat May 20 11:58:37 2017 +0530
Improved api for shop admin
[33mcommit 91ecc63d28f37b0abed57374ffe5d3ecaa466758[m
Author: Meghal Agrawal - Developer <meghal.nit@gmail.com>
Date: Thu May 18 20:16:08 2017 +0530
Final commit
[33mcommit 423b04e79d951ab630f05fc5f204482fc92dcef7[m
Author: Meghal Agrawal - Developer <meghal.nit@gmail.com>
Date: Thu May 18 01:04:35 2017 +0530
Made api for edit profile, show profile
[33mcommit 1f586d52b123fe6d680cda18281362c98517b09f[m
Author: Meghal Agrawal - Developer <meghal.nit@gmail.com>
Date: Wed May 17 20:12:55 2017 +0530
Worked on API's for app
[33mcommit 7cac5c8c0be212c62e2e7a4e822295fc8b6ce492[m
Author: Meghal Agrawal - Developer <meghal.nit@gmail.com>
Date: Wed May 17 01:34:30 2017 +0530
Verify otp for shop done
[33mcommit 6ca27a22dfce1f3e59a3a373aa63c3a82fb47e10[m
Author: Meghal Agrawal - Developer <meghal.nit@gmail.com>
Date: Wed May 17 00:21:13 2017 +0530
Worked on
[33mcommit 76a5e7492414a3e6d81e220f69fe6445062554ee[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Mon May 15 14:40:31 2017 +0530
Some Changes
[33mcommit 1645e414be92eeaa5d1ab738059975b9a21c4e6b[m
Author: ujjwalagrawal17 <ujjwal.iitism@gmail.com>
Date: Sat May 13 00:36:20 2017 +0530
Shop OTP App added and add_shop view added
[33mcommit 07d582c8ba1cdf89854b6e13eb23ad6780ef71c5[m
Author: Meghal Agrawal - Developer <meghal.nit@gmail.com>
Date: Fri Mar 31 12:17:31 2017 +0530
Improved codebase, All old modules working correctly
[33mcommit e5026aeaf4ccbac3d8c50981c9ab22cfd745db0b[m
Author: Meghal Agrawal - Developer <meghal.nit@gmail.com>
Date: Fri Apr 7 01:48:54 2017 +0530
Improved coding style and implemented foreign keys
[33mcommit b317a9bf2a4ea812e41b71359f15f62d3eb79608[m
Author: Meghal Agrawal - Developer <meghal.nit@gmail.com>
Date: Thu Mar 9 13:15:13 2017 +0530
Updated city-fcm-update method - Creates entry if not exist
[33mcommit af3dcaf27fcdb35641b030373ec569fcfe4c4858[m
Author: Meghal Agrawal - Developer <meghal.nit@gmail.com>
Date: Thu Mar 9 13:13:56 2017 +0530
Updated city-fcm-update method - Creates entry if not exist
[33mcommit 145e2aeea2211196640980bdf0f505c664f5dc7b[m
Author: Meghal Agrawal - Developer <meghal.nit@gmail.com>
Date: Thu Mar 9 13:12:21 2017 +0530
Updated city-fcm-update method - Creates entry if not exist
[33mcommit 5535514efd9cba741def192283e16980872f22f5[m
Author: Meghal Agrawal - Developer <meghal.nit@gmail.com>
Date: Thu Mar 9 13:10:05 2017 +0530
Updated city-fcm-update method - Creates entry if not exist
[33mcommit a651be6f36d045d9026312a7e2a949303d6fca2a[m
Merge: ba04757 c22461e
Author: Meghal Agrawal - Developer <meghal.nit@gmail.com>
Date: Thu Mar 9 13:08:58 2017 +0530
Merge branch 'master' of github.com:CodeNicely/OfferCartServer
[33mcommit ba047578e72c7ed69e56be59ed2385c2b463fff8[m
Author: Meghal Agrawal - Developer <meghal.nit@gmail.com>
Date: Thu Mar 9 13:08:29 2017 +0530
Updated city-fcm-update method - Creates entry if not exist
[33mcommit c22461e94e15b757e5aeba2d206256f19cb3356c[m
Merge: ba648a8 7f6188b
Author: Meghal <meghal.nit@gmail.com>
Date: Wed Mar 8 20:54:23 2017 +0000
Server Conflicts fixed
[33mcommit ba648a847b14f4fd2b2f840089175cafdb15ae71[m
Author: Meghal <meghal.nit@gmail.com>
Date: Wed Mar 8 20:53:53 2017 +0000
Server backup
[33mcommit 7f6188b65d1401b81615c8d1a94ba3dbe07b13d4[m
Author: Meghal Agrawal - Developer <meghal.nit@gmail.com>
Date: Thu Mar 9 02:23:26 2017 +0530
Fcm Issue Fixed Forever
[33mcommit f002124dcfee2cca0b2586398e343f3cfacb293c[m
Author: Meghal Agrawal - Developer <meghal.nit@gmail.com>
Date: Thu Mar 9 02:18:22 2017 +0530
Improved Fcm update
[33mcommit a60ac7ea12876f4a2b664b45f2c967259203157e[m
Author: Meghal Agrawal - Developer <meghal.nit@gmail.com>
Date: Thu Mar 9 02:17:08 2017 +0530
Improved Fcm update
[33mcommit e451bc820b749dd79c145a46b57767deefd7fc73[m
Author: Meghal Agrawal - Developer <meghal.nit@gmail.com>
Date: Thu Mar 9 02:12:49 2017 +0530
Improved Fcm update
[33mcommit 3aa4139db2fb50c1940ccb7e2ec4c10fe5289587[m
Author: Meghal Agrawal - Developer <meghal.nit@gmail.com>
Date: Thu Mar 9 02:09:44 2017 +0530
Improved Fcm update
[33mcommit 9a9667435e4c93a20c051949f788f5cf40006a9f[m
Author: Meghal Agrawal - Developer <meghal.nit@gmail.com>
Date: Thu Mar 9 02:09:12 2017 +0530
Improved Fcm update
[33mcommit 79eb4ee26f72899ba06d9de4f22c5d879f32a6ed[m
Author: Meghal Agrawal - Developer <meghal.nit@gmail.com>
Date: Thu Mar 9 02:07:11 2017 +0530
Improved Fcm update
[33mcommit 102abf25849818205776495d9e0348d8c8196214[m
Author: Meghal Agrawal - Developer <meghal.nit@gmail.com>
Date: Thu Mar 9 02:05:28 2017 +0530
Improved Fcm update
[33mcommit e6d9f0a567d3898670c0458291a650b2eb45fb26[m
Author: Meghal Agrawal - Developer <meghal.nit@gmail.com>
Date: Thu Mar 9 02:04:25 2017 +0530
Improved Fcm update
[33mcommit 57fcb5816158b4e5e40b466c1a53754a9a0d71f1[m
Author: Meghal Agrawal - Developer <meghal.nit@gmail.com>
Date: Thu Mar 9 00:52:20 2017 +0530
Changes in notification
[33mcommit fba108d5267715abcaa8782f78c02aeef00f1821[m
Merge: 27d1c0e 0e36ff1
Author: Meghal <meghal.nit@gmail.com>
Date: Wed Mar 8 19:19:48 2017 +0000
Fixed conflicts
[33mcommit 0e36ff1ebf379aa974bdd65cd4c7d68b931f2a08[m
Author: ramya <educate1996@gmail.com>
Date: Wed Mar 8 22:30:23 2017 +0530
improvements
[33mcommit ee39fe15c384c3426ad5b67dd5b15effbae5a056[m
Author: ramya <educate1996@gmail.com>
Date: Wed Mar 8 00:12:48 2017 +0530
some changesb
[33mcommit 27d1c0ed902ff6f3d6ed3ee31218ccdbdfee1f84[m
Merge: 4d31765 f6e2aba
Author: Meghal <meghal.nit@gmail.com>
Date: Tue Mar 7 18:33:09 2017 +0000
fixed
[33mcommit 4d3176505759a264e6cdecc5b086dc4ee636496b[m
Author: Meghal <meghal.nit@gmail.com>
Date: Tue Mar 7 18:32:25 2017 +0000
fixed
[33mcommit f6e2abaebc0d993a6c6dbbce2c3bb99892b5ef08[m
Author: ramya <educate1996@gmail.com>
Date: Tue Mar 7 23:59:27 2017 +0530
changed db
[33mcommit d5e3fb06481c57a56344483fce69e339d13f447a[m
Author: ramya <educate1996@gmail.com>
Date: Tue Mar 7 23:56:01 2017 +0530
some changes in city module
[33mcommit 8cce500d02b9ebcac51eac7773f0b3f5bc7e9c69[m
Author: ramya <educate1996@gmail.com>
Date: Tue Mar 7 00:00:02 2017 +0530
modified notifications
[33mcommit 726c6f9398ce47a524e20556d67204555db61214[m
Author: ramya <educate1996@gmail.com>
Date: Mon Mar 6 21:08:54 2017 +0530
changes in panel
[33mcommit 30832af23eec428b27ed6694e04382ce1dc00c8c[m
Author: ramya <educate1996@gmail.com>
Date: Mon Mar 6 20:52:39 2017 +0530
some changes
[33mcommit f80ab6b7e1ea8b3e0e5525e16382138d555033ba[m
Author: ramya <educate1996@gmail.com>
Date: Mon Mar 6 20:48:55 2017 +0530
some changes
[33mcommit 9a6e7477f96955c55839f275cbee6027fca043c4[m
Author: ramya <educate1996@gmail.com>
Date: Mon Mar 6 20:42:17 2017 +0530
some changes
[33mcommit 5fff208d3ec9775ea87bf8c069aece2da1c8e2cd[m
Author: ramya <educate1996@gmail.com>
Date: Mon Mar 6 20:38:32 2017 +0530
some changes
[33mcommit 0ecaf2f233fa97484b83893c6407b7d7078e0d2e[m
Author: ramya <educate1996@gmail.com>
Date: Mon Mar 6 20:08:47 2017 +0530
changed db
[33mcommit 8a2784a6d92b7160bef2230f17465a23c9e2a97a[m
Merge: 71669aa 06a834a
Author: ramya <educate1996@gmail.com>
Date: Mon Mar 6 20:01:53 2017 +0530
changed field
[33mcommit 71669aa818ac33da20787fb668f8282614e07d4d[m
Author: ramya <educate1996@gmail.com>
Date: Mon Mar 6 19:38:11 2017 +0530
changed field
[33mcommit 987522b008728c7d3703f5aa16fa85534f37bc2b[m
Author: ramya <educate1996@gmail.com>
Date: Mon Mar 6 19:37:16 2017 +0530
changed field
[33mcommit 06a834a36957d16bedc01251f68cdac00cdd82e1[m
Merge: 658bc95 06245d1
Author: Meghal <meghal.nit@gmail.com>
Date: Sun Mar 5 19:09:47 2017 +0000
server backup finish
[33mcommit 658bc95a45f90e6bed6072b646aa283783b8454f[m
Author: Meghal <meghal.nit@gmail.com>
Date: Sun Mar 5 19:04:56 2017 +0000
server backup
[33mcommit 06245d1f1d15668054b3525054dc096ce39a7821[m
Author: ramya <educate1996@gmail.com>
Date: Mon Mar 6 00:33:29 2017 +0530
changed db
[33mcommit 37442861738cb3d11f0c7b0490ed115ebd5dc132[m
Merge: b81cfed 2fdfe92
Author: Meghal <meghal.nit@gmail.com>
Date: Sun Mar 5 18:54:03 2017 +0000
Merge branch 'master' of https://github.com/CodeNicely/OfferCartServer
[33mcommit b81cfed5c44798810fd24a7bfb931f98928f73da[m
Merge: a09bfcb f8f486a
Author: Meghal <meghal.nit@gmail.com>
Date: Sun Mar 5 18:53:58 2017 +0000
otp