Commit Graph

15724 Commits

Author SHA1 Message Date
Vincent Petry 2d2af90fce Merge pull request #6028 from owncloud/extstorage-touchoperationreturnvalue
Fixed ext storage touch function to return true on success
2013-11-25 05:08:24 -08:00
Morris Jobke b7ddc78626 fix db.php doc 2013-11-25 14:06:25 +01:00
Robin Appelman d3bfb433d1 add occ commands for enabling and disabling apps 2013-11-25 13:20:16 +01:00
Robin Appelman 317d421874 provide more cli friendly error messages 2013-11-25 13:04:23 +01:00
Vincent Petry d88025bf6b Fixed ext storage touch function to return true on success
Some ext storage impl didn't return true on success.

Fixes #5943 (Dropbox)
Fixes #6010 (WebDAV)
2013-11-25 12:44:27 +01:00
Simon Könnecke 243f3f0c4c No decimal points for Kilobyte and Byte #5371. 2013-11-25 12:26:03 +01:00
Thomas Müller 993fea2f05 fix appframework routing 2013-11-25 11:36:33 +01:00
Vincent Petry 1b0c5e57e5 Fixed SMB rename function to overwrite target file
When uploading files through WebDAV, a part file is created and a rename
operation is performed with the expectation that the part file
overwrites an existing file, if any.

This fix makes the SMB external storage delete the target file before
renaming, as smbclient doesn't support overwrite on move/rename.

Fixes #5348
2013-11-25 11:17:38 +01:00
Vincent Petry de2b444030 Merge pull request #5960 from owncloud/enc_small_visual_improvements
[encryption] some small visual improvements
2013-11-25 02:12:31 -08:00
Vincent Petry 15f7315231 Merge pull request #6025 from owncloud/typo
fix typo
2013-11-25 02:12:09 -08:00
Bjoern Schiessle f1f172e16e fix typo 2013-11-25 11:09:31 +01:00
Bjoern Schiessle 49038545f8 Merge branch 'encryption_work_with_public_gallery' of github.com:owncloud/core into encryption_work_with_public_gallery 2013-11-25 10:29:53 +01:00
Bjoern Schiessle 9c4b8ae54c fix typo in comment 2013-11-25 10:29:05 +01:00
Morris Jobke b82146eeee Merge pull request #5991 from owncloud/extstorage-mountpointvalidation
Prevent using root as mount point for external storage
2013-11-25 00:30:06 -08:00
Thomas Müller 60e2ee631a Merge pull request #5998 from owncloud/navigation-fix
Doesn't Cut the top arrow from navigation
2013-11-24 15:02:56 -08:00
Thomas Müller 1a69079139 Merge pull request #6021 from owncloud/show_build
Show build number
2013-11-24 15:01:11 -08:00
Thomas Mueller 2a465fb20f Merge branch 'master' into encryption_work_with_public_gallery 2013-11-24 23:20:46 +01:00
Thomas Müller a2d4cd87d0 Merge pull request #5874 from owncloud/fix-5845
Fix file uploads on Windows with SQL Server
2013-11-24 14:15:17 -08:00
Thomas Müller 45db67d174 Merge pull request #6018 from owncloud/fix_overwritehost
fix overwrite host support and make the code a bit more readable
2013-11-24 14:02:51 -08:00
Thomas Mueller f6df4b349f remove logic from template and fix syntax error 2013-11-24 21:27:32 +01:00
Thomas Mueller 228f1788fa add new function to generate the human readable version string based on version, channel and build number 2013-11-24 21:26:34 +01:00
Thomas Mueller 229630f14c adding simple unit test to test scriptName() under overwrite condition 2013-11-24 21:19:06 +01:00
Thomas Mueller 6229f457d0 update PHPDoc 2013-11-24 21:18:14 +01:00
Frank Karlitschek 77bb168007 replace echo with p 2013-11-24 17:17:10 +01:00
Frank Karlitschek 22e39baf77 show the build number if on the daily build update channel 2013-11-24 16:46:07 +01:00
Frank Karlitschek a11192bab3 send the build number too to push the next daily build. This is needed for the new daily build update channel 2013-11-24 16:45:06 +01:00
Frank Karlitschek 2ce850f7db fix overwrite host support and make the code a bit more readable 2013-11-24 12:41:09 +01:00
Vincent Petry aef34618de Merge pull request #5995 from owncloud/extstorage-isreadablefix
Return plausible isReadable() default impl for ext storage
2013-11-24 03:04:33 -08:00
Jenkins for ownCloud ba0e09adce [tx-robot] updated from transifex 2013-11-24 00:14:51 -05:00
Arthur Schiwon d9347f2c9b LDAP: last avatar lookup must be stored per user. Someone had a blackout, eh? 2013-11-22 23:58:30 +01:00
Arthur Schiwon 6085878966 Avatar: accept OC_Image as in setParameter 2013-11-22 23:57:23 +01:00
Vincent Petry 2d947835b9 Now also preventing the user of "Shared" as mountpoint 2013-11-22 18:36:27 +01:00
Vincent Petry c62cce8269 Moved default isReadable/isUpdatable impl into Common class
Also adjusted all ext storage backends to not override these when the
default behavior is expected.
2013-11-22 18:21:17 +01:00
Vincent Petry a49e873d3f Return plausible isReadable() default impl for ext storage
When an ext storage doesn't implement isReadable(), always returning
true made the file scanner believe that the file exists and creates a
cache entry with the size zero.

