Commit graph

15819 commits

Author SHA1 Message Date
Jan-Christoph Borchardt
7867604e22 remove app specific code 2013-12-03 10:54:18 +01:00
Jan-Christoph Borchardt
d673dd066a fix details for buttons in header and controls bar 2013-12-03 10:54:18 +01:00
Jan-Christoph Borchardt
c44f534c2b account for shift of controls bar due to app navigation, do not shift on public page 2013-12-03 10:54:16 +01:00
Frank Karlitschek
b83e891456 Merge pull request from owncloud/code_check_on
switch code checker on by default. apps are not allowed to access
2013-12-03 01:14:35 -08:00
Thomas Müller
a999350f69 Merge pull request from owncloud/rmdir-check
check if a directory exists before we try to remove it
2013-12-02 15:14:41 -08:00
Jenkins for ownCloud
83ec234f53 [tx-robot] updated from transifex 2013-12-02 17:28:29 -05:00
Robin Appelman
64bfcbee0a check if a directory exists before we try to remove it 2013-12-02 22:44:28 +01:00
Björn Schießle
9d100b5f94 Merge pull request from owncloud/trash_fix_select
trash, make it possible to select folders
2013-12-02 13:22:28 -08:00
Bjoern Schiessle
ee66db447f make it possible to select folders 2013-12-02 16:30:03 +01:00
Robin Appelman
4f4ad72460 remove background jobs if they are failing 2013-12-02 13:43:26 +01:00
Robin Appelman
35bb6f7e3a Catch exceptions from background jobs and log them 2013-12-02 13:41:47 +01:00
Vincent Petry
a81d4175ba Merge pull request from owncloud/fix_trash_restore
Fix restore anbd delete operations in trash bin
2013-12-02 04:33:37 -08:00
Bjoern Schiessle
fac2f2a626 check explicitely all possible dir values 2013-12-02 12:13:32 +01:00
Bjoern Schiessle
edc4447d6a set delete all to true if a complete folder was deleted 2013-12-02 11:59:09 +01:00
Bjoern Schiessle
8ce3ea3e2c fix delete files from trash bin 2013-12-02 11:50:55 +01:00
Thomas Mueller
87e795a693 fixing PHPDoc and spelling 2013-12-02 08:42:28 +01:00
Frank Karlitschek
c2e83e635d ownCloud 6 RC2 2013-12-02 00:10:28 +01:00
Thomas Müller
832be7c908 Merge pull request from owncloud/datetime-doctrine
Get rid of date strings for DB. Completely use Doctrine and DateTime.
2013-12-01 01:29:35 -08:00
Thomas Müller
c2b11cae83 Merge pull request from owncloud/encryption-version-bump
Adjust files_encryption requirements to the new core requirement (PHP 5.3.8)
2013-11-29 15:20:54 -08:00
Andreas Fischer
efbf18652c Adjust files_encryption requirements to the new core requirement (PHP 5.3.8). 2013-11-29 20:34:57 +01:00
Vincent Petry
baa587fd3c Merge pull request from owncloud/extstorage-deletedirs2
Fixed FTP and SMB to use rmdir() when deleting folders
2013-11-29 11:23:02 -08:00
Thomas Müller
338a55e36c Merge pull request from owncloud/fix-6126-master
Also merge autoconfig variables into $_REQUEST.
2013-11-29 11:22:44 -08:00
Jenkins for ownCloud
1b18c5a047 [tx-robot] updated from transifex 2013-11-29 14:10:40 -05:00
Frank Karlitschek
3c62de90fd Merge pull request from owncloud/chunking-fixtouchafterassemble
Fixed touch after chunk assembling
2013-11-29 09:19:51 -08:00
Morris Jobke
0d464421ed Merge pull request from owncloud/minimum_php_version
make 5.3.8 the minimum supported version.
2013-11-29 08:07:43 -08:00
Bjoern Schiessle
71589e65d2 fix restore from files in sub-folders 2013-11-29 16:43:50 +01:00
Vincent Petry
80d2371f97 Fixed touch after chunk assembling
Fixed touch after chunk assembling which was using the wrong path,
resulting in the creation of an extra file.

