Commit graph

7673 commits

Author SHA1 Message Date
Robin Appelman
706bb3ccd6 move ETag generation to storage backends 2012-11-08 17:48:26 +01:00
Robin Appelman
72c3868644 add resolvePath to filesystem view api 2012-11-08 17:42:26 +01:00
Robin Appelman
091ff02362 merge master into filesystem 2012-11-08 17:32:00 +01:00
Thomas Müller
2d52365606 Merge pull request #326 from owncloud/add_credits
add credits to personal page too so that non admins can see what they run
2012-11-08 05:50:09 -08:00
Frank Karlitschek
fef2d07873 add credits to personal page too so that non admins can see what they run. 2012-11-08 14:12:49 +01:00
Thomas Müller
2b6b5269e1 Merge pull request #324 from owncloud/fix_image
fix the broken image path on the apps page
2012-11-08 04:44:14 -08:00
Frank Karlitschek
f799e48f7e fix the broken image path on the apps page 2012-11-08 13:34:00 +01:00
Tom Needham
8396c0478e Migration: Allow for no app data cases; handle file copying better 2012-11-08 11:37:27 +00:00
Tom Needham
0833be9d4e Migration: On import of user accounts only import folders in home dir, use OC_Helper::copyr
Check files when copying recursivley

Remove obsolete method

Dont count '.' and '..' as directories when importing.
2012-11-08 11:37:27 +00:00
Brice Maron
fbc3123d8e Correct more data vs attr to fix #189 2012-11-07 23:51:00 +00:00
Jenkins for ownCloud
c8f24fa3c9 [tx-robot] updated from transifex 2012-11-08 00:03:43 +01:00
Robin Appelman
ae74c54d65 normalize filepaths in OC_Files::getFileInfo 2012-11-07 22:54:10 +01:00
Robin Appelman
e14054610f Revert "fix blocking drag & drop upload of folders"
Fixes #150

