summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* always log locking errorsRobin Appelman2018-05-041-3/+1
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* Log more info about locking conflicts for memcache locking backendsRobin Appelman2018-05-042-7/+22
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* [tx-robot] updated from transifexNextcloud bot2018-05-012-0/+2
|
* Merge pull request #9348 from nextcloud/fix-js-testsJohn Molakvoæ2018-04-301-1/+1
|\ | | | | Replace deprecated sinon reset() call with resetHistory()
| * Replace deprecated sinon reset() call with resetHistory()Julius Härtl2018-04-301-1/+1
|/ | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* [tx-robot] updated from transifexNextcloud bot2018-04-3018-16/+46
|
* [tx-robot] updated from transifexNextcloud bot2018-04-2916-0/+32
|
* [tx-robot] updated from transifexNextcloud bot2018-04-2820-14/+16
|
* Merge pull request #9309 from nextcloud/feature/noid/no_js_sharepermission_logicMorris Jobke2018-04-274-19/+26
|\ | | | | Do not add sharePermission logic in JS
| * Fix sharedfilelistSpec.js testsRoeland Jago Douma2018-04-261-3/+6
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Do not add sharePermission logic in JSRoeland Jago Douma2018-04-263-16/+20
| | | | | | | | | | | | | | We have a dedicated dav property. We should do all the magic in 1 place. Not several. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #9325 from GitHubUser4234/ldap_cloned_connection_nc13fixMorris Jobke2018-04-271-0/+3
|\ \ | | | | | | Fix for unbound cloned LDAP connections
| * | unbound cloned connection fixRoger Szabo2018-04-271-0/+3
| | | | | | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
* | | Merge pull request #9321 from ↵Morris Jobke2018-04-271-1/+5
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/return_root_folder_when_at_root Actually return the root folder when traversing up the tree
| * | | Actually return the root folder when traversing up the treeRoeland Jago Douma2018-04-261-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you now keep calling $node->getParent() you will at some point get the RootFolder back. This is a nice termination check and will prevent endless loops if an exit condition is slightly off. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #9322 from nextcloud/bugfix/noid/swift_token_cacheMorris Jobke2018-04-271-3/+3
|\ \ \ \ | |_|/ / |/| | | Better swift V3 token handling
| * | | generateTokenFromCache is only valid for V3Roeland Jago Douma2018-04-261-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | json_decode an associative array for the swift cached tokenRoeland Jago Douma2018-04-261-1/+1
| |/ / | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #9319 from nextcloud/rakekniven-patch-1Morris Jobke2018-04-271-1/+1
|\ \ \ | | | | | | | | Fixed typo
| * | | Fixed typorakekniven2018-04-261-1/+1
| |/ /
* / / [tx-robot] updated from transifexNextcloud bot2018-04-2756-156/+316
|/ /
* | Merge pull request #9302 from nextcloud/update-phan-configMorris Jobke2018-04-261-7/+43
|\ \ | |/ |/| Improve phan config
| * Improve phan configLukas Reschke2018-04-261-7/+43
| | | | | | | | | | | | | | * exclude routes Signed-off-by: Lukas Reschke <lukas@statuscode.ch> Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #9308 from nextcloud/proper-ocp-constantsMorris Jobke2018-04-2674-298/+412
|\ \ | | | | | | Move log constants to ILogger
| * | move log constants to ILoggerArthur Schiwon2018-04-2674-298/+412
|/ / | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | [tx-robot] updated from transifexNextcloud bot2018-04-262-0/+2
| |
* | Merge pull request #9256 from nextcloud/fed-sharing-improvementsMorris Jobke2018-04-256-89/+25
|\ \ | | | | | | improve error reporting and move format parameter to the options
| * | improve error reporting and move format parameter to the optionsBjoern Schiessle2018-04-256-89/+25
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | Merge pull request #9296 from nextcloud/migrate-groups-fetch-to-ocs-apiMorris Jobke2018-04-252-450/+457
|\ \ \ | | | | | | | | Migrate groups fetch to ocs api
| * | | Workflow engine to ocs apiJohn Molakvoæ (skjnldsv)2018-04-251-369/+373
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Settings groups to ocsJohn Molakvoæ (skjnldsv)2018-04-251-81/+84
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #9284 from nextcloud/bugfix/9279/strict_sharee_apiMorris Jobke2018-04-251-5/+6
|\ \ \ \ | |_|_|/ |/| | | Make ShareesAPIController strict
| * | | Make ShareesAPIController strictRoeland Jago Douma2018-04-231-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #9279 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #8540 from nextcloud/theming-advancedMorris Jobke2018-04-2517-623/+717
|\ \ \ \ | | | | | | | | | | Add option for header logo and favicon in theming app
| * | | | Add more tests for ImageManagerJulius Härtl2018-04-191-0/+91
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Fix theming testsJulius Härtl2018-04-197-253/+186
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Make sure the custom favicon is usedJulius Härtl2018-04-191-2/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Add typehintsJulius Härtl2018-04-193-3/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Fix background colorJulius Härtl2018-04-191-5/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Return valueJulius Härtl2018-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Remove unneeded preview image handlingJulius Härtl2018-04-191-3/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Fix undo preview and remove duplicate codeJulius Härtl2018-04-192-29/+28
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Add advanced theming options to frontendJulius Härtl2018-04-191-7/+37
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Use generic image upload in theming JSJulius Härtl2018-04-191-45/+17
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Use SCSS for previewing images as wellJulius Härtl2018-04-191-6/+39
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Move theming settings to SCSSJulius Härtl2018-04-192-107/+120
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Move to more generic image handling and add extra imagesJulius Härtl2018-04-197-178/+191
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | [tx-robot] updated from transifexNextcloud bot2018-04-254-2/+4
| | | | |
* | | | | Merge pull request #9248 from nextcloud/fix-files-ellipsisRoeland Jago Douma2018-04-242-84/+27
|\ \ \ \ \ | | | | | | | | | | | | Fix ellipsis in filename column
| * | | | | Add min-width to trick the table width calculation in safariJulius Härtl2018-04-221-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-23 19:29:47 +0000