summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2018-04-2820-14/+16
|
* [tx-robot] updated from transifexNextcloud bot2018-04-2756-156/+316
|
* Merge pull request #9300 from nextcloud/final-13.0.2v13.0.2Morris Jobke2018-04-261-2/+2
|\ | | | | 13.0.2
| * 13.0.2Morris Jobke2018-04-251-2/+2
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | [tx-robot] updated from transifexNextcloud bot2018-04-262-0/+2
|/
* [tx-robot] updated from transifexNextcloud bot2018-04-254-2/+4
|
* [tx-robot] updated from transifexNextcloud bot2018-04-2418-4/+54
|
* [tx-robot] updated from transifexNextcloud bot2018-04-232-0/+2
|
* [tx-robot] updated from transifexNextcloud bot2018-04-2230-54/+104
|
* [tx-robot] updated from transifexNextcloud bot2018-04-2132-4/+180
|
* [tx-robot] updated from transifexNextcloud bot2018-04-2012-0/+22
|
* Merge pull request #9228 from nextcloud/13.0.2-RC1v13.0.2RC1Morris Jobke2018-04-191-2/+2
|\ | | | | 13.0.2 RC 1
| * 13.0.2 RC 1Morris Jobke2018-04-191-2/+2
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | [tx-robot] updated from transifexNextcloud bot2018-04-19150-124/+222
|/
* Merge pull request #9238 from nextcloud/13-8945Morris Jobke2018-04-182-6/+9
|\ | | | | [stable13] Fixed files copy/move when in favorites or recent section
| * Fixed files copy/move when in favorites or recent sectionJohn Molakvoæ (skjnldsv)2018-04-182-6/+9
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #9236 from nextcloud/13-8996Morris Jobke2018-04-182-2/+2
|\ \ | | | | | | [stable13] Fix webdav support for OneNote clients
| * | Fix webdav support for OneNote clientsBrandon Kirsch2018-04-182-2/+2
| |/
* | Merge pull request #9231 from nextcloud/13-9205Morris Jobke2018-04-185-16/+80
|\ \ | | | | | | [stable13] Provide an option to disable HTML emails
| * | Provide an option to disable HTML emailsMorris Jobke2018-04-185-16/+80
| |/ | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #9233 from nextcloud/13-9159Roeland Jago Douma2018-04-184-0/+34
|\ \ | | | | | | [stable13] fix appinfo parsing when a single localized option is provided
| * | fix appinfo parsing when a single localized option is providedRobin Appelman2018-04-184-0/+34
| |/ | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #8986 from nextcloud/backport/8821/show-eol-warningRoeland Jago Douma2018-04-188-1/+28
|\ \ | | | | | | [stable13] Show EOL warning in the update section
| * | Show EOL warning in the update sectionJoas Schilling2018-04-188-1/+28
| |/ | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #9230 from nextcloud/13-9206Daniel Calviño Sánchez2018-04-181-6/+0
|\ \ | | | | | | [stable13] Fix user selectable text for public links for text files
| * | Fix user selectable text for public links for text filesMorris Jobke2018-04-181-6/+0
| |/ | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #9234 from nextcloud/13-7661Julius Härtl2018-04-181-2/+2
|\ \ | |/ |/| [stable13] Use multibyte substring
| * Use multibyte substringRoeland Jago Douma2018-04-181-2/+2
|/ | | | | | Fixes #7661 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* [tx-robot] updated from transifexNextcloud bot2018-04-18254-572/+572
|
* 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>