summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Make 2FA backupcodes strictRoeland Jago Douma2018-03-261-8/+10
| | | | | | * and follow the interface again Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* [tx-robot] updated from transifexNextcloud bot2018-03-2610-0/+16
|
* [tx-robot] updated from transifexNextcloud bot2018-03-2514-10/+44
|
* [tx-robot] updated from transifexNextcloud bot2018-03-248-0/+14
|
* Merge pull request #8943 from nextcloud/dep_oc_jsonRoeland Jago Douma2018-03-2317-82/+82
|\ | | | | Remove \OCP\JSON
| * Finally remove \OCP\JSONRoeland Jago Douma2018-03-233-12/+12
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Move calls to \OCP\JSON to private \OC_JSONRoeland Jago Douma2018-03-2217-82/+82
| | | | | | | | | | | | They should be properly fixed at some point. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #8865 from nextcloud/ocs-groups-displaynameJoas Schilling2018-03-233-0/+59
|\ \ | | | | | | Return groups displayname in provisioning api
| * | Return groups displayname in provisioning apiJohn Molakvoæ (skjnldsv)2018-03-233-0/+59
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #8856 from nextcloud/ocs-api-new-user-password-emailMorris Jobke2018-03-232-12/+55
|\ \ \ | | | | | | | | Allow admin to create users without password by sending mail automatic…
| * | | Allow admin to create users withoutpassword by sending mail automaticallyJohn Molakvoæ (skjnldsv)2018-03-222-12/+55
| | |/ | |/| | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | [tx-robot] updated from transifexNextcloud bot2018-03-2318-8/+28
| | |
* | | Make displayname selectableRoeland Jago Douma2018-03-221-1/+1
| | | | | | | | | | | | It is dav. so if it is not properly set we just return a 404 anyway.
* | | Merge pull request #8909 from ↵Morris Jobke2018-03-221-6/+9
|\ \ \ | |/ / |/| | | | | | | | nextcloud/feature/noid/make-the-autocomplete-endpoint-ocs Make the new autocomplete endpoint OCS
| * | Make the new autocomplete endpoint OCSJoas Schilling2018-03-211-6/+9
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | [tx-robot] updated from transifexNextcloud bot2018-03-2210-0/+30
| | |
* | | Merge pull request #8918 from nextcloud/remove-deprecated-ocp-responseMorris Jobke2018-03-211-2/+2
|\ \ \ | | | | | | | | Remove deprecated and unused OCP\Response
| * | | Remove deprecated and unused OCP\ResponseMorris Jobke2018-03-211-2/+2
| |/ / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #7196 from nextcloud/sharing-confirm-buttonMorris Jobke2018-03-211-2/+10
|\ \ \ | |/ / |/| | Add confirmation button to share input
| * | Replace information icon with confirmation button in share inputJan-Christoph Borchardt2018-03-201-2/+10
| | | | | | | | | | | | | | | | | | | | | The confirmation button right now is just an icon; its behaviour will be added in the following commits. Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | [tx-robot] updated from transifexNextcloud bot2018-03-21130-390/+398
| | |
* | | Merge pull request #8821 from nextcloud/feature/noid/show-eol-warningMorris Jobke2018-03-207-0/+21
|\ \ \ | |/ / |/| | Show EOL warning in the update section
| * | Show EOL warning in the update sectionJoas Schilling2018-03-207-0/+21
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #8847 from nextcloud/ocs-api-userdetailsMorris Jobke2018-03-203-73/+169
|\ \ \ | |/ / |/| | Add userdetails to ocs api
| * | fixup! Check if groups is array, return empty do not throwJohn Molakvoæ (skjnldsv)2018-03-192-37/+5
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Check if groups is array, return empty do not throwJohn Molakvoæ (skjnldsv)2018-03-161-2/+2
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Fixed tests and improved codeJohn Molakvoæ (skjnldsv)2018-03-162-61/+117
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Fixed throw error on unreachable usersJohn Molakvoæ (skjnldsv)2018-03-161-7/+11
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Add userdetails to ocs apiJohn Molakvoæ (skjnldsv)2018-03-162-3/+71
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #8861 from nextcloud/rakekniven-patch-1Joas Schilling2018-03-202-5/+5
|\ \ \ | | | | | | | | Update ThemingController.php
| * | | Update ThemingControllerTest.phprakekniven2018-03-191-2/+2
| | | | | | | | | | | | Adjusted test
| * | | Update ThemingController.phprakekniven2018-03-191-1/+1
| | | | | | | | | | | | Changed file according to discussion on PR.
| * | | Update ThemingController.phprakekniven2018-03-161-3/+3
| | | | | | | | | | | | | | | | Changed wording according to discussion at Transifex. See https://www.transifex.com/nextcloud/nextcloud/translate/#de/$/121491259?issue=yes Aligned ending of error messages
* | | | Merge pull request #8864 from nextcloud/ocs-allow-empty-email-displaynameRoeland Jago Douma2018-03-201-1/+1
|\ \ \ \ | | | | | | | | | | Allow empty emails provisioning api
| * | | | Allow empty emails provisionning apiJohn Molakvoæ (skjnldsv)2018-03-171-1/+1
| | |_|/ | |/| | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | [tx-robot] updated from transifexNextcloud bot2018-03-2014-42/+94
| | | |
* | | | Merge pull request #8880 from nextcloud/delete_unused_downloadRoeland Jago Douma2018-03-192-55/+0
|\ \ \ \ | | | | | | | | | | Remove unused download.php
| * | | | Remove unused download.phpRoeland Jago Douma2018-03-192-55/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were two routes apps/files/ajax/download.php but apparently also apps/files/download.php I could not find any use of it. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #8878 from nextcloud/remove_tmpfileRoeland Jago Douma2018-03-194-5/+5
|\ \ \ \ \ | |/ / / / |/| | | | Remove deprecated tmpFile/tmpFolder
| * | | | Remove \OCP\Files::tmpFileRoeland Jago Douma2018-03-194-5/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #8815 from nextcloud/channel-descriptionRoeland Jago Douma2018-03-192-0/+27
|\ \ \ \ \ | |/ / / / |/| | | | Provide a description of the update channels inline
| * | | | Provide a description of the update channels inlineMorris Jobke2018-03-152-0/+27
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #8857 from nextcloud/swift-verify-cached-tokenMorris Jobke2018-03-191-1/+5
|\ \ \ \ \ | |_|/ / / |/| | | | verify cached swift token
| * | | | verify cached swift tokenRobin Appelman2018-03-161-1/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | [tx-robot] updated from transifexNextcloud bot2018-03-1720-0/+22
| |_|/ / |/| | |
* | | | Merge pull request #8843 from ↵blizzz2018-03-161-2/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/set-share-with-field-to-the-id-of-the-circle Set "share with" field to the ID of the circle
| * | | | Set "share_with" field to the ID of the circleDaniel Calviño Sánchez2018-03-161-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a share is shared with a circle the "share_with" field returned by the API endpoint was always set to the name of the circle. However, the name is not enough to identify a circle. The Circles app now provides the ID of the circle in the "shared with" field of a Share, so this commit modifies the API endpoint to set the "share_with" field to the ID of the circle when provided by the Circles app. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | Merge pull request #8835 from nextcloud/fix/noid/ldap_existence_checkMorris Jobke2018-03-161-1/+2
|\ \ \ \ \ | |/ / / / |/| | | | group existence check works without attribute (like with users)
| * | | | existence check works without attribute (like with users)Arthur Schiwon2018-03-151-1/+2
| | |_|/ | |/| | | | | | | | | | | | | | | | | | cn is not necessarily given everywhere Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* / | | [tx-robot] updated from transifexNextcloud bot2018-03-164-2/+26
|/ / /