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
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