summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2018-05-1238-104/+230
|
* Merge pull request #9447 from nextcloud/feature/noid/trashbin_propfind_oc_sizeRoeland Jago Douma2018-05-114-0/+14
|\ | | | | Trashbin propfind respond to oc:size
| * Trashbin propfind respond to oc:sizeRoeland Jago Douma2018-05-104-0/+14
| | | | | | | | | | | | | | In order to display the total size of folders also in the clients (and web) we should return the oc:size. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [tx-robot] updated from transifexNextcloud bot2018-05-1110-0/+22
|/
* Merge pull request #9360 from GitHubUser4234/ldap_password_renew_invarg_fixRoeland Jago Douma2018-05-102-6/+6
|\ | | | | Fix "Invalid argument supplied for foreach()"
| * adjust unit tests for \"Invalid argument supplied for foreach()\" fixRoger Szabo2018-05-091-4/+4
| | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
| * Fix "Invalid argument supplied for foreach()"Roger Szabo2018-05-021-2/+2
| | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
* | Merge pull request #9427 from ↵Roeland Jago Douma2018-05-102-2/+9
|\ \ | | | | | | | | | | | | nextcloud/bugfix/noid/no_listing_if_not_in_debug_trash_version If not in debug disable principal listing
| * | If not in debug disable principal listingRoeland Jago Douma2018-05-082-2/+9
| | | | | | | | | | | | | | | | | | | | | Trashbin and Version should have the same behaviour as the other collections. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | [tx-robot] updated from transifexNextcloud bot2018-05-1038-58/+428
| | |
* | | Merge pull request #9390 from nextcloud/bugfix/noid/no-body-for-no-contentblizzz2018-05-091-3/+55
|\ \ \ | | | | | | | | Do not send a body for "No content", "Not modified" and others
| * | | Do not send a body for "No content", "Not modified" and othersJoas Schilling2018-05-041-3/+55
| | |/ | |/| | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #9415 from nextcloud/feature/noid/trashbin_dav_deletion_timeMorris Jobke2018-05-096-3/+19
|\ \ \ | | | | | | | | Propfind for deletion time of trash files
| * | | Propfind for deletion time of trash filesRoeland Jago Douma2018-05-086-3/+19
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | [tx-robot] updated from transifexNextcloud bot2018-05-0928-2/+76
| | | |
* | | | Merge pull request #9418 from nextcloud/php-message-indexphpMorris Jobke2018-05-081-0/+5
|\ \ \ \ | |_|_|/ |/| | | Add PHP missing message to index.php
| * | | Add PHP missing message to index.phpMarius Blüm2018-05-081-0/+5
| |/ / | | | | | | Signed-off-by: Marius Blüm <marius@lineone.io>
* | | Merge pull request #9421 from nextcloud/navigation-settings-data-idRoeland Jago Douma2018-05-081-1/+1
|\ \ \ | | | | | | | | Add data-id to settings navigation
| * | | Add data-id to settings navigationJulius Härtl2018-05-081-1/+1
| |/ / | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #9419 from nextcloud/feature/noid/isCLI_parameterRoeland Jago Douma2018-05-081-0/+3
|\ \ \ | |/ / |/| | Expose isCLI to DI
| * | Expose isCLI to DIRoeland Jago Douma2018-05-081-0/+3
|/ / | | | | | | | | | | | | | | This allows apps/backgroundjobs to find out if they are run from the CLI or not. Some apps/backgroundjobs might do more if they are not at risk of timing out. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [tx-robot] updated from transifexNextcloud bot2018-05-08146-132/+202
| |
* | Merge pull request #9381 from ↵Morris Jobke2018-05-076-13/+147
|\ \ | | | | | | | | | | | | nextcloud/feature/noid/add-autocomplete-to-migration-commands Add autocomplete to migration commands
| * | Add autocomplete to migration commandsJoas Schilling2018-05-036-13/+147
| |/ | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #8842 from lanxenet/patch-1Morris Jobke2018-05-071-8/+10
|\ \ | | | | | | fix(AmazonS3): fix loop $result['Contents'] error
| * | fix(AmazonS3): fix loop $result['Contents'] errorenoch2018-03-161-8/+10
| | | | | | | | | Invalid argument supplied for foreach() at /var/www/html/apps/files_external/lib/Lib/Storage/AmazonS3.php#295
* | | Merge pull request #9151 from UncleAlbie/dialog-sortMorris Jobke2018-05-071-1/+1
|\ \ \ | | | | | | | | Sort files in dialog by name.
| * | | Sort files in dialog by name.Patrik Novotný2018-04-181-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Patrik Novotný <patrik.novotny@gmx.com>
* | | | Merge pull request #9411 from nextcloud/new-help-iconMorris Jobke2018-05-071-1/+1
|\ \ \ \ | | | | | | | | | | Replace help icon with ? to avoid conflict with the new about section
| * | | | Replace help icon with ? to avoid conflict with the new about sectionJulius Härtl2018-05-071-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #9397 from nextcloud/log-fileinfo-not-foundMorris Jobke2018-05-071-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Debug log file not found when getting fileinfo
| * | | | | Debug log file not found when getting fileinfoRobin Appelman2018-05-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Merge pull request #9388 from nextcloud/log-lock-state-on-conflictMorris Jobke2018-05-073-10/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | Log lock state on conflict
| * | | | | | 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>
* | | | | | | Merge pull request #9313 from nextcloud/phan-check-php-docMorris Jobke2018-05-071-0/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Check doc block signature to match the specified return type
| * | | | | | | Check doc block signature to match the specified return typeMorris Jobke2018-04-261-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | | Merge pull request #9374 from nextcloud/federation-share-popover-fixMorris Jobke2018-05-074-73/+70
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Federation share popover fix
| * | | | | | | | Fix position and templateJohn Molakvoæ (skjnldsv)2018-05-074-61/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | | | Fixed federation scope popovermenuJohn Molakvoæ (skjnldsv)2018-05-071-14/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | | | | Merge pull request #9393 from nextcloud/bugfix/noid/fix-workflow-rulesblizzz2018-05-072-374/+377
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix workflow rules
| * | | | | | | | | Do not error when the tag does not existJoas Schilling2018-05-041-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | | | | Reset the value when changing the check class (because it might be invalid)Joas Schilling2018-05-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | | | | Revert back to tabsJoas Schilling2018-05-041-372/+372
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | | | | Fix "data is undefined" by adjusting the name of the parameterJoas Schilling2018-05-041-3/+3
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | | | Merge pull request #9363 from ↵John Molakvoæ2018-05-071-0/+11
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/highlighted-navigation-counter Add support for a highlighted navigation counter
| * | | | | | | | | Fixed paddingJohn Molakvoæ2018-05-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | | | | Highlight element change and alignement fixJohn Molakvoæ (skjnldsv)2018-05-071-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | | | | Add support for a highlighted navigation counterJoas Schilling2018-05-071-0/+7
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | | | Merge pull request #9406 from nextcloud/security-devices-sessionsMorris Jobke2018-05-071-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Rename "Security" to "Devices & sessions"