aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #9213 from nextcloud/13-update-crlMorris Jobke2018-04-171-12/+12
|\ | | | | [stable13] Update CRL to include old quicknotes cert
| * Update CRL to include old quicknotes certMorris Jobke2018-04-171-12/+12
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* [tx-robot] updated from transifexNextcloud bot2018-04-178-4/+8
|
* [tx-robot] updated from transifexNextcloud bot2018-04-164-4/+4
|
* [tx-robot] updated from transifexNextcloud bot2018-04-146-0/+82
|
* [tx-robot] updated from transifexNextcloud bot2018-04-1312-4/+44
|
* [tx-robot] updated from transifexNextcloud bot2018-04-12154-264/+306
|
* [tx-robot] updated from transifexNextcloud bot2018-04-1122-70/+160
|
* Merge pull request #9073 from ↵Roeland Jago Douma2018-04-111-1/+1
|\ | | | | | | | | nextcloud/backport/9070/guessing_without_target_is_useles-13 [stable13] When formatting a share node an Empty target is invalid
| * When formatting a share node an Empty target is invalidRoeland Jago Douma2018-04-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | Fixes #9028 For federated shares the share table holds no target information (since it is on the other server). So when a node is actually invalid and not found we should not display it anymore in the shared with sections etc and thus throw the proper exceptions. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [tx-robot] updated from transifexNextcloud bot2018-04-10214-546/+578
| |
* | Merge pull request #9124 from ↵John Molakvoæ2018-04-091-7/+1
|\ \ | | | | | | | | | | | | nextcloud/stable13-9085-fix-progress-bar-hidden-before-the-upload-ends [stable13] Fix progress bar hidden before the upload ends
| * | Fix progress bar hidden before the upload endsDaniel Calviño Sánchez2018-04-091-7/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The jQuery File Upload plugin triggers the "stop" event once there are no more files being uploaded (even if some of them were added when another upload was already in progress). Therefore, the progress bar should be hidden in the "fileuploadstop" callback. In some cases the "stop" event is not triggered and thus the progress bar is not hidden once no more files are being uploaded. This is caused by a race condition and it will be fixed in another commit; except in buggy cases like that one (that need to be fixed anyway) it is safe to hide the progress bar in the "fileuploadstop" callback. In any case, note that the callbacks in "fileuploaddone" may be called after the "stop" event was triggered and handled when using chunked uploads. In that case once all the chunks are uploaded the assembled file is moved to its final destination, so its promise could be resolved after the "stop" event was triggered. Therefore a different approach would be needed to keep the progress bar visible until the chunked upload is truly finished, but for the time being the current one is good enough. Before this commit the progress bar was being hidden when the first upload finished, either successfully or with an error, no matter if there were other files being uploaded too. The progress bar was being explicitly hidden also when the upload was cancelled. When an upload is cancelled all the single uploads are aborted, which triggers a "fail" event for each of them. However, the "stop" event is always triggered when no more files are being uploaded, so it is triggered too once all the single uploads were aborted. As all the single uploads are immediately aborted in a loop when the general upload is cancelled it makes no difference to hide the progress bar when the first single upload is aborted or when all the single uploads were aborted, so the progress bar is no longer explicitly hidden in the former case. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | [tx-robot] updated from transifexNextcloud bot2018-04-094-8/+90
| |
* | [tx-robot] updated from transifexNextcloud bot2018-04-0814-22/+110
| |
* | [tx-robot] updated from transifexNextcloud bot2018-04-07140-176/+208
| |
* | Merge pull request #8779 from nextcloud/backport/8255/show-group-display-namesJohn Molakvoæ2018-04-0610-67/+178
|\ \ | | | | | | [stable13] Show group display names
| * | Fix unit testsJoas Schilling2018-03-162-16/+53
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Fixed caldav tests and metadata 2John Molakvoæ (skjnldsv)2018-03-122-4/+10
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Fix group displaynames in activityJoas Schilling2018-03-124-35/+108
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Correctly return the group nameJoas Schilling2018-03-122-11/+6
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Show the displayname in the users group listJoas Schilling2018-03-121-1/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #9095 from JaredBoone/bugfix/8387Morris Jobke2018-04-062-2/+2
|\ \ \ | | | | | | | | Do not convert email addresses with idn_to_ascii if…
| * | | Do not convert email addresses with idn_to_ascii if INTL_IDNA_VARIANT_UTS46 ↵Jared Boone2018-04-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is undefined. Fixes https://github.com/nextcloud/server/issues/8387. Signed-off-by: Jared Boone <jared.boone@gmail.com>
* | | | [tx-robot] updated from transifexNextcloud bot2018-04-068-4/+510
| | | |
* | | | Merge pull request #9094 from nextcloud/13-9092Roeland Jago Douma2018-04-051-2/+3
|\ \ \ \ | |/ / / |/| | | [stable13] Add more logging for the object storage during creation of the buckets
| * | | Add more logging for the object storage during creation of the bucketsMorris Jobke2018-04-051-2/+3
|/ / / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #9089 from ↵Morris Jobke2018-04-051-0/+1
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/backport/9087/windows10_webdav_netdrive-13 [stable13] Allow usage of Windows 10 WebDav Netdrive
| * | | Allow usage of Windows 10 WebDav NetdriveRoeland Jago Douma2018-04-051-0/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Fixes #3523 As long as we don't have #8123 lets not leave our Window10 netdrive users hanging. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #9071 from ↵Roeland Jago Douma2018-04-051-0/+1
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/backport/9006/ignore_encrypted_custom_properties-13 [stable13] Do not treat is-encrypted as custom property
| * | | Do not treat is-encrypted as customer propertyRoeland Jago Douma2018-04-041-0/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | fixes #8977 Else for all files in a folder we would launch off more queries. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #9077 from nextcloud/fix-callForSeenUsers-stable13Morris Jobke2018-04-051-1/+2
|\ \ \ | | | | | | | | [stable13] Move on with the next user if we found the user on one user back-end
| * | | Move on with the next user if we found the user on one user back-endBjoern Schiessle2018-04-041-1/+2
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | [tx-robot] updated from transifexNextcloud bot2018-04-0526-2/+48
|/ / /
* | | Merge pull request #9017 from nextcloud/smb-2.0.5-13Roeland Jago Douma2018-04-0410-24/+44
|\ \ \ | | | | | | | | [13] update icewind/smb to 2.0.5
| * | | update icewind/smb to 2.0.5Robin Appelman2018-03-2810-24/+44
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #9072 from nextcloud/backport/8891/fix_8890-13Morris Jobke2018-04-042-12/+11
|\ \ \ \ | |_|/ / |/| | | [stable13] Fix proper permissions for multiple file access
| * | | Fix testRoeland Jago Douma2018-04-041-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Fix proper permissions for multiple file accessRoeland Jago Douma2018-04-041-11/+10
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #8890 In case you have access to a file via multiple ways, for example: 1. the file is shared with you with permission read only 2. the folder containing the file is shared with your read/write Requesting the getById function on the userFolder would give back two entries but both with the same permissions. Depending on the node you picked this is not right. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #9064 from nextcloud/fix-copy-encrypted-files-stable13Roeland Jago Douma2018-04-042-8/+9
|\ \ \ | | | | | | | | [stable13] reset encryptionVersion to '1' if a file was stream copied
| * | | reset encryptionVersion to '1' if a file was stream copied, because this ↵Bjoern Schiessle2018-04-032-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | means that we basically write the file from scratch Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | [tx-robot] updated from transifexNextcloud bot2018-04-044-2/+88
|/ / /
* | | Merge pull request #9019 from nextcloud/stable13-8939Morris Jobke2018-04-031-0/+1
|\ \ \ | | | | | | | | [stable13] Fix search text overlapping close button
| * | | Fix search text overlapping clode buttonJulius Härtl2018-03-281-0/+1
| |/ / | | | | | | | | | | | | | | | fixes #8701 Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #9015 from nextcloud/backport-apps-versionsMorris Jobke2018-04-032-18/+45
|\ \ \ | | | | | | | | [stable13] Use app version to generate scss filename
| * | | Use app version to generate scss filenameJohn Molakvoæ (skjnldsv)2018-03-282-18/+45
| | | | | | | | | | | | | | | | | | | | | | | | Fixed scsscacher tests Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #9020 from nextcloud/stable13-8983Morris Jobke2018-04-032-2/+2
|\ \ \ \ | | | | | | | | | | [stable13] Clear any theming prefixed cache on cache buster increase
| * | | | Fix testsJulius Härtl2018-03-281-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Clear any theming prefixed cache on cache buster increaseJulius Härtl2018-03-281-1/+1
| | |/ / | |/| | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | [tx-robot] updated from transifexNextcloud bot2018-04-0314-16/+150
| | | |