Commit Graph

6833 Commits

Author SHA1 Message Date
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
Robin Appelman 6689d67a5b Fix recursive scanning 2014-06-02 21:04:36 +02:00
Bjoern Schiessle e0a5f3b570 get permissions directly from share storage to avoid additional db calls 2014-06-02 20:17:40 +02:00
Bjoern Schiessle 7ad0fee0b5 let file cache handle the versions size 2014-06-02 18:55:13 +02:00
Morris Jobke 9a67986473 add OCP\Config:deleteSystemValue 2014-06-02 18:31:43 +02:00
Morris Jobke 57ef089aac drop allowZIPdownload and maxZIPSize as options 2014-06-02 16:29:03 +02:00
Robin Appelman e002ff6065 propagate changes in the scanner 2014-06-02 15:24:08 +02:00
Robin Appelman 0158788a2a Split of cache writes in the scanner to their own methods 2014-06-02 14:52:21 +02:00
Robin Appelman a31f089266 Add a change propagator class to handle propagating etag and mtime changes 2014-06-02 14:39:12 +02:00
Arthur Schiwon e235de98e6 this line was lost on rebase 2014-06-02 13:22:06 +02:00
Arthur Schiwon b15a5a7ca0 undo lastLogin changes in base and user/user as this has now been properly done in #8681 2014-06-02 12:55:45 +02:00
Arthur Schiwon 2d83c68f05 make search parameter optional, which is already the case in the medthod it is passed to 2014-06-02 12:53:59 +02:00
Arthur Schiwon a9e8d53c8f fix PHPDoc 2014-06-02 12:53:59 +02:00
Arthur Schiwon 122ebf28f7 typo 2014-06-02 12:53:59 +02:00
Arthur Schiwon f9f9550969 small fixes / cleanup 2014-06-02 12:53:57 +02:00
Arthur Schiwon 734dd7013e add MetaData class for groups 2014-06-02 12:53:56 +02:00
Arthur Schiwon 2a8afb0ad9 add PHP doc 2014-06-02 12:53:56 +02:00
Arthur Schiwon 57ffaddf26 add Last Login column 2014-06-02 12:53:51 +02:00
Vincent Petry 4e957c7b18 Merge pull request #8443 from owncloud/csrf-on-login-and-logout
Add CSRF check on login and logout
2014-06-02 11:27:20 +02:00
Lukas Reschke c8b5ae675c Fix PHPDoc
- Remove not anymore existing parameters
- Fix typo
2014-06-01 21:46:05 +02:00
Robin Appelman a4949f4b31 Simplify AppConfig->getValues() 2014-06-01 14:14:30 +02:00
Robin Appelman 91180bfef4 Add caching to AppConfig->getApps 2014-06-01 14:04:17 +02:00
Georg Ehrke c8a8c7e933 read ocsid from shipped apps on install 2014-05-31 18:02:59 +02:00
Georg Ehrke 020255b4e5 add button for properly uninstalling apps 2014-05-31 17:50:39 +02:00
Georg Ehrke c8636ca4d9 Merge branch 'master' into update_shipped_apps_from_appstore
Conflicts:
	lib/private/app.php
	lib/private/installer.php
