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

11982 commits

Author SHA1 Message Date
Thomas Müller
f8c04a4219 Merge pull request #24392 from owncloud/declare-cron-jobs-in-info.xml 
Declare cron jobs in info.xml
 2016-05-03 12:03:28 +02:00
Thomas Müller
15a479fb96 Merge pull request #24408 from owncloud/improve-server-container 
Improve server container
 2016-05-03 12:03:09 +02:00
Thomas Müller
66bc092724 Merge pull request #24405 from owncloud/user_db_capped_cache 
Use a CappedCache in the user database backend
 2016-05-03 11:54:21 +02:00
Björn Schießle
8c0984d605
first call the post_login hooks, before we call getUserFolder. 
The login process needs to be completed before we can safely create
the users home folder. For example we need to give encryption a chance
to initialize the users encryption keys in order to copy the skeleton
files correctly
 2016-05-03 10:46:05 +02:00
Joas Schilling
61ce4f4ef3
Add methods to public interface 2016-05-03 10:30:15 +02:00
Joas Schilling
6ab004fac1
Fix doc block 2016-05-03 10:30:07 +02:00
Joas Schilling
1e5f85ac8c
Use internal tag so IDEs highlight the usage 2016-05-03 10:29:47 +02:00
Roeland Jago Douma
5ba6fe2983
Use a CappedCache in the user database backend 
When running with a user database backend on large installations the
cache can grow to significant sizes. This can be especially problematic
when running big cron/repair jobs.
 2016-05-03 09:29:22 +02:00
Thomas Müller
71fa0a75bf
Allow declaration of background jobs in info.xml 2016-05-03 08:58:12 +02:00
Roeland Jago Douma
03f1a270cc
Move \OC\Log to PSR-4 2016-05-03 08:57:26 +02:00
Roeland Jago Douma
fc82047e26
Move OC_Log_xx to \OC\Log namespace 2016-05-03 08:57:26 +02:00
Lukas Reschke
adf7e7295e Merge pull request #24375 from owncloud/archive_move 
Move OC_Archive to \OC\Archive and PSR-4
 2016-05-03 08:37:01 +02:00
Morris Jobke
a72e6a2dac Merge pull request #24386 from owncloud/psr4-for-apps 
PSR-4 for apps
 2016-05-03 08:24:22 +02:00
Roeland Douma
ed3b9d5aff Merge pull request #24381 from owncloud/correc_typehint 
Use correct typehint for the IProviderFactory
 2016-05-03 07:40:25 +02:00
Roeland Douma
c87bd0432a Merge pull request #24380 from owncloud/move-activity-manager-to-namespace 
Move activity manager to the namespace
 2016-05-03 07:40:04 +02:00
Roeland Jago Douma
c96ed5c4ce
Move OC_Archive to \OC\Archive\Archive 
* Move out of legacy folder
* Move to proper namespace
* Fix calling code
 2016-05-02 19:34:32 +02:00
Roeland Jago Douma
0cb434686c
Move OC_Archive_XX to PSR-4 
* Fix code
* Fix tests
 2016-05-02 19:32:51 +02:00
Thomas Müller
05cf552f66 Merge pull request #24322 from owncloud/install-and-uninstall-repair-steps 
Adding repair steps for install and uninstall
 2016-05-02 17:50:29 +02:00
Roeland Douma
b84825f030 Merge pull request #24229 from owncloud/session-id-wrapper 
add ISession::getId() wrapper for session_id
 2016-05-02 16:49:38 +02:00
Joas Schilling
d879354ccb
Use lib/ instead of src/ because that is what people are used to 2016-05-02 15:45:52 +02:00
Joas Schilling
ee3457aec0
Register the PSR-4 path on loadApp 2016-05-02 15:17:14 +02:00
Thomas Müller
7aca13f14c
Allow login by email address 2016-05-02 14:51:01 +02:00
Thomas Müller
fd844f3eb3 Merge pull request #24336 from owncloud/issue-24328-remove-password-from-exception-trace-in-dav-auth 
Remove the password from the validateUserPass() method as well
 2016-05-02 14:33:07 +02:00
Thomas Müller
b10dcfc3b7
Fixing local event delivery for calendar events based on the email address 2016-05-02 14:20:59 +02:00
Robin Appelman
9677681a37 free up memory when releasing the last shared lock 2016-05-02 14:18:46 +02:00
Joas Schilling
8668560352
Keep the composer instance so we can add psr4 paths later 2016-05-02 14:10:53 +02:00
Thomas Müller
d7eb17bdc0 Merge pull request #24327 from owncloud/better-callForAllUsers-performance 
Better callForAllUsers memory usage
 2016-05-02 13:12:43 +02:00
Roeland Jago Douma
eb1d5fdaf8
Use correct typehint 2016-05-02 11:59:54 +02:00
Joas Schilling
7bfc617b03
Move activity manager to the namespace 2016-05-02 11:57:24 +02:00
Lukas Reschke
f81b57bc45
Read only once 
This can lead to race conditions otherwise. Also depracted hasKey
 2016-05-02 11:31:57 +02:00
Morris Jobke
5595e038ae
Remove unneeded private wrapper methods 2016-05-02 11:23:14 +02:00
Joas Schilling
3397e27657
Remove the password from the validateUserPass() method as well 2016-05-02 10:44:09 +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
9b875db8b8
OCS API should catch LoginExceptions 
Catching the login exception and returning false (login failed). Makes
the OCS API properly return data instead of printing the exception page.
 2016-05-02 09:31:22 +02:00
