Robin Appelman
db3f0cee4a
Fix parsing of webdav permissions
2014-06-27 17:28:56 +02:00
Robin Appelman
6f5d5b9a30
Also check for updated permissions for webdav storages
2014-06-27 17:27:47 +02:00
Robin Appelman
5b8c2ac750
Use the etag to check for updates in webdav storages where available
2014-06-27 17:10:46 +02:00
Vincent Petry
fd8b5680dd
Merge pull request #8383 from owncloud/object_storage
...
Object storage
2014-06-27 16:53:03 +02:00
Jörn Friedrich Dreyer
25dbbbadd3
use normalize path to convert '.' to '' in objectstorestorage
2014-06-27 15:00:29 +02:00
Thomas Müller
4d6019b73f
Merge pull request #9247 from owncloud/move-webdav-class-to-core-master
...
Move webdav class to core master
2014-06-27 12:59:59 +02:00
Jörn Friedrich Dreyer
ab93f1949d
update hasUpdated description, overwrtie testStat for objectstore test
2014-06-27 12:14:31 +02:00
Vincent Petry
4b5bf606cb
Merge pull request #9215 from owncloud/officemimetypesupdatefix
...
Office mime types update fix
2014-06-27 11:23:19 +02:00
Thomas Müller
171475b95a
fix autoloader
2014-06-27 08:52:40 +02:00
Thomas Müller
c745240543
Move \OC\Files\Storage\DAV to core in order to reduce inter-app dependencies
2014-06-27 08:52:28 +02:00
Jenkins for ownCloud
36f771e9f0
[tx-robot] updated from transifex
2014-06-27 01:55:44 -04:00
Robin Appelman
f93457c41d
Fix check if class exists
2014-06-27 00:52:37 +02:00
Robin Appelman
437094bbfc
Check if classes/method exists before trying to call them in background jobs
2014-06-26 22:40:12 +02:00
Thomas Müller
7804bd010c
Merge pull request #9230 from owncloud/fix-repair-step-php-53
...
Redeclared as public to allow invocation from within the closure in php ...
2014-06-26 17:20:09 +02:00
Vincent Petry
8526556110
Merge pull request #9206 from owncloud/occ-scan-user
...
Prevent running the files:scan command as the wrong user
2014-06-26 17:03:23 +02:00
Vincent Petry
67d0a3c15e
Fixed mime type repair step
2014-06-26 16:40:12 +02:00
Vincent Petry
b7d79a90b0
Merge pull request #9210 from owncloud/better_validation_in_getAppPath
...
better validation for OC_App::getAppPath()
2014-06-26 15:52:12 +02:00
Thomas Müller
4c80c9595f
Redeclared as public to allow invocation from within the closure in php 5.3
2014-06-26 14:27:41 +02:00
Bernhard Posselt
2662c4c61b
use id instead of resourceId
2014-06-26 14:20:35 +02:00
Bernhard Posselt
5496ca234b
dont strip the s from the resource
2014-06-26 14:02:20 +02:00
Jörn Friedrich Dreyer
f96a535f80
fix objectstore test execution
2014-06-26 11:30:00 +02:00
Björn Schießle
1822bba5e9
Merge pull request #9193 from owncloud/sharing_etag_propagation
...
make sure that the etags get propagated correctly
2014-06-26 10:26:24 +02:00
Vincent Petry
b1e778d5fd
Moved office mimetype update to a repair step
2014-06-25 19:49:18 +02:00
VicDeo
7c362ab55e
Merge pull request #9194 from owncloud/revertloadapps
...
Bring back loadApps() in base.php
2014-06-25 18:52:56 +03:00
Georg Ehrke
09356bc5b3
better validation for OC_App::getAppPath()
2014-06-25 16:24:55 +02:00
Robin Appelman
9a2ed86672
Prevent running the files:scan command as the wrong user
2014-06-25 15:22:49 +02:00
icewind1991
16396e2e33
Merge pull request #9123 from owncloud/webdav-move-permissions
...
Fix permissions check when moving a file to a different directory over webdav
2014-06-25 15:09:58 +02:00
Jörn Friedrich Dreyer
8e6cb6dc54
delete object without downloading it first
2014-06-25 14:53:38 +02:00
Arthur Schiwon
f3ecf819ec
extend Dummy user and group implementation to pass tests
2014-06-25 13:13:53 +02:00
Robin Appelman
113749bd96
really always take root of the substorage
2014-06-25 13:00:11 +02:00
Bjoern Schiessle
a0b85fc5e4
make sure that during share and unshare the etags get propagated correctly
2014-06-25 12:11:56 +02:00
Arthur Schiwon
121d52860e
return int, not string
2014-06-24 21:54:57 +02:00
Bjoern Schiessle
92a82f02b3
always take root of the substorage
2014-06-24 18:53:51 +02:00
Vincent Petry
a120d6e9a3
Bring back loadApps() in base.php
...
loadApps() had been deleted by mistake in
799205488c
2014-06-24 17:37:58 +02:00
Robin Appelman
92f2a430a8
Don't bother checking for external updates for objectstore storages
2014-06-24 14:48:59 +02:00
Robin Appelman
eb97eee964
Only initialize the swift container when manipulating an object
2014-06-24 14:42:52 +02:00
Robin Appelman
159b603d13
Add support for rackspace swift backends
2014-06-24 14:36:29 +02:00
Bjoern Schiessle
70ca292fd9
only the mount point has delete and update permissions to enable rename operation
2014-06-24 13:55:04 +02:00
Bjoern Schiessle
84d36df70b
make sure that we always return the correct permissions
2014-06-24 13:39:37 +02:00
Jenkins for ownCloud
6a4a474aa9
[tx-robot] updated from transifex
2014-06-24 01:54:39 -04:00
Thomas Müller
f913b1629b
Merge pull request #9158 from owncloud/no-recursion-on-rmdirr-master
...
fix recursion on rmdirr
2014-06-23 23:18:10 +02:00
Thomas Müller
fba694edae
update PHPDoc $fileInfo is a SplFileInfo
2014-06-23 23:15:30 +02:00
Joas Schilling
167ba14af7
Merge pull request #9159 from owncloud/enabledapp-cache-loggedin
...
Only cache enabled apps when logged in
2014-06-23 18:02:57 +02:00
Jörn Friedrich Dreyer
28c1a95575
use common storage test
2014-06-23 16:29:01 +02:00
Vincent Petry
8c82098281
Merge pull request #8974 from owncloud/router-preventloadappsonupgrade
...
Prevent loadApps on upgrade
2014-06-23 15:15:50 +02:00
Robin Appelman
2547945779
Add comment
2014-06-23 15:14:35 +02:00
Thomas Müller
ed31f30afd
dir itself has to be removed as well
2014-06-23 14:40:55 +02:00
Robin Appelman
8b41689fe6
Only cache enabled apps when logged in
2014-06-23 13:55:21 +02:00
Thomas Müller
f83821c388
fix recursion on rmdirr
2014-06-23 13:54:27 +02:00
Arthur Schiwon
01a012980a
search term for users and groups may occur anywhere in the name or displayname, not just in the beginning
2014-06-23 12:03:09 +02:00
Jörn Friedrich Dreyer
7ec53571c4
use 'object' as the fakedir stream name
2014-06-23 11:07:01 +02:00
Arthur Schiwon
81ecbbb061
trusted domains shall not be ignored on autosetup
2014-06-23 10:33:15 +02:00
Vincent Petry
53ad15e0e3
Merge pull request #9138 from owncloud/fix-documentation
...
Add explanation about the current implementation of updateApp
2014-06-23 10:32:41 +02:00
Jenkins for ownCloud
b8b7c97a41
[tx-robot] updated from transifex
2014-06-23 01:54:38 -04:00
Bart Visscher
089139f8ea
Add explanation about the current implementation of updateApp
2014-06-22 12:45:59 +02:00
Jenkins for ownCloud
da0e4b0af0
[tx-robot] updated from transifex
2014-06-21 01:54:37 -04:00
Robin Appelman
80e6d357a2
Fix permissions check when moving a file to a different directory over webdav
2014-06-20 14:29:13 +02:00
Jörn Friedrich Dreyer
c112a1d323
move to stream based IObjectStore interface, rearrange & reformat code
2014-06-20 12:27:47 +02:00
Jenkins for ownCloud
ca96b9d3d5
[tx-robot] updated from transifex
2014-06-20 01:54:32 -04:00
Jenkins for ownCloud
e1fd10f226
[tx-robot] updated from transifex
2014-06-19 01:55:38 -04:00
Jörn Friedrich Dreyer
f2fe00e972
fix rebase, use 'object::user:<username>' or 'object::store:<storageid> as storage id, by default use container/bucket name for storageid, make storageid configurable, store user only for HomeObjectStoreStorage, change updateObject() to writeObject()
2014-06-18 15:20:26 +02:00
Jörn Friedrich Dreyer
5cae863408
change architecture from inheritance to composition
2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
9335a5f07f
remove duplicate method
2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
5722e31d1a
add autocreate config option for containers, implement autocreate and delete of containers, use generated container names for tests
2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
4e65889f54
only use one config option 'objectstore' for root and home storage configuration
2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
7493ff0624
fix unit test by always initializing the root of the storage in the constructor
2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
10de4a7b90
move creation of / and users 'files' from storage constructor to setupFS / mount initialization
2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
87aaf39259
fix checking unset array values, deduplicate code, remove file from cache if it could not be stored in the objectstore
2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
eca536d8b4
minor code cleanup
2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
c020e8e658
use exceptions to notify abstract parent class of problems
2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
60a8419a1f
when root storage cannot be mounted throw an exception visible to the end user
2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
1374ba9adf
fix fallback config for default home storage
2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
ccb698a6a8
move swift and abstract code to core
2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
85ccfad37c
change 'object_storage' config param to 'root_storage'
...
copy skeleton only for local filesystems
2014-06-18 12:53:19 +02:00
Jörn Friedrich Dreyer
2bf7e5c02f
make objectstore setup more robust, don't pass user to object store mounted as root
2014-06-18 12:53:19 +02:00
Jörn Friedrich Dreyer
3c66a8c8ed
allow configuring objectstore as home and root storage
2014-06-18 12:53:19 +02:00
Vincent Petry
799205488c
Prevent loadApps on upgrade
...
Moved OC::needUpgrade() to OCP\Util::needUpgrade() to make it accessible
form the router.
Moved maintenance + upgrade check to the router.
2014-06-18 11:10:07 +02:00
Jenkins for ownCloud
baf46c74cd
[tx-robot] updated from transifex
2014-06-18 01:55:13 -04:00
Lukas Reschke
d4bdcb7a9b
Merge pull request #9047 from owncloud/fix_preload_fundamental_apps
...
Load fundamental apps, before any possible customizing app may follow
2014-06-18 07:29:04 +02:00
icewind1991
8d1cf79152
Merge pull request #8399 from owncloud/server-server-sharing
...
Add server<->server sharing
2014-06-17 17:40:05 +02:00
Vincent Petry
cce58368ad
Merge pull request #9065 from owncloud/migrator-keepprimaryindexname
...
Do not rename primary key index when renaming table
2014-06-17 16:43:33 +02:00
Vincent Petry
7aa11b4361
Do not rename primary key index when renaming table
...
When the migrator renames a table, for example for upgrade simulation,
it should not rename the primary key to avoid messing up with the diff
because the MySQL Doctrine code expects that index to always be called
"primary".
2014-06-17 15:23:18 +02:00
Andreas Fischer
9db0a82a26
We obviously have to pass the hostname as is when there is no ':' in the hostname.
...
This reverts commit 73062040e6
.
2014-06-17 14:48:32 +02:00
Robin Appelman
07fdeba50b
Fix moving movablemount over webdav
2014-06-17 14:10:11 +02:00
Jenkins for ownCloud
ce179dcdcb
[tx-robot] updated from transifex
2014-06-17 01:55:43 -04:00
Lukas Reschke
f2fc214ce0
Add deprecation notice to load* functions
...
This functions are deprecated and/or removed since ownCloud 7. Additionally a issubdirectory check has been added here to prevent developers to use this function in a potentially insecure way.
Port of https://github.com/owncloud/core/pull/9033
2014-06-16 20:33:04 +02:00
Jörn Friedrich Dreyer
cd77f92f4c
add new keynote mimetype
2014-06-16 16:25:12 +02:00
Robin Appelman
b188550c22
Also support removeable mounts with rmdir
2014-06-16 16:24:42 +02:00
Robin Appelman
0532f5c39a
Fix permission for movable storage root
2014-06-16 16:20:40 +02:00
Georg Ehrke
15c215cd03
Merge pull request #8808 from owncloud/update_shipped_apps_from_appstore
...
Make shipped apps updatable via appstore
2014-06-16 15:54:50 +02:00
Georg Ehrke
86f546ff64
disable code check for shipped apps
2014-06-16 13:49:02 +02:00
Arthur Schiwon
7b704eeb5e
Load fundamental apps, before any possible customizing app may follow
2014-06-16 13:12:21 +02:00
Vincent Petry
a48bcceb23
Merge pull request #8917 from owncloud/repair-routine-base
...
Add support for repair step classes
2014-06-16 11:13:10 +02:00
Jenkins for ownCloud
ec5448bf7d
[tx-robot] updated from transifex
2014-06-16 01:54:35 -04:00
macjohnny
e5224782fa
Merge pull request #9022 from owncloud/speedup-nested-ldap-groups
...
drastic speedup for nested ldap groups
2014-06-16 07:50:53 +02:00
Jenkins for ownCloud
4d6fc6f309
[tx-robot] updated from transifex
2014-06-15 01:55:06 -04:00
Robin Appelman
87e311b996
Fix storage being passed to cache/watcher and scanner when using storage wrappers
2014-06-14 10:14:08 +02:00
Robin Appelman
c61f759a8b
Fix check for shared files inside shares
2014-06-14 10:14:08 +02:00
Robin Appelman
c6a83b2f17
Fix exposing single files over webdav
2014-06-14 10:13:24 +02:00
Robin Appelman
65f3b2fad2
Add server<->server sharing backend
2014-06-14 10:10:37 +02:00
Morris Jobke
35f7565e9b
Merge pull request #8978 from owncloud/movie_preview_improvements
...
movie previews: use file directly when it's stored locally and encryption is not enabled
2014-06-14 01:01:59 +02:00
Georg Ehrke
65028c459b
don't skip code check for skipped apps
...
those apps will have to use the public api
2014-06-13 21:51:16 +02:00
Georg Ehrke
c378e76412
skip certain tests for shipped apps
2014-06-13 21:45:31 +02:00
Frank Karlitschek
87101e6638
Merge pull request #9018 from owncloud/dbms-socket-support
...
Refactor OC_DB::connect() to properly support sockets.
2014-06-13 18:09:51 +02:00
Jenkins for ownCloud
083cf63cc2
[tx-robot] updated from transifex
2014-06-13 01:54:32 -04:00
macjohnny
767aa4e35f
drastic speedup for nested ldap groups
...
add a function getUserGroupIds for retrieving group ids instead of group objects. this significantly improves performance when using many (nested) groups.
Changes a function call in getUserGroups to only retrieve group ids instead of objects.
this change significantly improves performance when using owncloud with many groups, e.g. nested ldap hierarchy (1.2.840.113556.1.4.1941), since getUserGroups gets called in oc_share::getItems, which is needed for every page request.
in my particular case, it took more than 10s to load the calendar page and more than 6s to load the file page.
this was in an environment with 100 user groups (nested) per user. The performance was bad due to the following call stack:
self::getManager()->getUserGroups($user)
- getGroupObject() (executed for every group!)
- groupExists() (resulting in many ldap-requests)
since the groups are loaded from ldap, it is unnecessary to check whether the group exists or not.
2014-06-13 00:04:06 +02:00
Andreas Fischer
73062040e6
Don't specify host when using a socket.
2014-06-12 20:22:45 +02:00
Andreas Fischer
0932760304
Rename variable to indicate that it can be port and socket.
2014-06-12 20:18:38 +02:00
Andreas Fischer
3d8eabedbd
No need to check the port number as this will fail anyway.
2014-06-12 20:17:30 +02:00
Andreas Fischer
4ca1e3cc02
Move getValue() to where required. This actually is not required "global data".
2014-06-12 19:59:40 +02:00
Andreas Fischer
17c2e63449
Move check for : to where it belongs, getting rid of $socket = false;
2014-06-12 19:56:51 +02:00
Andreas Fischer
4b87586487
Extract common variables of $connectionParams.
2014-06-12 19:53:33 +02:00
Andreas Fischer
6da2beeaff
Inline $port expression, getting rid of $port variable.
2014-06-12 19:48:37 +02:00
Vincent Petry
b595c982d0
Merge pull request #8968 from owncloud/scanner-parent-repair
...
Repair broken parent link in the scanner
2014-06-12 17:40:44 +02:00
Vincent Petry
05e351416e
Fixed instanceof to use interface instead of class
2014-06-12 17:38:26 +02:00
Vincent Petry
ca690c4d02
Added RepairStep interface and default repair step lists
...
The updater is using "before update" repair steps and "regular" repair
steps.
The "regular" repair steps are also used by the CLI tool.
Currently no steps exist but can be added later in the static methods in
the \OC\Repair class.
Added unit test to test messaging, error and exception cases.
2014-06-12 17:38:26 +02:00
Vincent Petry
6fcd1af4db
Add support for repair step classes
...
This also makes it possible to unit test each repair step class
individually
2014-06-12 17:38:26 +02:00
Morris Jobke
ab7cff6dfd
Revert "Merge pull request #8998 from macjohnny/master"
...
This reverts commit 482eded8b3
, reversing
changes made to 354cace14a
.
2014-06-12 14:56:46 +02:00
macjohnny
482eded8b3
Merge pull request #8998 from macjohnny/master
...
drastic speedup for nested ldap groups
2014-06-12 14:49:15 +02:00
Vincent Petry
3e1576011f
Merge pull request #8980 from owncloud/better-accept-header
...
handle http accept headers more gracefully
2014-06-12 13:28:03 +02:00
macjohnny
e8e2e47e68
Update manager.php
2014-06-12 11:29:20 +02:00
macjohnny
b1094cfe82
Update group.php
2014-06-12 11:28:57 +02:00
macjohnny
0af8aa689f
drastic speedup for nested ldap groups
...
Changes a function call in getUserGroups to only retrieve group ids instead of objects.
this change significantly improves performance when using owncloud with many groups, e.g. nested ldap hierarchy (1.2.840.113556.1.4.1941), since getUserGroups gets called in oc_share::getItems, which is needed for every page request.
in my particular case, it took more than 10s to load the calendar page and more than 6s to load the file page.
this was in an environment with 100 user groups (nested) per user. The performance was bad due to the following call stack:
self::getManager()->getUserGroups($user)
- getGroupObject() (executed for every group!)
- groupExists() (resulting in many ldap-requests)
since the groups are loaded from ldap, it is unnecessary to check whether the group exists or not.
2014-06-12 09:51:23 +02:00
macjohnny
ede2aa236e
Update manager.php
...
add a function getUserGroupIds for retrieving group ids instead of group objects. this significantly improves performance when using many (nested) groups.
2014-06-12 09:41:23 +02:00
Vincent Petry
5def2a72dd
Merge pull request #8991 from owncloud/fix-php53-arraycombine
...
Fixed array_combine for PHP 5.3
2014-06-12 09:08:50 +02:00
Jenkins for ownCloud
55b5ddd735
[tx-robot] updated from transifex
2014-06-12 01:54:34 -04:00
josh4trunks
1b02991a1d
Fixes based on suggestions
...
I use the term socket for any extension, either unix socket, or internet socket (port).
I check if the socket is all digits
* only integers 0 and larger would pass this test.
I then check if the string is less than or equal to the maximum port number.
By using "if($socket)" I make sure socket isn't false, empty, or the string '0'.
I don't believe I need to initialize $port because $port will always be set if $socket is true. Please show me if I am wrong here. Thanks
2014-06-11 21:47:45 -07:00
Vincent Petry
4e4c2b04c8
Fixed array_combine for PHP 5.3
2014-06-11 19:13:49 +02:00
Vincent Petry
75a53b3c49
Merge pull request #8901 from owncloud/permissions-update-cache
...
Save the permissions in the filecache if it's not saved yet
2014-06-11 18:28:55 +02:00
Vincent Petry
65b3d293ce
Added ORDER BY to enforce share entry order
...
Sometimes MySQL decides to return the shares in the wrong order, but
some parts of the code seem to require the order to be known, at least
so that the parent shares come before the children shares.
This fix adds an ORDER BY clause to force the order by id.
2014-06-11 14:28:30 +02:00
Vincent Petry
491c96eaa9
Merge pull request #8966 from owncloud/fix_failing_tests_on_master
...
Fix failing tests on master
2014-06-11 10:05:38 +02:00
Jenkins for ownCloud
f769c52522
[tx-robot] updated from transifex
2014-06-11 01:55:07 -04:00
Bernhard Posselt
93169eca1e
also handle lowercase headers
2014-06-11 01:20:09 +02:00
Bernhard Posselt
0252d39bb6
fix indention
2014-06-11 00:57:00 +02:00
Bernhard Posselt
1002281dae
handle http accept headers more gracefully
2014-06-11 00:54:25 +02:00
Georg Ehrke
7396e5f455
movie previews: use file directly when it's stored locally and encryption is not enabled, fixes #7756
2014-06-10 22:08:27 +02:00
Georg Ehrke
5e9fa64819
don't show update button when appstore is disabled or no writable dir exists
2014-06-10 18:39:34 +02:00
Georg Ehrke
e047e28ac5
make text preview backend use imagettftext, fixes #8087
2014-06-10 17:29:40 +02:00
Robin Appelman
6b1d8a56bb
remove unused argument
2014-06-10 15:42:37 +02:00
Robin Appelman
054083b9cd
add some comments
2014-06-10 15:37:43 +02:00
Robin Appelman
21cfd1014a
Repair broken parent link in the scanner
2014-06-10 15:26:18 +02:00
Bjoern Schiessle
9dc0befcca
call self::getNumericStorageId() to get the numeric ID
2014-06-10 14:48:19 +02:00
Georg Ehrke
602404c631
fix php doc block
2014-06-10 13:58:41 +02:00
Georg Ehrke
6bf06890e7
always return a bool in OC_App::updateApp
2014-06-10 13:56:05 +02:00
Georg Ehrke
5d4f3baf56
fix php doc block
2014-06-10 13:51:20 +02:00
Georg Ehrke
1ab9bdcaa0
remove unnecessary @return
2014-06-10 13:01:10 +02:00
Jenkins for ownCloud
6546b589ce
[tx-robot] updated from transifex
2014-06-10 01:54:54 -04:00
Robin Appelman
41d2354191
Save the permissions in the filecache if it's not saved yet
2014-06-09 12:34:35 +02:00
Morris Jobke
63c5c7bd21
set logger before registrate to an error handler
2014-06-09 10:02:23 +02:00
Jenkins for ownCloud
e5c47a5e30
[tx-robot] updated from transifex
2014-06-09 01:54:32 -04:00
Morris Jobke
e769ef9bbb
Merge pull request #8916 from owncloud/rmdirr-test-cleanup-fix
...
Added hacky fix for long path cleanup routine
2014-06-08 20:46:00 +02:00
Jenkins for ownCloud
1f2722053f
[tx-robot] updated from transifex
2014-06-08 01:56:13 -04:00
Jenkins for ownCloud
e0446a1df5
[tx-robot] updated from transifex
2014-06-07 01:56:13 -04:00
Björn Schießle
3da47db33c
Merge pull request #8927 from owncloud/expire_only_link_shares
...
only expire link shares
2014-06-06 19:24:15 +02:00
Thomas Müller
647dcce514
Merge pull request #8253 from owncloud/pk-on-all-tables-master
...
Primary keys on all tables master
2014-06-06 16:40:11 +02:00
Thomas Müller
c053f27381
Merge pull request #8921 from owncloud/fix-remove-storage-master
...
No need to create a storage within remove
2014-06-06 16:16:44 +02:00
Bjoern Schiessle
f15d7dfec0
only expire link shares
2014-06-06 15:47:37 +02:00
Thomas Müller
fe8bae31dc
adding PK to table encryption
...
adding auto increment/PK to table files_trash
adding PK to table ldap_user_mapping and ldap_group_members
adding PK to table ldap_group_mapping
truncate permissions table to allow smooth creation of primary key
adding unit test for creating an auto increment column on a table which already contains data
remove unneeded table files_trashsizes
fix unit test
no need to truncate *PREFIX*permissions
On Oracle adding auto increment columns is not working out of the box - Oracle migrations are to be done manually
2014-06-06 13:33:56 +02:00
Vincent Petry
5cebb6fb9b
Merge pull request #4553 from owncloud/update_search_classes
...
Update search classes
2014-06-06 13:24:16 +02:00
Jörn Friedrich Dreyer
a59b5249d3
add more and fix office mimetypes, migrate wrong mimetypes
2014-06-06 12:00:25 +02:00
icewind1991
c47d4ebbac
Merge pull request #8666 from owncloud/mount-remove
...
Support for (re)moving mountpoints
2014-06-06 11:57:43 +02:00
Vincent Petry
0661d737e6
Merge pull request #8900 from guruz/webdav_permission_moveable_renameable
...
WebDAV Permissions: Distinguish between renameing and moving
2014-06-06 11:51:39 +02:00
Vincent Petry
ff12969276
Merge pull request #8905 from owncloud/update-cli-skipcheckmigrate
...
Added CLI arguments for upgrade simulation steps
2014-06-06 11:42:14 +02:00
Thomas Müller
26993f2167
No need to create a storage within remove
2014-06-06 11:39:35 +02:00
Thomas Müller
289accc31b
Merge pull request #8159 from owncloud/mobile-sidebar-swipe
...
Mobile sidebar swipe
2014-06-06 11:27:04 +02:00
Jörn Friedrich Dreyer
56470fa9b3
fix namespace for legacy search classes
2014-06-06 11:01:35 +02:00
Vincent Petry
6e2358c3a6
Added hacky fix for long path cleanup routine
2014-06-06 10:41:49 +02:00
Thomas Müller
3a7b30795c
Merge pull request #8783 from owncloud/remove-serializers
...
Remove controller serializers
2014-06-06 10:33:16 +02:00
Vincent Petry
5e27ac3e0d
Added CLI arguments for upgrade simulation steps
...
Added "dry run" argument to only run the update simulation.
Added argument to disable migration (useful for bigger setups where
table duplication would take too much space)
2014-06-06 10:11:14 +02:00
Thomas Müller
ff651a3e0d
Merge pull request #8909 from owncloud/fix-temporary-storage-rmdirr-master
...
use system function to recursive remove the directory used by temporary ...
2014-06-06 10:02:23 +02:00
Robin Appelman
46f70aabfd
Dont connect hooks twice
2014-06-06 09:56:02 +02:00
Bjoern Schiessle
3459f99dd6
make sure that we only delete shares for the current user
2014-06-06 09:56:02 +02:00
Bjoern Schiessle
eec1c4398a
only unshare user share if it was shared with the current user
2014-06-06 09:56:02 +02:00
Bjoern Schiessle
5bbfdc35d7
make sure that we remove all shares refering to the same parent
2014-06-06 09:56:02 +02:00
Bjoern Schiessle
86d7371d0c
fix unshareFromSelf()
2014-06-06 09:56:02 +02:00
Robin Appelman
e362373a30
Movable storage root can always be moved and deleted
2014-06-06 09:56:01 +02:00
Robin Appelman
a432459685
use triple equals
2014-06-06 09:56:01 +02:00
Robin Appelman
42a362f249
Fix phpdoc and comments
2014-06-06 09:56:01 +02:00
Bjoern Schiessle
b0a74edbb2
allow moving files to the root
2014-06-06 09:56:00 +02:00
Bjoern Schiessle
329bfd81c3
remove encryption keys if user unshares a file
2014-06-06 09:55:59 +02:00
Robin Appelman
dea5219244
Fix folder name for storage root
2014-06-06 09:55:59 +02:00
Bjoern Schiessle
bf5e9357fc
don't allow to share single files with delete permissions, user should only be possible to unshare a single file but never to delete it
2014-06-06 09:55:59 +02:00
Robin Appelman
4fbc991ea2
Add the removing logic for mounts
2014-06-06 09:55:59 +02:00
Robin Appelman
8abe1c3f1a
Don't do rename hooks for cache when moving the mountpoint
2014-06-06 09:55:58 +02:00
Robin Appelman
60a659c87e
Add a system for (re)movable mount points
2014-06-06 09:55:58 +02:00
Thomas Müller
79b65269c9
Merge pull request #8877 from owncloud/getpath-storage-check
...
Verify that we have a valid storage in View->getPath
2014-06-06 09:44:57 +02:00
Thomas Müller
d359765bdc
Update PHPDoc
2014-06-06 09:44:34 +02:00
Georg Ehrke
a110973b3a
some additional type checks
2014-06-06 09:41:53 +02:00
Georg Ehrke
498aa66648
add additional type check
2014-06-06 09:33:34 +02:00
Thomas Müller
ad4ec414c9
use system function to recursive remove the directory used by temporary storage
2014-06-06 09:29:31 +02:00
Jenkins for ownCloud
ca739a59f0
[tx-robot] updated from transifex
2014-06-06 01:57:10 -04:00
Jörn Friedrich Dreyer
aaf0d13171
make search non-static, add ISearch to server container, make legacy a static wrapper for it, move provider and result to public api
2014-06-06 01:17:02 +02:00
Georg Ehrke
0fe8f77c17
Merge branch 'master' into update_shipped_apps_from_appstore
...
Conflicts:
lib/private/app.php
settings/templates/apps.php
2014-06-05 22:54:27 +02:00
Jörn Friedrich Dreyer
5034bd1b12
minor phpdoc cleanup and imports
2014-06-05 19:49:21 +02:00
Andrew Brown
7a224f5762
Move new search results to 'lib/private/search'
2014-06-05 19:23:44 +02:00
Andrew Brown
8a223eb62d
Move legacy search to 'lib/private/legacy'
...
This fixes errors where apps would try to start providers using
OC_Search and would fail. Also, made OC_Search simply inherit from
\OC\Search.
2014-06-05 19:23:44 +02:00
Andrew Brown
794a133f9a
Re-add type to legacy OC_Search_Result class
2014-06-05 19:23:44 +02:00
Andrew Brown
70be98f6d0
Add audio and image result types
2014-06-05 19:22:22 +02:00
Andrew Brown
c46d514733
Add audio and image result types
2014-06-05 19:22:22 +02:00
Jörn Friedrich Dreyer
afd24385a8
fix formatting
2014-06-05 19:22:22 +02:00
Andrew Brown
a6583d3976
Add legacy adapters for file search
2014-06-05 19:21:47 +02:00
Andrew Brown
ac72828eae
Move to new namespace convention and add new result sub-classing
2014-06-05 19:21:47 +02:00
Thomas Müller
70e0ae0637
Merge pull request #8483 from owncloud/encryption_use_oc_preferences
...
[encryption] use oc preferences
2014-06-05 18:54:25 +02:00
Bernhard Posselt
587a8df566
remove controller serializers
2014-06-05 18:00:36 +02:00
Vincent Petry
1c59808517
Merge pull request #8865 from owncloud/improve_share_settings
...
Improve share settings
2014-06-05 17:23:42 +02:00
Bjoern Schiessle
2d83424a29
allow to set pre-condition for setValue
2014-06-05 16:54:03 +02:00
Thomas Müller
4b650a20a4
Merge pull request #8893 from owncloud/feature/get-users-by-preference
...
Add method to get users by their preference
2014-06-05 16:52:00 +02:00
Thomas Müller
fad3bd7fc0
reenable checkCode()
2014-06-05 16:32:46 +02:00
Robin Appelman
00539cf8f9
Verify that we have a valid storage in View->getPath
2014-06-05 15:50:19 +02:00
Bjoern Schiessle
6578f00b4b
unify share settings
2014-06-05 15:49:34 +02:00
Thomas Müller
3dbfd1fe46
Merge pull request #8529 from owncloud/remove-legacy-routing
...
Remove legacy routing code
2014-06-05 15:22:46 +02:00
Markus Goetz
e6665a0542
WebDAV Permissions: Distinguish between renameing and moving
2014-06-05 14:39:06 +02:00
Thomas Müller
e1beb8c6c3
Merge pull request #8889 from owncloud/mtime-reuse
...
Don't update the mtime if the storage mtime hasn't changed
2014-06-05 13:18:18 +02:00
Vincent Petry
bbdcbb9911
Merge pull request #8866 from owncloud/flock-quotafix
...
Fixed quota wrapper to return the value from flock()
2014-06-05 13:11:45 +02:00
Joas Schilling
4b18967129
Hack around oracle for CLOB fields
2014-06-05 12:19:48 +02:00
Jan-Christoph Borchardt
9e56acbdc9
add snap.js script
2014-06-05 11:52:17 +02:00
Joas Schilling
879237f32a
Add method to get users by their preference
2014-06-05 11:50:43 +02:00
Lukas Reschke
7c4abce373
Move authentication to it's own call
2014-06-05 11:45:45 +02:00
Lukas Reschke
ac7fb1b23e
Remove legacy routing code
...
The getfile routing code was absolutely legacy and not needed anymore. Additionally \OC::$REQUESTEDAPP was never set to the actually accessed application.
This commit removes the legacy routing code and ensures that $REQUESTEDAPP is always set so that other applications (e.g. the firewall or a two-factor authentication) can intercept the currently accessed app.
Testplan:
[x] Installation works
[x] Login with DB works
[x] Logout works
[x] Login with alternate backend works (tested with user_webdavauth)
[x] Other apps are accessible
[x] Redirect on login works (e.g. index.php?redirect_url=%2Fcore%2Findex.php%2Fsettings%2Fapps%3Finstalled)
[x] Personal settings are accessible
[x] Admin settings are accessible
[x] Sharing files works
[x] DAV works
[x] OC::$REQUESTEDAPP contains the requested application and can be intercepted by other applications
2014-06-05 11:45:45 +02:00
icewind1991
bd373d9621
Merge pull request #7878 from owncloud/quota-extstorageswitch
...
Added switch to count external storage data in quota
2014-06-05 11:23:32 +02:00
Jörn Friedrich Dreyer
f1bf06f8cf
Merge pull request #8884 from owncloud/move-flock-to-app
...
remove file locking - code will continue to live in it's own app
2014-06-05 10:54:24 +02:00
Thomas Müller
1c20c72efe
Merge pull request #8620 from owncloud/design-navigation-two
...
Toggle app navigation not only on mobile, but on desktop as well
2014-06-05 10:53:22 +02:00
Vincent Petry
71b86136c2
Merge pull request #8878 from owncloud/update-checkmigrationforapps
...
Simulate apps database schema update on upgrade
2014-06-05 10:28:30 +02:00
Robin Appelman
3e73251750
Don't update the mtime if the storage mtime hasn't changed
2014-06-05 10:08:25 +02:00
Thomas Müller
ff3ded6cb2
Merge pull request #8852 from owncloud/kill-permissions-master
...
Kill permissions table
2014-06-05 10:05:05 +02:00
Thomas Müller
da3974bcb2
- drop permissions table and related code
...
- the file/folder's permission is now stored in the file cache
- BackGroundWatcher has been removed - this has meanwhile be replaced by occ files:scan which can be executed in a cron jobs
- increase version to trigger database migration
2014-06-05 08:22:01 +02:00
josh4trunks
ea162c8a39
Fix variable not always being defined.
2014-06-04 23:03:13 -07:00
Jenkins for ownCloud
cb61d8a226
[tx-robot] updated from transifex
2014-06-05 01:57:20 -04:00
josh4trunks
e77c9bb97e
Work with MySQL Sockets
...
This passes anything that is not a valid port (0<int<65535) as a unix socket.
I tested this with unix sockets; this needs to be tested with a non-standard mysql port as well but I don't foresee any issues.
To use a unix socket, even one different than PHP's mysql.default_socket..
* Database Host = localhost:/path/to/socket
2014-06-04 22:50:23 -07:00
Thomas Müller
c044ff99ce
Merge pull request #8724 from owncloud/update-sabre-2.0
...
Update SabreDAV to 1.8.10
2014-06-04 23:05:34 +02:00
Thomas Müller
ec7225da66
remove file locking - code will continue to live in it's own app
2014-06-04 20:11:54 +02:00
Vincent Petry
95fda3c17c
Do not load apps when upgrade is needed
...
This prevents routes like "core/js/oc.js" to automatically load apps and
trigger their update prematurely.
2014-06-04 18:52:52 +02:00
Thomas Müller
a2db53b928
Merge pull request #8471 from owncloud/versioning_no_longer_track_the_size
...
[versioning] let the file cache track the size of the versions
2014-06-04 18:19:48 +02:00
Vincent Petry
d4ffafe467
Removed simulate db update flag and split into separate methods
2014-06-04 18:17:46 +02:00
Thomas Müller
48eee0b432
use the right interface \Sabre\DAVACL\PrincipalBackend\BackendInterface
2014-06-04 17:47:09 +02:00
Vincent Petry
5b97369b00
Simulate apps database schema update on upgrade
...
When upgrade, also simulate the database schema update for apps before
doing the actual upgrade.
2014-06-04 17:16:44 +02:00
Georg Ehrke
724d027f19
add unit test
2014-06-04 16:29:41 +02:00
Vincent Petry
da889ff029
Added experimental switch to count external storage data in quota
...
This includes all mountpoints except the Shared one in
the used space calculation.
Added unit tests for ext storage inclusion in quota calculation
2014-06-04 16:08:59 +02:00
Jan-Christoph Borchardt
35308f5b09
hide navigation by default, not only on small screens, first step
2014-06-04 14:29:46 +02:00
Vincent Petry
b5f0a17918
Merge pull request #8822 from owncloud/cache-change-propagator
...
[WIP] Improved propagation of cache changes
2014-06-04 13:03:14 +02:00
Vincent Petry
3507964820
Fixed quota wrapper to return the value from flock()
2014-06-04 12:36:53 +02:00
Thomas Müller
76e04027bc
Upgrade SabreDAV to 1.8.10
...
Updating SabreDAV namespaces
2014-06-04 12:22:23 +02:00
Georg Ehrke
2c00ab13cf
update autoloader
2014-06-04 11:34:09 +02:00
Bernhard Posselt
ade6ed3797
Merge pull request #8701 from owncloud/slide-up-toggle
...
Create reusable data attribute for apps setting slideup
2014-06-04 11:31:04 +02:00
Jan-Christoph Borchardt
a244172219
Merge pull request #8853 from owncloud/design-typeface
...
Use Open Sans as typeface
2014-06-04 11:16:03 +02:00
Thomas Müller
4ab77f90d2
Merge pull request #8662 from owncloud/f-lock
...
f-lock
2014-06-04 10:26:02 +02:00
Jan-Christoph Borchardt
6b2b903ea6
Merge pull request #8468 from owncloud/remove-infieldlabels
...
Remove infieldlabels
2014-06-04 09:28:20 +02:00
Jenkins for ownCloud
f5c4754c2b
[tx-robot] updated from transifex
2014-06-04 01:57:48 -04:00
ringmaster
0a417b1174
Use ->instanceOfStorage() not instanceof for Storage instances.
2014-06-04 07:55:46 +02:00
Bjoern Schiessle
48eb0515e9
only lock if unlink is called for a file
2014-06-04 07:55:46 +02:00
Bjoern Schiessle
ab6680e9ab
name the storage wrapper to make sure that we don't apply the wrapper multiple times
2014-06-04 07:55:46 +02:00
ringmaster
cda87fd9c4
Normalize lock exception messages.
2014-06-04 07:55:45 +02:00
ringmaster
ba887d2b17
Restore the reference to this used exception class.
2014-06-04 07:55:45 +02:00
ringmaster
54865815f5
Move Lock to private namespace, add interface. Update PHPDoc.
2014-06-04 07:55:45 +02:00
ringmaster
c9c6a0ab1e
Don't error out on console.
2014-06-04 07:55:45 +02:00
ringmaster
392a1b6662
Removed unused vars/declarations, update PHPDoc.
2014-06-04 07:55:45 +02:00
Lukas Reschke
826b14e36b
Fix typo
2014-06-04 07:55:45 +02:00
Lukas Reschke
9bbc4b0034
Fix typo
2014-06-04 07:55:44 +02:00
ringmaster
896bc526e6
Remove unused methods.
2014-06-04 07:55:44 +02:00
ringmaster
6b94732bdf
Respect locked files, surface correct exception.
2014-06-04 07:55:44 +02:00
ringmaster
428510a4f8
Simpler log unique id.
2014-06-04 07:55:44 +02:00
ringmaster
f9dbdb7c5c
Add actual locking and log changes necessary for debugging.
2014-06-04 07:55:44 +02:00
ringmaster
dc1e3620d2
Continued flock work.
2014-06-04 07:55:44 +02:00
ringmaster
5365ae416e
flock changes. Work in progress.
2014-06-04 07:55:44 +02:00
Robin Appelman
a6bb1e1bf8
Fix size calculation during recursive scan
2014-06-03 19:54:59 +02:00
Morris Jobke
3a1994d001
Merge pull request #8686 from owncloud/session-early
...
Make the session available as early as possible
2014-06-03 19:23:30 +02:00
Thomas Müller
6764d5b122
Merge pull request #8698 from owncloud/sharing_improve_permissions
...
get permissions directly from share storage to avoid additional db calls
2014-06-03 19:13:51 +02:00
Jan-Christoph Borchardt
80627dfd2c
use Open Sans as typeface
2014-06-03 19:07:08 +02:00
icewind1991
cdf8a123e7
Merge pull request #8264 from owncloud/app-enable-by-group
...
Add the option to enable apps only for specific groups
2014-06-03 19:01:12 +02:00
Thomas Müller
e4c3ff03d6
Merge pull request #8809 from owncloud/appconfig-caching
...
Improve caching in AppConfig
2014-06-03 18:59:37 +02:00
icewind1991
68b15f3282
Merge pull request #7015 from owncloud/db-migration-check-copy
...
Check database migration on a copy of the table first
2014-06-03 16:27:06 +02:00
Georg Ehrke
19129b3db2
use isset() instead of array_key_exists()
2014-06-03 16:23:33 +02:00
Morris Jobke
cea7d4961e
move to updated version of placeholder
2014-06-03 16:18:06 +02:00
Jan-Christoph Borchardt
7177d3a496
first step of infield label removal, fix login screen
2014-06-03 15:28:59 +02:00
Thomas Müller
587159c73e
Merge pull request #8838 from owncloud/backgroundjob-legacy-gc
...
Support having legacy `OC_Cache_FileGlobalGC` background jobs
2014-06-03 15:06:35 +02:00
Thomas Müller
79b3558c6d
Merge pull request #7151 from owncloud/user-jquery
...
Continuing the New User management
2014-06-03 15:04:30 +02:00
Thomas Müller
2b1a7a76c3
Merge pull request #8425 from owncloud/columns_should_be_nullable_by_default
...
columns should be nullable by default
2014-06-03 12:55:42 +02:00
Robin Appelman
3b1f291c60
Fix sorting of apps
2014-06-03 12:42:35 +02:00
Robin Appelman
c09852e006
Fix phpdoc
2014-06-03 12:42:35 +02:00
Robin Appelman
53dc30af4f
Add option to enable app for specific groups
2014-06-03 12:42:35 +02:00
Robin Appelman
b4025b3174
Allow enabling apps by group by setting the config value to a json encoded array of groups
2014-06-03 12:42:35 +02:00
Robin Appelman
6ed3194863
Use a map to prevent having to use search
2014-06-03 12:40:23 +02:00
Robin Appelman
bff9e11ff9
Remove duplicate cache cleanup
2014-06-03 12:38:15 +02:00
Robin Appelman
4429b54ce4
Fix typo
2014-06-03 12:00:39 +02:00
Robin Appelman
82b982a4eb
Better unique names for temporary tables
2014-06-03 11:24:31 +02:00
Robin Appelman
3be2643168
Add `generateChangeScript()` back
2014-06-03 11:19:58 +02:00
Robin Appelman
397a763c49
add a getter for the table
2014-06-03 11:18:46 +02:00
Robin Appelman
c6053b2830
Quote identifiers on mysql
2014-06-03 11:18:45 +02:00
Robin Appelman
6f71419f2b
Skip migration checks for all sql backends besides mysql, postgres and sqlite
2014-06-03 11:18:45 +02:00
Robin Appelman
a59f6818eb
Only quote identifiers for oracle during migration
2014-06-03 11:18:45 +02:00
Robin Appelman
3b4555ca91
Try and check migration before applying it
2014-06-03 11:18:17 +02:00
Robin Appelman
adeac7aa39
Check sqlite migration on a copy of the database file
2014-06-03 11:17:21 +02:00
Robin Appelman
35550e8d9a
Fix migrator for postgres
2014-06-03 11:17:21 +02:00
Robin Appelman
be80dce585
Fix temporary schema creation
2014-06-03 11:17:21 +02:00
Robin Appelman
58c61c8336
Fix generating migration test schemas
2014-06-03 11:17:21 +02:00
Robin Appelman
0035147be9
Create unique names for temporary indexes
2014-06-03 11:17:21 +02:00
Robin Appelman
9c6a93a87c
Add a mechanism to try the database migration on a copy of the tables before running it on the "real" data
2014-06-03 11:17:21 +02:00
Robin Appelman
ec9bf8a2d6
Support having legacy `OC_Cache_FileGlobalGC` background jobs
2014-06-03 11:01:01 +02:00
Robin Appelman
3e14affa9b
Add some comments
2014-06-03 10:57:18 +02:00
Georg Ehrke
eea501b847
various fixes as requested by pr reviewers
2014-06-02 21:39:15 +02:00