continuous deployment for api-refactor-feb-2018 #770
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
OriHoch
changed the title
OriHoch
added a commit
that referenced
this pull request
Mar 13, 2018
shaniqwa
added a commit
that referenced
this pull request
Mar 23, 2018
* midburn/master: fix camp selection content (#782) continuous deployment from api-refactor-feb-2018 to sparktesting environment (#770) enable continuous deployment for spark-drupal-sync (#763) Sorting using ng-repeat filter sortBy (#741) Tagging v2.10.30 Update package.json fixed incorrect tickets number displayed (#739) Fixed for unsynced tickets (#737) Fixed code in free text in the camp page (#713) (#736) Fix ticket sync from Drupal (#734) Tagging v2.10.27 update docs for import pre sale ticket allocations (#732) Ui style improvment and fixes (#733) Ui Bugs fixed: #708, #710, #711, #712 (#726) bumping version to v2.10.26 Bundle IDs should be int, not string (#729) Added correct bundle IDs for 2018 sale (#727) # Conflicts: # public/stylesheets/_camps.scss # public/stylesheets/_colors.scss # public/stylesheets/main.scss # views/includes/page.jade # views/pages/camps/index_user.jade
NitayRabi
added a commit
that referenced
this pull request
Apr 5, 2018
* Adding new supplier table * test * adding new relations table * adding suppliers locals * Adding new supplier table * test * adding new relations table * Adding suppliers routes * Move utility function in api_camps_routes to services. Fix linting Replace vars with const and let. * Initial structure (using routers and controllers) * Adding all routes to suppliers * Refactor api_camp_routes Refactor api_events_routes * Refactor api_routes (auth) * Refactor public camp routes * Fix an error in jade file Connect new API router to main app. * Add comments to index * Fix 404 redirect * Truly fix 404 * Add S3 changes to new refactored api * Fix lint * suppliers routes,controllers,and views added. TODO: connect suppliers to camps, and fix lang support * Merge fixs * suppliers are now connected to camps, unnecessary files deleted * language support added, and new supplier view fixed * duplicate camp bug fixed, and some unused code removed * Add DGS date columns to admin edit (GUI only) * Add DGS column to camps. Add DGS column to admin camps management table. Add disabled logic (for both quota columns). E2E - add dates to event, see the column is not disabled, add dgs tickets. * Handle dates in event editing * Add separation in camp edit statistics between ticket types Fix counts of statistics (total in camps, allocated, allocated by ticket etc...) Add dgs to B.E. Validate adding tickets and removing tickets * Fix counts * Fix lint * Initial work on camp edit disabling * suppliers management active button fixed * Implement disabling camp-manager page * Handle no event rules found (fix test) * continuous deployment from api-refactor-feb-2018 to sparktesting environment (#770) * Merge DGS changes * Merge suppliers * Fix Lint Fix Merge * Fix lint * Restructure suppliers to fit master * Merge fixs * Merge fixs * Fix JSON * Fix `edit.jade` Fix seeder spread operator Fix adding members Fix Event editing * Merge branch 'api-refactor-feb-2018' of https://github.com/Midburn/Spark into api-refactor-feb-2018 # Conflicts: # views/pages/home.jade * Change deployment rules
guyzohar1
pushed a commit
that referenced
this pull request
Apr 9, 2018
* Move utility function in api_camps_routes to services. Fix linting Replace vars with const and let. * Initial structure (using routers and controllers) * Refactor api_camp_routes Refactor api_events_routes * Refactor api_routes (auth) * Refactor public camp routes * Fix an error in jade file Connect new API router to main app. * Add comments to index * Fix 404 redirect * Truly fix 404 * Add S3 changes to new refactored api * Fix lint * Merge fixs * Add DGS date columns to admin edit (GUI only) * Add DGS column to camps. Add DGS column to admin camps management table. Add disabled logic (for both quota columns). E2E - add dates to event, see the column is not disabled, add dgs tickets. * Handle dates in event editing * Add separation in camp edit statistics between ticket types Fix counts of statistics (total in camps, allocated, allocated by ticket etc...) Add dgs to B.E. Validate adding tickets and removing tickets * Fix counts * Fix lint * Initial work on camp edit disabling * Implement disabling camp-manager page * Handle no event rules found (fix test) * continuous deployment from api-refactor-feb-2018 to sparktesting environment (#770) * Merge DGS changes * Merge suppliers * Fix Lint Fix Merge * Fix lint * Merge fixs * Fix JSON * Added Supplier entries route and initial view file * Broken progress commit * Initial work on supplier entries page * Add some fields * Add some fields * Add functionaly to view entries Add functionality to add/exit entry validate data on adding entry * Add table sorting. Add overdue class (lines are red if supplier is overdue) * Translation fix Smaller sorting icon * Lint fix CSS add-on
amotenko
pushed a commit
that referenced
this pull request
Apr 9, 2018
* Adding new supplier table * test * adding new relations table * adding suppliers locals * Adding new supplier table * test * adding new relations table * Adding suppliers routes * Adding all routes to suppliers * suppliers routes,controllers,and views added. TODO: connect suppliers to camps, and fix lang support * suppliers are now connected to camps, unnecessary files deleted * language support added, and new supplier view fixed * duplicate camp bug fixed, and some unused code removed * suppliers management active button fixed * Restructure suppliers to fit master * Merge fixs * get camps suppliers: add func to camp model. added api route to get camp suppliers (currently not in use). added camp suppliers to view camp details page * Adding gate API * add suppliers gate info * add suppliers select for needed camp id * fix readme staging link * Gate system broken UI - fix bug #799 * Use testing env * Suppliers gate (#814) * Move utility function in api_camps_routes to services. Fix linting Replace vars with const and let. * Initial structure (using routers and controllers) * Refactor api_camp_routes Refactor api_events_routes * Refactor api_routes (auth) * Refactor public camp routes * Fix an error in jade file Connect new API router to main app. * Add comments to index * Fix 404 redirect * Truly fix 404 * Add S3 changes to new refactored api * Fix lint * Merge fixs * Add DGS date columns to admin edit (GUI only) * Add DGS column to camps. Add DGS column to admin camps management table. Add disabled logic (for both quota columns). E2E - add dates to event, see the column is not disabled, add dgs tickets. * Handle dates in event editing * Add separation in camp edit statistics between ticket types Fix counts of statistics (total in camps, allocated, allocated by ticket etc...) Add dgs to B.E. Validate adding tickets and removing tickets * Fix counts * Fix lint * Initial work on camp edit disabling * Implement disabling camp-manager page * Handle no event rules found (fix test) * continuous deployment from api-refactor-feb-2018 to sparktesting environment (#770) * Merge DGS changes * Merge suppliers * Fix Lint Fix Merge * Fix lint * Merge fixs * Fix JSON * Added Supplier entries route and initial view file * Broken progress commit * Initial work on supplier entries page * Add some fields * Add some fields * Add functionaly to view entries Add functionality to add/exit entry validate data on adding entry * Add table sorting. Add overdue class (lines are red if supplier is overdue) * Translation fix Smaller sorting icon * Lint fix CSS add-on * fix for supplier * adding roles to suppliers api * A table and routes for supplier contracts - API for #803 (#807) * Supplier contracts - WIP * Drop unneeded column * Add SupplierContract model * Add a bucket for supplier contracts * Resolving rebase conflict * Resolving rebase conflict * Add checking for existing supplier; Insert or update the contract in the DB * Add a route for GETting supplier contract (#803) * Add a route for DELETing supplier contract (#803) * Improvements - supplier contract management (#803) - Change the type of supplier_id column to string - Change the column name of contract file to `file_name` * Improvements - supplier contract management (#803) - Add routes documentation - Limit access to camp admins - Change a contract column name to `file_name` * Delete extraneous userRole declaration (#803)
NitayRabi
pushed a commit
that referenced
this pull request
Apr 10, 2018
* Adding new supplier table * test * adding new relations table * adding suppliers locals * Adding new supplier table * test * adding new relations table * Adding suppliers routes * Adding all routes to suppliers * suppliers routes,controllers,and views added. TODO: connect suppliers to camps, and fix lang support * suppliers are now connected to camps, unnecessary files deleted * language support added, and new supplier view fixed * duplicate camp bug fixed, and some unused code removed * suppliers management active button fixed * Restructure suppliers to fit master * Merge fixs * get camps suppliers: add func to camp model. added api route to get camp suppliers (currently not in use). added camp suppliers to view camp details page * Adding gate API * add suppliers gate info * add suppliers select for needed camp id * fix readme staging link * Gate system broken UI - fix bug #799 * Unnecessary code removed. Suppliers routes now use suppliers api to fetch data. In new supplier wizard: category field changed to a drop down that contain 'Moving' and 'Other'. 'Breadcrumbs doesn't show on edit page' bug fixed * More unnecessary code deleted. table heads are now clickable and will sort the table by the clicked head. supplier SHOW page added: get there by clicking on supplier name * Use testing env * Suppliers gate (#814) * Move utility function in api_camps_routes to services. Fix linting Replace vars with const and let. * Initial structure (using routers and controllers) * Refactor api_camp_routes Refactor api_events_routes * Refactor api_routes (auth) * Refactor public camp routes * Fix an error in jade file Connect new API router to main app. * Add comments to index * Fix 404 redirect * Truly fix 404 * Add S3 changes to new refactored api * Fix lint * Merge fixs * Add DGS date columns to admin edit (GUI only) * Add DGS column to camps. Add DGS column to admin camps management table. Add disabled logic (for both quota columns). E2E - add dates to event, see the column is not disabled, add dgs tickets. * Handle dates in event editing * Add separation in camp edit statistics between ticket types Fix counts of statistics (total in camps, allocated, allocated by ticket etc...) Add dgs to B.E. Validate adding tickets and removing tickets * Fix counts * Fix lint * Initial work on camp edit disabling * Implement disabling camp-manager page * Handle no event rules found (fix test) * continuous deployment from api-refactor-feb-2018 to sparktesting environment (#770) * Merge DGS changes * Merge suppliers * Fix Lint Fix Merge * Fix lint * Merge fixs * Fix JSON * Added Supplier entries route and initial view file * Broken progress commit * Initial work on supplier entries page * Add some fields * Add some fields * Add functionaly to view entries Add functionality to add/exit entry validate data on adding entry * Add table sorting. Add overdue class (lines are red if supplier is overdue) * Translation fix Smaller sorting icon * Lint fix CSS add-on * making tests happy * api calls moved to client, client dates now use pretty date pipe
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.
Enable continuous deployment from branch api-refactor-feb-2018 to sparktesting environment available at https://spark.testing.midburn.org/
You can modify the DB export it uses by editing the sparktesting environment values