This reverts commit 5b2f3c7f72.
2012-11-07 21:59:18 +01:00
Björn Schießle
250f40fe40 check if $path is a empty string 2012-11-07 17:35:07 +01:00
Robin Appelman
961ff01a93 merge master into filesystem 2012-11-07 17:18:56 +01:00
icewind1991
5cad2d7ccc Merge pull request #307 from owncloud/etag-function-overwrite
Allow apps to change the way etags are generated
2012-11-07 08:02:59 -08:00
Björn Schießle
311b04f609 backport from approved patch in stable45:
make root the default parameter for getAbsolutePath()
2012-11-07 16:54:42 +01:00
Brice Maron
ba62d8dea7 Fix quoting problem in fs mount. give Big DB error at least in PG 2012-11-07 15:27:34 +01:00
Björn Schießle
1910bff75c Merge pull request #303 from owncloud/fix_issue_95
urlencode file/dir to allow special characters in filename/path (issue #95)
2012-11-07 05:48:28 -08:00
Björn Schießle
7b51a4e5f9 Merge pull request #306 from owncloud/crumb_drop_fix
extract the right file name for drag&drop.
2012-11-07 05:46:18 -08:00
Robin Appelman
99aa972a40 Allow changing the way etags are generated 2012-11-07 14:21:34 +01:00
Björn Schießle
168a2c7b6b get the right file name for drag&drop. This was necessary after the switch to css to show/hide file actions, otherwise the actions where part of the extracted file name. 2012-11-07 14:10:10 +01:00
Robin Appelman
012a907a8a fix user specific mount configuration 2012-11-07 14:05:45 +01:00
Thomas Müller
d42d88d391 Merge pull request #289 from zimba12/master
Move function that relativizes dates from Files app to core
2012-11-07 03:43:59 -08:00
Björn Schießle
12983cf0b0 urlencode file/dir to allow special characters in filename/path (issue #95) 2012-11-07 10:47:19 +01:00
Jenkins for ownCloud
3e01fe1dbb [tx-robot] updated from transifex 2012-11-07 00:02:51 +01:00
Lukas Reschke
e482de381e Merge pull request #294 from owncloud/fix_ldap_typo_set_not_get_value
LDAP: fix typo in config value handling.
2012-11-06 12:41:11 -08:00
Arthur Schiwon
6339e71bdc LDAP: fix typo in config value handling. 2012-11-06 20:16:37 +01:00
Alessandro Cosentino
50dbb30eb9 Moved relative_modified_date from file/js to core/js 2012-11-06 10:56:42 -05:00
blizzz
64ac208fb2 Merge pull request #258 from wardragon/ldap_existence_check_no_refactor
LDAP: improved object existence check
2012-11-06 07:24:15 -08:00
blizzz
bfaed9a8b6 Merge pull request #273 from owncloud/fix_webdav_shared_91
Return empty array if file does not exist inside Shared folder, fixes issue #91
2012-11-06 04:39:39 -08:00
Thomas Müller
bb40d14efa Merge pull request #281 from butonic/fix_human_filesize_column_header
fix human filesize column header
2012-11-06 02:22:09 -08:00
Jörn Friedrich Dreyer
c2d6ac53b2 fix human filesize column header 2012-11-06 11:08:02 +01:00
Thomas Müller
8f0269f121 Merge pull request #265 from owncloud/fix-button-img-cursor
make images in buttons also show click-hand on hover
2012-11-05 15:15:56 -08:00
Jenkins for ownCloud
4d052c1eee [tx-robot] updated from transifex 2012-11-06 00:01:40 +01:00
Michael Gapczynski
3d13c9db70 Return empty array if file does not exist inside Shared folder, fixes issue #91 2012-11-05 17:54:23 -05:00
Thomas Müller
b7e9d8d00e Merge pull request #267 from owncloud/improve_files_update
Improve performance of files update (on larger setups)
2012-11-05 14:06:07 -08:00
Thomas Müller
f2d5450e14 Merge pull request #269 from owncloud/fix_fe_mkdir_warning
Fix mkdir and opendir warnings when path does not exist
2012-11-05 13:48:17 -08:00
Lukas Reschke
3a4fc7c5b6 Merge pull request #268 from owncloud/fixing_template_test
Fixing failing template unit test
2012-11-05 12:46:25 -08:00
Arthur Schiwon
8b3ae4309b Fix mkdir and opendir warnings when path does not exist 2012-11-05 21:37:59 +01:00
Thomas Mueller
f9226f170e fixes #266 2012-11-05 21:26:59 +01:00
Arthur Schiwon
85d6a08ae9 prepare SQL query only once, that's what prepared statements are for. Should improve upgrade time with larger setups 2012-11-05 20:47:26 +01:00
Jan-Christoph Borchardt
1aec5378b8 make images in buttons also show click-hand on hover 2012-11-05 19:54:48 +01:00
Lorenzo M. Catucci
ca24f4767b Return an empty array on succesful existence check 2012-11-05 17:35:09 +01:00
Robin Appelman
972243d564 support string values ('true' and 'false') for configuring the secure parameter on external storage backends
fixes #78
2012-11-05 16:39:03 +01:00
Lorenzo M. Catucci
510191db68 Return true or false from readAttribute if $attr is empty
This way, readAttribute can act as an existence checker.
2012-11-05 15:38:49 +01:00
Thomas Müller
5c72d28ffd Merge pull request #245 from owncloud/fileactions
some more reuse for fileactions
2012-11-05 05:52:52 -08:00
Frank Karlitschek
59381b90a0 Merge pull request #252 from owncloud/fix_user_webdavauth
Fix user webdavauth
2012-11-05 05:38:06 -08:00
Frank Karlitschek
6fba4ba87d fix the webdavauth app 2012-11-05 14:22:16 +01:00
Robin Appelman
34fee8afaa remove debug statements 2012-11-05 13:52:02 +01:00