summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4816 from nextcloud/Ardinis-quota-files_externalMorris Jobke2017-05-121-1/+1
|\ | | | | Correctly calculate used space for quota with external storage
| * Correctly calculate used space for quota with external storageArdinis2017-05-121-1/+1
| | | | | | | | | | | | issue #4348 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #4825 from nextcloud/add-timeout-appstoreLukas Reschke2017-05-121-1/+3
|\ \ | | | | | | Add timeout for requests to appstore
| * | Add timeout for requests to appstoreMorris Jobke2017-05-111-1/+3
| |/ | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* / Log connectiong problems while fetching data from appstoreMorris Jobke2017-05-113-6/+24
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Proper logging for appstore updatesMorris Jobke2017-05-111-1/+9
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #4783 from nextcloud/lite-application-classesMorris Jobke2017-05-107-34/+19
|\ | | | | Use automatic injection for appdata folders
| * Automatic injection into the FetchersJoas Schilling2017-05-105-30/+14
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Automatic creation of Identity managerJoas Schilling2017-05-102-4/+5
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Use distributed cache for SCSS dependencies as wellMorris Jobke2017-05-101-1/+1
| | | | | | | | | | | | | | * followup to #3978 because with the proper setup of appdata we now are using the same data on all nodes Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Setup root FS for multibucket object storageMorris Jobke2017-05-101-1/+46
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Fix missing placeholder for doc linkJoas Schilling2017-05-101-1/+1
|/ | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Do not write and read rootcerts.crt at the same timeRoeland Jago Douma2017-05-091-2/+3
| | | | | | | | | | | | | | | | | (Possibly) fixes #3470 When updating the main file /files_external/rootcerts.crt we should not read from /files_external/rootcerts.crt at the same time. For 2 reasons: writing to a file and reading from it at the same time can have non deterministic results And we don't want all the certificates to appear 2 times in there. This isn't caught by our standard file locking (that does not allow this actually) because it is in a non locked path.... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #4705 from nextcloud/htaccess-uploadRoeland Jago Douma2017-05-091-1/+5
|\ | | | | Proper exception for upload of .htaccess file via WebDAV
| * Proper exception for upload of .htaccess file via WebDAVMorris Jobke2017-05-081-1/+5
| | | | | | | | | | | | * fixes #2860 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #4753 from nextcloud/fix-links-on-error-pageRoeland Jago Douma2017-05-092-14/+9
|\ \ | | | | | | Fix escaped HTML on error pages
| * | Fix escaped HTML on error pagesMorris Jobke2017-05-082-14/+9
| |/ | | | | | | | | | | * fixes #4655 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* / Don't redirect requests to /core/img/manifest.jsonLukas Reschke2017-05-091-0/+1
|/ | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Add function to request SVG or regular fallback imageLukas Reschke2017-05-082-8/+11
| | | | | | Fixes https://github.com/nextcloud/server/issues/4647 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Merge pull request #4514 from nextcloud/automatic-mysql-4byte-detectionLukas Reschke2017-05-082-0/+57
|\ | | | | Automatic mysql 4byte detection
| * MySQL 4 byte is now detected during setup in any case.Thomas Müller2017-04-281-6/+4
| | | | | | | | config.sample.php was updated to explicitly state that there detection in place to set mysql.utf8mb4
| * Add console command to migrate the charsetThomas Müller2017-04-282-23/+56
| |
| * During setup of a mysql database we try to detect if charset 'utf8mb4' can ↵Thomas Müller2017-04-281-0/+26
| | | | | | | | be used
* | ensure theming app is loaded when showing an error pageRobin Appelman2017-05-061-0/+5
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | handle permissions errors when copying the skeleton for a read only userRobin Appelman2017-05-051-2/+7
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Compatibility with Redis and RedisClusterMorris Jobke2017-05-041-2/+2
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Revert "fix permissions of mountpoints"Morris Jobke2017-05-041-6/+2
| |
* | Merge pull request #4623 from nextcloud/fileinfo-mount-permissionsMorris Jobke2017-05-021-2/+6
|\ \ | | | | | | fix permissions of mountpoints
| * | fix permissions of mountpointsRobin Appelman2017-05-011-2/+6
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #4620 from nextcloud/preview-error-handlingRoeland Jago Douma2017-05-023-5/+13
|\ \ \ | | | | | | | | better handling of preview generation errors
| * | | Add PHPDocMorris Jobke2017-05-022-1/+4
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | better handling of preview generation errorsRobin Appelman2017-05-022-4/+9
| |/ / | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #4659 from nextcloud/fix/ignore-empty-email-contacts-menuLukas Reschke2017-05-021-0/+4
|\ \ \ | | | | | | | | Do not show an email action for contacts with emtpy email addresses
| * | | Do not show an email action for contacts with emtpy email addressesChristoph Wurst2017-05-021-0/+4
| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #4651 from nextcloud/fix_appfetcher_updateMorris Jobke2017-05-024-15/+50
|\ \ \ \ | |/ / / |/| | | Make sure the AppFetcher fetches the new applist from the appstore
| * | | Make sure the AppFetcher fetches the new applist from the appstoreRoeland Jago Douma2017-05-024-15/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When in the upgrade process the version in the config is still the old version. (Since we only upgrade it after the upgrade is complete). However the app list fetched from the appstore must be the new list. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #4649 from nextcloud/update-links-to-12Lukas Reschke2017-05-021-1/+1
|\ \ \ \ | |/ / / |/| | | Update documentation go.php URL to 12
| * | | Update documentation go.php URL to 12Lukas Reschke2017-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/nextcloud/server/issues/4646 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | Do not do ETag caching when the version is updatedRoeland Jago Douma2017-05-021-12/+12
|/ / / | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* / / Mark IP as whitelisted if brute force protection is disabledLukas Reschke2017-05-011-0/+4
|/ / | | | | | | | | | | | | | | Currently, when disabling the brute force protection no new brute force attempts are logged. However, the ones logged within the last 24 hours will still be used for throttling. This is quite an unexpected behaviour and caused some support issues. With this change when the brute force protection is disabled also the existing attempts within the last 24 hours will be disregarded. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Rename “Server settings” to “Basic settings”Marius Blüm2017-04-291-1/+1
| | | | | | | | | | | | * fixes #4587 Signed-off-by: Marius Blüm <marius@lineone.io>
* | Merge pull request #4583 from nextcloud/theming-fixes-adminJan-Christoph Borchardt2017-04-291-1/+0
|\ \ | | | | | | Theming admin section fixes
| * | Make sure that ThemingDefaults uses the correct default values from \OC_DefaultsJulius Härtl2017-04-291-1/+0
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | UserManager can now count disabled usersArthur Schiwon2017-04-291-0/+22
|/ / | | | | | | | | | | Users page takes advantage of that Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | fix email verification statusBjoern Schiessle2017-04-281-1/+5
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | add missing translation and other small fixesBjoern Schiessle2017-04-281-1/+1
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | make use of verification buttonsBjoern Schiessle2017-04-281-3/+9
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | make sure that every data set has a 'verified' statusBjoern Schiessle2017-04-281-9/+30
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | ask lookup server if email address was verified by the userBjoern Schiessle2017-04-282-3/+35
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | make sure that we don't lose previous verification statusBjoern Schiessle2017-04-281-0/+15
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>