josh4trunks
acd5660492
Cleanup Document Preview
...
Use the env:UserInstallation flag like https://github.com/owncloud/documents/blob/master/lib/converter.php .
This will stop the creating of multiple directories for document conversion in tmpDir.
2014-07-22 22:46:38 -07:00
Sander
4e2954673a
Revert change
2014-07-22 19:45:01 +02:00
Sander
eacdf26cde
Allow getAppFolder to get another apps path
...
cc @Raydiation
2014-07-22 16:07:43 +02:00
Thomas Müller
0567fd031f
Merge pull request #9772 from owncloud/fix-chunked-upload-master-2
...
adding special handling of checkPrecondition() for chunked upload
2014-07-22 15:47:55 +02:00
Thomas Müller
8ed6adaf85
Merge pull request #9738 from owncloud/remove-uneeded-strip
...
Remove uneeded strip_tags
2014-07-22 15:06:23 +02:00
Thomas Müller
31149fb1c3
adding special handling of checkPrecondition() for chunked upload
2014-07-22 13:06:20 +02:00
Robin Appelman
e9de20952a
Return the proper owner for home storages
2014-07-21 16:59:59 +02:00
Joas Schilling
677c0288fb
Merge pull request #9757 from owncloud/issue/9756
...
Add language parameter to public API for getL10N()
2014-07-21 16:50:48 +02:00
Joas Schilling
01878153e0
Add language parameter to public API for getL10N()
...
Fix #9756
2014-07-21 14:50:34 +02:00
Thomas Müller
0a9e0d1051
perm -> permissions
2014-07-21 13:49:22 +02:00
Vincent Petry
3df7a83c72
Merge pull request #9406 from philfry/master
...
silently discard the response body, needed for apache/mod_dav and maybe ...
2014-07-21 12:22:06 +02:00
Morris Jobke
76a5fa11f5
Merge pull request #9741 from owncloud/fix-repair-innodb-9737-master
...
check if $tables is an array
2014-07-20 21:40:53 +02:00
Andreas Fischer
8cd1f7464e
Merge pull request #9672 from owncloud/mysql-affectedrows
...
Make MySQL affected row count consistent with other DBMSes
* owncloud/mysql-affectedrows:
Added test of OCS privatedata to trigger key duplication
Document why we have to check with defined() first.
Make MySQL return "number of found rows" instead of number of "affected rows".
2014-07-20 21:29:16 +02:00
Thomas Müller
f0c0bd5251
check if $tables is an array
2014-07-19 20:23:38 +02:00
Lukas Reschke
1c16d012ab
Remove uneeded `strip_tags`
...
This `strip_tags` seems to be completely unneeded and will cause problems with passwords containing stripped characters. (e.g. `<` or `>`)
Needs https://github.com/owncloud/core/pull/9735 to be merged first.
2014-07-19 10:17:24 +02:00
Jenkins for ownCloud
d09ec36751
[tx-robot] updated from transifex
2014-07-19 01:54:42 -04:00
Andreas Fischer
bfd59bddf4
Extract Auth Header logic into new function handleAuthHeaders().
2014-07-19 02:21:18 +02:00
Andreas Fischer
fafed17c60
Deduplicate user/password extraction from alternative HTTP headers.
2014-07-19 02:06:37 +02:00
Jenkins for ownCloud
80983f5853
[tx-robot] updated from transifex
2014-07-18 01:54:43 -04:00
Frank Karlitschek
f92b5a2507
update appstore api url
2014-07-17 21:54:46 -04:00
Vincent Petry
77d6d11b91
Merge pull request #9682 from owncloud/mappedlocal-rename
...
Fix renaming files in the root folder of a MappedLocal storage
2014-07-17 09:19:17 +02:00
Jenkins for ownCloud
b736864e78
[tx-robot] updated from transifex
2014-07-17 01:55:09 -04:00
Robin Appelman
5a0397eb5e
Fix renaming files in the root folder of a MappedLocal storage
2014-07-16 21:24:18 +02:00
icewind1991
d58c8d72cf
Merge pull request #9550 from kofemann/dcache-fixes-for-upstream
...
storage: do not check file mode on rename
2014-07-16 16:06:14 +02:00
Andreas Fischer
d8bd8c4b66
Document why we have to check with defined() first.
2014-07-16 15:13:35 +02:00
Andreas Fischer
e26612244a
Make MySQL return "number of found rows" instead of number of "affected rows".
2014-07-16 14:35:47 +02:00
Robin Appelman
94fa21d146
Add group management to the public api
2014-07-16 14:25:31 +02:00
Stephan Peijnik
4d74aa09bf
Port of #9584
...
Fixes #9583
lib/private/group/metadata.php: For subadmins also return an array of groups, indexed by their GIDs.
settings/users.php: Convert array of arrays to array of GIDs before calling into OC_Group::displayNamesInGroups.
Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
Fix indentation.
Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
Renamed $grp to $group in foreach loop.
Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
Use is_null() instead of empty() when checking the return value of GroupManager::get().
Additionally, $grp was renamed to $group inside
\OC\Group\MetaData::fetchGroups().
Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
Updated code to reflect changes introduced to \OC\Group\MetaData.
Now that fetchGroups() does not exist anymore and getGroups() is called
directory, the 'groups' property does not exist anymore.
Instead, we now generate that array on the fly and return it from getGroups.
Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
2014-07-16 12:23:26 +02:00
Björn Schießle
7d8a8e78fa
Merge pull request #9640 from owncloud/fix_9627
...
make sure that 'OC_Theme' exists before checking if the method exists
2014-07-16 10:12:52 +02:00
Jenkins for ownCloud
0155326227
[tx-robot] updated from transifex
2014-07-16 01:55:55 -04:00
Thomas Müller
0f9b22107b
Merge pull request #9644 from owncloud/fix_user_api
...
Fix user api
2014-07-15 23:57:02 +02:00
blizzz
10b59f101f
Merge pull request #9540 from owncloud/use_fileinfo_in_search_results
...
use fileinfo object in search results
2014-07-15 19:49:36 +02:00
Bjoern Schiessle
6967d328e2
make sure that 'OC_Theme' exists before checking if the method exists
2014-07-15 17:48:25 +02:00
Jörn Friedrich Dreyer
818929274d
use UserSession service to resolve user id
2014-07-15 17:42:17 +02:00
Jörn Friedrich Dreyer
b3106c321c
use correct IUser in interface
2014-07-15 17:41:44 +02:00
Vincent Petry
a8d95356ca
Merge pull request #8987 from owncloud/lastindexid-debug
...
[DEBUG] Test case for debugging the last index ID bug from Doctrine/MySQL
2014-07-15 17:01:57 +02:00
icewind1991
61b5a770e4
Merge pull request #9561 from libasys/patch-3
...
Fix Error undefined index: file_target
2014-07-15 16:54:57 +02:00
Thomas Müller
6c93bcc814
Merge pull request #9621 from owncloud/fix_logger_implementation
...
fix logger implementation
2014-07-15 16:05:15 +02:00
Jörn Friedrich Dreyer
4a855be814
fix logger implementation and test
2014-07-15 10:10:16 +02:00
Jenkins for ownCloud
ff11ef3c5b
[tx-robot] updated from transifex
2014-07-15 01:55:20 -04:00
Thomas Müller
e8f02b9410
Merge pull request #9562 from owncloud/users-groupfilter
...
Do not filter groups, but therefore update the user counts according to the filter
2014-07-15 07:40:55 +02:00
Thomas Müller
73e2bf7bf4
fixing PHPDoc
2014-07-14 21:26:47 +02:00
Arthur Schiwon
ab2c7e06a4
remove dead code
...
do not filter groups. but update the user count according to the filter
improve phpdoc
improve metadata runtime cache
add metadata tests
2014-07-14 21:26:37 +02:00
Jörn Friedrich Dreyer
8f11019f45
mkae getRelativePath of file search results overwriteable in subclasses
2014-07-14 19:27:10 +02:00
Jörn Friedrich Dreyer
eea5c2ee0a
return relative path
2014-07-14 19:12:06 +02:00
Robin Appelman
c3991ae13e
Use the correct path when building the FileInfo for the search result
2014-07-14 18:32:45 +02:00
Morris Jobke
9ee1c7ff71
Merge pull request #9228 from owncloud/remove-routing-singular-issues
...
Routing: Dont strip the s from the resource id to prevent possible weird behavior with irregular english plural nouns
2014-07-14 17:10:07 +02:00
Thomas Müller
4b91741875
Merge pull request #9598 from owncloud/fix-app-installation-master
...
append file extension to the temporary file which contains the downloade...
2014-07-14 17:05:36 +02:00
Vincent Petry
10a29556b0
- Added test to trigger index id error
...
- re-enable encryption migration tests
- sqlite requires reconnect after schema changes
2014-07-14 16:20:09 +02:00
Robin Appelman
51d0bdc90c
Expose the user manager in the public server container
2014-07-14 15:10:56 +02:00
Robin Appelman
20c1ce7f47
Add public interfaces for User, UserManager and UserSession
2014-07-14 15:10:51 +02:00
Björn Schießle
05ba9b3c64
Merge pull request #9539 from enoch85/patch-1
...
Fix for #9422
2014-07-14 12:58:23 +02:00
Vincent Petry
e58dce2ee0
Merge pull request #9571 from owncloud/fix_appstore_update_issue
...
Fix update to button issue
2014-07-14 10:00:39 +02:00
Jenkins for ownCloud
d7b8e3209b
[tx-robot] updated from transifex
2014-07-13 01:54:35 -04:00
Jenkins for ownCloud
c1e95d62ec
[tx-robot] updated from transifex
2014-07-12 01:54:39 -04:00
Thomas Müller
e47cd5ebf1
append file extension to the temporary file which contains the downloaded archive - in case of zip files fileinfo doesn't seem to return anything reliable
2014-07-11 16:51:59 +02:00
Georg Ehrke
fb685b0856
improve check for duplicate apps
2014-07-10 17:18:10 +02:00
Georg Ehrke
305db9c2d7
add proper version comparision in OC_Installer::isUpdateAvailable
2014-07-10 17:17:55 +02:00
Morris Jobke
e33ef0d449
Merge pull request #9536 from owncloud/default-app-groups-master
...
Default app groups master
2014-07-10 15:45:44 +02:00
Tigran Mkrtchyan
03f422153d
files: storage: rename should check parent directories of old and new files
...
as described by POSIX.1-2008
(see http://pubs.opengroup.org/onlinepubs/9699919799/functions/rename.html )
Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
2014-07-10 14:58:59 +02:00
libasys
cd88c2fd7b
Update share.php
...
change isset with empty on line 1911
2014-07-10 13:19:35 +02:00
libasys
b395ff549b
Update share.php
...
Added isset for error:
```
Undefined index: file_target at /var/www/owncloud/lib/private/share/share.php#1911
```
2014-07-10 13:02:04 +02:00
Jörn Friedrich Dreyer
3f093974f9
use fileinfo object in search results
2014-07-09 14:47:43 +02:00
Daniel Hansson
851c1f87d6
Fix for #9422
2014-07-09 14:40:05 +02:00
Thomas Müller
5d2a3c83ac
adding 'groups' entry to remote apps
2014-07-09 11:23:17 +02:00
Thomas Müller
1ae6e1bcf8
fixing typos
2014-07-09 10:20:17 +02:00
Thomas Müller
63fdaacbfc
Merge pull request #9510 from libasys/patch-1
...
BugFix missing $item on 'file_target' Line 1911
2014-07-09 07:58:37 +02:00
Jenkins for ownCloud
6e2e0108ee
[tx-robot] updated from transifex
2014-07-09 01:55:51 -04:00
Thomas Müller
10978a80c2
Merge pull request #9507 from owncloud/fix-9302-master
...
Upload abortion is now detected within the OC_Connector_Sabre_File::put...
2014-07-08 17:39:34 +02:00
Thomas Müller
65d9d6ad01
Merge pull request #9412 from owncloud/public-api-activity
...
Public api activity
2014-07-08 16:37:18 +02:00
Arthur Schiwon
3338a0f236
port of #9500
...
don't trigger update from checkPassword, it is already called by userExists, this is enough.
do not write to database when the value is the same
add test cases. also split test classes in a file each, looks like only the first class is being executed
also appconfig shall not write to database if the value is unchanged
2014-07-08 16:32:01 +02:00
Robin Appelman
3e3d460729
use case insensitive LIKE when searching for files in mysql
2014-07-08 15:49:27 +02:00
Robin Appelman
76c709d7de
Add repair step to set MySQL collation to utf8_bin
...
Set default collation of mysql connection to utf8_bin
Set utf_bin as default collation for new tables
2014-07-08 15:12:07 +02:00
Thomas Müller
ea269f0067
Upload abortion is now detected within the OC_Connector_Sabre_File::put()
...
OC_Connector_Sabre_AbortedUploadDetectionPlugin is pointless
Adding unit test testUploadAbort()
2014-07-08 11:09:59 +02:00
libasys
e70a7af6da
BugFix missing $item on 'file_target' Line 1911
...
I think this should be right!
2014-07-08 10:51:05 +02:00
Thomas Müller
8363f3c635
Adding new interface \OCP\Activity\IExtentsion
...
Adding method getNotificationTypes()
Adding method filterNotificationTypes()
Adding method getDefaultTypes()
Adding method translate() and getTypeIcon()
Adding method getGroupParameter()
Adding method getNavigation()
Adding method getNavigation()
Adding method isFilterValid() and getQueryForFilter()
Adding unit tests for \OC\ActivityManager
2014-07-08 09:04:37 +02:00
Jenkins for ownCloud
20fc4b8b53
[tx-robot] updated from transifex
2014-07-08 01:55:17 -04:00
Morris Jobke
29bdfc0ce2
Merge pull request #9502 from owncloud/add_ocsids
...
Add ocsids for shipped apps in core repo
2014-07-07 19:58:41 +02:00
Morris Jobke
b2377129b6
Merge pull request #9494 from owncloud/issue/9490
...
[issues/9490] \OC::$WEBROOT is invalid when called from cron.php
2014-07-07 19:36:41 +02:00
Georg Ehrke
e5e8e28ae7
add ocsids to info.xml
2014-07-07 17:11:50 +02:00
Joas Schilling
5d3e1bc023
Only calculate the WEBROOT from scriptName if it contains $SUBURI
...
If not we are most likely in CLI mode. However to be able to still
generate valid URLs, we need to use the overwrite webroot instead.
Fix #9490
2014-07-07 15:08:46 +02:00
Joas Schilling
e8537afd60
Only overwrite serverHost when in unit tests
...
The intention of the original commit 12f7cb8767
was to fix tests. But cron should always return a valid host not localhost.
2014-07-07 15:08:45 +02:00
Thomas Müller
b091b15f0b
MySQL: adding repair step to convert MyIsam tables to InnoDB
2014-07-07 12:32:24 +02:00
Vincent Petry
5c444c2da8
Merge pull request #9468 from owncloud/fix_logout_error_messages
...
better validation: cadd extra check if appinfo/info.xml exists
2014-07-07 10:58:23 +02:00
Jenkins for ownCloud
6e9905d7cf
[tx-robot] updated from transifex
2014-07-07 01:54:28 -04:00
Jenkins for ownCloud
33492b4448
[tx-robot] updated from transifex
2014-07-06 01:54:33 -04:00
Georg Ehrke
1565089c02
fix phpDocBlock for OC_App::getAppInfo
2014-07-05 13:32:21 +02:00
Georg Ehrke
042ec984bd
better validation: cadd extra check if appinfo/info.xml exists
2014-07-05 13:28:47 +02:00
Jenkins for ownCloud
23e0ef6ed0
[tx-robot] updated from transifex
2014-07-05 01:56:33 -04:00
Jörn Friedrich Dreyer
8fbcca1291
Merge pull request #9419 from owncloud/fix_search_results_in_root_dir
...
Fix search results in root dir & deprecate OC_Search_Provider
2014-07-04 18:28:54 +02:00
Björn Schießle
a544bd3a0f
Merge pull request #9357 from owncloud/sharing_unshare_on_delete
...
[sharing] unshare childrens on delete
2014-07-04 17:42:52 +02:00
icewind1991
d3fab824f7
Merge pull request #9445 from owncloud/filelist-auth-error
...
Reload the page when the files app encounters an authentication error
2014-07-04 16:39:00 +02:00
Robin Appelman
4fe1cdd2a7
Add machine readable error messages to OC\JSON
...
Reload the files app in case of authentication errors, expired tokens or disabled app
Reloading will triger the full server side handeling of those errors
formatting
fix missing semicolon + some jshint warnings
2014-07-04 16:20:27 +02:00
Jörn Friedrich Dreyer
aeeae5f1b2
Merge pull request #8308 from owncloud/case_insensitive_search_oracle
...
use case insensitive linguistic sort and compare when connecting to oracle
2014-07-04 15:51:57 +02:00
Thomas Müller
2327d41b11
Merge pull request #9269 from owncloud/fix_versions_preview
...
change order of registering api and capabilities to fix file version previews
2014-07-04 15:25:24 +02:00
Bjoern Schiessle
e9f5730869
make sure that the umount hook always contains the path relative to data/user/files
2014-07-04 10:34:54 +02:00
Jenkins for ownCloud
e4a3f8d3c4
[tx-robot] updated from transifex
2014-07-04 01:56:01 -04:00
Vincent Petry
dd4273e2e3
Merge pull request #9413 from owncloud/fix_hook_names
...
fix hook names
2014-07-03 22:01:24 +02:00
Jörn Friedrich Dreyer
b5545b81c6
make search case insensitive on postgres and oracle
2014-07-03 19:01:00 +02:00
Jörn Friedrich Dreyer
b56f5f2773
deprecate OC_Search_Provider in favor of \OCP\Search\Provider
2014-07-03 16:03:09 +02:00
Bjoern Schiessle
3c45925e74
fix hook names
2014-07-03 13:52:58 +02:00
Vincent Petry
2fec6cbd5b
Remove forgotten debug log
2014-07-03 12:26:17 +02:00
Philippe Kueck
ef114b6594
silently discard the response body, needed for apache/mod_dav and maybe other dav servers which return an html body
2014-07-03 12:04:38 +02:00
Jenkins for ownCloud
1a1c5aa3c0
[tx-robot] updated from transifex
2014-07-03 01:56:24 -04:00
Vincent Petry
ed29e7d160
Merge pull request #9329 from owncloud/sharing_check_target
...
don't move a share mount point into a different mount point
2014-07-02 21:01:03 +02:00
Vincent Petry
f4eb90e229
Merge pull request #9311 from owncloud/storage-not-available
...
Handle storages not being available in webui and webdav
2014-07-02 18:15:58 +02:00
Morris Jobke
904e3102d3
Merge pull request #9288 from owncloud/fix_dispatcher_null_values
...
don't typecast null values inside dispatcher.php
2014-07-02 15:29:33 +02:00
Robin Appelman
edb67f9f4d
Remove invalid mounts from the active fs
2014-07-02 15:00:12 +02:00
Volkan Gezer
805a7cf485
Merge pull request #9338 from owncloud/fix-redirect-for-appframework
...
Redirect after session expiry to the previous loaded page
2014-07-02 11:39:41 +02:00
Jenkins for ownCloud
9933b33166
[tx-robot] updated from transifex
2014-07-02 01:55:17 -04:00
Vincent Petry
94c3bac9ed
Merge pull request #9327 from owncloud/migrator-postgreskeywordtest
...
Added migrator test for reserved keyword
2014-07-01 20:40:18 +02:00
Vincent Petry
3d921ed3c3
Merge pull request #9334 from owncloud/defaultappfix
...
Default app fix
2014-07-01 20:39:13 +02:00
Bjoern Schiessle
bb935978fa
don't move a share mount point into a different mount point
2014-07-01 19:38:55 +02:00
Bjoern Schiessle
735eac6c9d
add a explicit interface for the home storage
2014-07-01 17:31:33 +02:00
Vincent Petry
7c17452028
Added unit test for default app URL
2014-07-01 16:55:29 +02:00
Morris Jobke
b6a4cc20f7
Redirect after session expiry to the previous loaded page
...
* fixes #6945
2014-07-01 16:54:52 +02:00
Jörn Friedrich Dreyer
5a588333b2
introduce and use getCurrentConnection()
2014-07-01 16:45:00 +02:00
Vincent Petry
3e78f41d00
Use getAbsoluteUrl for redirection URL
...
Also separate the function into getDefaultPageUrl() and
redirectToDefaultPage() to make it testable.
2014-07-01 16:02:38 +02:00
Vincent Petry
c005515ebd
Support for multiple default apps
...
If a default app isn't visible for the user, try the next one.
Else fallback to the "files" app.
2014-07-01 15:42:26 +02:00
Robin Appelman
8161104420
Catch StorageInvalidException in webdav
2014-07-01 15:03:29 +02:00
blizzz
616f9b1e03
Merge pull request #9156 from owncloud/solve-8959
...
search term for users and groups may occur anywhere in the name or displ...
2014-07-01 14:37:09 +02:00
Robin Appelman
1c43081d38
Detect removed public shares
2014-07-01 14:36:06 +02:00
Vincent Petry
894d69184a
Add bak defaultapp setting
2014-07-01 14:28:45 +02:00
Jörn Friedrich Dreyer
dd20b9f672
reset collection to 'root' after adding a route to the api
2014-07-01 14:21:20 +02:00
Vincent Petry
b752aff51d
Fix migrator tests to use the correct migrator instances
2014-07-01 12:54:35 +02:00
Jan-Christoph Borchardt
75a5746b70
Merge pull request #9306 from owncloud/publicneedsupgrade
...
Return 503 in public.php and OCS API when upgrade is due
2014-07-01 11:52:39 +02:00
Morris Jobke
88e6f5c318
Merge pull request #9292 from owncloud/issue/9161
...
Use get random bytes as uniqeid() is not unique in some cases
2014-07-01 09:51:45 +02:00
Jenkins for ownCloud
a878b42b42
[tx-robot] updated from transifex
2014-07-01 01:54:43 -04:00
Arthur Schiwon
16275eca84
loop over usernames, not passwords
2014-06-30 20:43:50 +02:00
Robin Appelman
99960d7747
Handle StorageNotAvailableException in webdav
2014-06-30 16:36:11 +02:00
Robin Appelman
d78a2a9f78
Add StorageNotAvailableException
2014-06-30 15:46:37 +02:00
Vincent Petry
972fffbe02
Return 503 OCS response with requested format
2014-06-30 15:37:38 +02:00
Joas Schilling
0c711e1cfa
Use get random bytes as uniqeid() is not unique in some cases
...
Fix #9161
2014-06-30 11:10:10 +02:00
Jenkins for ownCloud
589f68ebf6
[tx-robot] updated from transifex
2014-06-30 01:54:47 -04:00
Georg Ehrke
c30bea45e9
don't typecast null values inside dispatcher.php
2014-06-29 22:40:50 +02:00
Thomas Müller
9032ce4535
Merge pull request #9266 from owncloud/fix_objectstore_etag_update
...
always regenerate etag when writing back file to objectstore
2014-06-29 20:59:20 +02:00
Jenkins for ownCloud
ebf93448f2
[tx-robot] updated from transifex
2014-06-29 01:56:00 -04:00
Volkan Gezer
ae68a773c0
more strings to translate in utils also some fixes in defaults
2014-06-28 13:29:24 +02:00
Normal Ra
42edd5b788
Add .apk mimetype.
2014-06-28 00:13:15 +02:00
icewind1991
1a3e698294
Merge pull request #9263 from owncloud/remote-share-update
...
Better detecting of remote changes for external shares
2014-06-27 19:31:18 +02:00
Jörn Friedrich Dreyer
23fa75f5ac
always regenerate etag when writing back file to objectstore
2014-06-27 18:49:06 +02:00
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