summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | [tx-robot] updated from transifexNextcloud bot2017-02-166-8/+16
| |
* | Merge pull request #3499 from nextcloud/fix-addressbook-deletionMorris Jobke2017-02-154-3/+30
|\ \ | | | | | | [stable11] Address book data lost when any user receiving a share is deleted backport
| * | Address book data lost when any user receiving a share is deleted backportJohn Molakvoæ (skjnldsv)2017-02-154-3/+30
| |/ | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #3500 from nextcloud/stable11-3403Roeland Jago Douma2017-02-152-9/+9
|\ \ | | | | | | [stable11] Rename database password toggle
| * | Rename database password toggleMorris Jobke2017-02-152-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | * otherwise submitting the form with the password show will be overwritten * see https://github.com/nextcloud/server/blob/2c9d7eeb763d2f907eea8234f6c60a829a5d39f7/core/Controller/SetupController.php#L59 * seems to be a legacy fallback * fixes #3381 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #3494 from nextcloud/backport-3485Morris Jobke2017-02-151-4/+0
|\ \ \ | |_|/ |/| | [stable11] Popovermenu files css fix
| * | Css fixJohn Molakvoæ (skjnldsv)2017-02-151-4/+0
|/ / | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | [tx-robot] updated from transifexNextcloud bot2017-02-1522-64/+354
| |
* | Merge pull request #3481 from nextcloud/stable11-screensharing-iconMorris Jobke2017-02-145-0/+44
|\ \ | | | | | | [stable11] add screensharing icon
| * | add screensharing iconJan-Christoph Borchardt2017-02-145-0/+44
|/ / | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | [tx-robot] updated from transifexNextcloud bot2017-02-1468-206/+1094
| |
* | Merge pull request #3440 from nextcloud/backport-oc-26963v11.0.2RC1Lukas Reschke2017-02-131-8/+8
|\ \ | | | | | | [stable11] Make sure invalid images don't flood the log file
| * | Check if color exists in palette before using itVictor Dubiniuk2017-02-101-3/+3
| | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | Make sure invalid images don't flood the log fileJoas Schilling2017-02-101-5/+5
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #3445 from nextcloud/stable11-add-integration-tests-for-davLukas Reschke2017-02-138-31/+90
|\ \ \ | | | | | | | | [stable11] Add integration tests for legacy DAV endpoints
| * | | Add integration tests for legacy DAV endpointsLukas Reschke2017-02-108-31/+90
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | [tx-robot] updated from transifexNextcloud bot2017-02-1316-60/+248
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-02-1230-10/+314
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-02-11212-1336/+1732
| |_|/ |/| |
* | | Merge pull request #3431 from nextcloud/backport-3430-fix-ios-client-detectionLukas Reschke2017-02-105-11/+10
|\ \ \ | |/ / |/| | [stable11] Fix detection of the new iOS app
| * | Fix detection of the new iOS appJoas Schilling2017-02-105-11/+10
| |/ | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #3436 from nextcloud/stable11-increase-versionLukas Reschke2017-02-102-3/+3
|\ \ | | | | | | Increase version to 11.0.2 RC1
| * | Increase version to 11.0.2 RC1Lukas Reschke2017-02-102-3/+3
| | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #3259 from ↵Lukas Reschke2017-02-106-48/+234
|\ \ \ | |/ / |/| | | | | | | | nextcloud/add-profile-data-to-provisioning-api-stable11 Add profile data to provisioning api stable11
| * | make sure that 'getCurrentUser' gets an array in order to manipulate the ↵Bjoern Schiessle2017-01-262-36/+83
| | | | | | | | | | | | | | | | | | data to match the old API Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | unify endpoints form core and the the provisioning apiBjoern Schiessle2017-01-256-35/+113
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | add data from the users profile to the provisioning apiBjoern Schiessle2017-01-252-4/+65
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | Merge pull request #3433 from nextcloud/backport-3181-fix-favorite-activity-mailLukas Reschke2017-02-102-11/+28
|\ \ \ | | | | | | | | [stable11] Make sure the file information is available when sending the email
| * | | Make sure the file information is available when sending the emailJoas Schilling2017-02-102-11/+28
| | |/ | |/| | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #3426 from nextcloud/stable11-set-vendor-during-installLukas Reschke2017-02-101-0/+15
|\ \ \ | | | | | | | | [stable11] Set vendor during install
| * | | Set vendor during installMorris Jobke2017-02-091-0/+15
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #3286 from nextcloud/popover-backportLukas Reschke2017-02-105-151/+234
|\ \ \ \ | | | | | | | | | | [stable11] popovermenu backport
| * | | | Fit newFileMenu to css guidelinesJohn Molakvoæ (skjnldsv)2017-01-263-41/+12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Fit federationScopeMenu to guidelinesJohn Molakvoæ (skjnldsv)2017-01-261-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Popover backport from 12John Molakvoæ (skjnldsv)2017-01-261-109/+221
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | Merge pull request #3412 from ↵Lukas Reschke2017-02-108-770/+543
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | nextcloud/backport-3394-files-activity-expects-parameter-1-to-be-an-array [stable11] Make sure ownCloud 8.2 activities also can get displayed
| * | | | Backport more fixesJoas Schilling2017-02-091-1/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Fix files sharing legacy as wellJoas Schilling2017-02-097-751/+296
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Add tests for getUser()Joas Schilling2017-02-091-0/+71
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Add tests for getFile()Joas Schilling2017-02-092-11/+149
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Make sure ownCloud 8.2 activities also can get displayedJoas Schilling2017-02-091-12/+30
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #3414 from ↵Morris Jobke2017-02-101-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/backport-3396-dont-log-password-on-failed-confirmation [stable11] Don't log the password on confirmPassword when LDAP throws an exception
| * | | | | Don't log the password on confirmPassword when LDAP throws an exceptionJoas Schilling2017-02-091-1/+2
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #3411 from ↵Morris Jobke2017-02-091-0/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/backport-3407-user-settings-email-accounts-table [stable11] Update the email in the accounts table as well
| * | | | | Update the email in the accounts table as wellJoas Schilling2017-02-091-0/+17
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #3423 from nextcloud/stable11-transifexMorris Jobke2017-02-092-0/+6
|\ \ \ \ \ | |_|_|/ / |/| | | | add transifex config for sharebymail
| * | | | add transifex config for sharebymailMorris Jobke2017-02-092-0/+6
|/ / / / | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | [tx-robot] updated from transifexNextcloud bot2017-02-1018-6/+42
| | | |
* | | | Merge pull request #3251 from nextcloud/fix-upload-estimation-translationLukas Reschke2017-02-091-9/+6
|\ \ \ \ | |/ / / |/| | | Use correct plural implementation for upload estimation
| * | | Use correct plural implementation for upload estimationJoas Schilling2017-01-251-9/+6
| | |/ | |/| | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>