Thomas Müller
9c9fec36dd
Add occ commands to enable and disable a user + a disabled user can no longer login - fixes #23838 2016-05-02 09:31:22 +02:00
Thomas Müller
5e055ca6c1
Move uninstall repair step execution to the correct place 2016-05-02 09:22:26 +02:00
Thomas Müller
b0211a54c4
Repair steps no longer implement the Emitter interface 2016-05-02 09:17:20 +02:00
Thomas Müller
f91e5f87d2
Fix installer file location 2016-05-02 09:06:19 +02:00
Thomas Müller
e049953d1a
OC_Installer -> \OC\Installer 2016-05-02 08:52:06 +02:00
Thomas Müller
54f45f95f5
Adding repair steps for install and uninstall - fixes #24306 2016-05-02 08:52:06 +02:00
Jenkins for ownCloud
a323111bd1 [tx-robot] updated from transifex 2016-05-02 02:08:49 -04:00
Roeland Jago Douma
e68ca8695d
Move lonely file from \OC\Files to PSR-4 
Conflicting PR probabaly caused this
 2016-05-01 19:40:55 +02:00
Christoph Wurst
13883d2d57
add IClientService to DI container 2016-05-01 15:08:56 +02:00
Roeland Jago Douma
0caa09e845
Move \OC\Group to PSR-4 2016-05-01 13:10:07 +02:00
Roeland Jago Douma
d89b533fa5
Move old classes to legacy 2016-05-01 13:09:28 +02:00
Thomas Müller
4575e8acfc Merge pull request #24360 from owncloud/cleanup_non_psr4 
Move non PSR-4 files from lib/private root to legacy
 2016-05-01 08:47:38 +02:00
Jenkins for ownCloud
ff8980d59c [tx-robot] updated from transifex 2016-05-01 01:55:00 -04:00
Roeland Douma
3a7ad79505 Merge pull request #24212 from owncloud/no_need_to_prop_etag_on_shares 
There is no need to do old etag propagation on shares
 2016-04-30 12:40:30 +02:00
Roeland Jago Douma
368be8894c
Move non PSR-4 files from lib/private root to legacy 
As discussed we move all old style classes (OC_FOO_BAR) to legacy.
Then from there we can evaluate the need to convert them back or if they
can be fully deprecated/deleted.
 2016-04-30 11:32:22 +02:00
Roeland Douma
8f8ae963fd Merge pull request #24207 from owncloud/cache-mount-provider 
mount custom cache folder using mount providers
 2016-04-30 10:47:35 +02:00
Roeland Jago Douma
00122c166a
Properly get the internal path for a cachejail move 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
Thomas Müller
6c2e94e0b2 Merge pull request #24335 from owncloud/warning-for-wrongly-done-storage-wrappers 
Add a warning if a storage wrapper was registered outside of the hook
 2016-04-29 17:43:50 +02:00
Thomas Müller
e59ccc5fe9 Merge pull request #24299 from owncloud/availability-avoid-concurrency 
Prevent concurrent storage availability checks
 2016-04-29 17:43:31 +02:00
Robin Appelman
e51467689d
mount custom cache folder using mount providers 2016-04-29 17:41:09 +02:00
Thomas Müller
f79a81258e Merge pull request #24357 from owncloud/psr_more2 
Move more from \OC to PSR-4
 2016-04-29 17:39:44 +02:00
Vincent Petry
b3a2828c46 Merge pull request #24350 from owncloud/locking-release-memory 
optimize releaselock for memcache based locking backends
 2016-04-29 17:00:44 +02: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
Morris Jobke
daf5f793a4 Merge pull request #24351 from owncloud/capped-normalized-cache 
cap the normalized path cache
 2016-04-29 15:22:06 +02:00
Robin Appelman
a3623745d5 Free up folder content from memory before recursing in the file scanner 2016-04-29 15:16:41 +02:00
Roeland Jago Douma
f52c5b31b6
Move more from \OC to PSR-4 
* \OC\OCSClient
* \OC\Preview
* \OC\PreviewManager
* \OC\Repair
* \OC\RepairException
* \OC\Search
* \OC\ServerContainer
* \OC\ServerNotAvailableException
* \OC\ServiceUnavailableException
* \OC\Setup
* \OC\Streamer
* \OC\SubAdmin
* \OC\SystemConfig
* \OC\TagManager
* \OC\Tags
* \OC\TempManager
* \OC\TemplateLayout
* \OC\URLGenerator
* \OC\Updater
 2016-04-29 15:08:01 +02:00
Roeland Douma
5bf7e6dd02 Merge pull request #24352 from owncloud/psr4_more 
Move more of \OC to PSR-4
 2016-04-29 14:57:58 +02:00
Vincent Petry
6571da1519 Merge pull request #24305 from owncloud/update-show-repair-step-progress 
[Update] show repair step progress ...
 2016-04-29 13:47:15 +02:00
Robin Appelman
d850a764eb cap the normalized path cache 2016-04-29 13:17:41 +02:00
Roeland Jago Douma
f5e0d6ae6a
Move more of \OC to PSR-4 
* \OC\DateTimeFormatter
* \OC\DateTimeZone
* \OC\ForbiddenException
* \OC\HTTPHelper
* \OC\HintException
* \OC\LargeFileHelper
* \OC\Log
* \OC\NaturalSort
* \OC\NavigationManager
* \OC\NeedsUpdateException
* \OC\NotSquareException
 2016-04-29 13:13:47 +02:00
Robin Appelman
49ad0fcfa9 optimize releaselock for memcache based locking backends 2016-04-29 12:54:33 +02:00
Thomas Müller
b9330b5523 Merge pull request #24342 from owncloud/fix_private_root_files 
Moved some files in \OC to PSR-4
 2016-04-29 11:54:59 +02:00
Lukas Reschke
5f9700ccda Merge pull request #24317 from owncloud/app-require-bits 
Allow app developers to specify the minimum int size
 2016-04-29 11:40:42 +02:00
