Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Asi 09 04 changes #261

Merged
merged 193 commits into from
Apr 10, 2017
Merged

Asi 09 04 changes #261

merged 193 commits into from
Apr 10, 2017

Conversation

asihud
Copy link
Contributor

@asihud asihud commented Apr 9, 2017

Fixes: …

  1. Date format is changed to suit mysql format.
  2. Now we receiving ticket information
  3. Bug fix of join camp. very critical!
  4. spark link to support page fixed
  5. added birth_date, and showing camp info on whoami only if approved
  6. on members in camps, we can see the total tickets of camp.

Asaf Azulay and others added 30 commits March 19, 2017 09:35
last commit
eb204b4
latest check
ced9340
new db migrations and updated passport
d57eff4
@netanelben
login with drupal support
4fce166
@netanelben
add the rest, and lint
5d00fa4
GUI changes
4079b26
@LeonFedotov
merge master
fe3276d
@LeonFedotov
Merge branch 'master' into passport_login_with_drupal
9d2738f
@LeonFedotov
not sure how does res reach here
8be271b
@LeonFedotov
that cache again
0eb6ec9
@LeonFedotov
cleanup
04a6f7a
@LeonFedotov
remove code duplication
a99bdee
@LeonFedotov
fix lint
a49b7f4
@LeonFedotov
adding error handling
036773a
@LeonFedotov
pass the error handling on
05d42d6
@natekonimbo
Merge branch 'master' into passport_login_with_drupal
74899de
commit changes
c27fd48
Merge branch 'Midburn-master'
1aa5148
fixed constants.js
823d2ad
@asihud
Merge pull request #22 from Midburn/master
253889c 
my pool request
@LeonFedotov
tmp disable travis cache for node_modules
7a9e785
@asihud
Update passport.js
bf651e1
@LeonFedotov
update to latest
9f55ccc
@asihud
Merge branch 'master' into passport_login_with_drupal
d3b417a
@asihud
Merge pull request #23 from Midburn/passport_login_with_drupal
a53c4a0 
Passport login with drupal
@LeonFedotov
adding test special case
0b3120d
@LeonFedotov
no yoda notation for me T_T
a811430
@LeonFedotov
Update main_routes.test.js
8195294
dddd
c527eb2
Merge branch 'master' of https:/asihud/Spark
c39d2ab
Asaf Azulay and others added 19 commits April 8, 2017 12:11
update from master
0a21666
lint
0fd9cf8
fixed mail delivery to join request
ba3979c
Merge branch 'master' into asi-07-04-changes_1
8972a2d
lint
d90dbed
Merge branch 'asi-07-04-changes_1' of https:/Midburn/Spark …
35e6113 
…into asi-07-04-changes_1
refactoring edit + new, to fix foreign key, and adding fields to edit…
47de874 
… only for admin
fixed add new camp, and adding default member.
42580a6 
todo:
after success update, forward to edit camp
check if camp_name hebrew + english are not empty
change selection of camp manager to be select2 input
@asihud
Merge branch 'master' into asi-08-04-changes
99339db
lint
3b43627
Merge branch 'asi-08-04-changes' of https:/Midburn/Spark …
83fcb13 
…into asi-08-04-changes
lint
d8f97a3
lint
967e94f
lint fixes
f5d9693
Merge branch 'asi-08-04-changes' of https:/Midburn/Spark …
1846911 
…into asi-08-04-changes
lint
aa4c7e5
latest fixes
86a53da
Merge branch 'master' of https:/Midburn/Spark into asi-08…
c25f989 
…-04-changes
Fixes:
2dd13cd 
1. Date format is changed to suit mysql format.
2. Now we receiving ticket information
3. Bug fix of join camp
4. spark link to support page fixed
5. added birth_date, and showing camp info on whoami only if approved
@asihud asihud mentioned this pull request Apr 9, 2017
Closed
@asihud asihud mentioned this pull request Apr 9, 2017
Closed
@asihud asihud merged commit 66d24da into master Apr 10, 2017
@asihud asihud deleted the asi-09-04-changes branch April 11, 2017 17:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@asihud @netanelben @LeonFedotov @natekonimbo @guywarburg