summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #16167 from nextcloud/fix/oauth2/testsRoeland Jago Douma2019-07-011-1/+1
|\ | | | | Fix the actual oauth2 tests
| * 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-07-012-0/+2
| |
* | [tx-robot] updated from transifexNextcloud bot2019-06-304-4/+44
|/
* [tx-robot] updated from transifexNextcloud bot2019-06-2920-4/+20
|
* Merge pull request #16148 from nextcloud/fix/text-official-labelRoeland Jago Douma2019-06-281-0/+1
|\ | | | | Mark text as shipped so it's marked as official
| * Mark text as shipped so it's marked as officialJan-Christoph Borchardt2019-06-281-0/+1
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | Merge pull request #16145 from nextcloud/fix/files-rightclick-official-labelRoeland Jago Douma2019-06-281-0/+1
|\ \ | | | | | | Mark files_rightclick as shipped so it's marked as official
| * | Mark files_rightclick as shipped so it's marked as officialChristoph Wurst2019-06-281-0/+1
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #16147 from nextcloud/pol/16076/oauth_downJoas Schilling2019-06-281-1/+1
|\ \ \ | |_|/ |/| | Move OAuth down in admin security settings
| * | Move OAuth down in admin security settingsRoeland Jago Douma2019-06-281-1/+1
|/ / | | | | | | | | | | For #16076 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #16070 from nextcloud/fix/setup-check-no-internet-no-errorRoeland Jago Douma2019-06-284-28/+28
|\ \ | |/ |/| Do not show a internet connectivity warning if internet access is dis…
| * Do not show a internet connectivity warning if internet access is disabledChristoph Wurst2019-06-274-28/+28
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | [tx-robot] updated from transifexNextcloud bot2019-06-2820-28/+54
| |
* | 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 #16122 from nextcloud/fix/apps/sidebar-close-iconRoeland Jago Douma2019-06-274-12/+9
|\ \ \ | | | | | | | | Remove duplicate close-icon
| * | | Remove duplicate close-iconGreta Doci2019-06-274-12/+9
| |/ / | | | | | | | | | Signed-off-by: Greta Doci <gretadoci@gmail.com>
* | | Merge pull request #16107 from nextcloud/local-check-pathRoeland Jago Douma2019-06-271-0/+21
|\ \ \ | | | | | | | | verify that paths are valid for recursive local move
| * | | verify that paths are valid for recursive local moveRobin Appelman2019-06-271-0/+21
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #16097 from ↵Joas Schilling2019-06-274-6/+291
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 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>
| * | | | Add integration test for increasing sub reshare permissionsDaniel Calviño Sánchez2019-06-272-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tests check an user share and a link share; there is a slight difference in style between them as each one is based on the test above it, which tests increasing reshare permissions. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | Do not create folders with admin userDaniel Calviño Sánchez2019-06-271-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The admin user is not deleted after each integration test is run, so folders created by the admin user in one test are still there when the next tests run; tests should be independent one from each other, so a regular user that is created and deleted for each test should be used instead. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | 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 #16117 from nextcloud/fix/avatar_testsRoeland Jago Douma2019-06-271-0/+0
|\ \ \ \ | | | | | | | | | | Use correct test avatar
| * | | | Use correct test avatarRoeland Jago Douma2019-06-271-0/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Show contacts app mgmt link in contacts menu (#16104)John Molakvoæ2019-06-278-16/+23
|\ \ \ \ \ | | | | | | | | | | | | Show contacts app mgmt link in contacts menu
| * | | | | Show contacts app mgmt link in contacts menuChristoph Wurst2019-06-278-16/+23
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | 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>
* | | | | | Merge pull request #16088 from ↵Joas Schilling2019-06-272-5/+7
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/allow-longer-comments-to-be-stored-in-the-comments-api Allow apps to store longer messages in the comments API
| * | | | | Allow apps to store longer messages in the comments APIJoas Schilling2019-06-262-5/+7
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2019-06-278-2/+36
| | | | |
* | | | | Merge pull request #15829 from nextcloud/fix/js-l10n-registrationRoeland Jago Douma2019-06-2610-72/+181
|\ \ \ \ \ | | | | | | | | | | | | Fix js l10n registration to also work with more than one bundle
| * | | | | Fix js l10n registration to also work with more than one bundleChristoph Wurst2019-06-2610-72/+181
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | 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>
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-07 01:01:24 +0000