Commit Graph

21769 Commits

Author SHA1 Message Date
Thomas Müller b2175f0e25 Use \OCP\ILogger 2014-12-01 16:21:54 +01:00
Byron Marohn fa9b36b726 Added error check to lib/private/image.php
This checks that imagecreatetruecolor actually creates an image, rather than returning FALSE.
Without this check, subsequent loop might create billions of ERROR-level log messages.

Signed-off-by: Byron Marohn <combustible@live.com>
2014-12-01 16:20:17 +01:00
Lukas Reschke 805be635fa Only store user credentials when SMB_OC storage is enabled
Conflicts:
	apps/files_external/lib/smb_oc.php
2014-12-01 11:18:29 +01:00
Vincent Petry 8db4dd7585 Merge pull request #12469 from owncloud/issue/12460-port-local-changes2mapped
Issue/12460 port local changes2mapped
2014-12-01 10:42:39 +01:00
Morris Jobke 48f00df08e move jstz to bower management 2014-12-01 10:40:31 +01:00
Morris Jobke fefeb506b2 include lock files of bower to be able to use "bower install" 2014-12-01 10:30:15 +01:00
Lukas Reschke ffd1fc42e7 Merge pull request #12427 from owncloud/issue/6101-deprecate-namespaced-functions
Depcrate namespaced functions, since they can not be autoloaded
2014-12-01 09:38:15 +01:00
Jenkins for ownCloud 5275daff4e [tx-robot] updated from transifex 2014-12-01 01:54:26 -05:00
Adam Williamson 415411a3d5 google: delete original after successful rename
In GDrive, filenames aren't unique, and directories are just
special files - so you can have multiple files with the same
name, multiple directories with the same name, and even files
with the same names as directories.

OC doesn't handle this at all, though, and just wants to act
as if file and directory names *are* unique. So when renaming,
we must check if there's an existing object with the same
file or directory name before we commit the rename, and
explicitly delete it if the rename is successful. (Other
providers like dropbox do the same for files, but intentionally
don't do it for directories; we really need to do it for
directories too.)

A good way to observe this is to run the storage unit tests
and look at the state of the Drive afterwards. Without this
commit, there will be several copies of all the test files
and directories. After this commit, there's just one of each.

We can't just say "hey, Drive lets us do this, what's the
problem?" because we don't handle multiple-objects, same-name
cases - getDriveFile() just bails and prints an error if it
searches for the file or directory with a given name and gets
multiple results.
2014-11-30 15:34:35 -08:00
Morris Jobke 6fa748621f Merge pull request #12398 from oparoz/patch-5
You can only change the oritentation of a JPEG
2014-11-30 10:32:51 +01:00
Jenkins for ownCloud 40badba703 [tx-robot] updated from transifex 2014-11-30 01:54:25 -05:00
Jenkins for ownCloud 83d097c524 [tx-robot] updated from transifex 2014-11-29 01:54:28 -05:00
Lukas Reschke ebb243344a Merge pull request #12499 from owncloud/disableMSSQL
Disable MSSQL and OCI for new CE installations
2014-11-28 18:38:34 +01:00
Lukas Reschke f0e6876f2e Merge pull request #12488 from owncloud/activity_group_multiple_conditions
activitymanager: concatenate queries with 'or'
2014-11-28 17:35:05 +01:00
Lukas Reschke 18b6fc9332 Adjust sample config 2014-11-28 16:58:09 +01:00
Lukas Reschke 9a8dc4a832 Disable OCI as it is unsupported by most CE apps 2014-11-28 16:23:03 +01:00
Lukas Reschke f3e75c085c Disable MSSQL for new CE installations
Since automatic schema migrations are not yet possible let's disable this for now.
2014-11-28 16:08:38 +01:00
Bjoern Schiessle bf2c9be066 concatenate queries with 'or' 2014-11-28 14:46:27 +01:00
Lukas Reschke 2c157da1c2 Merge pull request #12486 from owncloud/activity_priorities
add activity priorities to core so that other apps can reuse it
2014-11-28 14:40:27 +01:00
Lukas Reschke b3afc98f82 Merge pull request #12483 from owncloud/issue/6101-preview-providers
Issue/6101 Autoload preview providers
2014-11-28 13:43:41 +01:00
Thomas Müller 7c96cedd25 Merge pull request #12489 from owncloud/skip-sendpassword-email-test-windows
Skip lostcontroller sending email test on windows
2014-11-28 12:41:53 +01:00
Joas Schilling 9cfae2ed44 Skip lostcontroller sending email test on windows 2014-11-28 11:38:22 +01:00
Bjoern Schiessle 00ad7d48c7 add activity priorities to core so that other apps can reuse it 2014-11-28 10:37:16 +01:00
Vincent Petry 154628daf4 Merge pull request #12432 from owncloud/nosqlite
Add notes that SQLite is CE only
2014-11-28 10:19:15 +01:00
Morris Jobke b188710af3 Merge pull request #12472 from owncloud/modifyCookies
Add functions to modify cookies to response class
2014-11-28 10:16:22 +01:00
Morris Jobke 7a9af8c40c Merge pull request #12443 from owncloud/issue/6101-all-classes-autoloadable
Issue/6101 Make all interfaces/classes autoloadable
2014-11-28 09:40:27 +01:00
Jan-Christoph Borchardt e7ed62b2c8 remove border from user menu, adjust to apps menu 2014-11-28 09:35:50 +01:00
Morris Jobke 99d0e7e92d Merge pull request #12479 from rclarkson/master
Limit blacklist to php files
2014-11-28 09:29:15 +01:00
Joas Schilling ec7b55f5be Split bitmap providers into one per file 2014-11-28 09:28:33 +01:00
Joas Schilling 3ec42ad598 Split office providers into one class per file 2014-11-28 09:28:30 +01:00
Joas Schilling 9cb54e3809 Fix intendation and doc blocks of preview providers 2014-11-28 09:28:28 +01:00
Jenkins for ownCloud 96b0328d39 [tx-robot] updated from transifex 2014-11-28 01:55:29 -05:00
Richard Clarkson 0d98329cac Limit blacklist to php files
During performance optimization I have discovered that the installer scans all files for the blacklisted words. This greatly impacts speed on lower end devices such as the raspberry pie. This commit limits it to PHP files which seems to achieve the desired effect. 