Joas Schilling
f1b6b0799c
Add a warning if a storage wrapper was registered outside of the hook 2016-04-29 09:08:40 +02:00
Roeland Jago Douma
d312051b3d
Moved some files in \OC to PSR-4 
* \OC\ActivityManager
* \OC\AllConfig
* \OC\AppConfig
* \OC\AppHelper
* \OC\Avatar
* \OC\AvatarManager
* \OC\CapabilitiesManager
* \OC\Config
* \OC\ContactsManager
* \OC\DatabaseException
* \OC\DatabaseSetupException
 2016-04-29 08:00:31 +02:00
Thomas Müller
46caf1fbfe Merge pull request #24332 from owncloud/http_psr4 
Move \OC\Http to PSR-4
 2016-04-29 06:53:04 +02:00
Bernhard Posselt
4c1b55be92 allow app developers to specify the minimum int size 
simplify comparison

remove additional null

fix off by 1 error
 2016-04-28 22:55:15 +02:00
Roeland Douma
238dbe9252 Merge pull request #24326 from owncloud/fix_for_php_7_0_6 
Make ownCloud work again in php 7.0.6
 2016-04-28 21:43:32 +02:00
Thomas Müller
0e774e0fd8 Merge pull request #24274 from owncloud/async-repair-steps 
Introduce background repair steps
 2016-04-28 14:11:43 +02:00
Thomas Müller
821d8736c8
Adding progress to web upgrade 2016-04-28 13:52:01 +02:00
Thomas Müller
bbd2a07525
Remove emitter from class Repair 2016-04-28 13:52:01 +02:00
Thomas Müller
cdcd49b473
Adding progress to occ maintenance:repair 2016-04-28 13:52:01 +02:00
Joas Schilling
b8114bcc33
When we iterate over all users that might be too much memory 2016-04-28 12:26:48 +02:00
Roeland Jago Douma
eb11ed1851
Make ownCloud work again in php 7.0.6 
See https://bugs.php.net/bug.php?id=72117
 2016-04-28 12:23:17 +02:00
Joas Schilling
76af70180d
Don't loop over the backends, we already know where the user should be 2016-04-28 12:03:19 +02:00
Roeland Jago Douma
0b69cd1120
Move \OC\Http to PSR-4 2016-04-28 10:10:50 +02:00
Jenkins for ownCloud
ba0099f73a [tx-robot] updated from transifex 2016-04-28 01:55:14 -04:00
Roeland Jago Douma
873d12600d
Move \OC\L10N to PSR-4 2016-04-27 20:23:25 +02:00
Roeland Jago Douma
20020abff4
Move OC_L10N_String to legacy folder 2016-04-27 20:23:25 +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
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
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
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
Roeland Jago Douma
a93c7d0387
Move \OC\Search to PSR-4 2016-04-26 07:32:37 +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
Robin Appelman
61054df36d triger the propagator from the command line scanner 2016-04-25 17:23:48 +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
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
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
Robin Appelman
21643150aa error out if a local storage isn't setup correctly 2016-04-25 14:36:53 +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
Christoph Wurst
0d53e86421
add ISession::getId() wrapper for session_id 2016-04-25 10:36:24 +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
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
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
Roeland Jago Douma
a1373ae259
Move \OC\SystemTag to PSR-4 2016-04-22 20:49:16 +02:00
Roeland Jago Douma
d379157289
Move \OC\Encryption to PSR-4 2016-04-22 17:34:01 +02:00
Thomas Müller
8c7c713e86 Merge pull request #24187 from owncloud/fs-initmountpoint-rethrowifusernotfoundagain 
Mark $usersSetup only if user was found in initMountPoints
 2016-04-22 17:25:40 +02:00
Thomas Müller
e37b95ae53 Merge pull request #24200 from owncloud/appframework_psr4 
Move \OC\AppFramework to PSR-4
 2016-04-22 17:22:02 +02:00
Roeland Jago Douma
4eebccd81f
Fix inconsistent nameing of AppFramework 2016-04-22 16:00:00 +02:00
Thomas Müller
f56be022a3
Disable web updater if ldap or shibboleth are installed - refs https://github.com/owncloud/core/issues/23913#issuecomment-213432232 2016-04-22 15:53:27 +02:00
Roeland Jago Douma
1d33a5ef13
Move \OC\AppFramework to PSR-4 
* Also moved the autoloader setup a bit up since we need it in initpaths
 2016-04-22 15:28:09 +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
cc4efc4c03 Merge pull request #24085 from owncloud/feedback-on-app-migrations 
App migration steps need to push feedback to the user ....
 2016-04-22 14:39:11 +02:00
Vincent Petry
13c01e62cf
Mark $usersSetup only if user was found in initMountPoints 
initMountPoints is marking a user as successfully initialized too
early. If the user was not found an NoUserException was thrown, the
second time initMountPoints is called would not rethrow the exception
and happily continue.

This fix makes sure that we consistently throw NoUserException when
initMountPoints is called repeatedly with invalid users.
 2016-04-22 14:29:41 +02:00
Thomas Müller
c26145aab3 Merge pull request #24166 from owncloud/drop-old-calendar-and-contacts-tables 
Drop old calendar and contacts tables
 2016-04-22 14:23:49 +02:00
Roeland Douma
d0c1dfd30d Merge pull request #24191 from owncloud/setup_psr4 
Move \OC\Setup to PSR-4
 2016-04-22 14:21:17 +02:00
Thomas Müller
43323b0062 Merge pull request #24183 from owncloud/change-background-job-sort-order 
Change the sort order of background jobs to be DESC instead of ASC
 2016-04-22 13:33:54 +02:00
Roeland Jago Douma
479245a301
Move \OC\Repair to PSR-4 2016-04-22 13:00:41 +02:00
Thomas Müller
486c5b1112
Drop old calendar and contacts tables - fixes #21889 2016-04-22 12:26:03 +02:00
Vincent Petry
085bcd7da2
Throw NoUserException when attempting to init mount point for null user 
In some scenarios initMountPoints is called with an empty user, and
also there is no user in the session.