2014-05-31 14:55:00 +02:00
Georg Ehrke 2bcfd8e084 make it possible to update shipped apps via the appstore 2014-05-31 12:17:54 +02:00
Jenkins for ownCloud cff9440a37 [tx-robot] updated from transifex 2014-05-31 01:55:46 -04:00
Thomas Müller 86b06c72bb Merge pull request #8800 from owncloud/db-changes-as-required-by-8483
Database code cleanup
2014-05-31 00:47:03 +02:00
Thomas Müller 999f6216dc - fix dropTable() and introduce tableExists()
- kill replaceDB() - this function is unused and it's implementation obviously wrong
- add method annotation OC_DB_StatementWrapper::fetchAll
- remove duplicate code in Test_DBSchema and reuse OC_DB::tableExists
- remove unused variables
2014-05-30 23:34:42 +02:00
Thomas Müller 5dd3e34f57 Merge pull request #8444 from owncloud/cleanup-list-code
Cleanup code of files_sharing/ajax/ a little bit
2014-05-30 22:40:28 +02:00
Thomas Müller 555b9cc245 Merge pull request #7614 from owncloud/test_annotations_working
Check if ReflectionMethod::getDocComment is working
2014-05-30 22:17:30 +02:00
Owen Winkler da6aae28ad Merge pull request #8607 from owncloud/filescan_app_hook
Allow apps to control via a hook skipping add/remove a file during filescan
2014-05-30 12:38:37 -04:00
ringmaster 19f0c47842 Missed one. 2014-05-30 10:40:26 -04:00
Thomas Müller 31ad1cbdd8 Merge pull request #5365 from owncloud/filesize-improvements-32bit
Add LargeFileHelper / Add CURL filesize workaround / Fix some 32-bit filesize issues
2014-05-30 16:13:48 +02:00
ringmaster 16ae63bdfd Updates per comments on PR:
* Use "filesystem_cache_readonly" config setting, update comment in config.sample
* Use $this->cacheActive to cache config setting
* Add public Scanner::setCacheActive() to set $cacheActive programmatically
2014-05-30 09:42:41 -04:00
icewind1991 2ba5701b1a Merge pull request #8778 from owncloud/storage-instanceof
Add storage->instanceOfStorage() to handle instanceof with storage wrappers
2014-05-30 14:58:59 +02:00
Jenkins for ownCloud 929882a32a [tx-robot] updated from transifex 2014-05-30 01:55:11 -04:00
Lukas Reschke 45d93cc6ec Merge pull request #8759 from owncloud/fix-phpunit
fix 8757, get rid of service locator antipattern
2014-05-29 21:35:47 +02:00
Lukas Reschke 705242d390 Merge pull request #8727 from owncloud/upgrade-overview
Added update overview page
2014-05-29 21:28:47 +02:00
Andreas Fischer 2929d19c7f Document exceptions thrown by \OC\LargeFileHelper. 2014-05-29 16:26:02 +02:00
Andreas Fischer ea246d058e Use "file size" instead of "filesize", then also apply camel case. 2014-05-29 16:26:02 +02:00
Andreas Fischer 0417e52134 Increase file size limit from 2 GiB to 4 GiB when workarounds are unavailable. 2014-05-29 16:26:02 +02:00
Andreas Fischer fb4556033a Cast '{DAV:}getcontentlength' to number instead of int. 2014-05-29 16:26:02 +02:00
Andreas Fischer 0bae68017e Cast to number instead of integer in OC\Files\Cache\HomeCache 2014-05-29 16:26:02 +02:00
Andreas Fischer a34aa1959a Cast to number instead of integer in OC\Files\Cache\Cache 2014-05-29 16:26:01 +02:00
Andreas Fischer a9b28323dd Add LargeFileHelper::__construct() verifying that our assumptions hold. 2014-05-29 16:26:01 +02:00
Andreas Fischer 2c36a4b07a Add helper method for turning int|float into base-10 unsigned integer string. 2014-05-29 16:26:01 +02:00
Andreas Fischer fb7ec2bb22 Only call $this->filesize() for files. 2014-05-29 16:26:01 +02:00
Andreas Fischer df29eec72b Windows exec() implementation. 2014-05-29 16:26:01 +02:00
Andreas Fischer 626e87aa54 Output validation for exec() method. 2014-05-29 16:26:01 +02:00
Andreas Fischer c8fa1fd687 Refactor Large File handling code. 2014-05-29 16:26:01 +02:00
Andreas Fischer 3f8f8027d2 Cast to numeric instead of float, i.e. use an integer if possible. 2014-05-29 16:17:13 +02:00
Andreas Fischer 6195f13bda Use CURL to get filesize on 32bit systems. 2014-05-29 16:17:13 +02:00
Robin Appelman 998fa2d9be Pass any methods custom to specific storage implementations to the wrapped storage 2014-05-29 16:13:05 +02:00
Robin Appelman 0ae7a49c8e Fix storage wrapper being called with null 2014-05-29 14:15:48 +02:00
Robin Appelman 99d46af0b4 Use instanceOfStorage instead of instanceof 2014-05-29 13:52:58 +02:00
Robin Appelman 8c5521fdfc Add $storage->instanceOfStorage to handle instanceof for storage wrappers 2014-05-29 13:45:50 +02:00
icewind1991 c0f02be50a Merge pull request #3908 from owncloud/storage-folder-copy-rename
Recursive copy and remove for local storage backends
2014-05-29 13:29:24 +02:00
Thomas Müller 3ef9570d02 Merge pull request #8547 from owncloud/path-length-master
Handling long paths properly in \OC\Files\View
2014-05-29 00:08:29 +02:00
Lukas Reschke 1af293dc13 Merge pull request #8754 from owncloud/3rdparty-upgraded-phpmailer
upgraded phpmailer into v5.2.8 via composer
2014-05-28 22:42:45 +02:00
ringmaster f79948f519 Prevent apps from affecting the scanner via hook. 2014-05-28 13:20:20 -04:00
Lukas Reschke ce9d5df6df Merge pull request #8681 from owncloud/logintimestamp
Record login timestamp per user. Required for new user managament.
2014-05-28 19:06:47 +02:00
Robin Appelman 467e9c2bb0 Remove code duplication 2014-05-28 18:16:24 +02:00
Robin Appelman af35b6ad9d Fix LocalStorage->unlink to work on folder as expected 2014-05-28 18:16:24 +02:00
Robin Appelman 8187164fe1 re-use rescursive copy from common storage 2014-05-28 18:16:24 +02:00
Robin Appelman 488fc402e4 remove unneeded check 2014-05-28 18:16:23 +02:00
Robin Appelman d15ed9b4d3 use \OC\Files\Filesystem::isIgnoredDir 2014-05-28 18:16:23 +02:00
Robin Appelman ea44f0e20f fix recursive copy and rename for common storage backend 2014-05-28 18:16:23 +02:00
Robin Appelman c3c9612c99 fix recursive copy and rename for mapped local storage backend 2014-05-28 18:16:23 +02:00
Robin Appelman 03ba497a8c add recursive copy to local storage backend 2014-05-28 18:16:23 +02:00
Robin Appelman 38c1da0976 fix recursive rename for local storage backend 2014-05-28 18:16:23 +02:00
Robin Appelman e83b41493f remove unneeded delTree 2014-05-28 18:16:23 +02:00
Thomas Müller a2e4bc8d33 # This is a combination of 2 commits.
# The first commit's message is:

