summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #14825 from marius-wieschollek/bugfix/11236Morris Jobke2019-03-251-3/+35
|\ | | | | Set parameter type in QBMapper
| * [#11236] Set parameter type in QBMapperMarius David Wieschollek2019-03-241-3/+35
| | | | | | | | Signed-off-by: Marius David Wieschollek <git.public@mdns.eu>
* | Fetch proper translationsRoeland Jago Douma2019-03-251-2/+3
| | | | | | | | | | | | | | | | | | | | | | Fixes #14793 This is caused by the mess we have with OC\Settings mapping to settings and lib/private/Settings. Anyway this is the quick fix. Moving stuff around for 17 seems better. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #14813 from nextcloud/fix/sentry/unsetMorris Jobke2019-03-251-0/+4
|\ \ | |/ |/| Check if elements are set in installer
| * Check if elements are set in installerRoeland Jago Douma2019-03-221-0/+4
| | | | | | | | | | | | | | Since we now have all the apps from the appstore we need to do a bit more checking. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #14812 from nextcloud/bugfix/noid/collections-access-typeRoeland Jago Douma2019-03-231-1/+1
|\ \ | | | | | | Force boolean type for access parameter
| * | Force boolean type for access parameterJulius Härtl2019-03-221-1/+1
| |/ | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* / Properly inject EventDispatched in BackgroundRepairRoeland Jago Douma2019-03-221-4/+1
|/ | | | | | Else it will just be null when called Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Store user object later in the codeVlastimil Pecinka2019-03-211-1/+2
| | | | Signed-off-by: Vlastimil Pecinka <pecinka@email.cz>
* Fix PHPDocMorris Jobke2019-03-212-2/+2
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Code cleanup.Ole Ostergaard2019-03-215-15/+16
| | | | Signed-off-by: Ole Ostergaard <ole.c.ostergaard@gmail.com>
* Add insertIgnoreConflict to IDBConnection interface.Ole Ostergaard2019-03-211-0/+14
| | | | Signed-off-by: Ole Ostergaard <ole.c.ostergaard@gmail.com>
* Add supression of SqlInjectionChecker.Ole Ostergaard2019-03-212-0/+6
| | | | Signed-off-by: Ole Ostergaard <ole.c.ostergaard@gmail.com>
* Add PostgreSQL specific implementation for includeIgnoreConflict.Ole Ostergaard2019-03-211-0/+12
| | | | Signed-off-by: Ole Ostergaard <ole.c.ostergaard@gmail.com>
* Add insertIgnoreConflict to Adapter and use it for for executing the file ↵Ole Ostergaard2019-03-213-11/+18
| | | | | | locking. Signed-off-by: Ole Ostergaard <ole.c.ostergaard@gmail.com>
* [tx-robot] updated from transifexNextcloud bot2019-03-21128-814/+130
|
* Merge pull request #14578 from nextcloud/enh/force_enable_appsRoeland Jago Douma2019-03-204-32/+57
|\ | | | | Force enable apps
| * Do not ignore the max-version for the "update-available" checkJoas Schilling2019-03-201-2/+11
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Remove apps from the list which have no release at allJoas Schilling2019-03-201-0/+5
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * allow enforcing apps to ignore the max versionRoeland Jago Douma2019-03-204-34/+45
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #14753 from ↵Roeland Jago Douma2019-03-205-170/+4
|\ \ | | | | | | | | | | | | nextcloud/revert-13097-feature/11319/where-is-your-data Revert "Where is your data?"
| * | Revert "Where is your data?"Roeland Jago Douma2019-03-205-170/+4
| |/
* | Update lib/private/Share20/Manager.php Morris Jobke2019-03-201-1/+1
| | | | | | | | | | tabulator change Co-Authored-By: aignerat <46312655+aignerat@users.noreply.github.com>
* | Update lib/private/Share20/Manager.php Morris Jobke2019-03-201-1/+1
| | | | | | | | | | fixed tabulator Co-Authored-By: aignerat <46312655+aignerat@users.noreply.github.com>
* | groupname like username - allow share with bothChristian Aigner2019-03-201-2/+2
|/ | | | Signed-off-by: Christian Aigner <christian.aigner@huemer-it.com>
* Merge pull request #14691 from nextcloud/rename-mountpoint-within-mountpointRoeland Jago Douma2019-03-201-11/+6
|\ | | | | always allow moving mountpoints inside the same mountpoint
| * always allow moving mountpoints inside the same mountpointRobin Appelman2019-03-191-11/+6
| | | | | | | | | | | | even if that mountpoint isn't normally a valid target for moving mounts into Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #14664 from ↵Roeland Jago Douma2019-03-194-111/+17
|\ \ | | | | | | | | | | | | nextcloud/bugfix/noid/absolute-paths-of-images-for-linked-collaboration-resources Replace the icon-class with an absolute link to an image
| * | Use rich objects instead of name, link and iconJoas Schilling2019-03-194-112/+17
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Replace the icon-class with an absolute link to an imageJoas Schilling2019-03-194-6/+7
| |/ | | | | | | | | | | Otherwise the icon can not be displayed in mobile apps Signed-off-by: Joas Schilling <coding@schilljs.com>
* / Fix getting the access list on external storageRoeland Jago Douma2019-03-191-1/+7
|/ | | | | | | If a file is on external storage there is no owner. WHich means we can't check. So just return an empty array then. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #14724 from nextcloud/enh/nonce_for_iframesMorris Jobke2019-03-181-1/+5
|\ | | | | CSP: set nonce for iframes
| * CSP: set nonce for iframesRoeland Jago Douma2019-03-161-1/+5
| | | | | | | | | | | | | | This for now uses the jsNonce. That way we can easily backport it. For 17 I will fix it properly. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [tx-robot] updated from transifexNextcloud bot2019-03-182-6/+6
| |
* | [tx-robot] updated from transifexNextcloud bot2019-03-172-2/+14
|/
* [tx-robot] updated from transifexNextcloud bot2019-03-164-12/+12
|
* Merge pull request #14689 from nextcloud/rename-moveable-mount-readonly-parentRoeland Jago Douma2019-03-151-1/+9
|\ | | | | allow renaming the root of a movable mount even if the parent folder …
| * allow renaming the root of a movable mount even if the parent folder is readonlyRobin Appelman2019-03-141-1/+9
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Remove spaming debug logsJoas Schilling2019-03-152-2/+0
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #14684 from nextcloud/long-etag-davRoeland Jago Douma2019-03-141-1/+5
|\ \ | | | | | | handle long etags from dav external storage
| * | handle long etags from dav external storageRobin Appelman2019-03-141-1/+5
| |/ | | | | | | | | | | we can only store etags up to 40 characters long in the database, so when we get an etag that's longer we simply hash it to bring down the length Signed-off-by: Robin Appelman <robin@icewind.nl>
* | [tx-robot] updated from transifexNextcloud bot2019-03-1416-60/+134
| |
* | add casting to string for postgresql query builderRobin Appelman2019-03-141-5/+7
|/ | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* Do not allow invalid users to be createdRoeland Jago Douma2019-03-141-0/+14
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Remove sensitive SMB arguments from exception logMorris Jobke2019-03-121-0/+6
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Add a message about disabled global routesJoas Schilling2019-03-111-0/+8
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Make sure urlParams are correctly injected in global routesJoas Schilling2019-03-111-1/+15
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Merge pull request #14548 from ↵Morris Jobke2019-03-082-4/+23
|\ | | | | | | | | nextcloud/bugfix/noid/avoid-duplicate-container-creation Avoid duplicate App container creation
| * Make the file strictJoas Schilling2019-03-051-4/+5
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Avoid duplicate App container creationJoas Schilling2019-03-052-1/+19
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>