In such cases, it is unsafe to let the code move on with an empty user.
 2016-04-22 11:46:33 +02:00
Joas Schilling
04cee6a7db
Change the sort order of background jobs to be DESC instead of ASC 
In theory, if your instance ever creates more jobs then your system cron can
handle, the default background jobs get never executed anymore. Because
everytime when the joblist returns the next job it looks for the next ID,
however there is always a new next ID, so it will never wrap back to execute
the low IDs. But when we change the sort order to be DESC, we make sure that
these low IDs are always executed, before the system jumps back up to
execute the new IDs.
 2016-04-22 10:49:55 +02:00
Vincent Petry
7be1094ba5 Merge pull request #24173 from owncloud/master-certificate 
[master] Ignore certificate file if it starts with file://
 2016-04-22 09:28:07 +02:00
Thomas Müller
3aa77960ef
Adding pre- and post-migration repair steps 2016-04-22 09:26:31 +02:00
Thomas Müller
788005fd0c Merge pull request #24174 from owncloud/repair_psr4 
Move \OC\Repair to PSR-4
 2016-04-22 09:22:56 +02:00
Thomas Müller
d0030aad6c
Remove deprecated HTTPHelper from InfoParser 2016-04-22 08:38:41 +02:00
Jenkins for ownCloud
ded84bf571 [tx-robot] updated from transifex 2016-04-22 01:54:58 -04:00
Roeland Jago Douma
dbe316f3c5
Move \OC\Repair to PSR-4 2016-04-21 19:22:58 +02:00
Lukas Reschke
06a4da43ec
[master] Ignore certificate file if it starts with file:// 2016-04-21 19:02:31 +02:00
Robin Appelman
5762a68c97 dont do optimized size propagation for encrypted files 2016-04-21 13:18:24 +02:00
Thomas Müller
93649d6fe8 Merge pull request #24135 from owncloud/also-write-htaccess-from-cli 
Write .htaccess also from CLI
 2016-04-21 12:17:55 +02:00
Joas Schilling
6f5d3adfa4 Merge pull request #24133 from owncloud/tagging_psr4 
Move \OC\Tagging to PSR-4
 2016-04-21 10:16:31 +02:00
Jenkins for ownCloud
02ecd040e6 [tx-robot] updated from transifex 2016-04-21 01:58:49 -04:00
Thomas Müller
a061ef75ea Merge pull request #24127 from owncloud/handle-app-loading-error 
Handle app loading error
 2016-04-20 22:41:02 +02:00
Lukas Reschke
cd299b8537
Write .htaccess also from CLI 
The new updater as shipped with ownCloud 9.0.x invokes `occ` via `shell_exec`. This means that the `\OC::$CLI` code is used when updating.

This removes the manual `.htaccess` modifications, effectively leading to the fact that URLs without index.php in it stop working. This also affects share URLs which could be considered a rather serious regression.

- User installs 9.0.0 via web
- User shares /s/1234
- User updates to 9.0.1 via ownCloud updater
- Link to /s/1234 is broken, /index.php/s/1234 works
 2016-04-20 22:00:44 +02:00
Roeland Jago Douma
269eaeed0b
Move \OC\Tagging to PSR-4 2016-04-20 21:24:23 +02:00
Thomas Müller
42b25f7821 Merge pull request #23951 from owncloud/cleanlocks-chunk 
chunk the cleaning up of shared locks
 2016-04-20 20:40:32 +02:00
Thomas Müller
cd01c440a0 Merge pull request #23919 from owncloud/cyclyc-share-dep-example 
SharedStorage to new sharing code + cleanup
 2016-04-20 20:37:27 +02:00
Thomas Müller
cdcabbd0b3 Merge pull request #24098 from owncloud/fix_23782 
When calling file_put_contents clear the checksum
 2016-04-20 20:37:01 +02:00
Thomas Müller
7fea9974b7 In case an app has issues while loading the app is disabled and request processing continues 2016-04-20 18:02:37 +02:00
Thomas Müller
6a6fc742dc Catch class Error on all root entrypoints 2016-04-20 18:01:47 +02:00
Thomas Müller
069af51dd0 With PHP7 Throwable is the new base interface for all Exception and Error - we should be capable to log Throwable as well 2016-04-20 17:56:08 +02:00
Björn Schießle
2edbb7d4bd
if share-permissions exists we use this information as indicator to check if the file has changed or not 2016-04-20 17:47:33 +02:00
Björn Schießle
e906796f99
ask for share-permissions on propfind 2016-04-20 17:47:32 +02:00
Roeland Jago Douma
702046d4aa
Move \OC\Preview to PSR-4 2016-04-20 15:02:44 +02:00
Lukas Reschke
afad27fafd Merge pull request #24075 from owncloud/no-html-on-cli 
In case of fatal php errors and other unhandled exceptions no html er…
 2016-04-20 13:50:43 +02:00
Thomas Müller
ae27583fe2 Merge pull request #24116 from owncloud/fix_24095 
preserve information if it is a rename operation or not
 2016-04-20 13:48:24 +02:00
Thomas Müller
fff272b5cc Merge pull request #23760 from owncloud/fix-setup-mysql 
Fix conditional check in MySQL setup
 2016-04-20 13:46:42 +02:00
Robin McCorkell
440b5caad7 Fix conditional check in MySQL setup 2016-04-20 11:58:27 +01:00
Roeland Jago Douma
bc4185a6fe
Move \OC\Mail to PSR-4 2016-04-20 12:49:23 +02:00
Björn Schießle
4f438eee56
preserve information if it is a rename operation or not 2016-04-20 12:17:15 +02:00
Thomas Müller
aa33ab0c03 Merge pull request #24094 from owncloud/move_dummy_group_backend_to_test 
Move the group dummy backend to test
 2016-04-20 11:55:00 +02:00