I have used the --include option to achieve this, see http://stackoverflow.com/questions/1987926/how-do-i-grep-recursively

This contribution is MIT licensed
2014-11-27 20:26:45 +01:00
Joas Schilling fca9d32545 Move registration of core preview providers to preview
So the class files only have class code and don't execute code
2014-11-27 19:40:23 +01:00
Joas Schilling 7bbc27708a Move NaturalSort_DefaultCollator to its own file 2014-11-27 17:47:21 +01:00
Joas Schilling 7b8824a4e3 Move iHomeStorage to own file 2014-11-27 17:47:20 +01:00
Joas Schilling dfde04291e Move share interfaces to own files so they can be autoloaded 2014-11-27 17:47:19 +01:00
Robert Jäckel 1a6928f447 blocked 3rdparty instead of l10n 2014-11-27 17:33:45 +01:00
Robert Jäckel 8c3bf139ff restrict access to public files only
use mod_rewrite to pretend theese files are not existend for security purposes
2014-11-27 17:14:27 +01:00
Robin Appelman 05a069c101 Merge pull request #12426 from owncloud/jail-mask-wrappers
Add Jail and PermissionsMask storage wrappers
2014-11-27 16:00:14 +01:00
Robin Appelman 33b64868d7 Add storage and cache wrappers to apply a permissions mask to a storage 2014-11-27 15:25:57 +01:00
Robin Appelman abb6e89c5d Add storage and cache wrappers to jail a storage to a subfolder 2014-11-27 15:25:53 +01:00
Lukas Reschke af56429a9a Merge pull request #12470 from owncloud/jenkins-12447
Jenkins 12447
2014-11-27 15:16:14 +01:00
Joas Schilling 7761f0288e Also clearstatcache() in MappedLocal before using the stats
Local change 283c10f010
2014-11-27 14:59:10 +01:00
Joas Schilling 50f85bfd1f Check whether file exists before trying to touch() it
Local changes from d069ee8a8b
and 258ad38fd3
2014-11-27 14:59:09 +01:00
Joas Schilling c5427da76d Check return of disk_free_space before returning it
Local changes copied from ed83597371
and 25370fcb82
2014-11-27 14:59:08 +01:00
Joas Schilling 1062f4fe44 Check file existance in MappedLocal in hasUpdated()
Only fixed in Local by eeee9eacea
2014-11-27 14:59:07 +01:00
Joas Schilling b886d3d645 Make MappedLocal::isLocal() true like for Local
Missed in 788c8540aa
2014-11-27 14:59:07 +01:00
Vincent Petry e733d32eec Merge pull request #12462 from owncloud/issue/12460-localstorage-buildpath
Introduce buildPath() in Storage\Local to reduce the difference to MappedLocal
2014-11-27 14:57:08 +01:00
Lukas Reschke e35feadac2 Pass \OC::$WEBROOT to the ctr 2014-11-27 14:50:14 +01:00