summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #16200 from nextcloud/revert/16049-wrong-roundMorris Jobke2019-07-032-2/+2
|\ | | | | Revert incorrect rouding
| * Revert "Fix usage view tests"Daniel Kesselberg2019-07-021-1/+1
| | | | | | | | | | | | This reverts commit 7da7acd0 Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * Revert parts hide quota bar if unlimitedDaniel Kesselberg2019-07-021-1/+1
| | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | [tx-robot] updated from transifexNextcloud bot2019-07-0336-12/+46
| |
* | Merge pull request #16199 from ↵Morris Jobke2019-07-022-3/+20
|\ \ | | | | | | | | | | | | nextcloud/bugfix/noid/refresh_webcal_job_enhancements RefreshWebcalJob: replace ugly Regex with standard php utils
| * | RefreshWebcalJob: replace ugly Regex with standard php utilsGeorg Ehrke2019-07-022-3/+20
| | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | Merge pull request #15741 from mxss/fix/phpdoc-fixesMorris Jobke2019-07-024-2/+40
|\ \ \ | |_|/ |/| | misc phpdoc fixes
| * | misc phpdoc fixesMax Kovalenko2019-05-274-0/+38
| | | | | | | | | | | | Signed-off-by: Max Kovalenko <mxss1998@yandex.ru>
| * | fixed phpdoc parameter typesMax Kovalenko2019-05-271-2/+2
| | | | | | | | | | | | Signed-off-by: Max Kovalenko <mxss1998@yandex.ru>
* | | Merge pull request #16198 from nextcloud/fix/tests/usageMorris Jobke2019-07-021-1/+1
|\ \ \ | | | | | | | | Fix usage view tests
| * | | Fix usage view testsRoeland Jago Douma2019-07-021-1/+1
| | |/ | |/| | | | | | | | | | | | | Follow up to #16049 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #13186 from labor4/edit_carddav_typesMorris Jobke2019-07-021-1/+1
|\ \ \ | |/ / |/| | add carddav-search (vCard2Array) option for X-ADDRESSBOOKSERVER-MEMBER
| * | add carddav-search option for X-ADDRESSBOOKSERVER-MEMBERlabor42019-06-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding field X-ADDRESSBOOKSERVER-MEMBER which can be used to relate persons to groups (macos behaviour). - groups are cards with field X-ADDRESSBOOKSERVER-KIND == 'group' - and all members' UUID/URI in the X-ADDRESSBOOKSERVER-MEMBER array of that group-card. Signed-off-by: labor4 <schreibtisch@labor4.ch>
* | | Do not fail hard on new user mail error (#16183)John Molakvoæ2019-07-021-2/+3
|\ \ \ | | | | | | | | Do not fail hard on new user mail error
| * | | Do not fail hard on new user mail errorJohn Molakvoæ (skjnldsv)2019-07-021-2/+3
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | [tx-robot] updated from transifexNextcloud bot2019-07-02164-290/+324
| | | |
* | | | Merge pull request #16170 from nextcloud/dnd-upload-permissionsRobin Appelman2019-07-011-1/+1
|\ \ \ \ | | | | | | | | | | fix permissions for drag-n-drop uploads
| * | | | fix permissions for drag-n-drop uploadsRobin Appelman2019-07-011-1/+1
| |/ / / | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #16136 from nextcloud/design/theming-body-loginJohn Molakvoæ2019-07-011-1/+1
|\ \ \ \ | | | | | | | | | | Fix dark text in body-login box on light theming colors
| * | | | Fix dark text in body-login box on light theming colorsJan-Christoph Borchardt2019-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | Hide quota bar if unlimited quota (#16049)John Molakvoæ2019-07-012-21/+18
|\ \ \ \ \ | |_|/ / / |/| | | | Hide quota bar if unlimited quota
| * | | | Don't show absolute number in tooltipDaniel Kesselberg2019-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | Show used space in mb instead of %Daniel Kesselberg2019-06-242-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | Hide quota bar if unlimitedDaniel Kesselberg2019-06-231-20/+17
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | Fix the actual oauth2 testsRoeland Jago Douma2019-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Fix tense in email (#16163)John Molakvoæ2019-07-011-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix tense in email
| * | | | | Revert "Change send to sent in l10n files"Frederic Werner2019-06-3090-128/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7ed0d0909db71b01e3960e1ec7f7f8dce7b1c1a5. Signed-off-by: Frederic Werner <frederic-github@werner-net.work>
| * | | | | Change send to sent in l10n filesFrederic Werner2019-06-3090-128/+128
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Frederic Werner <frederic-github@werner-net.work>
| * | | | | Change send to sentFrederic Werner2019-06-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Frederic Werner <frederic-github@werner-net.work>
* | | | | | [tx-robot] updated from transifexNextcloud bot2019-06-302-2/+8
|/ / / / /
* | | | | Move OAuth down in admin security settingsRoeland Jago Douma2019-06-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For #16076 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | [tx-robot] updated from transifexNextcloud bot2019-06-2810-12/+12
| |/ / / |/| | |
* | | | Merge pull request #16121 from ↵Roeland Jago Douma2019-06-271-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/dont-allow-to-disable-encryption-via-the-api Don't allow to disable encryption via the API
| * | | | Don't allow to disable encryption via the APIJoas Schilling2019-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #16097 from ↵Joas Schilling2019-06-272-3/+243
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/correctly-check-share-permissions-for-updating-reshare-permissions Better check reshare permissions
| * | | | | Fix sharing testsRoeland Jago Douma2019-06-271-0/+230
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Correctly check share permissions when updating a re-sub-shareJoas Schilling2019-06-271-3/+13
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change the node you shared was checked for permissions. This works when you reshare the folder that was shared with you. However when you reshared a subfolder (e.g. as public link), you could afterwards update the permissions and grant create+update permissions although the share you receive was read-only. Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #16118 from ↵Roeland Jago Douma2019-06-272-4/+15
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | nextcloud/fix-placement-of-icon-in-public-share-page-for-audio-files Fix placement of icon in public share page for audio files
| * | | | Fix placement of icon in public share page for audio filesDaniel Calviño Sánchez2019-06-272-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the preview for audio files is used an HTML 5 audio element is shown in the public share page. This element is added by the template, so it is already there when the mimetype icon is added to the "#imgframe" element. Instead of appended the icon is now prepended, so it appears before the audio element (prepending instead of appending should make no difference for other types of files, as in that case the "#imgframe" element is empty). Besides that, the CSS was modified to show the icon centered above the audio preview instead of next to it. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | Fix download link included in public share page with hidden downloadDaniel Calviño Sánchez2019-06-271-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The preview element in the public share page was always wrapped with a link to download the file; now that link is included only if the "Hide download" option of the share is not enabled. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | Merge pull request #16101 from ↵blizzz2019-06-273-7/+37
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/fix/ldap/invaliate-user-after-delete-by-plugin invalidates user when plugin reported deletion success
| * | | | | Also invalidate groups after deletionArthur Schiwon2019-06-271-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | invalidates user when plugin reported deletion successArthur Schiwon2019-06-262-5/+26
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | [tx-robot] updated from transifexNextcloud bot2019-06-274-2/+14
| | | | | |
* | | | | | Merge pull request #16095 from nextcloud/bugfix/theming-filetypesJan-Christoph Borchardt2019-06-261-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Only return link to themed icon if file exists
| * | | | | | Only return link to themed icon if file existsJulius Härtl2019-06-261-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | Merge pull request #16093 from nextcloud/design/comments-iconJan-Christoph Borchardt2019-06-262-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update comments icon to use updated core one
| * | | | | | Update comments icon to use updated core oneJan-Christoph Borchardt2019-06-262-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | Merge pull request #16084 from nextcloud/design/fix-files-checkboxesJan-Christoph Borchardt2019-06-261-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix file checkbox margin causing layout issues in file list
| * | | | | Fix file checkbox margin causing layout issues in file listJan-Christoph Borchardt2019-06-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>