Thomas Müller
64956ec2cf Merge pull request #24103 from owncloud/diagnostics_psr4 
Move \OC\Diagnostics to PSR-4
 2016-04-20 11:53:24 +02:00
Jan-Christoph Borchardt
5fe630c4f1 Merge pull request #23980 from owncloud/remember-email-when-setting-expirationdate 
remember email when setting expiration date
 2016-04-20 11:42:02 +02:00
Jenkins for ownCloud
a296cbd203 [tx-robot] updated from transifex 2016-04-20 01:54:55 -04:00
Roeland Jago Douma
0dbcbc4cae
When the scanner detects a file is changed clear checksum 
Fixes #23782 and #23783

If the file scanner detects a changed file we clear the checksum while
we update the cache.

* Unit test added
 2016-04-19 20:20:45 +02:00
Roeland Jago Douma
e2bff0b35d
Move \OC\Diagnostics to PSR-4 2016-04-19 19:29:47 +02:00
Thomas Müller
c0d132150a Merge pull request #24079 from owncloud/console_psr4 
Move \OC\Console to PSR-4
 2016-04-19 16:05:34 +02:00
Thomas Müller
5b2ef92eb2 Merge pull request #24004 from owncloud/dont-transfer-files-to-not-ready-user 
Introduce isReadyForUser and verify in file transfer ownership
 2016-04-19 15:56:47 +02:00
Roeland Jago Douma
dd7e0d13e5
Move the group dummy backend to test 
The dummy backend is only used for testing and should thus reside in
tests.
 2016-04-19 15:13:31 +02:00
Roeland Jago Douma
b53d6598f1
Move moveFromCache to CacheJail 2016-04-19 14:04:00 +02:00
Roeland Jago Douma
f27d7cbf99
Move copy- and moveFromStorage to jail 2016-04-19 14:04:00 +02:00
Robin Appelman
2f1c62ce0b
Only construct the storage when we start using it 2016-04-19 14:04:00 +02:00
Roeland Jago Douma
c98fef8a51
Fix resolve path 2016-04-19 14:04:00 +02:00
Roeland Jago Douma
afa37d363f
Fix related logic 2016-04-19 14:04:00 +02:00
Robin Appelman
3f95d44ed1
cache the scanner/updater/cache in the wrapper storage 2016-04-19 14:04:00 +02:00
Christoph Wurst
e7f07ba02e
extract mail view for sending share invitations 
fixes #22947
 2016-04-19 11:37:23 +02:00
Roeland Jago Douma
a3a31b5fee
Move \OC\Console to PSR-4 2016-04-19 10:48:46 +02:00
Thomas Müller
7054b9719b Merge pull request #24074 from owncloud/integritycheck_psr4 
Move OC\IntegrityCheck to PSR-4
 2016-04-19 10:17:48 +02:00
Thomas Müller
f8c55beaae Merge pull request #23903 from owncloud/fix-user-data-folder-creation-for-apache-login 
Ensure the user's data folder is created for IApacheBackend authentication
 2016-04-19 08:35:21 +02:00
Jenkins for ownCloud
f812f51c5d [tx-robot] updated from transifex 2016-04-19 01:55:59 -04:00
Thomas Müller
1773dcbef2 Merge pull request #23973 from owncloud/share_move_post_delete_from_group_hook 
Move post_removeFromGroup to shareManager
 2016-04-19 06:59:58 +02:00
Petr Svoboda
465152023d solves problem with moving files via WebDAV 
When moving files via WebDAV I sometimes got 

PHP Fatal error:  Nesting level too deep - recursive dependency? in /var/www/owncloud/lib/private/files/view.php on line 729

This small change has fixed the problem for me
 2016-04-19 00:49:21 +02:00
Thomas Müller
c609abf075
In case of fatal php errors and other unhandled exceptions no html error page is expected to be displayed in the console 2016-04-18 22:30:01 +02:00
Roeland Jago Douma
c03bd2d8a7
Fix use statement 2016-04-18 22:06:14 +02:00
Roeland Jago Douma
161eaadc89
Move OC\IntegrityCheck to PSR-4 2016-04-18 21:46:07 +02:00
Lukas Reschke
8222ad5157
Move logout to controller 
Testable code. Yay.
 2016-04-18 21:21:52 +02:00
Christoph Wurst
b4c5a5b9bf Merge pull request #23911 from owncloud/split-upgrade-command 
Move version check code out of class Updater
 2016-04-18 20:58:00 +02:00
Thomas Müller
1626850fc9
Remove deprecated HTTPHelper 2016-04-18 17:28:10 +02:00
Thomas Müller
5c3183cedd
Move version check code out of class Updater 2016-04-18 17:12:59 +02:00
Thomas Müller
739dfb5c66
Suggest cli based updater in case the instance is bigger - #23913 2016-04-18 17:09:21 +02:00
Lukas Reschke
14fdafaede Merge pull request #23947 from owncloud/login-to-ctrl 
Move login form into controller
 2016-04-18 11:47:57 +02:00
Roeland Jago Douma
3301bfd195
Move \OC\Notification to PSR-4 2016-04-18 09:20:06 +02:00
Roeland Jago Douma
f3d05486fd
Move \OC\Memcache to PSR-4 2016-04-18 08:21:50 +02:00
Morris Jobke
d5aa694ccf Merge pull request #24036 from owncloud/db_psr4 
Move \OC\DB to PSR-4
 2016-04-17 19:50:07 +02:00
Jenkins for ownCloud
d33f048bee [tx-robot] updated from transifex 2016-04-17 01:54:52 -04:00
Roeland Jago Douma
d09f835dca
Move \OC\DB to PSR-4 
Besides the statement wrapper that is moved to the legacy folder
(namepsace of shame folder)
 2016-04-15 19:46:34 +02:00
