Asi 23 04 camps add more managers #336
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
my pool request
Passport login with drupal
…-04-bug-fixes
…into asi-15-04-bug-fixes
…-04-bug-fixes
…-04A-camps-bug-fixes
…-04A-camps-bug-fixes
…-04B-camps-bug-fixes
noam-almog
pushed a commit
that referenced
this pull request
Apr 26, 2017
* last commit * latest check * new db migrations and updated passport * login with drupal support * add the rest, and lint * GUI changes * not sure how does res reach here * that cache again * cleanup * remove code duplication * fix lint * adding error handling * pass the error handling on * fixed constants.js * tmp disable travis cache for node_modules * Update passport.js * update to latest * adding test special case * no yoda notation for me T_T * Update main_routes.test.js * dddd * update test-user and raise timeout * update test-user and omit some test logic to adjust to new bizlogic of login * changed the test user no need for mock anymore * remove underscore * updated imported csv to new members_camp * commit changes * d * fixed the validated sign * some fixes, adding the EVENT_ID * removed the campDetails from all places. fixed one insert and update. update on new camp the event_id * fix for eslint * fixes * fixed for eslint * local commit * added enabled status * refine * Merge branch 'master' of https:/Midburn/Spark * camps route fix * Revert "camps route fix" This reverts commit d926484. * basic members implementation * bug fix * add member form * removed unnecessary function call * fixed several small issues, with getUserCamps functions, moving the functionality from API to the User model. * fixed several small issues, with getUserCamps functions, moving the functionality from API to the User model. * manually loaded api_camps_route * test * fix * sdfsadf * change activity time to multi select * lilach location fixes * improve contact person dropdown display * facebook link size fix * data validation * lint * Changed the API commands for join & join_deliver to work with the model commands. * fix lint issues * added option to remove approve new members * lint * fixed some bugs with getUserCamps and fix security issues. * ui fixes * commit passport + approve * ddd * changes * join camp is according to lang * FB link doesn't get too long * translation fixes * added approve join request btn * added email templates * comit local changes * changes of field names for members * typo fix * updated the join camp flow, and tested * lint shit * lint shit * fixes the join system, and several bug fix * lint shit * finalized the join flow several bug was removed. still having angular issue, need to be found. * removed junk * lint * fixes issues before production, also import bugs. * show contact information good * d * changes for lint * small issues * fixed the cancel user request fixed some small security issues with users removed automatic fetch from camps_v2 added language string for all status code. * lint shit * Introduced the camp __prototype to use for other camp types. fixed the camp_location_area * fixing all hebrew titles fixed who am i introduced the camp_type schema * lint shit * changes * fixes split issue * template api_gate * fixed the members add, for admin show all camps * lint * fixed mail delivery to join request * lint * refactoring edit + new, to fix foreign key, and adding fields to edit only for admin * fixed add new camp, and adding default member. 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 * lint * lint * lint * lint fixes * lint * latest fixes * Fixes: 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 * lint * trying to fix the tests * travis * Update admin_routes.test.js * ffff * remved problem tests * fixed a lot of GUI stuff: 1. Dispaly of camp desc will show also linking URL. 2. Display of camp desc will show in the formatted text. 3. Updated translation strings, where was default 4. on members list, changed buttons with description instead of just icons. * eslint * added camp_manager, camp information to email * fixed NPO form, to include english * Issue #278 Issue #277 * Add 1st sanity test * Rename npm target * Add pending test for 'forgot password' page * Fixed MIDBURN2017 Tickets type on constants * refactor emailValidate function to the common * Fixing of all emails, with the info inside. * API Gate route fixes * lint * fixing small bugs with gui * lint check * updated package.json version * v2.2.2 * fix to show on camps_open api, all camps * fix to show on camps-index published with active status. * fix join_request showing cancel request in english * changed the admin table * commit * passport fix for null user password * fixed passport null issue * fixed options to set more than one manager. * space missing on members_table.jade * fixed mail problem when name field is empty!
ghost
mentioned this pull request
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
bug with mail for new campers, not sending join notification mail.
space missing on members.jade