summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add tests for OAuth2 appLukas Reschke2017-05-189-8/+563
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Add test for DefaultTokenMapperLukas Reschke2017-05-181-0/+11
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Fix style issues pointed out in reviewLukas Reschke2017-05-182-2/+1
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Rename table back to lowercaseLukas Reschke2017-05-182-14/+18
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Add tests for ClientFlowLoginControllerLukas Reschke2017-05-182-25/+185
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Add app to autoenabled provisioning API scenarioLukas Reschke2017-05-181-0/+1
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Add OAuth state to sessionLukas Reschke2017-05-182-32/+27
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Cleanup codeLukas Reschke2017-05-182-3/+6
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Add XSD definitionsLukas Reschke2017-05-182-3/+3
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* delete auth token when client gets deletedBjoern Schiessle2017-05-187-18/+79
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* use name of oauth app to identify auth tokenBjoern Schiessle2017-05-181-2/+10
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* hide client secret by defaultBjoern Schiessle2017-05-183-2/+26
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* add some spacing between the logo and the content of the pageBjoern Schiessle2017-05-181-1/+1
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* show error page if no valid client identifier is given and if it is not a ↵Bjoern Schiessle2017-05-181-5/+24
| | | | | | API request Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* handle case if no valid client identifier is givenBjoern Schiessle2017-05-181-0/+5
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* remove 'Alternative login using app token' in case of oauth loginBjoern Schiessle2017-05-181-0/+2
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* Remove special charactersLukas Reschke2017-05-181-1/+1
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* It's a bearerLukas Reschke2017-05-181-1/+1
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Fetch signle rowLukas Reschke2017-05-181-1/+1
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Change to POSTLukas Reschke2017-05-181-2/+1
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Increase length of encrypted token in databaseLukas Reschke2017-05-182-2/+2
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Get a single rowLukas Reschke2017-05-182-8/+4
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Use query builderLukas Reschke2017-05-182-6/+14
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Add basic implementation for OAuth 2.0 Authorization Code FlowLukas Reschke2017-05-1817-23/+838
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Merge pull request #4812 from nextcloud/move-sharing-to-migrationBjörn Schießle2017-05-187-526/+310
|\ | | | | Move the file sharing app to migration
| * Fix the share type of guest shares when migrating from ownCloudJoas Schilling2017-05-122-0/+83
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Move the file sharing app to migrationJoas Schilling2017-05-126-526/+227
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #4939 from nextcloud/add-share-name-columnBjörn Schießle2017-05-183-2/+11
|\ \ | | | | | | Add the column so we keep the value from before the update
| * | Add the column so we keep the value from before the updateJoas Schilling2017-05-183-2/+11
|/ / | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | [tx-robot] updated from transifexNextcloud bot2017-05-18154-456/+568
| |
* | Merge pull request #4929 from nextcloud/beta-4v12.0.0beta4Lukas Reschke2017-05-181-2/+2
|\ \ | | | | | | 12.0.0 Beta 4
| * | 12.0.0 Beta 4Lukas Reschke2017-05-171-2/+2
| | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #4892 from nextcloud/fix/encryption-remembered-login-hookLukas Reschke2017-05-172-1/+11
|\ \ \ | | | | | | | | Fix encryption + remembered login due to missing login hook
| * | | Fix encryption + remembered login due to missing login hookChristoph Wurst2017-05-162-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The encryption app relies on the post_login hook to initialize its keys. Since we do not emit it on a remembered login, the keys were always un- initialized and the user was asked to log out and in again. This patch *translates* the postRememberedLogin hook to a post_login hook. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #4921 from nextcloud/filerow-clickabilityLukas Reschke2017-05-171-0/+1
|\ \ \ \ | |_|/ / |/| | | Increase width of clickable area in file row to open file/folder
| * | | Increase width of clickable area in file row to open file/folderJan-Christoph Borchardt2017-05-161-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | Merge pull request #4923 from nextcloud/backgroundjobs-wordingLukas Reschke2017-05-172-6/+6
|\ \ \ \ | | | | | | | | | | Change cron wording to background jobs
| * | | | Change cron wording to background jobsJan-Christoph Borchardt2017-05-162-6/+6
| |/ / / | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | Merge pull request #4926 from nextcloud/remove-saml-from-shipped-appsLukas Reschke2017-05-171-1/+0
|\ \ \ \ | | | | | | | | | | user_saml is shipped via appstore
| * | | | user_saml is shipped via appstoreLukas Reschke2017-05-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keeping it in the shipped.json leads to odd side-effects such as https://help.nextcloud.com/t/earn-a-t-shirt-by-testing-nextcloud-12-beta-2/12374/41?u=lukasreschke in case a previous version was installed. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | Merge pull request #4927 from nextcloud/bump-dom-purify-releaseLukas Reschke2017-05-172-5/+5
|\ \ \ \ \ | | | | | | | | | | | | Bump DOMPurify version to 0.8.9
| * | | | | Bump DOMPurify version to 0.8.9Lukas Reschke2017-05-172-5/+5
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | Merge pull request #4924 from nextcloud/shadow-styleLukas Reschke2017-05-172-11/+3
|\ \ \ \ \ | | | | | | | | | | | | Unify box-shadow style, remove filter
| * | | | | Unify box-shadow style, remove filterJan-Christoph Borchardt2017-05-162-11/+3
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-05-1796-208/+236
| | | | |
* | | | | Merge pull request #4922 from nextcloud/verbose-uploadmenu-textMorris Jobke2017-05-171-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Use more verbose text for upload menu
| * | | | | Use more verbose text for upload menuJan-Christoph Borchardt2017-05-161-2/+2
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | Merge pull request #4918 from nextcloud/theming-capabilities-plain-backgroundMorris Jobke2017-05-172-28/+48
|\ \ \ \ \ | | | | | | | | | | | | OCS Return color when theming uses no background image
| * | | | | Return color when theming uses no background imageJulius Härtl2017-05-172-28/+48
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #4887 from nextcloud/theming-appdata-fixMorris Jobke2017-05-176-39/+68
|\ \ \ \ \ | |/ / / / |/| | | | Use appdata logo when generating icons