Lukas Reschke
17dfffefb3
Keep used username in URL 
This is required until the new controller can also handle POST requests
 2016-04-15 19:33:25 +02:00
Daniel Jagszent
5a0938ad8e Call private cache methods only for OC\Files\Cache\Cache 
The two implementation detail methods `correctFolderSize` and
`calculateFolderSize` should only be called for instances of
`OC\Files\Cache\Cache`. This commit adds guarding checks
whenever they are called.
 2016-04-15 17:56:27 +02:00
Lukas Reschke
331e4efacb
Move login form into controller 
First step on getting the authorisation stuff cleaned up. This is only for the login form, all other stuff is still where it is.
 2016-04-15 17:36:23 +02:00
Roeland Jago Douma
653325f254
Move \OC\Comments to PSR-4 2016-04-15 15:54:20 +02:00
Thomas Müller
50e20e531e
Introduce isReadyForUser and verify in file transfer ownership - fixes #23786 2016-04-15 15:07:40 +02:00
Roeland Jago Douma
5c6079cd89
Move \OC\Command to PSR-4 2016-04-15 12:01:13 +02:00
Roeland Jago Douma
d9007ccacf
Move \OC\Cache to PSR-4 2016-04-15 09:22:37 +02:00
Roeland Jago Douma
e2c36c2903
Move \OC\Session to PSR-4 2016-04-15 07:46:19 +02:00
Thomas Müller
e3b90d7caa Merge pull request #24007 from owncloud/security_psr4 
Move \OC\Security to PSR-4
 2016-04-14 23:44:36 +02:00
Thomas Müller
b23037ec5c Merge pull request #23998 from owncloud/translate-birthday 
Translate contacts birthday
 2016-04-14 23:41:03 +02:00
Thomas Müller
f4f4f88347 Merge pull request #24005 from owncloud/3rdparty-has-to-be-in-root 
Kill movable 3rdparty
 2016-04-14 23:33:34 +02:00
C. Montero Luque
ed1874ee97 Merge pull request #23561 from owncloud/background-scan-unscanned 
handle completely unscanned storages in the background scanner
 2016-04-14 15:23:42 -04:00
Roeland Jago Douma
9050e76d95
Move \OC\Security to PSR-4 2016-04-14 19:21:18 +02:00
Thomas Müller
dc061bae42
Kill movable 3rdparty 2016-04-14 17:59:49 +02:00
Thomas Müller
55735e1450
Translate contacts birthday - fixes #23982 2016-04-14 16:58:45 +02:00
Thomas Müller
0cff70bb90 Merge pull request #23991 from owncloud/handle-exceptions-in-templates 
Properly handle exception within templates
 2016-04-14 15:38:47 +02:00
