mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
32,829 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

32829 Commits

Author SHA1 Message Date
Roeland Jago Douma 20020abff4
Move OC_L10N_String to legacy folder 2016-04-27 20:23:25 +02:00
Thomas Müller d061b7072e Merge pull request #24310 from owncloud/enoch85-patch-1 
2015 --> 2016
 2016-04-27 17:04:53 +02:00
Daniel Hansson e4c21eef7b 2015 --> 2016 2016-04-27 15:52:59 +02:00
Thomas Müller 2ab4b1ce04 Merge pull request #23942 from owncloud/fix-behat 
Use baseUrl as provided
 2016-04-27 10:01:32 +02: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
Thomas Müller 20602ff36a Merge pull request #21417 from J0WI/css-fixes 
css fallbacks and code style fixes
 2016-04-27 09:47:36 +02:00
Thomas Müller 977ad50640 Merge pull request #24286 from owncloud/hooks_psr4 
Move \OC\Hooks to PSR-4
 2016-04-27 09:46:54 +02:00
Jenkins for ownCloud 2b67f87ea8 [tx-robot] updated from transifex 2016-04-27 01:55:59 -04:00
Robin McCorkell 77cec29b10 Prevent concurrent availability checks 2016-04-26 22:30:09 +01:00
Lukas Reschke ddbebe91f0 Merge pull request #24246 from owncloud/local-invalid 
error out if a local storage isn't setup correctly
 2016-04-26 20:57:56 +02:00
Carla Schroder 80a9a7d15f correct typo in mimetypealiases.dist.json 2016-04-26 07:29:36 -07:00
Robin Appelman 2f01c83a01 add tests 2016-04-26 16:08:52 +02:00
Robin Appelman 1cc17436f7 update icewind/streams to 1.1.0 2016-04-26 15:43:30 +02:00
Roeland Jago Douma 9a9834d9f5
Move \OC\Hooks to PSR-4 2016-04-26 15:33:47 +02:00
Christoph Wurst e93bf80b29
throw SessionNotAvailableException if session_id returns empty string 2016-04-26 14:51:21 +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
Thomas Müller e5dbeb24ea Merge pull request #24277 from owncloud/more-sanity 
Don't write empty RewriteBase
 2016-04-26 14:35:53 +02:00
Thomas Müller 7d86136670 Merge pull request #24269 from owncloud/backgroundjob_psr4 
Move \OC\BackgroundJob to PSR-4
 2016-04-26 14:34:42 +02:00
Lukas Reschke df8b851f53
Don't write empty RewriteBase 
ownCloud may be configured to live at the root folder without a
trailing slash being specified. In this case manually set the
rewrite base to `/`
 2016-04-26 13:18:18 +02:00
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