forked from Midburn/spark
-
Notifications
You must be signed in to change notification settings - Fork 0
/
stop
2265 lines (1486 loc) · 63.4 KB
/
stop
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 b81a31159a07a013b8b5ba4bdd81ee4aaf5f8883[m
Author: yanipo5 <[[email protected]]>
Date: Tue Jan 30 12:41:12 2018 +0200
git resolutions
[33mcommit 4605c1e7d49c7959189387886cd75d6a36d08406[m
Merge: 40532aa 0dc3eec
Author: yanipo5 <[[email protected]]>
Date: Tue Jan 30 12:40:28 2018 +0200
conflit resulotion
[33mcommit 0dc3eecd4d23d42e6434bd25eb0247d244598502[m
Merge: ece5cb4 a3ea77c
Author: Yaniv Peretz <[email protected]>
Date: Tue Jan 23 16:17:05 2018 +0200
Merge pull request #588 from Midburn/event-form-partials
Jade partical for the event form.
Travis errors not relevant for commit
[33mcommit a3ea77cf3cc6873c2fcfe8510639e9279bdfa23b[m
Author: yanipo5 <[[email protected]]>
Date: Tue Jan 23 16:11:27 2018 +0200
Jade partical for the event form
[33mcommit ece5cb4cb336b92fad656473bc7f661799b88dae[m
Author: Noam Almog <[email protected]>
Date: Tue Jan 23 12:01:46 2018 +0200
sample doc
[33mcommit cfe4cc4551c8692fbdf90a26335a9b1203e1147b[m
Merge: b917843 e7084c5
Author: Alex <[email protected]>
Date: Fri Jan 19 18:29:35 2018 +0200
Merge pull request #577 from OriHoch/fix-bad-gateway-bug-due-to-drupal-missing-checkbox
fix for bad gateway error due to missing details on drupal - displays an error message
[33mcommit b9178435374ce7eb8822f849b8751686f959854a[m
Merge: bd49e86 3207fdd
Author: Alex <[email protected]>
Date: Wed Jan 17 15:06:52 2018 +0200
Merge pull request #576 from Midburn/create-profile-placeholders
Adding login email placeholders, better text for new users
[33mcommit 3207fdd01006c13a622b20d25f3ea730e9bd6330[m
Merge: 37d24d3 bd49e86
Author: Alex Motenko <[email protected]>
Date: Wed Jan 17 14:46:05 2018 +0200
Merge branch 'master' of https://github.com/Midburn/spark into create-profile-placeholders
[33mcommit bd49e869d8a54a104011d3e769b8c27cbac9d67f[m
Merge: e763c1d 3257d0c
Author: Alex <[email protected]>
Date: Wed Jan 17 13:55:50 2018 +0200
Merge pull request #580 from Midburn/2.10.15-tag
tagging 2.10.15
[33mcommit 3257d0c3ac6cc368e660140cabea95146dff819f[m
Author: Alex <[email protected]>
Date: Tue Jan 16 20:06:26 2018 +0200
Update package.json
[33mcommit 37d24d34f57fb5240d1cffba38909fb053af6945[m
Author: Alex Motenko <[email protected]>
Date: Tue Jan 16 19:26:58 2018 +0200
fixing tests
[33mcommit e7084c5a36647bb2e39ccc266ba5b3bdc68a0433[m
Author: Ori Hoch <[email protected]>
Date: Mon Jan 15 23:34:02 2018 +0200
fix for bad gateway error due to missing details on drupal - displays an error message
[33mcommit 67b7638404520731157a4b5eb807c5028d861654[m
Author: Alex Motenko <[email protected]>
Date: Mon Jan 15 23:30:22 2018 +0200
Adding login email placeholders, better text for new users
[33mcommit e763c1d8e3377bf9246062bb2699c4be6f1c4027[m
Author: Ori Hoch <[email protected]>
Date: Mon Jan 15 22:34:12 2018 +0200
fix node-sass + upgrade dependencies
[33mcommit 4cfee24855b52f7ae4f36587417f26f6cc1649be[m
Author: Artyom Katsap <[email protected]>
Date: Mon Jan 15 22:11:58 2018 +0200
fix volunteers (#573)
[33mcommit f424ffc1213332db080914985dbe9d268d4332b3[m
Author: Artyom Katsap <[email protected]>
Date: Mon Jan 15 21:56:07 2018 +0200
[WIP] Search profile end point for volunteers module Fixes #529 (#530)
* removed odl apis added a new one
* fixed lint
* deleted tests
* added authentication
[33mcommit 4d785da17ef16e691b63c9a95b67960eef246c45[m
Author: Elad Lachmi <[email protected]>
Date: Mon Jan 15 21:37:57 2018 +0200
Update package.json
[33mcommit d8e7064a21284fad12f0a08a0a551538ec55d1ae[m
Author: Elad <[email protected]>
Date: Wed Jan 10 17:45:09 2018 +0200
Upgraded version of failing package
[33mcommit 060e056982a2a4c8776aadd8f7288d176d6cd2f9[m
Author: Elad Lachmi <[email protected]>
Date: Wed Jan 10 16:52:45 2018 +0200
Update package.json
Revert json2csv version
[33mcommit 3a2a5c4260a1ce7f36e7a3f59cc6ca695191fbed[m
Author: Elad Lachmi <[email protected]>
Date: Wed Jan 10 14:20:47 2018 +0200
Update package.json
Trigger redeploy
[33mcommit b183a933fcdc670109cbec41e2bacce3a6eaf09f[m
Merge: f93b28a ee85177
Author: Elad Lachmi <[email protected]>
Date: Tue Jan 9 21:42:46 2018 +0200
Merge pull request #568 from elad-lachmi/master
Export presale ticket emails to CSV
[33mcommit ee85177725f008fdde4e58997af737c46143463c[m
Author: Elad Lachmi <[email protected]>
Date: Tue Jan 9 21:30:30 2018 +0200
Fixed eslint error
[33mcommit ad086997998863dac729bcea3be652d1c8e69f51[m
Author: Elad Lachmi <[email protected]>
Date: Tue Jan 9 21:11:50 2018 +0200
Fixed json2csv call and some lite refactoring
[33mcommit cd5dc643fc494613cae1e9bc861f907542bf8de0[m
Merge: 7e6ae8d f93b28a
Author: nnakash <[email protected]>
Date: Tue Jan 9 00:24:07 2018 +0200
Merge branch 'master' into presale_tickets_csv
[33mcommit 7e6ae8dcaace13e3c73de77a0742fa15f7ab6800[m
Author: noy <[email protected]>
Date: Mon Jan 8 21:35:49 2018 +0200
presale ticket csv
[33mcommit 40532aa3957f7840470458f75511f54b1b18752c[m
Author: yanipo5 <[[email protected]]>
Date: Mon Jan 8 20:07:04 2018 +0200
noved dates check ito Modify_User_AddInfo func
[33mcommit f93b28adcfc515c952cdec35912342696aaeebf8[m
Merge: 2d0a38e ffaf00d
Author: Alex <[email protected]>
Date: Mon Jan 8 13:30:56 2018 +0200
Merge pull request #566 from Midburn/tag-v2-10-14
tagging v2.10.14 before release
[33mcommit ffaf00d97c0ad097abc000c4c8ff0a94cdb2d354[m
Author: Alex Motenko <[email protected]>
Date: Mon Jan 8 13:23:25 2018 +0200
tagging v2.10.14 before release
[33mcommit 2d0a38e0ff798127e22a00b286168b7c0a6082f1[m
Merge: 1ed85fd a74fc95
Author: guyzohar1 <[email protected]>
Date: Mon Jan 8 00:52:10 2018 +0200
Merge pull request #565 from Midburn/current_event_view
fix null view on pre sale tickets
[33mcommit a74fc95f7837104369e6073ddd24bc67f147ebca[m
Author: Guy Zohar <[email protected]>
Date: Mon Jan 8 00:46:05 2018 +0200
fix null view on pre sale tickets
[33mcommit 1ed85fd9e3478a6cd23c147900d70dc7f332c4c4[m
Author: Artyom Katsap <[email protected]>
Date: Mon Jan 8 00:30:33 2018 +0200
changed placeholder text (#564)
[33mcommit 55db53e1d82a11c3b136ecef67e7772879aaaf15[m
Merge: e4e05d5 5815ff6
Author: guyzohar1 <[email protected]>
Date: Mon Jan 8 00:19:39 2018 +0200
Merge pull request #563 from Midburn/current_event_view
View change for camps and camps members
[33mcommit 5815ff68640a0ee64a35a26c73c8172a8a3427da[m
Author: Guy Zohar <[email protected]>
Date: Mon Jan 8 00:13:01 2018 +0200
View change for camps and camps members
[33mcommit e4e05d51660a5be70d929e1e24039ed9f480f959[m
Merge: 414c207 9f76e64
Author: Elad Lachmi <[email protected]>
Date: Sun Jan 7 22:56:57 2018 +0200
Merge pull request #562 from elad-lachmi/master
Email will now be shown to the camp manager
[33mcommit 9f76e642425fad4e5fed656c221ed041a9a37c19[m
Author: Elad Lachmi <[email protected]>
Date: Sun Jan 7 21:55:46 2018 +0200
- Email will now be shown to the camp manager
- Fixed SQL error
[33mcommit e188239e6a6b242feba2fdab27d62c96ea5cf28b[m
Author: yanipo5 <[[email protected]]>
Date: Sat Jan 6 11:09:23 2018 +0200
events form - presale allocation dates
[33mcommit 414c207c644ba9b4b68b3d76ccb31b33848d4caa[m
Author: Ori Hoch <[email protected]>
Date: Sun Jan 7 13:11:07 2018 +0200
.travis
[33mcommit 293c4af620b33684c40e2a77c7e14787b12396f7[m
Merge: f1c74a0 f7fb0d9
Author: Alex <[email protected]>
Date: Sun Jan 7 13:02:24 2018 +0200
Merge pull request #558 from Midburn/bumping-to-v2.10.13
Bumping version to v2.10.13
[33mcommit f7fb0d909c02a64ffea84b4c2241d7237157f86d[m
Author: Alex <[email protected]>
Date: Sun Jan 7 12:57:49 2018 +0200
Bumping version to v2.10.13
[33mcommit f1c74a0bd69ebe5e66afc801e4b7133506c832d8[m
Author: Ori Hoch <[email protected]>
Date: Sun Jan 7 12:49:51 2018 +0200
speed up the docker build
[33mcommit 9f9f119d9312f5055f5d676ef42db31ffde54806[m
Merge: df72386 6de5173
Author: Alex <[email protected]>
Date: Sun Jan 7 12:31:30 2018 +0200
Merge pull request #557 from Midburn/alex-fix-user-group-membership-migration
Fix user group membership migration
[33mcommit 6de5173ca12c9f0960a91237045d0f97fd72f7fe[m
Author: Alex Motenko <[email protected]>
Date: Sun Jan 7 12:25:32 2018 +0200
bumping version to 2.10.12
[33mcommit df7238629232251472e30c27ebf865cc9284988e[m
Author: Ori Hoch <[email protected]>
Date: Sun Jan 7 12:23:35 2018 +0200
added cloudbuild + fix deployment of migrations
[33mcommit 925795d566484aa2bb17296bd3473dc6c9a17f73[m
Author: Alex Motenko <[email protected]>
Date: Sun Jan 7 11:59:03 2018 +0200
adding a check against existence of status column in users_group_membership for prod env
[33mcommit 4a308712f9095e9beea21cc8a3d768fb69f3a6a3[m
Author: Ori Hoch <[email protected]>
Date: Sun Jan 7 11:44:38 2018 +0200
.travis
[33mcommit 04c58d4303440fa843f2d06b04a0cb9d028f5f0c[m
Author: Ori Hoch <[email protected]>
Date: Sun Jan 7 11:35:28 2018 +0200
.travis
[33mcommit cbf1fcae75389ed2fe763ae0cc911304d2ef1c27[m
Author: Ori Hoch <[email protected]>
Date: Sun Jan 7 11:31:45 2018 +0200
.travis
[33mcommit 1e28fd721dcf030712fbae1e443c777bc0f6c62b[m
Author: Ori Hoch <[email protected]>
Date: Sun Jan 7 10:58:28 2018 +0200
wait for deployment to complete + show logs while waiting
[33mcommit 30b91d08f342e4c766e4a7c2b8ceb8641eef9542[m
Author: Ori Hoch <[email protected]>
Date: Sun Jan 7 08:51:13 2018 +0200
bump to 2.10.11
[33mcommit 14b08940a6ef9d761f2d7dcf608b5ffb96169c2a[m
Merge: 32ac83c 882e23d
Author: guyzohar1 <[email protected]>
Date: Sat Jan 6 19:29:58 2018 +0200
Merge pull request #551 from Midburn/current_event_view
Setting real dates for pre sale
[33mcommit 882e23dafb790581a01100fe4c3fef516eb846e4[m
Author: Guy Zohar <[email protected]>
Date: Sat Jan 6 19:20:00 2018 +0200
Setting real dates fro pre sale
[33mcommit 32ac83cce2b0a7522d4402c0a17417ec20842709[m
Author: Ori Hoch <[email protected]>
Date: Sat Jan 6 19:01:02 2018 +0200
.travis
[33mcommit 89aa4ba71fd5d77adca06d1c8f51db1376740979[m
Author: Ori Hoch <[email protected]>
Date: Sat Jan 6 18:41:11 2018 +0200
.travis
[33mcommit dcc7ebbb2f0eb215d6b4a76c3e1d6742387773ae[m
Author: Ori Hoch <[email protected]>
Date: Sat Jan 6 18:28:41 2018 +0200
bump version to 2.10.9
[33mcommit 2cb9a3522249c579b85586c0290d0ee58abb4fac[m
Author: Ori Hoch <[email protected]>
Date: Sat Jan 6 18:27:01 2018 +0200
deploy to production on master branch tags (publish release in github)
[33mcommit 55fc8c7bc96700ae1f28c4c718d837c07b9a51fd[m
Author: Ori Hoch <[email protected]>
Date: Sat Jan 6 17:57:41 2018 +0200
.travis
[33mcommit 54e93564067ef374266bc2e9ac666b43ddf8979c[m
Author: Ori Hoch <[email protected]>
Date: Sat Jan 6 17:45:29 2018 +0200
.travis
[33mcommit 717ff5c2347a139055467a6d255d3f9f8fa00d97[m
Author: Ori Hoch <[email protected]>
Date: Sat Jan 6 17:23:52 2018 +0200
.travis
[33mcommit ff7015f62d791c5dd75cd9fdee162aa2d39c4547[m
Author: Ori Hoch <[email protected]>
Date: Sat Jan 6 16:51:44 2018 +0200
.travis
[33mcommit 42f4935594626ff2afd8c07c85cae1abb79b3e6c[m
Author: Ori Hoch <[email protected]>
Date: Sat Jan 6 16:49:02 2018 +0200
.travis
[33mcommit bfd5e2d385090a5e710659cdf82484911a18d8ef[m
Author: Ori Hoch <[email protected]>
Date: Sat Jan 6 16:43:30 2018 +0200
.travis
[33mcommit e65a2dbcf943d979d81040c163f98b7131dce18f[m
Author: Ori Hoch <[email protected]>
Date: Sat Jan 6 16:41:37 2018 +0200
.travis
[33mcommit a27515041a2ed4ae7c9783f089f537c3dad8b782[m
Author: Ori Hoch <[email protected]>
Date: Sat Jan 6 16:39:05 2018 +0200
update continuous deployment for production
[33mcommit 8c3dcf55be751e0e0433b00b23327fce1119810f[m
Author: Ori Hoch <[email protected]>
Date: Sat Jan 6 16:15:03 2018 +0200
allow to link to a specific release url
[33mcommit ad1fe549e5477030937e5ff9b7ab70d3f76ed185[m
Merge: 4da017a ee74ebb
Author: guyzohar1 <[email protected]>
Date: Sat Jan 6 15:13:24 2018 +0200
Merge pull request #548 from Midburn/current_event_view
Add new column status to users_groups_memberships
[33mcommit ee74ebb942fe0f1d4170fb9ee1ae3f76f218f9aa[m
Author: Guy Zohar <[email protected]>
Date: Sat Jan 6 15:06:55 2018 +0200
Add new column status to users_groups_memberships
[33mcommit 4da017ab8c2b4d17b28a280f6796f3d5bcaa58b3[m
Merge: c5ef8a2 7e8281d
Author: guyzohar1 <[email protected]>
Date: Sat Jan 6 13:01:46 2018 +0200
Merge pull request #547 from Midburn/current_event_view
Fix for reject/update user in camp
[33mcommit 7e8281d99bf9741847e83ee58c983051aa042a45[m
Author: Guy Zohar <[email protected]>
Date: Sat Jan 6 12:53:35 2018 +0200
Fix for reject/update user in camp
[33mcommit c5ef8a20781a970d70d9a1c57ff36e5bf099c798[m
Merge: 3bd16f0 d76abcf
Author: guyzohar1 <[email protected]>
Date: Sat Jan 6 12:31:48 2018 +0200
Merge pull request #546 from Midburn/current_event_view
open event id change for all users
[33mcommit d76abcf376aeca3a651ec66b2bffa21d01262f85[m
Author: Guy Zohar <[email protected]>
Date: Sat Jan 6 12:18:51 2018 +0200
open event id change for all users
[33mcommit 3bd16f04e4ebacd54e65f483e584ea7a30bac82e[m
Author: Artyom Katsap <[email protected]>
Date: Fri Jan 5 19:45:20 2018 +0200
removed the camp prototype constraint (#544)
[33mcommit 60c8bcf586f929a9bb774d60f5fadcd4eb1db6ec[m
Merge: 02d5dd1 9c02a95
Author: guyzohar1 <[email protected]>
Date: Fri Jan 5 19:13:28 2018 +0200
Merge pull request #542 from Midburn/current_event_view
fix for camp current event id
[33mcommit 9c02a95872048ebb043b9cf5984be420f1778d40[m
Author: Guy Zohar <[email protected]>
Date: Fri Jan 5 18:54:40 2018 +0200
fix for camp current event id
[33mcommit 02d5dd182a0794c652db95ea4394d2fdeb2059ec[m
Merge: f0038d4 9bc9268
Author: guyzohar1 <[email protected]>
Date: Fri Jan 5 18:24:18 2018 +0200
Merge pull request #540 from Midburn/current_event_view
fix for addimg new member to camp
[33mcommit 9bc92682e711c2c5c47eb3d95391e68f67f93339[m
Author: Guy Zohar <[email protected]>
Date: Fri Jan 5 18:17:47 2018 +0200
fix for addimg new member to camp
[33mcommit f0038d49d999029c21524d0815c7df7c63220cf0[m
Author: Artyom Katsap <[email protected]>
Date: Fri Jan 5 17:05:28 2018 +0200
update art installation managers roles (#533)
* initial commit
* added setting manager as main_contact in camps
* remove data
[33mcommit 0a1df60a00a48f3874f3a98baea92c17a9641998[m
Merge: 7ac45a9 a505161
Author: guyzohar1 <[email protected]>
Date: Fri Jan 5 16:55:24 2018 +0200
Merge pull request #535 from Midburn/current_event_view
fix: bug- as a admin, i can't enter and view a camp #534
[33mcommit a505161bc23a594efae713ed43f2d2fc9e8ad8a3[m
Author: Guy Zohar <[email protected]>
Date: Fri Jan 5 15:44:22 2018 +0200
fix: bug- as a admin, i can't enter and view a camp #534
[33mcommit 7ac45a94667d9ce2c96beac771d0c4dfbb089029[m
Author: Elad Lachmi <[email protected]>
Date: Tue Jan 2 00:43:29 2018 +0200
Update .travis.yml
[33mcommit e8e57a8581a207fdc8867ebafb2587d1a144c212[m
Author: Elad Lachmi <[email protected]>
Date: Mon Jan 1 22:57:27 2018 +0200
Update .travis.yml
[33mcommit 9b5eb06322a85690bb1b3b5f6ed761536533f344[m
Author: Elad Lachmi <[email protected]>
Date: Mon Jan 1 22:55:19 2018 +0200
Update .travis.yml
[33mcommit f026a18d673dbfef9c9a6b5686d4274e5b6feb6d[m
Merge: e33bcf7 6230b7b
Author: Elad Lachmi <[email protected]>
Date: Mon Jan 1 22:51:13 2018 +0200
Merge pull request #532 from elad-lachmi/master
Fix for bash in yml
[33mcommit 6230b7b3b1fb27d650c4246a8215e7e14f1697a1[m
Merge: 9bc4f4a d24ef14
Author: Elad Lachmi <[email protected]>
Date: Mon Jan 1 22:50:09 2018 +0200
Merge branch 'feature/opbeat-travis'
[33mcommit d24ef14094943980c21e25fa9830d299fec37d86[m
Author: Elad Lachmi <[email protected]>
Date: Mon Jan 1 22:49:35 2018 +0200
yml fix
[33mcommit e33bcf7e2338dee80abfc82647839feaf48ffba0[m
Merge: c25e600 9bc4f4a
Author: Elad Lachmi <[email protected]>
Date: Mon Jan 1 22:44:01 2018 +0200
Merge pull request #531 from elad-lachmi/master
Added opbeat notification to travis post deploy
[33mcommit 9bc4f4ad9753fa7c245926a0a445e8c6da533586[m
Merge: c25e600 bc72e7e
Author: Elad Lachmi <[email protected]>
Date: Mon Jan 1 22:41:39 2018 +0200
Merge branch 'feature/opbeat-travis'
[33mcommit bc72e7e942f62947ca5c321ab405c5e89dd58dbd[m
Author: Elad Lachmi <[email protected]>
Date: Mon Jan 1 22:38:23 2018 +0200
Added opbeat notify to travis build
[33mcommit c25e6008aba5e6aed9efc0dab6271eab69594b24[m
Merge: 69a33c8 13ed5cc
Author: guyzohar1 <[email protected]>
Date: Mon Jan 1 21:58:35 2018 +0200
Merge pull request #524 from Midburn/current_event_view
Adding new dynamic event id that is selected by the user for admins a…
[33mcommit 13ed5ccef9502ba2f4b2c9e25b126c4bd8af04f6[m
Author: Guy Zohar <[email protected]>
Date: Mon Jan 1 21:47:31 2018 +0200
Yarn + fix for current event id
[33mcommit 23f441129c38cd28c591c4be2181163ceb2779fc[m
Merge: 69a33c8 2892891
Author: Guy Zohar <[email protected]>
Date: Mon Jan 1 21:12:53 2018 +0200
Merge branch 'current_event_view' of github.com:Midburn/spark into current_event_view
[33mcommit 69a33c8848a6477f0c5b1b86df3dbdf5c94cbab4[m
Author: Ori Hoch <[email protected]>
Date: Thu Dec 28 16:31:28 2017 +0200
staging environment / k8s / continuous deployment (#526)
[33mcommit 289289148c60bd35919cd2eecf7314ba5127e758[m
Merge: 57fb2a5 7a4abc7
Author: guyzohar1 <[email protected]>
Date: Wed Dec 27 17:37:06 2017 +0200
Merge branch 'master' into current_event_view
[33mcommit 57fb2a5ef0ab289f070ec831715becf490e4a8ea[m
Merge: 7044b03 486509b
Author: guyzohar1 <[email protected]>
Date: Wed Dec 27 01:57:02 2017 +0200
Adding new dynamic event id that is selected by the user
[33mcommit 7a4abc7a9fbae911e57e5f59186e5687a15680a0[m
Merge: 7044b03 486509b
Author: guyzohar1 <[email protected]>
Date: Wed Dec 27 01:57:02 2017 +0200
Merge pull request #513 from Midburn/pre_sale_tickets
presale tickets edit on main pageadd time check
[33mcommit 7044b0368bbf624a0779694d7982a4859cbb1608[m
Author: Ori Hoch <[email protected]>
Date: Tue Dec 26 15:43:23 2017 +0200
added support for setting the login staging message - to allow showing version / other information regarding the staging environment (#523)
[33mcommit ed38afdfe3418f7dbb39d5df9d8cb5a0dfd3ce0c[m
Author: Ori Hoch <[email protected]>
Date: Tue Dec 26 13:09:57 2017 +0200
upgrade to node 8 and yarn, added docker and continuous deployment to the midburn-k8s staging environment (#521)
* upgrade to latest node 8, switch to yarn, add docker, docker compose
* prepopulate the DB for the docker-compose environment
* fix tests for node and dependencies upgrade
* kubernetize - integrate with midburn-k8s environment
* continuous deployment
[33mcommit fd48ed14377cef2d78d9ab6dad1a75c303270fd9[m
Merge: cc15b6f 9e05c07
Author: Yaniv Peretz <[email protected]>
Date: Fri Dec 22 19:32:00 2017 +0200
Merge pull request #522 from Midburn/migration-event-ext_id-toString
events.ext_id_event_id to String
[33mcommit 9e05c07cb255617a0d5a9b52c2d5f614f25b58b3[m
Author: yanipo5 <[[email protected]]>
Date: Fri Dec 22 19:25:54 2017 +0200
events.ext_id_event_id to String
[33mcommit 486509b6221576012a1441f26f54df29be63693f[m
Author: Guy Zohar <[email protected]>
Date: Sun Dec 17 22:02:32 2017 +0200
presale tickets edit on main page + add time check
[33mcommit cc15b6f217d5b9d3491b4d40906234f9f6f13d11[m
Author: yanipo5 <[[email protected]]>
Date: Tue Dec 19 16:09:35 2017 +0200
redundancies
[33mcommit 7d8090f7df40f43ff2f282aacfda9d46243a126d[m
Author: yanipo5 <[[email protected]]>
Date: Tue Dec 19 15:14:18 2017 +0200
event start date lock handler
[33mcommit 0a9b1650ee6c4de8047a77654dfdf68006634604[m
Merge: 599752b b2c1e38
Author: Yaniv Peretz <[email protected]>
Date: Tue Dec 19 14:33:03 2017 +0200
Merge pull request #520 from Midburn/event-dates
Event dates & checkbox and name
[33mcommit b2c1e380b9dfaa67558e5b0569c2536b42f692f3[m
Author: yanipo5 <[[email protected]]>
Date: Tue Dec 19 14:30:04 2017 +0200
travis fixer
[33mcommit 2cee1fdf1391314baf12976f6f9fc3e6c52419d2[m
Author: yanipo5 <[[email protected]]>
Date: Tue Dec 19 14:11:56 2017 +0200
fix event name
[33mcommit 2372f17c64f83a7cf8f14bc8a3b28de0ef874fb8[m
Author: yanipo5 <[[email protected]]>
Date: Tue Dec 19 13:56:32 2017 +0200
fix name
[33mcommit 599752bf298780baea03083c11b36f1b29d79e46[m
Merge: 19ab7b9 2545394
Author: Yaniv Peretz <[email protected]>
Date: Tue Dec 19 13:41:06 2017 +0200
Merge pull request #519 from Midburn/event-dates
fixer for dates and checkbox
[33mcommit 2545394f6a1ea62ca18f50105bf5eef10e2e2807[m
Author: yanipo5 <[[email protected]]>
Date: Tue Dec 19 13:33:56 2017 +0200
fixer for checkbox
[33mcommit b989f717707d03584c55296939ecac41564ceec2[m
Author: yanipo5 <[[email protected]]>
Date: Tue Dec 19 13:30:58 2017 +0200
fixer for dates and checkbox
[33mcommit 19ab7b97c97be98ed2a3973cca4115f75c2a9983[m
Merge: a1c3d44 080e974
Author: Yaniv Peretz <[email protected]>
Date: Tue Dec 19 13:10:37 2017 +0200
Merge pull request #518 from Midburn/update-event-function
Update event function
[33mcommit 080e974f7c11a36315c46d7b3f874855018725de[m
Author: yanipo5 <[[email protected]]>
Date: Tue Dec 19 12:56:18 2017 +0200
passing json
[33mcommit 14b64ae09b4522cf70e4df97258311d6931a65da[m
Author: yanipo5 <[[email protected]]>
Date: Tue Dec 19 12:35:04 2017 +0200
updates addiitional info json
[33mcommit a1c3d443ffff90aa94955a8fd7b7eb03b3cea6e7[m
Merge: 7ccf722 f3d2e27
Author: Elad Lachmi <[email protected]>
Date: Tue Dec 19 03:00:42 2017 +0200
Merge pull request #517 from elad-lachmi/master
Opbeat integration
[33mcommit f3d2e279a8e55062b799345e7e3b94ea815f636a[m
Author: Elad <[email protected]>
Date: Sat Dec 2 12:50:20 2017 +0200
Opbeat integration
Added prod flag and moved credentials to env file
[33mcommit 7ccf722a7bab99a3ba5d890a91ff25bc94fd889d[m
Merge: 69900aa d414c21
Author: Elad Lachmi <[email protected]>
Date: Tue Dec 19 02:29:55 2017 +0200
Merge pull request #516 from elad-lachmi/master
Changed S3 lib to ES6 class
[33mcommit d414c2121fa89cf987b7f6bc32aed384a6df7b91[m
Author: Elad <[email protected]>
Date: Sat Dec 2 12:26:41 2017 +0200
Changed S3 lib to ES6 class
[33mcommit 4da3ba00e1c5d6d97b75e736b7f567f3db6d343f[m
Author: yanipo5 <[[email protected]]>
Date: Mon Dec 18 23:03:18 2017 +0200
update event function
[33mcommit 69900aa66a1a32acc48116fa9fd7d31a5a0bd2ad[m
Merge: 076b08c b667445
Author: Yaniv Peretz <[email protected]>
Date: Mon Dec 18 21:46:31 2017 +0200
Merge pull request #514 from Midburn/event-page
added 2 inputs, and styles finishers
[33mcommit b66744542bd6d144181fd6863caba84b11207cf7[m
Author: yanipo5 <[[email protected]]>
Date: Mon Dec 18 21:39:01 2017 +0200
added 2 inputs, and styles finishers
[33mcommit 076b08ceb89cdadf7e3ed9673e7821b410d32959[m
Merge: 7e22de1 3c9dd3a
Author: guyzohar1 <[email protected]>
Date: Tue Dec 12 00:11:51 2017 +0200
Merge pull request #508 from Midburn/pre_sale_tickets
pre sale tickets changes
[33mcommit 3c9dd3a19ad16a7c92f3a281b80492395fcbb65c[m
Author: Guy Zohar <[email protected]>
Date: Mon Dec 11 23:44:57 2017 +0200
Bug fix doc type
[33mcommit 936e439ef480e97fec96ea479a11fdee686ae555[m
Author: Guy Zohar <[email protected]>
Date: Sat Dec 9 18:23:09 2017 +0200
Adding some cosmetics
[33mcommit 69e0443d53f8235035a3b0d6247543accc21f25d[m
Author: Guy Zohar <[email protected]>
Date: Sat Dec 2 18:26:55 2017 +0200
Setting back event ID to 2018(changed by accident)
[33mcommit 4c869d2ecd2a5886070fdefeca274552141662c2[m
Author: Guy Zohar <[email protected]>
Date: Sat Dec 2 18:13:18 2017 +0200
Adding configurable entrance quota for admins
[33mcommit 289f38b133e7447c873d8cc891bd7367b7d933d0[m
Author: Guy Zohar <[email protected]>
Date: Wed Nov 29 21:38:56 2017 +0200
pre sale tickets changes
[33mcommit 7e22de1db1e057287bd06e09240a373f99703e83[m
Author: Elad Lachmi <[email protected]>
Date: Mon Dec 11 21:49:35 2017 +0200
Server-side implementation for #79 (#506)
* [WIP] Adding S3 upload and server-side handling
* Added save to DB using Bookshelf
* Cleanup
* Added seeding for the Midburn 2018 event
* Added GET method
[33mcommit 808c0f194f9efa11e13d29ace1bfac971b6b1db6[m
Merge: 3b266ce 6c9ba59
Author: alechko <[email protected]>
Date: Mon Dec 11 08:59:43 2017 +0000
Merge pull request #491 from alechko/master
update real hostname if setup other then localhost
[33mcommit 6c9ba5915910d01dc84c5982035856756e246c18[m
Merge: d3f9b35 3b266ce
Author: alechko <[email protected]>
Date: Mon Dec 11 07:50:45 2017 +0000
Merge branch 'master' of https://github.com/Midburn/Spark
[33mcommit 3b266cefa49a5fb99eeae6b22b3a820399b413d8[m
Merge: 6fe287e c8b4abd
Author: Artyom Katsap <[email protected]>
Date: Fri Dec 8 14:41:00 2017 +0200
Merge pull request #502 from ArtyomKa/fix_api_routes
Basic Implementation of save Event
[33mcommit c8b4abd4b3d6d4fd1d8f1b5bcd6673915c07ab6a[m
Author: Artyom Katsap <[email protected]>
Date: Sat Dec 2 19:46:40 2017 +0200
extracted more fields from the form
[33mcommit 7c49c3641a542d7b1470a369ecc4b3fdabfb9118[m
Author: Artyom Katsap <[email protected]>
Date: Wed Nov 29 23:11:13 2017 +0200
Initial implementaion on save
[33mcommit 6fe287eb5c5094dc7e20356c4341b20e0a51d0fd[m
Merge: 69ab460 70033e8
Author: Lior Kaplan <[email protected]>
Date: Fri Dec 8 13:30:28 2017 +0200
Merge pull request #511 from Midburn/snyk-fix-0ad67263
[Snyk] Fix for 6 vulnerable dependency paths
[33mcommit 70033e81844a48bad9649be9e2ac238a93523ff5[m
Author: snyk-bot <[email protected]>
Date: Wed Dec 6 09:20:12 2017 +0000
fix: package.json & .snyk to reduce vulnerabilities
The following vulnerabilities are fixed with a Snyk patch:
- https://snyk.io/vuln/npm:minimatch:20160620
- https://snyk.io/vuln/npm:uglify-js:20151024
The following vulnerabilities are ignored:
- https://snyk.io/vuln/npm:mime:20170907
- https://snyk.io/vuln/npm:tunnel-agent:20170305
Latest report for midburn/spark:
https://snyk.io/test/github/midburn/spark
Some vulnerabilities weren't fixed or ignored, and so will still fail
the Snyk test report.
[33mcommit 69ab4604d75bee2b46575c9b53678917380ffb28[m
Merge: 942e8e3 b1a060a
Author: Yaniv Peretz <[email protected]>
Date: Sun Dec 3 17:24:56 2017 +0200
Merge pull request #510 from Midburn/event-title-cleanups
Event title cleanups and removal of dead comments
[33mcommit b1a060adb8ee8f5538b5e6496400b2d95bd998be[m
Author: yanipo5 <[[email protected]]>
Date: Sun Dec 3 17:20:48 2017 +0200
remove dead comments
[33mcommit c9105f025548c1d3ea15d364a73ec40e220c5668[m
Author: yanipo5 <[[email protected]]>
Date: Sun Dec 3 17:20:30 2017 +0200
fixed event page title
[33mcommit 942e8e3c36cc0873dedcdb4debf0a5d15ad116a1[m
Merge: a066d8e 2204848
Author: Yaniv Peretz <[email protected]>
Date: Sun Dec 3 16:45:25 2017 +0200
Merge pull request #509 from Midburn/event-url
fix url and object mapping
[33mcommit 220484865fdd74b0f736e7861c667b76538fc909[m
Author: yanipo5 <[[email protected]]>
Date: Sun Dec 3 16:38:10 2017 +0200
fix url and object mapping
[33mcommit a066d8e05c4b0dd657d03996d7cefc007fad1fa8[m
Merge: fca04d5 78986e2
Author: Yaniv Peretz <[email protected]>
Date: Thu Nov 30 16:54:05 2017 +0200
Merge pull request #505 from Midburn/new-event-close-button
fixed close button on new/edit event
[33mcommit 78986e2e1d93190f194b08ef50fea5c170ea6f99[m