This fix makes the default impl of isReadable() use file_exists().

Fixes #5940
2013-11-22 18:21:17 +01:00
Bjoern Schiessle aeefe48cba Revert "use relative paths to create images from a file. This way it also works if"
This reverts commit 3488f0b77a.
2013-11-22 18:01:44 +01:00
Bjoern Schiessle acf74b24f2 remove unused variable 2013-11-22 16:10:30 +01:00
Morris Jobke ae6610f0ea fix navigation scrollbar 2013-11-22 15:48:24 +01:00
Vincent Petry 3b904647b0 Merge pull request #6003 from owncloud/incognito_mode
Incognito mode
2013-11-22 06:08:49 -08:00
Thomas Müller c67b8f2b22 fixed documentation 2013-11-22 14:58:36 +01:00
Bjoern Schiessle 2cc0c90015 set incognito mode for public.php calls. Because in this case ownCloud should always work the same way as if no user is logged in 2013-11-22 14:00:08 +01:00
Bjoern Schiessle 7e4f50d4e3 add incognito mode, allows to hide my user ID. For example, this is useful to access public resources while a user is still logged in 2013-11-22 13:55:38 +01:00
Thomas Müller c05177b25b Merge pull request #5882 from owncloud/preview-movie-5s
Movie preview - use frame after 5 seconds
2013-11-22 04:27:34 -08:00
Arthur Schiwon 6fdce3b7e9 LDAP: user proxy must support canChangeAvatar too 2013-11-22 13:25:20 +01:00
Arthur Schiwon 8ccac86c98 Enable user backends to provide avatar images 2013-11-22 13:25:20 +01:00
Arthur Schiwon 54f0deff2a LDAP: get user photo from LDAP and set it as avatar if available 2013-11-22 13:25:20 +01:00
Raghu Nayyar c503588827 Merge pull request #6000 from owncloud/use_relative_path_to_create_images
use relative paths to create images from a file.
2013-11-22 03:52:40 -08:00
blizzz 2f73db12bb Merge pull request #5040 from owncloud/public_api_avatar_master
Add public API for \OC\Avatar
2013-11-22 03:42:28 -08:00
Thomas Müller 92c8672c0f fixing PHPDoc comments and syntax 2013-11-22 12:34:37 +01:00
Bjoern Schiessle 3488f0b77a use relative paths to create images from a file. This way it also works if
no user is logged in (e.g. public gallery share)
2013-11-22 12:26:01 +01:00
Thomas Müller 14e7075030 we better use 5MB (1024 * 1024 * 5 = 5242880) instead of 1MB.
in some cases 1MB was no enough to generate thumbnail
2013-11-22 12:23:22 +01:00