summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4981 from ↵Morris Jobke2017-05-191-1/+1
|\ | | | | | | | | nextcloud/fix-missing-argument-2-getAppContainer-master Fix missing argument 2 for Settings classes
| * Fix missing argument 2 for Settings classesJoas Schilling2017-05-191-1/+1
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #4956 from nextcloud/endless-loop-on-invalid-assetRoeland Jago Douma2017-05-193-0/+26
|\ \ | | | | | | Stop infinit loop on invalid settings css/js file
| * | Stop infinit loop on invalid settings css/js fileJoas Schilling2017-05-193-0/+26
| | | | | | | | | | | | | | | | | | Don't try to find dirname of false... Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Fixed typoMiha Frangez2017-05-191-1/+1
| |/ |/|
* | Merge pull request #4905 from nextcloud/auto-di-for-apps-without-app.phpJoas Schilling2017-05-191-2/+18
|\ \ | |/ |/| Allow automatic DI for apps that don't register the container in app.php
| * Allow automatic DI for apps that don't register the container in app.phpJoas Schilling2017-05-161-2/+18
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #4894 from nextcloud/generic-security-activitiesLukas Reschke2017-05-191-5/+6
|\ \ | | | | | | Change 2FA activities to more generic security activities
| * | Change 2FA activities to more generic security activitiesChristoph Wurst2017-05-181-5/+6
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #4792 from nextcloud/fix-storage-wrappers-on-scannerLukas Reschke2017-05-193-2/+10
|\ \ \ | | | | | | | | Make sure we use the passed-in storage when there is one
| * | | use unmasked permissions during scanningRobin Appelman2017-05-183-1/+6
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | Make sure we use the passed-in storage when there is oneJoas Schilling2017-05-101-1/+4
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #4704 from nextcloud/add-oauth-code-flow-supportLukas Reschke2017-05-182-2/+14
|\ \ \ \ | | | | | | | | | | Add oauth code flow support
| * | | | Rename table back to lowercaseLukas Reschke2017-05-181-8/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | delete auth token when client gets deletedBjoern Schiessle2017-05-181-7/+19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | Add basic implementation for OAuth 2.0 Authorization Code FlowLukas Reschke2017-05-181-2/+2
| | |/ / | |/| | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | Copy avatars to the new locationJoas Schilling2017-05-181-14/+56
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | We want to see 1 in 100 messages, not all but the 100thJoas Schilling2017-05-181-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Fix updating from some 11 versions when people didn't updateJoas Schilling2017-05-181-0/+6
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Allow migrating from ownCloud 10.0.0Joas Schilling2017-05-181-1/+12
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Add some more castingJoas Schilling2017-05-181-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Avoid problems for some DBs by removing the table completlyJoas Schilling2017-05-181-4/+2
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Add a migration step to save the data from the accounts table before migratingJoas Schilling2017-05-182-0/+181
|/ / / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | 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>
* | | Use appdata logo when generating iconsJulius Härtl2017-05-171-1/+1
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #4767 from nextcloud/app-code-checkerMorris Jobke2017-05-162-0/+165
|\ \ \ | | | | | | | | Check language files and database schema with app code checker
| * | | 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-161-0/+107
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Check the syntax of the language fileJoas Schilling2017-05-161-0/+56
| |/ / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | 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-161-6/+4
|\ \ \ | |/ / |/| | 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>
* | | Revert "fix permissions of mountpoints - take 2"Morris Jobke2017-05-151-6/+2
| | |
* | | Merge pull request #4685 from nextcloud/fix_4683Morris Jobke2017-05-151-2/+6
|\ \ \ | | | | | | | | fix permissions of mountpoints - take 2
| * | | 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-152-0/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 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>
* | | | | Merge pull request #4867 from nextcloud/kill-install-appLukas Reschke2017-05-152-28/+29
|\ \ \ \ \ | | | | | | | | | | | | Remove OC_App:installApp
| * | | | | Remove OC_App:installAppMorris Jobke2017-05-152-28/+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>
* / | | | | | Check whether the $_SERVER['REQUEST_*'] vars exist before using themJoas Schilling2017-05-152-7/+6
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>