summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4890 from nextcloud/unify-settingsblizzz2017-06-2914-69/+771
|\ | | | | Unify settings
| * move admin templates to the right placeArthur Schiwon2017-06-276-6/+6
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * adapt to force language changesArthur Schiwon2017-06-231-7/+16
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * do not offer additional settings when there is no contentArthur Schiwon2017-06-231-1/+18
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * take over changes from #5166 and follow #5267Arthur Schiwon2017-06-233-71/+6
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * take over changes from #5084Arthur Schiwon2017-06-233-10/+59
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * fix getting sectionsRobin Appelman2017-06-231-2/+2
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * add missing pieces to Settings Manager and fix and extend its unit testsArthur Schiwon2017-06-232-2/+60
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * add Additional (+ Fallback) section for Personal settingsArthur Schiwon2017-06-232-0/+64
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * Adopt DB and Manager to personal settings structureArthur Schiwon2017-06-232-40/+97
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * sync clients have their own placeArthur Schiwon2017-06-233-20/+93
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * take over app passwordsArthur Schiwon2017-06-232-1/+66
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * convert Sessions sectionArthur Schiwon2017-06-232-0/+66
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * add storage info, fix URL generationArthur Schiwon2017-06-233-3/+21
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * fix displaying groups in personal infoArthur Schiwon2017-06-231-10/+44
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * completing PersonalInfoArthur Schiwon2017-06-234-8/+182
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * brief, incomplete personal info settings implementationArthur Schiwon2017-06-231-0/+59
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * Extend interfacesArthur Schiwon2017-06-231-0/+36
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * one settings link, common template, stylingArthur Schiwon2017-06-231-16/+4
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #5460 from nextcloud/objectstore-error-loggingRoeland Jago Douma2017-06-291-5/+21
|\ \ | | | | | | improved logging of objectore errors
| * | improved logging of objectore errorsRobin Appelman2017-06-211-5/+21
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #5518 from nextcloud/deprecate-old-logMorris Jobke2017-06-231-0/+1
|\ \ \ | |_|/ |/| | Deprecate static writeLog() method
| * | Deprecate static writeLog() methodMorris Jobke2017-06-231-0/+1
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #5498 from nextcloud/allow-to-force-a-languageMorris Jobke2017-06-221-1/+7
|\ \ \ | |/ / |/| | Allow to force a language and set it via the ocs api
| * | Allow to force a language and set it via the ocs apiJoas Schilling2017-06-211-1/+7
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #5491 from ↵blizzz2017-06-221-0/+13
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/issue-5457-create-users-in-non-default-backends Create users in non default backends first
| * | | Create users in non default backends firstJoas Schilling2017-06-201-0/+13
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Most of the time, when people have multiple backends or add a custom backend, they want to create the users there and not in the default backend. But since that is registered first, users were always created there. Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #5474 from nextcloud/wording-4925Morris Jobke2017-06-211-20/+20
|\ \ \ | | | | | | | | Improve wording of various error messages
| * | | Improve wording of various error messagesJan-Christoph Borchardt2017-06-211-20/+20
| |/ / | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | Merge pull request #5252 from derkostka/masterMorris Jobke2017-06-212-2/+2
|\ \ \ | |/ / |/| | Use realpath to obtain the webroot.
| * | Squashed the webroot fixSebastian Kostka2017-06-202-2/+2
| | | | | | | | | | | | Signed-off-by: Sebastian Kostka <sebastian.kostka@gmail.com>
* | | Merge pull request #5429 from nextcloud/cache-baseurlMorris Jobke2017-06-183-19/+46
|\ \ \ | | | | | | | | Use base url for cache prefix and SCSS caching
| * | | Fix theming app to also use the prefixJulius Härtl2017-06-161-5/+10
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Add tests and inject IRequestJulius Härtl2017-06-162-5/+15
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Do not open version file againJulius Härtl2017-06-151-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Make cache and scss caching depend on the baseUrlJulius Härtl2017-06-153-15/+27
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | Fix 500 Internal Server Error on writingJan-Philipp Litza2017-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some not yet completely determined configurations, the following error could occur while writing a file: Error: Call to a member function getUsers() on null /var/www/nextcloud/lib/private/Share20/Manager.php - line 1277: OC\Share20\DefaultShareProvider->getAccessList(Array, true) /var/www/nextcloud/lib/private/Share20/ShareHelper.php - line 51: OC\Share20\Manager->getAccessList(Object(OC\Files\Node\Folder), true, true) /var/www/nextcloud/apps/activity/lib/FilesHooks.php - line 616: OC\Share20\ShareHelper->getPathsForAccessList(Object(OC\Files\Node\File)) /var/www/nextcloud/apps/activity/lib/FilesHooks.php - line 196: OCA\Activity\FilesHooks->getUserPathsFromPath('/path/to/file', 'user') /var/www/nextcloud/apps/activity/lib/FilesHooks.php - line 157: OCA\Activity\FilesHooks->addNotificationsForFileAction('/path/to/file', 'file_changed', 'changed_self', 'changed_by') /var/www/nextcloud/apps/activity/lib/FilesHooksStatic.php - line 55: OCA\Activity\FilesHooks->fileUpdate('/path/to/file') /var/www/nextcloud/lib/private/legacy/hook.php - line 106: OCA\Activity\FilesHooksStatic fileUpdate(Array) /var/www/nextcloud/lib/private/Files/View.php - line 1245: OC_Hook emit('OC_Filesystem', 'post_update', Array) /var/www/nextcloud/lib/private/Files/View.php - line 1173: OC\Files\View->runHooks(Array, '/path/to/file', true) /var/www/nextcloud/lib/private/Files/View.php - line 679: OC\Files\View->basicOperation('file_put_conten...', '/path/to/file', Array, '<?xml version="...') /var/www/nextcloud/lib/private/Files/Node/File.php - line 64: OC\Files\View->file_put_contents('/path/to/file', '<?xml version="...') [...] Signed-off-by: Jan-Philipp Litza <janphilipp@litza.de>
* | | | Merge pull request #5421 from nextcloud/5190-masterMorris Jobke2017-06-151-9/+32
|\ \ \ \ | | | | | | | | | | [master] Treat PHP Errors on User session regenerate
| * | | | Forward port of #5190 to masterArthur Schiwon2017-06-151-9/+32
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Treat PHP Errors on User session regenerate Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> remove unnecessary lines… Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> change PHP errors to ErrorException in the session (PHP >=7) Otherwise it might be that authentication apps are being disabled on during operation while in fact the session handler has hiccup. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | Merge pull request #5396 from nextcloud/gpx-mimetypeblizzz2017-06-151-0/+15
|\ \ \ \ | |/ / / |/| | | add gpx mimetype
| * | | added kml, kmz, tcx types as well while at itArthur Schiwon2017-06-141-1/+4
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | add geospatial mime types repair stepArthur Schiwon2017-06-141-0/+12
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | Merge pull request #4993 from michaelletzgus/emit_css-tagsMorris Jobke2017-06-141-1/+31
|\ \ \ \ | | | | | | | | | | Emit css tags
| * | | | Streamline templates, more DRYMichael Letzgus2017-05-251-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Unified function to emit <link> tags for css loading, obey "Don't Repeat Yourself" ;-) (Next step might by to combine this with the emit <script> function (even more DRY?) AND move all this to a better place?) Signed-off-by: Michael Letzgus <michaelletzgus@users.noreply.github.com>
* | | | | a parameter too muchArthur Schiwon2017-06-141-2/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | Merge pull request #5361 from ↵Lukas Reschke2017-06-141-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/exclude-files-external-dir-from-encryption don't try to encrypt/decrypt the certificate bundle
| * | | | | don't try to encrypt/decrypt the certificate bundleBjoern Schiessle2017-06-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | | Merge pull request #5072 from mjmunger/masterMorris Jobke2017-06-131-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Fixed a crash caused by Local::copyFromStorage() not conforming to Co…
| * | | | | Fixed a crash caused by Local::copyFromStorage() not conforming to ↵Michael Munger2017-05-231-1/+1
| | |/ / / | |/| | | | | | | | | | | | | Common::copyFromStorage. Issue# 5071
* | | | | Fix unknown share tokenJoas Schilling2017-06-131-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>