Scrutinizer Auto-Fixer
25fff15487 Scrutinizer Auto-Fixes (#23959) 
* Scrutinizer Auto-Fixes

This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com

* revert append() change
 2016-04-14 11:50:06 +02:00
Morris Jobke
dfb98c31a3 Merge pull request #19615 from owncloud/issue-15858-mount-points-return-wrong-paths-for-getusersharingfiles 
Fix Share::getUsersSharingFile() for mount points
 2016-04-14 11:49:11 +02:00
Roeland Jago Douma
7b3191705c
Let the querybuilder convert 2016-04-14 11:32:34 +02:00
Robin Appelman
68746e1bdb
chunk the cleaning up of shared locks 2016-04-14 11:32:34 +02:00
Morris Jobke
12f1adb7bb
Properly handle exception within templates 
* fixes partial printed templates when exception is thrown in between
 2016-04-14 11:22:38 +02:00
Roeland Jago Douma
86e757d2b3
Move \OC\Lock to PSR-4 2016-04-14 08:28:16 +02:00
Roeland Jago Douma
e5dd4272d3
Move \OC\App to PSR-4 2016-04-13 19:53:05 +02:00
Joas Schilling
79c17cdfa6
Fix Share::getUsersSharingFile() for mount points 2016-04-13 17:44:18 +02:00
Roeland Jago Douma
6144ced7a0
Move post_removeFromGroup to shareManager 
The last sharing hook to be moved over.

* Added unit tests
* Removed old tests that relied on old behaviour
* Removed old hooks.php
 2016-04-13 15:00:12 +02:00
Thomas Müller
7f87c3e843 Merge pull request #23962 from owncloud/activity-psr4 
Move files in \OC\Activity to PSR-4
 2016-04-13 14:10:07 +02:00
Joas Schilling
009f96cb83 Merge pull request #23963 from owncloud/lazyRoot 
Add LazyRootFolder
 2016-04-13 12:53:28 +02:00
Roeland Jago Douma
55497e09a9
Make shareproviders use the lazy root folder 2016-04-13 11:23:07 +02:00
Roeland Jago Douma
5cd8382d39
Add lazyRootFolder 2016-04-13 11:23:02 +02:00
Thomas Müller
e90a3b5ba7 Merge pull request #23954 from stweil/master 
misc: Fix some typos
 2016-04-13 11:08:58 +02:00
Roeland Jago Douma
a5a6c85c1c
Move files in \OC\Activity to PSR-4 2016-04-13 10:29:36 +02:00
Jenkins for ownCloud
a2da7614a0 [tx-robot] updated from transifex 2016-04-13 01:54:59 -04:00
Stefan Weil
ee5f5eebe5 misc: Fix some typos 
Some of them were found by codespell.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2016-04-12 18:36:39 +02:00
Björn Schießle
f17ad18865
set $share to null if getShareByToken() failed 2016-04-12 17:26:09 +02:00
Thomas Müller
fdee771aca Add unit testing capabilities for templates (#23708) 
Add unit testing capabilities for templates
 2016-04-12 12:49:11 +02:00
Roeland Douma
495a964ca2 Migrate post_groupDelete hook to share manager (#23841) 
The hook now calls the share manager that will call the responsible
shareProvider to do the proper cleanup.

* Unit tests added

Again nothing should change it is just to cleanup old code
 2016-04-12 09:46:25 +02:00
Roeland Douma
4ddf9f98f1 Don't calculate permissions twice (#23917) 
There is no need to calculate the permissions twice.
Saves some is_dir and file_exists calls.
 2016-04-12 09:45:59 +02:00
Jenkins for ownCloud
59080bef51 [tx-robot] updated from transifex 2016-04-12 02:08:35 -04:00
Joas Schilling
8e16e7bf34 Merge pull request #23856 from owncloud/share_remove_addtogroup_hooks 
Remove pre/post_addToGroup hooks for shares
 2016-04-11 15:05:20 +02:00
Morris Jobke
ddbb9b7ec4 Catch the AutoloadNotAllowedException also for legacy jobs (#23901) 
* same as #18839 for legacy jobs
* avoids spamming the log with useless entries
 2016-04-11 14:06:11 +02:00
Joshua Ruehlig
329849f2c2 To be safe don't unload until end (#23752) 
* To be safe don't unload until end

* unlink needs to be before return to actually do anything
 2016-04-11 14:04:57 +02:00
Morris Jobke
929a28421a Merge pull request #23798 from owncloud/federated-unshare-background-job 
re-try to send unshare notification if remote server is not available
 2016-04-11 11:13:00 +02:00
Thomas Müller
bab55141a6 Fixes #23899 2016-04-11 10:35:52 +02:00
Thomas Müller
e2c4a0cecd Merge pull request #23860 from owncloud/followup-23304-opening-empty-file 
Correctly return an empty string for empty files
 2016-04-11 10:08:24 +02:00
Thomas Müller
1d3d43b1e9 Merge pull request #23553 from owncloud/lock-ttl-execution-time 
Make lock ttl configurable
 2016-04-08 14:53:26 +02:00
Thomas Müller
53acb4a65f Merge pull request #23736 from owncloud/move_public_webdav_auth_to_share_manager 
Move public webdav auth to share manager
 2016-04-08 14:52:15 +02:00
Joas Schilling
178ad23d80
Correctly return an empty string for empty files 2016-04-08 14:50:42 +02:00
Roeland Jago Douma
bd3bde2f3b
Set proper permissions on link share 
If we do not allow public upload we should limit the permissions on
links shares upon retrieval.

* Added unit test
* Allow fetching federated shares by token as well
 2016-04-08 14:17:05 +02:00
Roeland Jago Douma
3fae4c82d2
Remove pre/post_addToGroup hooks for shares 
There is no need to perform the checks for unique targets on add to
group as we have to do this all when mounting the shares anyway.
 2016-04-08 11:56:38 +02:00
Bjoern Schiessle
fbd5c28c39 re-try to send unshare notification if remote server is not available 2016-04-08 11:32:04 +02:00
Stefan Weil
b1a856d7b7 lib: Fix typos (found by codespell) 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2016-04-07 19:51:27 +02:00
Joas Schilling
0de15a86f0 Merge pull request #23773 from owncloud/share_move_delete_user_hook 
Migrate post_userDelete hook to share manager
 2016-04-07 13:01:10 +02:00
Robin Appelman
cdedda99e4 Make lock ttl configurable 2016-04-07 08:24:13 +02:00
Jenkins for ownCloud
1576a9a10b [tx-robot] updated from transifex 2016-04-07 01:56:01 -04:00
Lukas Reschke
9b930cd01d Merge pull request #23766 from owncloud/replace-getid-3 
Replace getid3 with ID3Parser
 2016-04-06 18:32:18 +02:00
Roeland Douma
93b1768eb7 Merge pull request #23819 from owncloud/move-core-completely-to-psr4 
Move OC/Core completely to PSR-4
 2016-04-06 13:31:44 +02:00
Roeland Douma
7ed271b168 Merge pull request #23820 from owncloud/move-settings-completely-to-psr4 
Move OC/Settings completely to PSR-4
 2016-04-06 13:31:05 +02:00
Jenkins for ownCloud
de122a9b04 [tx-robot] updated from transifex 2016-04-06 06:47:12 -04:00
Lukas Reschke
cc5a2b549e
Replace getid3 with ID3Parser 2016-04-06 12:00:16 +02:00
Lukas Reschke
5a0c936f99
Remove OC/Settings from old autoloader 2016-04-06 11:34:53 +02:00
Lukas Reschke
c952adabb5
Remove OC/Core autoloading from old autoloader 2016-04-06 11:34:29 +02:00
Morris Jobke
046506dd14 Merge pull request #23763 from owncloud/do_not_export_share_type_2 
Share type 2 is private
 2016-04-06 09:40:13 +02:00
Thomas Müller
1bb40b866a Merge pull request #23811 from owncloud/move-settings-and-oc-core-to-composer 
Add OC\Core and OC\Settings to composer autoloader
 2016-04-05 17:58:07 +02:00
Thomas Müller
60f532882c Merge pull request #23794 from owncloud/handle-null-in-usermanager 
Prevent null to be passed into the closure of callForAllUsers
 2016-04-05 17:57:39 +02:00
Lukas Reschke
433c0160b6 Move OC\Core and OC\Settings to composer autoloader 2016-04-05 16:47:38 +02:00
Thomas Müller
64d400b5df Prevent null to be passed into the closure of callForAllUsers 2016-04-05 10:26:04 +02:00
Jan-Christoph Borchardt
73a6664ca8 load mobile styles last, fix #19596 2016-04-05 09:47:39 +02:00
Thomas Müller
961bb4c3e3 Merge pull request #23677 from owncloud/db-schema-migration-feedback 
Show individual sql schema migration steps during upgrade - on web as…
 2016-04-05 09:39:35 +02:00
Morris Jobke
6ecd1d9e86 Fix PHP memory leak in file_get_contents() 
* ref https://bugs.php.net/bug.php?id=61961

* ref https://github.com/owncloud/core/issues/20261#issuecomment-180000256

* code is based on the proposal of @chriseqipe

* fixes #20261
 2016-04-04 16:48:09 +02:00
Thomas Müller
4b79fb10a2 Fix verbose output of upgrade command - not progressbar in this case and the schema migration test has one progressbar now for all tables - before we had one progressbar for each table 2016-04-04 16:20:53 +02:00
Roeland Jago Douma
e0cee43cf0 Migrate post_userDelete hook to share manager 
This makes the post_userDelete hook call the sharemanager. This will
cleanup to and from this user.

* All shares owned by this user
* All shares with this user (user)
* All custom group shares
* All link share initiated by this user (to avoid invisible link shares)

Unit tests are added for the defaultshare provider as well as the
federated share provider
 2016-04-04 14:15:38 +02:00
Thomas Müller
f6cea3c9c4 Merge pull request #23557 from owncloud/sabre-plugin-browser-error-page 
In case of exception we return an html page in case the client is a b…
 2016-04-04 13:51:23 +02:00
Thomas Müller
1bf4c75e8b Show individual sql schema migration steps during upgrade - on web as well as on the command line 2016-04-04 12:34:18 +02:00
Bernhard Posselt
4887f0f9b5 Add better messages for sometimes obscure exceptions 
* add better messages for sometimes obscure exceptions

* fix formatting
 2016-04-04 10:55:46 +02:00
Thomas Müller
64d68eb2da Merge pull request #23722 from owncloud/also-hide-password-for-private-key-password-update 
Also replace password in updatePrivateKeyPassword
 2016-04-04 10:54:59 +02:00
Joas Schilling
1d542e4ed2 Merge pull request #23728 from owncloud/sanitize-more-data-for-config-report 
Sanitize more data in config report
 2016-04-04 09:47:02 +02:00
Roeland Jago Douma
d3959ee152 Share type 2 is private 
This was added to the factory for legacy reasons when converting from
old to new sharing code. It is not used anymore so can be deleted. Which
means we no longer expose internal types.
 2016-04-04 09:00:06 +02:00
Jenkins for ownCloud
deca08a683 [tx-robot] updated from transifex 2016-04-02 01:55:25 -04:00
Lukas Reschke
a5f2f22c12 Sanitize more data in config report 
This sanitizes the following keys as well:

- `proxyuserpwd`
- `shared_secret` of `log.condition`
- `license-key`
- `password` of `redis`
 2016-04-01 13:03:34 +02:00
Lukas Reschke
09b14ceffc Also replace password in updatePrivateKeyPassword 
Fixes https://github.com/owncloud/core/issues/23717
 2016-04-01 10:32:23 +02:00
Joas Schilling
0235a79b4e Initialise the printcss array 2016-04-01 09:46:15 +02:00
Jenkins for ownCloud
cce6194368 [tx-robot] updated from transifex 2016-04-01 01:56:19 -04:00
Thomas Müller
2714dfce21 Merge pull request #23713 from owncloud/small_encryption_fix 
make sure that we always remove the file again from the cache after t…
 2016-03-31 23:13:52 +02:00
Morris Jobke
902abe33f5 Merge pull request #23676 from owncloud/handle-null-return-getAppInfo 
Properly handle return values of OC_App::getAppInfo()
 2016-03-31 22:21:50 +02:00
C. Montero Luque
0393e80c7c Merge pull request #16857 from owncloud/printStylesheets 
Support for print stylesheets
 2016-03-31 22:13:44 +02:00
Bjoern Schiessle
e4b451491b make sure that we always remove the file again from the cache after the version was created 2016-03-31 21:52:23 +02:00
Frank Karlitschek
f5709b511b Merge pull request #23445 from owncloud/enc_small_improvement 
small performance improvement: no need to calculate the header size
 2016-03-31 20:38:42 +02:00
Frank Karlitschek
2bff34be56 Merge pull request #23707 from owncloud/make-sure-that-encrypted-version-is-set 
Make sure that the encrypted version is set
 2016-03-31 20:37:17 +02:00
Frank Karlitschek
fdb59079a2 Merge pull request #23675 from owncloud/fix_encryption_versions_on_external_storages 
fix creation of versions of encrypted files on external storages
 2016-03-31 20:36:03 +02:00
Frank Karlitschek
ba8c81e6d1 Merge pull request #23526 from owncloud/fix_23337 
Add setId and setProviderId to IShare interface
 2016-03-31 20:07:02 +02:00
Bjoern Schiessle
93ed965cbb fix creation of versions of encrypted files on external storages 
in order to create a 1:1 copy of a file if a version gets created
we need to store this information on copyBetweenStorage(). This
allows us to by-pass the encryption wrapper if we read the source file.
 2016-03-31 19:24:47 +02:00
Lukas Reschke
c427bf3b5d Make sure that the encrypted version is set 
The code path called when using external storage with WebDAV is using `\OC\Files\Storage\Wrapper\Encryption::getMetaData` which did not contain the actual encrypted version inside the cache entry version. This lead to the following:

1. User uploaded a file
2. File is created and `\OC\Files\Storage\Wrapper\Encryption::getMetaData` is called. It has an empty `encryptedVersion` but sets `encrypted` to either `true` or `false`.
3. The call when updating the file cache will use the old version.
 2016-03-31 18:06:37 +02:00
Jenkins for ownCloud
82da373ee7 [tx-robot] updated from transifex 2016-03-31 01:55:24 -04:00
Morris Jobke
f5beeec833 Properly handle return values of OC_App::getAppInfo() 
* fixes #23668
 2016-03-30 23:29:26 +02:00