Commit graph

31945 commits

Author SHA1 Message Date
Thomas Müller
2ee7d2485c
Introduce background repair steps 2016-04-26 11:56:56 +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
Morris Jobke
23e7ad7a78 Merge pull request #24256 from owncloud/scanner-propagate
triger the propagator from the command line scanner
2016-04-26 10:05:39 +02:00
Morris Jobke
ef8fc6a03c Merge pull request #24262 from owncloud/fix-24228
check whether index is set before using it
2016-04-26 09:57:50 +02:00
Roeland Jago Douma
6b5db081a5
Move \OC\BackgroundJob to PSR-4 2016-04-26 08:47:26 +02:00
Morris Jobke
6d62a74d7e Merge pull request #24199 from owncloud/ocp-repair
Introduce OCP\Migration\IRepairStep and adopt all repair steps to thi…
2016-04-26 08:47:04 +02:00
Thomas Müller
0241f7f02c Merge pull request #24268 from owncloud/search_psr4
Move \OC\Search to PSR-4
2016-04-26 08:36:57 +02:00
Roeland Douma
41d435227e Merge pull request #24266 from owncloud/mimetypealiases
correct occ command for mimetypealiases
2016-04-26 07:36:04 +02:00
Roeland Jago Douma
a93c7d0387
Move \OC\Search to PSR-4 2016-04-26 07:32:37 +02:00
Carla Schroder
7dbba520f0 correct occ command for mimetypealiases 2016-04-25 16:08:49 -07: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
9ad30f9c92 Merge pull request #22783 from patelfenil/bugfix-issue-17320
Remove image now not coming when user changes fullname. Fixes #17320
2016-04-25 23:02:00 +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
Lukas Reschke
9c6ba6b123 Merge pull request #24264 from owncloud/route_psr4
Move \OC\Route to PSR-4
2016-04-25 22:32:34 +02:00
Roeland Douma
6938cfc9e3 Merge pull request #24251 from owncloud/fix-mailer
Allow automatic dependency injection for OCP\Mail\Mailer
2016-04-25 21:58:54 +02:00
Roeland Jago Douma
bb1e2f9d9d
Move \OC\Route to PSR-4 2016-04-25 21:49:07 +02:00
Arthur Schiwon
4b46571370
check whether index is set before using it 2016-04-25 18:36:50 +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
Robin Appelman
61054df36d triger the propagator from the command line scanner 2016-04-25 17:23:48 +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
Joas Schilling
a18c8a7da0
Fix the syntax and methods in the sample 2016-04-25 16:03:20 +02:00
Joas Schilling
6d668807fb
Allow automatic dependency injection for OCP\Mail\Mailer 2016-04-25 16:02:57 +02:00
Thomas Müller
c7542c02db
Introduce OCP\Migration\IRepairStep and adopt all repair steps to this new interface - refs #24198 2016-04-25 15:01:13 +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
9e40b647f3 Merge pull request #24248 from owncloud/d--j-master
D  j master
2016-04-25 14:53:37 +02:00
Thomas Müller
f31d0ce87c
Merge branch 'master' of https://github.com/d--j/core into d--j-master 2016-04-25 14:52:38 +02:00
Thomas Müller
ed7e009e05 Merge pull request #24247 from owncloud/weits-patch-1
Weits patch 1
2016-04-25 14:50:32 +02:00
Thomas Müller
ab690371b7
Merge branch 'patch-1' of https://github.com/weits/core into weits-patch-1 2016-04-25 14:49:49 +02:00
Thomas Müller
5348424417 Merge pull request #24205 from owncloud/scanner-locking
add locks in the scanner to prevent multiple scanners running on the …
2016-04-25 14:48: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
Thomas Müller
d43e769e90 Merge pull request #24231 from owncloud/updater_psr4
Move \OC\Updater to PSR-4
2016-04-25 14:41:34 +02:00
Robin Appelman
21643150aa error out if a local storage isn't setup correctly 2016-04-25 14:36:53 +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
76c72b5f43
Move \OC\Updater to PSR-4 2016-04-25 11:32:09 +02:00
Robin Appelman
4ac16001e0
add locks in the scanner to prevent multiple scanners running on the same files 2016-04-25 11:09:08 +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
Christoph Wurst
0d53e86421
add ISession::getId() wrapper for session_id 2016-04-25 10:36:24 +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
Thomas Müller
a4b1d9feee Merge pull request #24226 from owncloud/files_psr4
Move \OC\Files to PSR-4
2016-04-25 08:27:57 +02:00
Jenkins for ownCloud
dab4633300 [tx-robot] updated from transifex 2016-04-25 01:54:53 -04:00
Roeland Jago Douma
dedf392751
Move \OC\Files to PSR-4 2016-04-24 21:37:35 +02:00
Lukas Reschke
dc5c570d7c Merge pull request #24213 from owncloud/systemtag_psr4
Move \OC\SystemTag to PSR-4
2016-04-24 21:02:39 +02:00