summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix unit testJoas Schilling2018-02-281-0/+6
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Catch exception when the parent is deleted as wellJoas Schilling2018-02-281-2/+27
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Do a recursion instead of an endless loopJoas Schilling2018-02-281-1/+1
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Fix problem with deleted filesJoas Schilling2018-02-281-5/+14
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Fix path handling for activitiesJoas Schilling2018-02-281-7/+20
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Add special handling for e2e encryptionJoas Schilling2018-02-281-1/+108
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Extract duplicated logic into a methodJoas Schilling2018-02-281-80/+24
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* [tx-robot] updated from transifexNextcloud bot2018-02-28194-464/+662
|
* Merge pull request #8565 from ↵Roeland Jago Douma2018-02-273-2/+137
|\ | | | | | | | | nextcloud/bugfix/fat-48/make-outlook-and-thunderbird-addons-identifyable Make the Outlook and Thunderbird addons identifyable
| * Make the Outlook and Thunderbird addons identifyableJoas Schilling2018-02-273-2/+137
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #8496 from nextcloud/ext-strg-design-fixesMorris Jobke2018-02-276-112/+126
|\ \ | |/ |/| External storage design fixes and update
| * fixup! Fixed testsJohn Molakvoæ (skjnldsv)2018-02-271-3/+3
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * fixup! Fixed testsJohn Molakvoæ (skjnldsv)2018-02-273-13/+10
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * fixup! Fixed testsJohn Molakvoæ (skjnldsv)2018-02-271-20/+20
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Fixed testsJohn Molakvoæ (skjnldsv)2018-02-271-3/+10
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Fixed actions and header missing thJohn Molakvoæ (skjnldsv)2018-02-273-7/+8
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * fixup! Fixed icons paddingJohn Molakvoæ (skjnldsv)2018-02-261-0/+1
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Fixed icons paddingJohn Molakvoæ (skjnldsv)2018-02-262-19/+21
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Select in popover fixJohn Molakvoæ (skjnldsv)2018-02-222-1/+5
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Tooltip fix on status iconJohn Molakvoæ (skjnldsv)2018-02-222-2/+7
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * fixup! Changed config saving feedback designJohn Molakvoæ (skjnldsv)2018-02-221-2/+0
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Better label stylingJohn Molakvoæ (skjnldsv)2018-02-221-3/+3
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Changed config saving feedback designJohn Molakvoæ (skjnldsv)2018-02-224-15/+14
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * fixup! Use popovermenu instead of dropdown and small fix to popovermenuJohn Molakvoæ (skjnldsv)2018-02-221-3/+4
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Use popovermenu instead of dropdown and small fix to popovermenuJohn Molakvoæ (skjnldsv)2018-02-224-58/+57
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #8219 from nextcloud/fix-overwrite-url-on-cli-installMorris Jobke2018-02-271-3/+8
|\ \ | | | | | | Fix proper overwrite URL on CLI install
| * | Fix proper overwrite URL on CLI installMorris Jobke2018-02-071-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * regression from #7835 Steps * having a my.config.php with a proper `overwrite.cli.url` and `htaccess.RewriteBase` set * install with this * before: short URLs where broken and you need to call `occ maintenance:update:htaccess` additionally to fix this * after: occ install results in a proper htaccess like on stable13 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #7363 from nextcloud/default-share-permsMorris Jobke2018-02-2717-64/+244
|\ \ \ | | | | | | | | Let the admin configure the default share permissions
| * | | Fix JSDocMorris Jobke2018-02-271-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Fix share capabilities JS testsVincent Petry2018-02-271-1/+24
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | fix unit testsBjoern Schiessle2018-02-274-28/+65
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | share api: use default permission of no permission is givenBjoern Schiessle2018-02-271-28/+35
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | improved layout of the admin settingsBjoern Schiessle2018-02-271-12/+11
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | add share permissions to settings pageBjoern Schiessle2018-02-279-27/+107
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | expose capabilities in jsBjoern Schiessle2018-02-274-4/+38
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | Merge pull request #8051 from nextcloud/public-templateRoeland Jago Douma2018-02-2724-109/+781
|\ \ \ \ | | | | | | | | | | Public page template response
| * | | | Remove settersJulius Härtl2018-02-271-48/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Rework array handling to avoid phan errorJulius Härtl2018-02-271-27/+12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Add id to list elementJulius Härtl2018-02-271-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Fix acceptance test for new menu structureJulius Härtl2018-02-272-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Add test for PublicTemplateResponseJulius Härtl2018-02-271-0/+84
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Sort menu by priorityJulius Härtl2018-02-271-0/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Fix files_sharing testsJulius Härtl2018-02-272-5/+31
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Add missing phpdoc for public APIJulius Härtl2018-02-273-11/+75
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Add phpdoc, typehints and sanitize HTMLJulius Härtl2018-02-273-11/+96
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Fix popovermenuJulius Härtl2018-02-271-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Use PublicTemplateResponse for files_sharingJulius Härtl2018-02-277-101/+157
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Expose parameters as variables to templatesJulius Härtl2018-02-271-1/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | update autoloaderJulius Härtl2018-02-272-0/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Add menu item abstractionJulius Härtl2018-02-273-0/+265
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>