Commit Graph

36783 Commits

Author SHA1 Message Date
Morris Jobke e48f608b08
add transifex config for sharebymail
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-09 19:56:04 -06:00
Nextcloud bot 3aeed578fc
[tx-robot] updated from transifex 2017-02-10 01:07:12 +00:00
Joas Schilling 1ee9bee489
Backport more fixes
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-09 14:53:17 +01:00
Lukas Reschke 201055bf8c Merge pull request #3251 from nextcloud/fix-upload-estimation-translation
Use correct plural implementation for upload estimation
2017-02-09 14:45:46 +01:00
Joas Schilling 8d87ac3a9d
Don't log the password on confirmPassword when LDAP throws an exception
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-09 12:20:53 +01:00
Joas Schilling 1badbe922e
Fix files sharing legacy as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-09 12:17:22 +01:00
Joas Schilling fb3821406a
Add tests for getUser()
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-09 12:15:53 +01:00
Joas Schilling b89e2ecd05
Add tests for getFile()
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-09 12:15:44 +01:00
Joas Schilling 0f823b654a
Make sure ownCloud 8.2 activities also can get displayed
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-09 12:15:36 +01:00
Joas Schilling 0ec38e2cf3
Update the email in the accounts table as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-09 12:13:27 +01:00
Nextcloud bot acc759e0c9
[tx-robot] updated from transifex 2017-02-09 01:07:20 +00:00
Joas Schilling d8916ddfd8 Merge pull request #3400 from nextcloud/backport-3023-filter-out-sensitive-appconfigs
[stable11] Filter out sensitive appconfig values
2017-02-08 12:10:13 +01:00
Lukas Reschke e803d8b00d Merge pull request #3399 from nextcloud/backport-3163-wrong-page-title-on-non-nonce-browser
[stable11] Use correct theming when returning the defaults
2017-02-08 10:10:27 +01:00
Nextcloud bot dfe4491b00
[tx-robot] updated from transifex 2017-02-08 01:07:18 +00:00
Morris Jobke 2c4f8089b0 Merge pull request #3363 from nextcloud/fix/2787/busy_also_for_creator_bug_stable11
fix shared-as-busy events for owner
2017-02-07 16:03:41 -06:00
Morris Jobke 98e99cf7ca Merge pull request #3397 from nextcloud/backport-3359-fix-sharing-app-description
[stable11] Fix Sharing app description
2017-02-07 10:47:33 -06:00
Joas Schilling cf849e621b
Fix tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-07 17:00:10 +01:00
Joas Schilling 7c366f1602
Filter out sensitive appconfig values
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-07 16:59:59 +01:00
Joas Schilling 7917ae7c23
Use correct theming when returning the defaults
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-07 16:57:30 +01:00
Joas Schilling 0cb057e256
Fix Sharing app description
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-07 14:34:48 +01:00
Nextcloud bot cd82be929d
[tx-robot] updated from transifex 2017-02-07 01:09:03 +00:00
Nextcloud bot aa124646d2
[tx-robot] updated from transifex 2017-02-06 01:07:13 +00:00
Nextcloud bot 335f2087a3
[tx-robot] updated from transifex 2017-02-05 01:07:13 +00:00
Nextcloud bot 69f0bfb2c1
[tx-robot] updated from transifex 2017-02-04 01:07:29 +00:00
Georg Ehrke d398de5c6a
fix shared-as-busy events for owner
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-02-03 11:08:13 +01:00
Nextcloud bot 8d12c43556
[tx-robot] updated from transifex 2017-02-03 01:07:30 +00:00
Nextcloud bot d71e472ab6
[tx-robot] updated from transifex 2017-02-02 01:07:13 +00:00
Nextcloud bot 44264daa42
[tx-robot] updated from transifex 2017-02-01 01:07:06 +00:00
Nextcloud bot 97a4688580
[tx-robot] updated from transifex 2017-01-31 01:07:13 +00:00
Nextcloud bot 6ab21c2e94
[tx-robot] updated from transifex 2017-01-30 01:07:22 +00:00
Nextcloud bot ea51c2fc12
[tx-robot] updated from transifex 2017-01-29 01:07:03 +00:00
Nextcloud bot 89cd31bd0f
[tx-robot] updated from transifex 2017-01-28 01:07:09 +00:00
Nextcloud bot edb9d83658
[tx-robot] updated from transifex 2017-01-27 01:07:28 +00:00
John Molakvoæ (skjnldsv) 9e7afbf6cb
Fit newFileMenu to css guidelines
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-26 18:32:25 +01:00
John Molakvoæ (skjnldsv) 0b83a25208
Fit federationScopeMenu to guidelines
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-26 18:32:25 +01:00
John Molakvoæ (skjnldsv) aa636f0450
Popover backport from 12
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-26 18:32:25 +01:00
Bjoern Schiessle 757f1b922c
make sure that 'getCurrentUser' gets an array in order to manipulate the data to match the old API
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-26 11:34:07 +01:00
Morris Jobke 475e466d58 Merge pull request #3213 from nextcloud/ldap-ocs-stable11
[stable] 11 LDAP OCS API
2017-01-25 22:50:27 -06:00
Morris Jobke 66efe66580 Merge pull request #3115 from nextcloud/backport-3106-spreed-calls-are-objects
[stable11] Define spreed calls
2017-01-25 22:07:32 -06:00
Nextcloud bot 6b3ddd5ccd
[tx-robot] updated from transifex 2017-01-26 01:07:27 +00:00
Bjoern Schiessle 659320dfca
unify endpoints form core and the the provisioning api
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-25 14:19:41 +01:00
Bjoern Schiessle c4ae0cd433
add data from the users profile to the provisioning api
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-25 14:17:18 +01:00
Joas Schilling 1ae01c5eb5
Use correct plural implementation for upload estimation
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-25 10:22:35 +01:00
Nextcloud bot 026ceab35f
[tx-robot] updated from transifex 2017-01-25 01:10:10 +00:00
Nextcloud bot 175435c76b
[tx-robot] updated from transifex 2017-01-24 01:07:25 +00:00
Arthur Schiwon 9299c9fc79
LDAP OCS API (Part 1)
LDAP OCS Api for create config

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

LDAP OCS Api for delete config

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

fix and extend behat tests

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

add LDAP OCS Api for modifying a configuration

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

test against OCS v2 instead

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

LDAP OCS Api for show config

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

also, let ldap integration tests run

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

fix indentation

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

enable user_ldap app for tests

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

LDAP PUT command now supports setting multiple keys at once

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

fix deletion for configIDs < s10

Also move ensureConfigIDExists checks into try, it might throw DB
related exceptions

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

remove outdated scenario

covered by "Delete a non-existing configuration"

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-23 14:24:10 +01:00
Joas Schilling 275db05a46 Merge pull request #2953 from nextcloud/backport-2797-sudo-password-with-ldap
[stable11] Use login name to fix password confirm with ldap users
2017-01-23 12:09:38 +01:00
Nextcloud bot 34fff32409
[tx-robot] updated from transifex 2017-01-23 00:17:48 +00:00
Nextcloud bot 948ab09a18
[tx-robot] updated from transifex 2017-01-22 01:08:00 +00:00
Nextcloud bot 8c4a329b6d
[tx-robot] updated from transifex 2017-01-21 01:07:55 +00:00