[stable10] Backport it all #131
Merged
Conversation
This file contains hidden or 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
…es, bump version number
Update UIkit version
* Adding bundles route - refs #74 * Change api key backend * Introduce views for bundled Apps and API Key * fix apikey saving * adjust url in marketplace api call * And url changed once more .... * Enrich apps in bundle just like usual apps - e.g. installed flag, update flag ... * Verify api key before saving it * Translate messages in the controller ... * Perliminary frontend core; API Key and Bundle support * Fetch all after valid apikey has been set * Translate server side messages as well - MarketController only for now * Update translations * Remove idle css * Perliminary frontend work * Fix installation process * Remove link from Bundle Title * enterprise_key app check before installing ocl apps * Allow installing enterprise_key app * Check if license-key is configured before activating market app * Adding bundles route - refs #74 * Change api key backend * Introduce views for bundled Apps and API Key * fix apikey saving * adjust url in marketplace api call * And url changed once more .... * Enrich apps in bundle just like usual apps - e.g. installed flag, update flag ... * Verify api key before saving it * Translate messages in the controller ... * Perliminary frontend core; API Key and Bundle support * Fetch all after valid apikey has been set * Translate server side messages as well - MarketController only for now * Update translations * Remove idle css * Perliminary frontend work * Fix installation process * Remove link from Bundle Title * enterprise_key app check before installing ocl apps * Allow installing enterprise_key app * Check if license-key is configured before activating market app * Fix translation in Controller uninstall * - Use isEnabledForUser() instead of enableApp - because enableApp('enterprise_key') can stop the instance right away - Added license key validation - not really sure about this: an invalid license will stop the instance right away - fix PHPDoc and use declaration * Translate messages in MarketService * Add translations for MarketService * Show individual spinner while installing bundled app * Move "App Bundles" to the top in Navigation; Remove console.log from store * Show missing detail infos if app is installed * Adding single app route * Update translations * Better visual bundle installation process * Fetch all Apps after bundle installation is complete
* added route for license key check * added functionallity to check if a license key is available, also added api action so the frontend can use it * make sure existing market app logic uses the getLicenseKey method to also get keys from appconfig if necessary * Add "Start trial" button and modal, add Sourcemaps for easier js debugging * Move API key settings to the menu, make slicker trial form * added exceptions * added method to request and save the demo license key from the marketplace * added api endpoint to load the demo license key from the marketplace * fixed false appconfig key * Improve EE Trial process [WIP] * Fix license error * fixed EnterpriseKey usage * Finalise trial process * added missing license header
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
This reverts commit 01ff874.
Merged
PVince81
approved these changes
Aug 14, 2017
Contributor
PVince81
left a comment
PVince81
left a comment
There was a problem hiding this comment.
👍 did a quick test and market app still works.
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.
No description provided.