Skip to content

Enterprise demo (trial) process #107

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

Merged
DeepDiver1975 merged 15 commits into from
Jul 6, 2017
Merged

Enterprise demo (trial) process #107

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1944cb6
added route for license key check
Jul 4, 2017
5e06aa7
added functionallity to check if a license key is available, also add…
Jul 4, 2017
821323a
make sure existing market app logic uses the getLicenseKey method to …
Jul 4, 2017
45f270f
Add "Start trial" button and modal,
lordelix Jul 4, 2017
2db8ce8
Move API key settings to the menu,
lordelix Jul 4, 2017
3121ace
added exceptions
Jul 5, 2017
5cd8e43
added method to request and save the demo license key from the market…
Jul 5, 2017
586848c
added api endpoint to load the demo license key from the marketplace
Jul 5, 2017
0ad64f4
fixed false appconfig key
Jul 5, 2017
2f938bb
Improve EE Trial process [WIP]
lordelix Jul 6, 2017
abe28eb
Fix license error
lordelix Jul 6, 2017
5afe3e9
fixed EnterpriseKey usage
Jul 6, 2017
c7d3843
Merge branch 'enterprise-trial-proce' of github.com:owncloud/market i…
Jul 6, 2017
7487c81
Finalise trial process
lordelix Jul 6, 2017
8713a67
added missing license header
Jul 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixed false appconfig key
  • Loading branch information
Philipp Schaffrath committed Jul 5, 2017
commit 0ad64f4363993b6830921695a636c1f940a5a91d
2 changes: 1 addition & 1 deletion lib/MarketService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,7 @@ public function requestLicenseKey() {
throw new MarketException('Marketplace returned an empty demo license key.');
Copy link
Member

@DeepDiver1975 DeepDiver1975 Jul 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing translation

Copy link
Contributor Author

@phisch phisch Jul 6, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, but it's not used to display in any userinterface.

}

$this->config->setAppValue('enterprise_key', 'license', $demoLicenseKey);
$this->config->setAppValue('enterprise_key', 'license-key', $demoLicenseKey);

return $demoLicenseKey;
}
Expand Down