summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | Fix testsJulius Härtl2017-05-171-5/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Use appdata logo when generating iconsJulius Härtl2017-05-175-34/+66
|/ / / / | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | [tx-robot] updated from transifexNextcloud bot2017-05-1722-0/+80
| | | |
* | | | Merge pull request #4767 from nextcloud/app-code-checkerMorris Jobke2017-05-167-13/+246
|\ \ \ \ | | | | | | | | | | Check language files and database schema with app code checker
| * | | | Implement skip checkers and log the currently tested appMorris Jobke2017-05-162-2/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | Skip the code checking for nowJoas Schilling2017-05-162-1/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Fix return code handlingJoas Schilling2017-05-161-1/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Run the app checker on all appsJoas Schilling2017-05-162-12/+35
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | We don't use the prefix on index namesJoas Schilling2017-05-161-6/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Fix apps without translationsJoas Schilling2017-05-161-0/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Check the name length of database itemsJoas Schilling2017-05-164-0/+122
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Check the syntax of the language fileJoas Schilling2017-05-164-0/+68
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #4911 from nextcloud/public-link-buttonMorris Jobke2017-05-161-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Remove primary class from public link download button
| * | | | | Remove primary class from public link download buttonJan-Christoph Borchardt2017-05-161-1/+1
|/ / / / /
* | | | | Merge pull request #4900 from nextcloud/fix-search-mime-iconsChristoph Wurst2017-05-161-26/+4
|\ \ \ \ \ | | | | | | | | | | | | Use proper mime icons for search results
| * | | | | Use proper mime icons for search resultsJulius Härtl2017-05-161-26/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | Merge pull request #4907 from nextcloud/mention-bogLukas Reschke2017-05-161-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add some ignores
| * | | | | | Add some ignoresMorris Jobke2017-05-161-1/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #4906 from nextcloud/use-review-requested-featureMorris Jobke2017-05-161-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use reviews instead of comments
| * | | | | | Use reviews instead of commentsLukas Reschke2017-05-161-1/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows using stuff such as https://github.com/nextcloud/server/pulls/review-requested/LukasReschke Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | Merge pull request #4893 from nextcloud/fix_4886Morris Jobke2017-05-161-2/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Cache deps list to memcache on write not on first read
| * | | | | | Cache deps list to memcache on write not on first readRoeland Jago Douma2017-05-161-2/+4
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #4886 Caching on first read leads to the bug that if the files are updated we will never cache again. Since we will always fetch from the memcache (which works) and then see that the files are newer. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #4666 from nextcloud/enable-redis-clusterMorris Jobke2017-05-164-6/+44
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add redis cluster tests to our CI jobs
| * | | | | | Do not scan for keys just get all the keys (with prefix)Roeland Jago Douma2017-05-161-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently scan leads to some issues sometimes on cluster. So just use the get function to fetch the keys. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>