Lukas Reschke
f65b99c17d
Merge pull request #3431 from nextcloud/backport-3430-fix-ios-client-detection
...
[stable11] Fix detection of the new iOS app
2017-02-10 14:45:54 +01:00
Lukas Reschke
592af1fff1
Merge pull request #3259 from nextcloud/add-profile-data-to-provisioning-api-stable11
...
Add profile data to provisioning api stable11
2017-02-10 13:00:04 +01:00
Lukas Reschke
3f290315ef
Merge pull request #3433 from nextcloud/backport-3181-fix-favorite-activity-mail
...
[stable11] Make sure the file information is available when sending the email
2017-02-10 12:49:39 +01:00
Lukas Reschke
020bf77dde
Merge pull request #3286 from nextcloud/popover-backport
...
[stable11] popovermenu backport
2017-02-10 11:27:03 +01:00
Lukas Reschke
0cb59ad3f5
Merge pull request #3412 from nextcloud/backport-3394-files-activity-expects-parameter-1-to-be-an-array
...
[stable11] Make sure ownCloud 8.2 activities also can get displayed
2017-02-10 10:44:14 +01:00
Joas Schilling
372474603d
Make sure the file information is available when sending the email
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-10 10:35:29 +01:00
Joas Schilling
76a2bf72e6
Fix detection of the new iOS app
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-10 10:13:33 +01:00
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
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
Nextcloud bot
acc759e0c9
[tx-robot] updated from transifex
2017-02-09 01:07:20 +00: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
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
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
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
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
Nextcloud bot
f6b42901dc
[tx-robot] updated from transifex
2017-01-20 01:07:49 +00:00
Nextcloud bot
623ea04317
[tx-robot] updated from transifex
2017-01-19 01:08:17 +00:00
Joas Schilling
d17635b502
Escape the name for the jquery selector
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-18 09:08:13 +01:00
Nextcloud bot
0c8220d57e
[tx-robot] updated from transifex
2017-01-18 01:07:47 +00:00
Joas Schilling
832007a993
Fix "broken" app descriptions
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-17 11:36:40 +01:00
