Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2017-02-16 | 6 | -8/+16 | |
| | | ||||||
* | | Merge pull request #3499 from nextcloud/fix-addressbook-deletion | Morris Jobke | 2017-02-15 | 4 | -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 backport | John Molakvoæ (skjnldsv) | 2017-02-15 | 4 | -3/+30 | |
| |/ | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | |||||
* | | Merge pull request #3500 from nextcloud/stable11-3403 | Roeland Jago Douma | 2017-02-15 | 2 | -9/+9 | |
|\ \ | | | | | | | [stable11] Rename database password toggle | |||||
| * | | Rename database password toggle | Morris Jobke | 2017-02-15 | 2 | -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-3485 | Morris Jobke | 2017-02-15 | 1 | -4/+0 | |
|\ \ \ | |_|/ |/| | | [stable11] Popovermenu files css fix | |||||
| * | | Css fix | John Molakvoæ (skjnldsv) | 2017-02-15 | 1 | -4/+0 | |
|/ / | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | |||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2017-02-15 | 22 | -64/+354 | |
| | | ||||||
* | | Merge pull request #3481 from nextcloud/stable11-screensharing-icon | Morris Jobke | 2017-02-14 | 5 | -0/+44 | |
|\ \ | | | | | | | [stable11] add screensharing icon | |||||
| * | | add screensharing icon | Jan-Christoph Borchardt | 2017-02-14 | 5 | -0/+44 | |
|/ / | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | |||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2017-02-14 | 68 | -206/+1094 | |
| | | ||||||
* | | Merge pull request #3440 from nextcloud/backport-oc-26963v11.0.2RC1 | Lukas Reschke | 2017-02-13 | 1 | -8/+8 | |
|\ \ | | | | | | | [stable11] Make sure invalid images don't flood the log file | |||||
| * | | Check if color exists in palette before using it | Victor Dubiniuk | 2017-02-10 | 1 | -3/+3 | |
| | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | |||||
| * | | Make sure invalid images don't flood the log file | Joas Schilling | 2017-02-10 | 1 | -5/+5 | |
| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | |||||
* | | | Merge pull request #3445 from nextcloud/stable11-add-integration-tests-for-dav | Lukas Reschke | 2017-02-13 | 8 | -31/+90 | |
|\ \ \ | | | | | | | | | [stable11] Add integration tests for legacy DAV endpoints | |||||
| * | | | Add integration tests for legacy DAV endpoints | Lukas Reschke | 2017-02-10 | 8 | -31/+90 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | |||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-02-13 | 16 | -60/+248 | |
| | | | | ||||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-02-12 | 30 | -10/+314 | |
| | | | | ||||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-02-11 | 212 | -1336/+1732 | |
| |_|/ |/| | | ||||||
* | | | Merge pull request #3431 from nextcloud/backport-3430-fix-ios-client-detection | Lukas Reschke | 2017-02-10 | 5 | -11/+10 | |
|\ \ \ | |/ / |/| | | [stable11] Fix detection of the new iOS app | |||||
| * | | Fix detection of the new iOS app | Joas Schilling | 2017-02-10 | 5 | -11/+10 | |
| |/ | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | |||||
* | | Merge pull request #3436 from nextcloud/stable11-increase-version | Lukas Reschke | 2017-02-10 | 2 | -3/+3 | |
|\ \ | | | | | | | Increase version to 11.0.2 RC1 | |||||
| * | | Increase version to 11.0.2 RC1 | Lukas Reschke | 2017-02-10 | 2 | -3/+3 | |
| | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | |||||
* | | | Merge pull request #3259 from ↵ | Lukas Reschke | 2017-02-10 | 6 | -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 Schiessle | 2017-01-26 | 2 | -36/+83 | |
| | | | | | | | | | | | | | | | | | | data to match the old API Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | |||||
| * | | unify endpoints form core and the the provisioning api | Bjoern Schiessle | 2017-01-25 | 6 | -35/+113 | |
| | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | |||||
| * | | add data from the users profile to the provisioning api | Bjoern Schiessle | 2017-01-25 | 2 | -4/+65 | |
| | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | |||||
* | | | Merge pull request #3433 from nextcloud/backport-3181-fix-favorite-activity-mail | Lukas Reschke | 2017-02-10 | 2 | -11/+28 | |
|\ \ \ | | | | | | | | | [stable11] Make sure the file information is available when sending the email | |||||
| * | | | Make sure the file information is available when sending the email | Joas Schilling | 2017-02-10 | 2 | -11/+28 | |
| | |/ | |/| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | |||||
* | | | Merge pull request #3426 from nextcloud/stable11-set-vendor-during-install | Lukas Reschke | 2017-02-10 | 1 | -0/+15 | |
|\ \ \ | | | | | | | | | [stable11] Set vendor during install | |||||
| * | | | Set vendor during install | Morris Jobke | 2017-02-09 | 1 | -0/+15 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | |||||
* | | | | Merge pull request #3286 from nextcloud/popover-backport | Lukas Reschke | 2017-02-10 | 5 | -151/+234 | |
|\ \ \ \ | | | | | | | | | | | [stable11] popovermenu backport | |||||
| * | | | | Fit newFileMenu to css guidelines | John Molakvoæ (skjnldsv) | 2017-01-26 | 3 | -41/+12 | |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | |||||
| * | | | | Fit federationScopeMenu to guidelines | John Molakvoæ (skjnldsv) | 2017-01-26 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | |||||
| * | | | | Popover backport from 12 | John Molakvoæ (skjnldsv) | 2017-01-26 | 1 | -109/+221 | |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | |||||
* | | | | | Merge pull request #3412 from ↵ | Lukas Reschke | 2017-02-10 | 8 | -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 fixes | Joas Schilling | 2017-02-09 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | |||||
| * | | | | Fix files sharing legacy as well | Joas Schilling | 2017-02-09 | 7 | -751/+296 | |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | |||||
| * | | | | Add tests for getUser() | Joas Schilling | 2017-02-09 | 1 | -0/+71 | |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | |||||
| * | | | | Add tests for getFile() | Joas Schilling | 2017-02-09 | 2 | -11/+149 | |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | |||||
| * | | | | Make sure ownCloud 8.2 activities also can get displayed | Joas Schilling | 2017-02-09 | 1 | -12/+30 | |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | |||||
* | | | | | Merge pull request #3414 from ↵ | Morris Jobke | 2017-02-10 | 1 | -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 exception | Joas Schilling | 2017-02-09 | 1 | -1/+2 | |
| |/ / / / | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | |||||
* | | | | | Merge pull request #3411 from ↵ | Morris Jobke | 2017-02-09 | 1 | -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 well | Joas Schilling | 2017-02-09 | 1 | -0/+17 | |
| |/ / / / | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | |||||
* | | | | | Merge pull request #3423 from nextcloud/stable11-transifex | Morris Jobke | 2017-02-09 | 2 | -0/+6 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | add transifex config for sharebymail | |||||
| * | | | | add transifex config for sharebymail | Morris Jobke | 2017-02-09 | 2 | -0/+6 | |
|/ / / / | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | |||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-02-10 | 18 | -6/+42 | |
| | | | | ||||||
* | | | | Merge pull request #3251 from nextcloud/fix-upload-estimation-translation | Lukas Reschke | 2017-02-09 | 1 | -9/+6 | |
|\ \ \ \ | |/ / / |/| | | | Use correct plural implementation for upload estimation | |||||
| * | | | Use correct plural implementation for upload estimation | Joas Schilling | 2017-01-25 | 1 | -9/+6 | |
| | |/ | |/| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> |