Fixes 
2013-11-29 16:29:35 +01:00
Andreas Fischer
2ec085b51f Also merge autoconfig variables into $_REQUEST. 2013-11-29 16:24:48 +01:00
Frank Karlitschek
7ca0de9bd3 make 5.3.8 the minimum supported version. This fixes several issues with broken PHP versions like: https://github.com/owncloud/core/issues/5734
Also make the version compare clearer. It was pure luck that floatval on a php version returned the correct value.
2013-11-29 15:46:10 +01:00
Vincent Petry
d69243ee51 Fixed FTP and SMB to use rmdir() when deleting folders
Some storages need to use different calls for deleting files or folders,
usually unlink() and rmdir().

Fixes  (SMB dir deletion)
Fixes  (FTP dir deletion)

Note that the extra is_dir() should be fast because it's read from the
stat cache.
2013-11-29 13:01:01 +01:00
Frank Karlitschek
1dc931b778 Merge pull request from owncloud/nav-scrollbar
always show app navigation scrollbar when too many apps in there
2013-11-29 03:27:50 -08:00
Frank Karlitschek
a03ba06dcd Merge pull request from owncloud/fix-api-documentation
API doc for contacts manager, server container and share
2013-11-29 03:24:19 -08:00
Frank Karlitschek
0b698e6901 Merge pull request from owncloud/non-floating-trash-button-chrome
Fix resize issue for trash button in chrome and overflowing spinner in ....
2013-11-29 02:44:49 -08:00
Morris Jobke
41a1a32e5a Merge pull request from owncloud/fix_source_not_found_warnings
make sure that we don't try to access an already deleted files
2013-11-28 12:59:24 -08:00
Morris Jobke
0cbe9d79ba Merge pull request from owncloud/fix_preview_creation
Fix preview creation
2013-11-28 12:48:19 -08:00
Morris Jobke
587fc1aff3 Fix resize issue for trash button in chrome and overflowing spinner in .update class
fixes 
2013-11-28 21:36:43 +01:00
Bjoern Schiessle
b3724cd9c6 remove duplicate 2013-11-28 20:58:32 +01:00
Bjoern Schiessle
348706854c use better coding style 2013-11-28 19:31:35 +01:00
Bjoern Schiessle
466ed01e5d correctFolder() already resolves the dirname internally 2013-11-28 19:25:49 +01:00
Bjoern Schiessle
bdfef554c4 add PHPDoc for setMimetype() 2013-11-28 19:05:43 +01:00
Bjoern Schiessle
bef5108218 detect mimetype from the original filename, without the versioning timestamp 2013-11-28 18:59:38 +01:00
Bjoern Schiessle
863aedf784 detect mimetype from the original filename, without the delete timestamp 2013-11-28 18:59:12 +01:00
Bjoern Schiessle
eeb31420fe we need to be able to set the mimetype manually 2013-11-28 18:52:58 +01:00
ganomi
f723bf744a Merge pull request from ganomi/summaryfix
Fix filellist/rename/summary problem
2013-11-28 08:00:41 -08:00
Morris Jobke
3a31f7eb4a Merge pull request from owncloud/extstorage-ftptrailingslash
Add trailing slash in FTP root path when missing
2013-11-28 04:52:08 -08:00
Morris Jobke
603613e6e6 Merge pull request from owncloud/files-renamediriconfix
Fixed directory icon after rename
2013-11-28 04:50:17 -08:00
Morris Jobke
b87e88b48a Merge pull request from owncloud/fix_loginnameusage
loginname is not necessarily username
2013-11-28 04:46:54 -08:00
Bjoern Schiessle
eaedda2116 make sure that we don't try to access an already deleted files, fixes some file source not found warnings 2013-11-28 13:31:08 +01:00
Arthur Schiwon
ee78d48186 loginname is not necessarily username 2013-11-28 13:26:31 +01:00
Vincent Petry
da1a89fd15 Fixed directory icon after rename 2013-11-28 13:15:20 +01:00