summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2018-04-1096-212/+244
|
* Merge pull request #9111 from nextcloud/use-proper-bool-user-disabled-stateMorris Jobke2018-04-092-3/+3
|\ | | | | Return proper boolean and do not save enabled state in db
| * Fixed testsJohn Molakvoæ (skjnldsv)2018-04-091-2/+2
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Properly return boolean on enable stateJohn Molakvoæ (skjnldsv)2018-04-091-1/+1
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #9108 from nextcloud/ocs-api-subadmins-quota-adduserMorris Jobke2018-04-091-43/+77
|\ \ | | | | | | Allow user creation with subadmins and quota
| * | Allow user creation with subadmins and quotaJohn Molakvoæ (skjnldsv)2018-04-061-43/+77
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #9116 from nextcloud/rakekniven-patch-1Roeland Jago Douma2018-04-091-1/+1
|\ \ \ | | | | | | | | Update settings.php
| * | | Update settings.phprakekniven2018-04-091-1/+1
| | | | | | | | | | | | Changed according to discussion.
| * | | Update settings.phprakekniven2018-04-071-1/+1
| | | | | | | | | | | | | | | | | | | | Tiny l10n improvement. Reported at Transifex: https://www.transifex.com/nextcloud/nextcloud/translate/#de_DE/user_ldap/91002448
* | | | Merge pull request #9090 from nextcloud/fix/noid/ldap-format-strict-paramMorris Jobke2018-04-091-17/+26
|\ \ \ \ | | | | | | | | | | parameter provided to L10N::n() could have been a string
| * | | | parameter provided to L10N::n() could have been a stringArthur Schiwon2018-04-051-17/+26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | [tx-robot] updated from transifexNextcloud bot2018-04-092-2/+70
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2018-04-088-0/+16
| |/ / / |/| | |
* | | | [tx-robot] updated from transifexNextcloud bot2018-04-0712-2/+20
| |_|/ |/| |
* | | Merge pull request #9084 from nextcloud/public-page-template-extendMorris Jobke2018-04-0610-190/+16
|\ \ \ | |_|/ |/| | Public page template enhancements
| * | Fix testsJulius Härtl2018-04-051-2/+2
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Update composer autoloaderJulius Härtl2018-04-052-4/+0
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Move external share saving to templateJulius Härtl2018-04-051-10/+10
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Move styling and menu handling to publicpage.jsJulius Härtl2018-04-053-38/+2
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Do not hide primary action textJulius Härtl2018-04-051-4/+0
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Move common menu templates to public APIJulius Härtl2018-04-053-132/+2
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #8904 from nextcloud/ocs-api-get-users-details-per-groupsRoeland Jago Douma2018-04-068-218/+347
|\ \ \ | | | | | | | | Api: return users details by groups
| * | | Rebase to masterJohn Molakvoæ (skjnldsv)2018-04-051-1/+10
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Use abstract subclass so members can be definedJoas Schilling2018-04-055-54/+63
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Fixed testsJohn Molakvoæ (skjnldsv)2018-04-053-49/+54
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Trait bumpJohn Molakvoæ (skjnldsv)2018-04-055-126/+177
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Fixed testsJohn Molakvoæ (skjnldsv)2018-04-052-11/+20
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Cast types directlyJohn Molakvoæ (skjnldsv)2018-04-051-27/+9
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Limit and offsetJohn Molakvoæ (skjnldsv)2018-04-051-1/+5
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Api, return users details by groupsJohn Molakvoæ (skjnldsv)2018-04-054-9/+69
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | [tx-robot] updated from transifexNextcloud bot2018-04-062-0/+2
|/ / /
* | | Merge pull request #9082 from nextcloud/feature/8795/new_webdav_url_in_webRoeland Jago Douma2018-04-053-1/+8
|\ \ \ | |_|/ |/| | Show the new dav url in the web UI
| * | Show the new dav url in the web UIRoeland Jago Douma2018-04-053-1/+8
| |/ | | | | | | | | | | Fixes #8795 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #9085 from ↵Morris Jobke2018-04-051-7/+1
|\ \ | |/ |/| | | | | nextcloud/fix-progress-bar-hidden-before-the-upload-ends Fix progress bar hidden before the upload ends
| * Fix progress bar hidden before the upload endsDaniel Calviño Sánchez2018-04-051-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-0516-0/+26
| |
* | Merge pull request #8926 from nextcloud/ocs-api-quota-fallbackblizzz2018-04-041-1/+10
|\ \ | |/ |/| Return quota even if user is not initialised
| * Fix quota return if unlimitedJohn Molakvoæ (skjnldsv)2018-03-221-1/+1
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Return quota even if user is not initializedJohn Molakvoæ (skjnldsv)2018-03-221-1/+10
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | 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-044-2/+88
| |
* | Merge pull request #8996 from brandonkirsch/fix-onenote-davMorris Jobke2018-04-032-2/+2
|\ \ | | | | | | Fix webdav support for OneNote clients
| * | Fix webdav support for OneNote clientsBrandon Kirsch2018-03-262-2/+2
| | |
* | | Merge pull request #9006 from ↵Morris Jobke2018-04-031-0/+1
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/bugfix/8977/ignore_encrypted_custom_properties Do not treat is-encrypted as custom property
| * | | Do not treat is-encrypted as customer propertyRoeland Jago Douma2018-03-281-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 #8945 from nextcloud/fix-files-copy-in-recent-favoritesMorris Jobke2018-04-032-6/+9
|\ \ \ \ | | | | | | | | | | Fixed files copy/move when in favorites or recent section
| * | | | Fixed files copy/move when in favorites or recent sectionJohn Molakvoæ (skjnldsv)2018-03-222-6/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | Merge pull request #9014 from nextcloud/smb-2.0.5Morris Jobke2018-04-039-25/+45
|\ \ \ \ \ | | | | | | | | | | | | update icewind/smb to 2.0.5
| * | | | | update icewind/smb to 2.0.5Robin Appelman2018-03-289-25/+45
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | [tx-robot] updated from transifexNextcloud bot2018-04-038-16/+144
| | | | | |