summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
| * | | Make cache tests a bit more clearMorris Jobke2017-05-111-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Add redis cluster tests to our CI jobsMorris Jobke2017-05-113-0/+39
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #4554 from nextcloud/pointer-cursor-on-clickable-userLukas Reschke2017-05-161-0/+1
|\ \ \ \ | | | | | | | | | | Make it clear that you can now click on usernames
| * | | | Make it clear that you can now click on usernamesJoas Schilling2017-04-271-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #4865 from nextcloud/improve-two-factor-buttonsRoeland Jago Douma2017-05-162-2/+17
|\ \ \ \ \ | | | | | | | | | | | | Improve layout of buttons for two factor auth
| * | | | | Improve layout of buttons for two factor authMorris Jobke2017-05-152-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #4889 from nextcloud/fix-contactsmenu-overflowRoeland Jago Douma2017-05-161-0/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Fix contacts menu overflow for few entries, fix #4744
| * | | | | Fix contacts menu overflow for few entries, fix #4744Jan-Christoph Borchardt2017-05-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | Merge pull request #4425 from nextcloud/ociMorris Jobke2017-05-154-6/+121
|\ \ \ \ \ \ | | | | | | | | | | | | | | Primary key is too long for oracle
| * | | | | | Rename the index so the name is unique until the old table is deletedJoas Schilling2017-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | Add a update step that copies all the backup codesJoas Schilling2017-05-152-1/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | Rename the table to a valid nameJoas Schilling2017-05-152-4/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* / / / / / [tx-robot] updated from transifexNextcloud bot2017-05-1670-96/+162
|/ / / / /
* | | | | Merge pull request #4881 from nextcloud/sign-off-checkv12.0.0beta3Roeland Jago Douma2017-05-151-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Run sign-off check as last check
| * | | | | Run sign-off check as last checkMorris Jobke2017-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #4884 from nextcloud/beta-3Lukas Reschke2017-05-151-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Bump to 12.0.0 beta 3
| * | | | | | Bump to 12.0.0 beta 3Lukas Reschke2017-05-151-2/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | Merge pull request #4883 from nextcloud/revert-4685-fix_4683Morris Jobke2017-05-152-10/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Revert "fix permissions of mountpoints - take 2"
| * | | | | | Revert "fix permissions of mountpoints - take 2"Morris Jobke2017-05-152-10/+5
|/ / / / / /
* | | | | | Merge pull request #4685 from nextcloud/fix_4683Morris Jobke2017-05-152-5/+10
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | fix permissions of mountpoints - take 2
| * | | | | update comment to codeRobin Appelman2017-05-151-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | Fix SharedStorage TestRoeland Jago Douma2017-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A moveable mount point (What a SharedStorage is) always has DELETE + UPDATE permissions. Since you can either delete (unshare) or update (rename) it. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Revert "Revert "fix permissions of mountpoints""Roeland Jago Douma2017-05-041-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 70a0e9c2d39532f9de6c6e108ef7eaaebb856ed6. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #4871 from ↵Morris Jobke2017-05-155-6/+96
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/remove-more-personal-info-on-user-deletion Remove more personal info on user deletion
| * | | | | | Remove account data on user deletionJoas Schilling2017-05-152-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | Remove 2FA backup codes on user deletionJoas Schilling2017-05-153-6/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | Merge pull request #4867 from nextcloud/kill-install-appLukas Reschke2017-05-153-80/+29
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove OC_App:installApp
| * | | | | | | Remove OC_App:installAppMorris Jobke2017-05-153-80/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * uses Installer->installApp now * removes unused code * fixes #4453 * added some additional checks Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | | Merge pull request #4810 from nextcloud/downstream-27668Morris Jobke2017-05-151-5/+10
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | Fix mimetype update query
| * | | | | | | Fix variable namesJoas Schilling2017-05-151-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | | Fix order of parameter and escapingJoas Schilling2017-05-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | | Actually we want to update the mimetype of all files ending with the suffixJoas Schilling2017-05-111-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | | don´t change folders with --repair-filecacheRello2017-05-111-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | check if folder is "httpd/unix-directory" and don´t perform here #27585
* | | | | | | | Merge pull request #4877 from nextcloud/oc-group-is-goneMorris Jobke2017-05-151-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove OC_Group call
| * | | | | | | | Remove OC_Group callLukas Reschke2017-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OC_Group has been removed in March with https://github.com/nextcloud/server/pull/4867, the check in question is also performed two lines below already. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | | | | Merge pull request #4847 from nextcloud/throw-exception-if-password-not-availMorris Jobke2017-05-154-0/+39
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Throws exception if password not available
| * | | | | | | | | Update autoloader mapLukas Reschke2017-05-152-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | | | | | Thows exception if password not availableMorris Jobke2017-05-122-0/+37
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | | | Merge pull request #4873 from nextcloud/check-whether-REQUEST-existsMorris Jobke2017-05-154-13/+14
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Check whether the $_SERVER['REQUEST_*'] vars exist before using them