Thomas Müller
8486926a14
Add provisioning api to enable and disable users
2016-05-02 09:31:22 +02:00
Jenkins for ownCloud
a323111bd1
[tx-robot] updated from transifex
2016-05-02 02:08:49 -04:00
Jenkins for ownCloud
ff8980d59c
[tx-robot] updated from transifex
2016-05-01 01:55:00 -04:00
Roeland Jago Douma
420b5273b1
There is no need to do old etag propagation
...
Etags are calculated differently now and don't require manual updating.
2016-04-30 10:40:45 +02:00
Jenkins for ownCloud
023c8b0eac
[tx-robot] updated from transifex
2016-04-30 01:55:54 -04:00
Jenkins for ownCloud
1f63e8df61
[tx-robot] updated from transifex
2016-04-29 01:54:56 -04:00
Vincent Petry
6ec835c1da
Merge pull request #24287 from owncloud/smb-110
...
update icewind/streams to 1.1.0
2016-04-28 14:08:51 +02:00
Jenkins for ownCloud
ba0099f73a
[tx-robot] updated from transifex
2016-04-28 01:55:14 -04:00
Thomas Müller
44709276c0
Merge pull request #22777 from owncloud/encrypt_all_master_key
...
improved encrypt-all script
2016-04-27 09:48:46 +02:00
Jenkins for ownCloud
2b67f87ea8
[tx-robot] updated from transifex
2016-04-27 01:55:59 -04:00
Robin Appelman
1cc17436f7
update icewind/streams to 1.1.0
2016-04-26 15:43:30 +02:00
Thomas Müller
887045b790
Merge pull request #24027 from owncloud/translate_ocs_share
...
Translate OCS Share API error messages
2016-04-26 14:42:18 +02:00
Bjoern Schiessle
d86f8ba5f8
if we don't have a encrypted file key we can return a empty string right away
2016-04-26 11:06:55 +02:00
Bjoern Schiessle
088ffd05d7
don't create a private-/public-key pair for each user if the master key is enabled
2016-04-26 11:06:55 +02:00
Jenkins for ownCloud
14c3491977
[tx-robot] updated from transifex
2016-04-26 04:50:32 -04:00
Thomas Müller
d8f327831e
Merge pull request #23726 from owncloud/ldap-wizard-improve-status-indicator
...
LDAP Wizard: reset connection status indicator when switching LDAP co…
2016-04-25 23:02:23 +02:00
Thomas Müller
f6e1b43a38
Merge pull request #22648 from owncloud/propagate-single
...
do propagation in a single query
2016-04-25 23:01:45 +02:00
Vincent Petry
5e57d3a0b9
Merge pull request #24244 from owncloud/mount-unique
...
don't get the config for the same mount multiple times
2016-04-25 17:42:20 +02:00
Arthur Schiwon
3e26e1ec16
LDAP Wizard: reset connection status indicator when switching LDAP config
2016-04-25 16:24:44 +02:00
Robin Appelman
dbfdc6282a
do propagation in a single query
2016-04-25 16:18:59 +02:00
Thomas Müller
6321596134
Merge pull request #24052 from owncloud/fix-ldap-cache-race-conditions
...
Fix LDAP race conditions
2016-04-25 14:55:20 +02:00
Thomas Müller
972ce1fe6e
Merge pull request #24240 from owncloud/issue-24233-add-missing-use-statement
...
Add missing use statement
2016-04-25 14:46:29 +02:00
Robin Appelman
ca5b189522
add test
2016-04-25 14:28:01 +02:00
Robin Appelman
7e8fd2c639
don't get the config for the same mount multiple times
2016-04-25 14:21:15 +02:00
Joas Schilling
9491d0f65b
Add missing use statement
2016-04-25 13:22:54 +02:00
Lukas Reschke
604b7a49f6
Merge pull request #24230 from owncloud/you-form-of-activities
...
Translate the current user with "You ..."
2016-04-25 12:57:34 +02:00
Vincent Petry
7a22e3f083
Merge pull request #24214 from owncloud/fix-ldap-connection-unbind-on-login
...
on clone Connection, do not take over the existing LDAP resource
2016-04-25 12:38:09 +02:00
Roeland Jago Douma
5e9b618604
Translate OCS Share API error messages
...
For https://github.com/owncloud/core/issues/22209
2016-04-25 11:08:48 +02:00
Joas Schilling
d4c9566cd5
Translate the current user with "You ..."
2016-04-25 10:30:58 +02:00
Björn Schießle
74de72e75e
Merge pull request #24073 from owncloud/move_federated_sharing_settings_to_app
...
move federated sharing settings to the federatedfilesharing app
2016-04-25 10:19:46 +02:00
Jenkins for ownCloud
dab4633300
[tx-robot] updated from transifex
2016-04-25 01:54:53 -04:00
Jenkins for ownCloud
4dc17e4863
[tx-robot] updated from transifex
2016-04-24 01:55:06 -04:00
Jenkins for ownCloud
afce892e9c
[tx-robot] updated from transifex
2016-04-23 01:56:02 -04:00
Arthur Schiwon
203b0e9cba
on clone Connection, do not take over the existing LDAP resource
...
For one, it solves potential conflicts when using the resource. For the
other, one on the login check (the only place where a clone happens
currently) we do not need to rebind after confirming the user's login
was successful.
2016-04-22 21:43:41 +02:00
Thomas Müller
a3813c55da
Merge pull request #24124 from owncloud/encryped-size-progation
...
dont do optimized size propagation for encrypted files
2016-04-22 15:23:42 +02:00
Björn Schießle
e10105474f
move federated sharing settings to the federatedfilesharing app
2016-04-22 14:55:40 +02:00
Björn Schießle
606b756a94
Merge pull request #23918 from owncloud/cruds-for-federated-shares
...
bring back CRUDS permissions for federated shares
2016-04-22 14:50:42 +02:00
Thomas Müller
3b3cff4f79
Merge pull request #24151 from owncloud/create-personal-calendar
...
Personal calendar should be generated even if the birthday calendar a…
2016-04-22 11:09:45 +02:00
Jenkins for ownCloud
ded84bf571
[tx-robot] updated from transifex
2016-04-22 01:54:58 -04:00
Thomas Müller
a1da081c62
Merge pull request #24157 from owncloud/files-app-is-not-available-on-public-page
...
OCA.Files.App is not available on public page
2016-04-21 23:21:18 +02:00
Thomas Müller
6e4a28ae86
Merge pull request #24155 from owncloud/fix-birthday_calendar-acl
...
Birthday calendar should never have write acl
2016-04-21 16:49:21 +02:00
Björn Schießle
80959ad95a
Merge pull request #24111 from owncloud/chunk-users-in-background-jobs
...
Chunk the users correctly in the trashbin and versions background job
2016-04-21 14:26:41 +02:00
Christoph Wurst
df2a9d1733
OCA.Files.App is not available on public page
2016-04-21 14:23:18 +02:00
Thomas Müller
1d1247069f
Birthday calendar should never have write acl - fixes #24154
2016-04-21 13:36:52 +02:00
Robin Appelman
b7867e9368
Add unit tests for shared size propagation with encryption
2016-04-21 13:13:18 +02:00
Thomas Müller
38c7296867
Personal calendar should be generated even if the birthday calendar already exists - fixes #24082
2016-04-21 12:34:20 +02:00
Vincent Petry
b50d3255fb
Merge pull request #22791 from owncloud/enc_master_key_improvements
...
Enc master key improvements
2016-04-21 11:48:26 +02:00
Jenkins for ownCloud
02ecd040e6
[tx-robot] updated from transifex
2016-04-21 01:58:49 -04:00
Morris Jobke
62a59854f0
Fix LDAP race conditions
...
* getFromCache is wrapped in isCached
* inbetween the two calls the cache entry hits it's TTL
* getFromCache returns null
* this fix only checkes if the returned value is null and
return only non-null values
2016-04-20 21:50:28 +02:00
Thomas Müller
1ab27ddd4a
Merge pull request #24081 from owncloud/migrate-deprecated-jquery-v1-functions
...
migrate deprecated jQuery 1.x functions
2016-04-20 20:38:38 +02:00