adding tests for long paths
increment path field in database up to 4000 (maximum for Oracle - otherwise we could use php's 4096)
increment version to trigger database migration
adding unit test for too long path

# This is the 2nd commit message:

fix too long path
2014-05-28 15:30:44 +02:00
ringmaster 3d1ba574e4 Change visibility of scanner internals
so that descendant classes can access them.
2014-05-28 07:59:38 -04:00
Vincent Petry 09645b9221 Merge pull request #8755 from owncloud/fix-8737-master
remove legacy OC_Filesystem being used in a hook callback
2014-05-28 10:57:54 +02:00
Jenkins for ownCloud 80641cae72 [tx-robot] updated from transifex 2014-05-28 01:56:09 -04:00
Bernhard Posselt 5e9ea2b365 fix 8757, get rid of service locator antipattern 2014-05-28 02:15:16 +02:00
Thomas Müller f03a3d9d05 remove legacy OC_Filesystem being used in a hook callback 2014-05-28 00:13:54 +02:00
Volkan Gezer c100da33bb upgraded phpmailer into v5.2.8 via composer 2014-05-27 23:33:18 +02:00
Bart Visscher a51e9a5cfe Merge pull request #8136 from owncloud/contactsmanager-register
Implement the register function of OC\ContactsManager
2014-05-27 22:35:50 +02:00
ringmaster 26d169b27c Use 'filesystem_check_enable' as a config option. 2014-05-27 16:01:16 -04:00
ringmaster 3b287f8274 Allow the default behavior to come from the config. 2014-05-27 15:21:35 -04:00
ringmaster fdf26c5a3f Rename variable to something more appropriate. 2014-05-27 15:12:56 -04:00
ringmaster 645e7035a4 Allow apps to control via a hook to skip adding/removing a file during filescan 2014-05-27 15:12:54 -04:00
Vincent Petry 02f682b156 Now showing disabled apps as upgrade status line
- Added app id in update overview.
- Added status message for disabled app for CLI upgrade and web upgrade
2014-05-27 15:20:33 +02:00
Vincent Petry 146583a98d Added update overview page 2014-05-27 14:53:08 +02:00
Vincent Petry d43a7c5f6e Added requiremin/requiremax fields for apps
Apps can now specify a minimum and maximum version of ownCloud in which
they are supported.
2014-05-27 11:54:12 +02:00
Jenkins for ownCloud a756666585 [tx-robot] updated from transifex 2014-05-27 01:54:54 -04:00
Bernhard Posselt c2330e558e rename to apps.js 2014-05-26 17:31:41 +02:00
Arthur Schiwon 3a21c3e2f4 Merge branch 'logintimestamp' of git://github.com/owncloud/core into logintimestamp 2014-05-26 13:56:40 +02:00
Arthur Schiwon 4a4ea67a31 drop superflous statement in phpdoc 2014-05-26 13:56:08 +02:00
Arthur Schiwon 748a219243 add preRememberedLogin hook and document this and postRememberedLogin in class descripttion. Also fixes documentation of postLogin hook 2014-05-26 13:53:26 +02:00
Vincent Petry a34491e288 Merge pull request #8687 from owncloud/recursive-remove-smb
Make the recursive delete more robust
2014-05-26 11:06:13 +02:00
Frank Karlitschek 48d0cebc42 Merge pull request #8674 from owncloud/watch-policy
Add a config option for setting the filesystem watcher policy
2014-05-26 10:48:44 +02:00
Jenkins for ownCloud 790c0e8e7c [tx-robot] updated from transifex 2014-05-26 01:55:36 -04:00
Jenkins for ownCloud 3029029afd [tx-robot] updated from transifex 2014-05-25 01:54:35 -04:00
Lukas Reschke c03e7fcfa9 Clarify comment 2014-05-24 10:24:42 +02:00
Jenkins for ownCloud 2afdd1bf1a [tx-robot] updated from transifex 2014-05-24 01:55:34 -04:00
Bernhard Posselt db1511a11d add a slideup mechanism 2014-05-23 18:49:16 +02:00
Robin Appelman be8326668a Make the recursive delete more robust 2014-05-23 13:31:45 +02:00
Robin Appelman 8b56d52398 Make the session available as early as possible 2014-05-23 13:27:27 +02:00
Robin Appelman 151c48494e Add a config option fro setting the filesystem watcher policy 2014-05-23 12:20:31 +02:00
Arthur Schiwon 2e85d5a852 increase scrutinizer happyiness by removing minor/informational issues 2014-05-23 11:20:46 +02:00
Björn Schießle 050df76830 Merge pull request #8599 from owncloud/sharing_disable_for_groups
allow admin to disable sharing for specific groups of users
2014-05-22 08:19:27 -04:00
Robin Appelman ff1f341d97 Fix phpdoc 2014-05-22 13:30:32 +02:00
Bjoern Schiessle 12338e0ef0 allow admin to disable sharing for specific groups of users 2014-05-22 10:43:44 +02:00
Vincent Petry 25ecd2bdda Merge pull request #8659 from owncloud/get-preference-multiple-user
Add a method to get the values for multiple users to OC\Preferences
2014-05-22 09:59:20 +02:00
Björn Schießle 14a953fbe0 Merge pull request #8416 from owncloud/sharing_keep_mount_points_visible
[sharing] move the mount point up if the parent folder no longer exists
2014-05-21 14:07:49 -04:00
Arthur Schiwon 2c89962919 clean up tryRememberLogin and save the timestamp of users last login 2014-05-21 18:03:37 +02:00
Joas Schilling e20fb37038 Correctly create list of placeholders 2014-05-21 14:35:59 +02:00
Bjoern Schiessle 5f403f3e92 move the mount point up if a share is mounted to a subfolder and the subfolder no longer exists 2014-05-21 13:19:17 +02:00
Joas Schilling 4fbfe077fb Move return to new line 2014-05-21 13:10:23 +02:00
Joas Schilling cf3cd572b0 Add a method to get the values for multiple users to OC\Preferences 2014-05-21 11:14:52 +02:00
scolebrook 954d5b27ff use custom logfile path if defined, otherwise use default of owncloud.log in data directory 2014-05-20 11:29:59 -04:00
Jenkins for ownCloud 40fc1d5b4b [tx-robot] updated from transifex 2014-05-20 01:54:53 -04:00
Thomas Müller 06af8e09da adding annotation check to checkServer() 2014-05-19 21:51:35 +02:00
Thomas Müller 30f1ec2521 Merge branch 'master' into test_annotations_working
Conflicts:
	lib/private/util.php
2014-05-19 21:42:30 +02:00
Thomas Müller 8749442fec no return on register and unregister 2014-05-19 21:39:19 +02:00
Thomas Müller bb6fac1102 Merge branch 'master' into contactsmanager-register
Conflicts:
	lib/private/contactsmanager.php
2014-05-19 21:35:13 +02:00
Thomas Müller 51a6764f31 Merge branch 'master' into cleanup-list-code
Conflicts:
	apps/files_sharing/ajax/list.php
2014-05-19 20:52:25 +02:00
Thomas Müller f8cb8f4803 Merge branch 'master' into csrf-on-login-and-logout
Conflicts:
	core/templates/login.php
2014-05-19 20:40:55 +02:00
Thomas Müller b6d2d6329d Merge pull request #8639 from owncloud/drop-brief
Remove all occurences of @brief and @returns from PHPDoc
2014-05-19 20:18:32 +02:00
Morris Jobke dc36d30953 Remove all occurences of @brief and @returns from PHPDoc
* test case added to avoid adding them later
2014-05-19 17:50:53 +02:00
Frank Karlitschek 090d127050 Merge pull request #6457 from owncloud/db-convert-tool
Command line tool to convert current database to others, except sqlite
2014-05-19 16:41:31 +01:00
Thomas Müller 95741f3936 Merge pull request #8435 from owncloud/fix-8322-master
Expose permission via WebDAV
2014-05-19 16:52:03 +02:00
Thomas Müller 04e6c12fe2 Merge pull request #8557 from owncloud/custom_session_handling
Allow apps to create custom session handlers.
2014-05-19 15:58:30 +02:00
Morris Jobke 48977c8579 Merge pull request #7286 from owncloud/issue/4823
Set expiration date by default when adding additional shares
2014-05-19 10:26:54 +02:00
Jenkins for ownCloud d52252998a [tx-robot] updated from transifex 2014-05-19 01:54:46 -04:00
Joas Schilling ab7ae004f7 Automatically copy the share expiration date when new shares are created
Fix #4823
2014-05-19 01:38:47 +02:00
Morris Jobke 804020bb6d Merge pull request #7363 from owncloud/optimize-startup-queries
Optimize some queries that are always executed when loading base.php
2014-05-19 01:21:37 +02:00
Jenkins for ownCloud a7509e5fd9 [tx-robot] updated from transifex 2014-05-18 01:55:01 -04:00
Jenkins for ownCloud a1b356c7b6 [tx-robot] updated from transifex 2014-05-17 01:57:38 -04:00
Björn Schießle 42b99b6d0f Merge pull request #8555 from owncloud/sharing_default_expire_only_public_links
use default expire date only for link shares
2014-05-16 14:57:11 -04:00
Björn Schießle b52cb8f557 Merge pull request #8604 from owncloud/sharing_encforce_password
allow admin to enforce passwords for public link shares
2014-05-16 12:23:01 -04:00
Bjoern Schiessle 7a48f24459 use default expire date only for link shares 2014-05-16 18:12:13 +02:00
Bjoern Schiessle b6e14af861 allow admin to enforce passwords for public link shares 2014-05-16 17:41:09 +02:00
Vincent Petry 1fb0d5412c Merge pull request #6260 from owncloud/jan-navigation-filesidebar
Files app navigation sidebar
2014-05-16 13:00:35 +02:00
Jenkins for ownCloud 43d6650d19 [tx-robot] updated from transifex 2014-05-16 01:55:55 -04:00
Vincent Petry 04f73275ba Now settings CSS class with appid in content DIV 2014-05-15 17:51:04 +02:00
Thomas Müller 7abe3b1989 Merge pull request #8587 from Raydiation/master
Small cleanup and language detection for apps
2014-05-15 12:22:47 +02:00
Jenkins for ownCloud d9d684197a [tx-robot] updated from transifex 2014-05-15 01:55:53 -04:00
Jenkins for ownCloud c9df98abae [tx-robot] updated from transifex 2014-05-14 01:55:31 -04:00
Bernhard Posselt d8020c3506 use registerService method instead of array access 2014-05-14 01:09:48 +02:00
Bernhard Posselt 9e36c33104 use fetch method instead of fetchRow because fetchRow is only an owncloud internal alias that exists purely for compability 2014-05-14 01:09:48 +02:00
Bernhard Posselt 512373fadf provide a way to detect the language that is being used (e.g. for clientside javascript language selection 2014-05-14 01:09:48 +02:00
Thomas Müller 37ba6f503a fixing variable naming 2014-05-13 19:09:15 +01:00
Thomas Müller fa503a4772 fix PHPDoc 2014-05-13 19:09:15 +01:00
Thomas Müller 650a55e2ba object -> \OC\Preview 2014-05-13 19:09:14 +01:00
Thomas Müller 7853bc4cac adding PHPDoc 2014-05-13 19:09:14 +01:00
Thomas Müller 147007bdd8 fixing typo and missing @throws 2014-05-13 19:09:14 +01:00
Robin McCorkell 4755392c65 More PHPDoc for file functions 2014-05-13 19:09:14 +01:00
Robin McCorkell f7e777f7d2 Fix various code errors detected by Scrutinizer
Fixed:
- An error with a misplaced bracket in lib/private/util.php
- An error with an incorrect function being called in lib/public/contacts.php
2014-05-13 19:09:14 +01:00
Robin McCorkell bac8962bbc Fix Scrutinizer errors 2014-05-13 19:08:14 +01:00
Robin McCorkell bd3bf4b507 Change parameter order of implode 2014-05-13 19:08:14 +01:00
Robin McCorkell 8ab01599a9 Use OC_User_Interface instead of OC_User_Backend 2014-05-13 19:08:14 +01:00
Lukas Reschke 7e448a376f Fix PHPDoc and typos
Some things my IDE complained about while creating a custom backend.

Fix PHPDoc and typos

Some things my IDE complained about while creating a custom backend.

Conflicts:
	lib/private/group/database.php
	lib/private/group/dummy.php
	lib/private/group/example.php
2014-05-13 19:08:14 +01:00
Robin McCorkell 3bed3d2a23 Change parameter type for useBackend 2014-05-13 19:08:14 +01:00
Robin McCorkell 87b548ed91 Fix all PHPDoc types and variable names, in /lib 2014-05-13 19:08:14 +01:00
Robin McCorkell a7ae2e874a Squash 'a | b' into 'a|b', in /lib 2014-05-13 19:08:14 +01:00
Robin McCorkell b5bc37d2e4 Fix @return array PHPDocs, in /lib 2014-05-13 19:08:14 +01:00
Robin McCorkell b653ad164b Replace @returns with @return, in /lib 2014-05-13 19:08:14 +01:00
Thomas Müller f5bc680f9c Merge pull request #8572 from owncloud/core-getabsolutepathwithzero
Fixed getAbsolutePath case when path is "0"
2014-05-13 17:41:18 +02:00
Vincent Petry bab8c1f8e5 Fixed getAbsolutePath case when path is "0"
Make sure to correctly check for string emptiness when the passed path
is "0".
2014-05-13 17:38:46 +02:00
Björn Schießle b8de1e5d71 Merge pull request #8398 from owncloud/enc_backup_keys
backup the encryption key after the encryption was disabled
2014-05-13 09:25:16 -04:00
Bjoern Schiessle a9ac11718e backup the encryption key after the encryption was disabled so that the user
can restore them if needed
2014-05-13 12:35:25 +02:00
Bernhard Posselt a152e320f6 make it possible to omit parameters and use the default parameters from the controller method 2014-05-13 10:40:49 +02:00
Vincent Petry e3f6abf1f0 Merge pull request #8546 from owncloud/fix-preview-orientation-encrypted-master
Rotate thumbnail when encryption is enabled
2014-05-13 10:27:41 +02:00
Jenkins for ownCloud a60db322c2 [tx-robot] updated from transifex 2014-05-13 01:55:41 -04:00
Thomas Müller 8314e5f4d1 fixing typos and adding PHPDoc 2014-05-12 21:58:09 +02:00
Thomas Müller 408189b7e4 Merge pull request #8556 from owncloud/kill-legacy-code-master
Kill legacy code master
2014-05-12 20:55:24 +02:00
Lukas Reschke aea44ee0d5 Merge pull request #8538 from owncloud/make-my-ide-less-complain-about-ldap
Use proper PHPDoc and variable names in the LDAP lib
2014-05-12 19:31:43 +02:00
Thomas Müller ee8a7b53da Merge pull request #8553 from owncloud/fix-8549-master
adding X-Robots-Tag to all responses of ownCloud + move addSecurityHeade...
2014-05-12 17:45:08 +02:00
ringmaster 75bc25f906 Allow apps to create custom session handlers. 2014-05-12 11:08:28 -04:00
Thomas Müller 1d18fd4e6d Merge pull request #8482 from owncloud/public-logger
Make logger available in the container
2014-05-12 16:40:58 +02:00
Thomas Müller f5ed92bf31 remove legacy aka deprecated code: OC_Cache_FileGlobalGC 2014-05-12 16:34:47 +02:00
Thomas Müller e0dd69e4e6 remove legacy aka deprecated code: OC_FilesystemView 2014-05-12 16:30:39 +02:00
Thomas Müller 33987eea83 remove legacy aka deprecated code: OC_Cache 2014-05-12 16:23:33 +02:00
Thomas Müller 4dd1a49a68 remove legacy aka deprecated code: OC_Filesystem 2014-05-12 16:20:07 +02:00
Thomas Müller 3cd32dcb7c adding X-Robots-Tag to all responses of ownCloud + move addSecurityHeaders() to OC_Response, which seems to be a more reasonable place 2014-05-12 15:14:01 +02:00