wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
31879 commits 157 branches 562 tags 714 MiB
Commit graph

13247 commits

Author SHA1 Message Date
Roeland Jago Douma
354329acf2
Cleanup Files_Sharing CLASSPATH 
* OC\Files\Cache\SharedScanner
* OC\Files\Cache\Shared_Cache
* OC\Files\Cache\Shared_Permissions
* OC\Files\Cache\Shared_Updater
* OC\Files\Cache\Shared_Watcher
* OCA\Files\Share\Maintainer
* OCA\Files\Share\Proxy
 2016-05-02 16:15:40 +02:00
Joas Schilling
b8650be732 Merge pull request #24238 from owncloud/caldav-test-event-in-far-future 
Test an event in the far future
 2016-05-02 10:42:47 +02:00
Roeland Douma
5a62c74495 Merge pull request #24376 from owncloud/remove_dead_code 
Remove dead code
 2016-05-02 09:57:28 +02:00
Morris Jobke
6b12f96b14 Merge pull request #24341 from owncloud/scan-nfd-showwarning 
Add files:scan warning when NFD or incompatible encoding found
 2016-05-02 09:41:12 +02:00
Roeland Jago Douma
45d618a133
Remove dead code 
Ancient files_sharing updater code I came across.
 2016-05-02 08:20:42 +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
Vincent Petry
4326d73ff6
Fix SMB storage to not normalize UTF8 
This makes sure that even if a NFD file name exists, it is found by the
storage and will be visible to higher layers. Even though the file will
be discarded anyway there, it gives the scanner a chance to display a
warning at least.
 2016-04-29 16:19:53 +02:00
Vincent Petry
61203eee04
Add files:scan warning when NFD or incompatible encoding found 2016-04-29 16:18:59 +02:00
Thomas Müller
dda942a917
firstoccurence and lastoccurence have a length now - triggering BIGINT on postgres - refs #24221 2016-04-29 14:57:19 +02:00
Thomas Müller
22ff97256e
Test an event in the far future - refs #24221 2016-04-29 14:57:19 +02: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