summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove/replace missing css varsJulius Härtl2019-02-275-5/+4
| | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* Merge pull request #14343 from nextcloud/bugfix/14052-multiple-navigation-itemsMorris Jobke2019-02-278-18/+370
|\ | | | | Parse multiple navigation items
| * two item => two itemsDaniel Kesselberg2019-02-253-1/+1
| | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * Generate id for navigation itemDaniel Kesselberg2019-02-251-2/+2
| | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * Parse multiple navigation itemsDaniel Kesselberg2019-02-228-17/+369
| | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | Merge pull request #13844 from ↵Morris Jobke2019-02-271-5/+4
|\ \ | | | | | | | | | | | | felixn/bugfix/10862-trash-bin-ignores-trashbin_retention_obligation Bugfix for issue 10862: Trash-bin ignores trashbin_retention_obligation
| * | Fix for issue 10862: calculation of free space ignores external storage ↵Felix Nieuwenhuizen2019-01-261-5/+4
| | | | | | | | | | | | | | | | | | (doesn't count towards quota) Signed-off-by: Felix Nieuwenhuizen <felix@tdlrali.com>
* | | Merge pull request #14399 from ↵blizzz2019-02-273-3/+6
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/feature/noid/fix-top-margin-special-updater-url Fix top margin for info text when non-default updater server URL is used
| * | | Fix top margin for info text when non-default updater server URL is usedMorris Jobke2019-02-273-3/+6
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #14402 from nextcloud/bugfix/noid/log-spamMorris Jobke2019-02-271-1/+0
|\ \ \ \ | | | | | | | | | | Do not register unexisting section
| * | | | Do not register unexisting sectionJoas Schilling2019-02-271-1/+0
|/ / / / | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #14389 from nextcloud/dav-photo-propJohn Molakvoæ2019-02-274-0/+104
|\ \ \ \ | | | | | | | | | | Add HasPhoto DAV plugin
| * | | | Add HasPhoto DAV pluginJohn Molakvoæ (skjnldsv)2019-02-274-0/+104
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2019-02-27154-1490/+1546
| | | | |
* | | | | Merge pull request #14318 from DominikWA/RemoveUnnecessaryMetaTagsRoeland Jago Douma2019-02-264-4/+0
|\ \ \ \ \ | | | | | | | | | | | | Fix referrer policy meta tags.
| * | | | | Remove additional referrer policy meta tag.Dominik Wasielewski2019-02-261-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dominik Wasielewski <d-wasi@web.de>
| * | | | | Remove unnecessary meta tags.Dominik Wasielewski2019-02-263-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dominik Wasielewski <d-wasi@web.de>
* | | | | | Merge pull request #14333 from nextcloud/feature/sharee-explicit-lookupRoeland Jago Douma2019-02-2611-71/+174
|\ \ \ \ \ \ | | | | | | | | | | | | | | Search sharees on lookup server when explicitly requested by user
| * | | | | | Search sharees on lookup server when explicitly requested by userChristoph Wurst2019-02-2611-71/+174
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | Merge pull request #14385 from ↵Joas Schilling2019-02-265-8/+134
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | nextcloud/feature/noid/add-event-to-allow-to-filter-results Add an event to the Autocomplete Controller to allow to filter the re…
| * | | | | Add an event to the Autocomplete Controller to allow to filter the resultsJoas Schilling2019-02-265-8/+134
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #14342 from ↵Morris Jobke2019-02-262-8/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/13911-occ-files-scan-elapsedtime-not-good-after-1day Fix occ files:scan elapsed time
| * | | | | | Fix occ files:scan-app-data elapsed timeJoel S2019-02-222-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joel S <joel.devbox@protonmail.com>
| * | | | | | Fix-13911-occ-files-scan-elapsed-timeJoel S2019-02-221-4/+3
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Signed-off-by: Joel S <joel.devbox@protonmail.com>
* | | | | | Merge pull request #14346 from tomaski/masterMorris Jobke2019-02-261-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix(EMailTemplate): malformed HTML in some cases
| * | | | | | changed order of methodsTomasz Paluszkiewicz2019-02-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Tomasz Paluszkiewicz <tomasz.paluszkiewicz@gmail.com>
| * | | | | | fix(EMailTemplate): malformed HTML in some casesTomasz Paluszkiewicz2019-02-241-0/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when an addBodyListItem() is not directly followed by addBodyButton(), resulting HTML is broken Signed-off-by: Tomasz Paluszkiewicz <tomasz.paluszkiewicz@gmail.com>
* | | | | | Merge pull request #14251 from tomasz-grobelny/upload_reliability_improvementsRoeland Jago Douma2019-02-263-68/+120
|\ \ \ \ \ \ | | | | | | | | | | | | | | Limit number of simultaneous MKCOL requests to server to increase upload reliability
| * | | | | | Fix unit testsTomasz Grobelny2019-02-201-49/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Tomasz Grobelny <tomasz@grobelny.net>
| * | | | | | Limit number of simultaneous MKCOL requests to server to increase upload ↵Tomasz Grobelny2019-02-162-19/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reliability Signed-off-by: Tomasz Grobelny <tomasz@grobelny.net>
* | | | | | | Merge pull request #14227 from nextcloud/enh/comments_to_webpackRoeland Jago Douma2019-02-2629-29/+69
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Move comments to webpack
| * | | | | | | Move comments to webpackRoeland Jago Douma2019-02-2629-29/+69
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* / | | | | | [tx-robot] updated from transifexNextcloud bot2019-02-266-0/+48
|/ / / / / /
* | | | | | Merge pull request #14322 from nextcloud/users-management-enhancementsRoeland Jago Douma2019-02-269-24/+4077
|\ \ \ \ \ \ | | | | | | | | | | | | | | Users management enhancements and fixes
| * | | | | | Compile assetsRoeland Jago Douma2019-02-259-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | Merge remote-tracking branch 'origin/master' into users-management-enhancementsRoeland Jago Douma2019-02-25163-1557/+3501
| |\ \ \ \ \ \
| * | | | | | | Focus new group input on showJohn Molakvoæ (skjnldsv)2019-02-211-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | | Fix app-navigation loadingJohn Molakvoæ (skjnldsv)2019-02-211-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | | update settings buildJohn Molakvoæ (skjnldsv)2019-02-2115-23/+4048
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | | Fix group form reset after new userJohn Molakvoæ (skjnldsv)2019-02-211-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | | Automatically select newly created groupJohn Molakvoæ (skjnldsv)2019-02-211-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | | Fix infiniteLoading state after user add/removeJohn Molakvoæ (skjnldsv)2019-02-211-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2019-02-2616-0/+16
| | | | | | | |
* | | | | | | | Merge pull request #14198 from nextcloud/bugfix/8647-exclude-file-name-patternsMorris Jobke2019-02-262-8/+123
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Exclude file name patterns; ignore gentoo webapp files
| * | | | | | | | Use more precise regexDaniel Kesselberg2019-02-142-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | | | | | Apply code style fixes from owncloud, revert regexDaniel Kesselberg2019-02-142-30/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | | | | | Fix test caseRomain Rivière2019-02-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Romain Rivière <lecoyote@lecoyote.org>
| * | | | | | | | Exclude file name patterns; ignore gentoo webapp filesRomain Rivière2019-02-142-7/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Romain Rivière <lecoyote@lecoyote.org>
* | | | | | | | | Merge pull request #14377 from nextcloud/fix/noid/typoMorris Jobke2019-02-251-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | Fix typo in info log for autoconfig
| * | | | | | | | Fix typo in info log for autoconfigMorris Jobke2019-02-251-1/+1
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>