Commit Graph

16123 Commits

Author SHA1 Message Date
Robin Appelman 4e2b52a376 merge master into fileinfo 2014-01-29 16:33:27 +01:00
Jan-Christoph Borchardt f5f918b8bf Merge pull request #6903 from owncloud/fix-ms-office-icons
Add/fix Microsoft Office file icons.
2014-01-29 07:31:25 -08:00
Morris Jobke c65fac092d Merge pull request #6995 from jbtbnl/master
Add white color variant of checkmark icon
2014-01-29 06:32:34 -08:00
Jan-Christoph Borchardt 5a869732d1 adjust file type icon placement for when no preview can be generated 2014-01-29 15:28:57 +01:00
Bjoern Schiessle 229f13adc0 change order of issubdirectory() calls to avoid error messages for non-apps 2014-01-29 14:40:59 +01:00
Pellaeon Lin 929c930b0a Use $storageInfo['free'] 2014-01-29 21:24:31 +08:00
jbtbnl f798ad9a20 Add white color variant of checkmark icon 2014-01-29 13:47:37 +01:00
Vincent Petry 58c7042e70 Added error message for when target folder was removed
Whent trying to upload/rename/create files in a folder that was removed
or rename, the correct error message is now shown.

In the case of upload of multiple files, the upload is cancelled.

This situation can happen if the target folder was renamed or removed
from another browser window or client.
2014-01-29 12:46:11 +01:00
Björn Schießle 609d5f2458 Merge pull request #6987 from owncloud/share_api_and_encryption
[ocs share api] public upload is also possible with encryption enabled, since OC6
2014-01-29 02:50:25 -08:00
Jan-Christoph Borchardt d310df505c permanently show download action on mobile, only icon 2014-01-29 11:43:34 +01:00
Vincent Petry a2b79ead2d Merge pull request #6990 from owncloud/files-fixrenamewarnings
Fix warnings in logs when renaming over the web UI
2014-01-29 02:21:30 -08:00
Jan-Christoph Borchardt 8f81f007cd fix horizontal scrollbar appearing when footer is too long, footer wraps now 2014-01-29 11:06:19 +01:00
Martial Saunois 0f1c587e6b The regexp of the Freebox user agent is now more strict.
A new unit test has been added in consequence.
2014-01-29 10:58:34 +01:00
Jan-Christoph Borchardt 13ed59c1cf merge master into mobile-style 2014-01-29 10:55:44 +01:00
Vincent Petry e6f93fc841 Fix warnings in logs when renaming over the web UI
The determineIcon() method was expecting attributes to be set which
caused warnings about undefined indices in the error log.

This fix pre-initializes the array with 'directory' and
'isPreviewAvailable' to make them disappear.
2014-01-29 10:43:13 +01:00
Morris Jobke cf2c061f1f Merge pull request #6929 from owncloud/sharing-fixfiledownloadlink
Sharing fixfiledownloadlink
2014-01-29 00:39:14 -08:00
Martial Saunois 8507efc427 Unit tests added for the new Freebox user agent. 2014-01-28 21:08:27 +01:00
Bjoern Schiessle cd4e044f66 public upload is also possible with encryption enabled, since OC6 2014-01-28 17:28:20 +01:00
Thomas Müller 75c8d74c94 Merge pull request #6979 from owncloud/share_api_error_codes
[ocs share api] use error code 403 if sharing is not permitted
2014-01-28 07:28:07 -08:00
Bjoern Schiessle 7f83f2a8f2 use more accurate error codes 2014-01-28 13:31:43 +01:00
VicDeo 0a77d41178 Merge pull request #6965 from owncloud/unused-free-space
Remove unused $freeSpace
2014-01-27 10:27:51 -08:00
Robin Appelman b590f019f6 Remove unused $freeSpace 2014-01-27 16:51:32 +01:00
Thomas Müller ab9ddda8f2 Merge pull request #6907 from owncloud/webdav-logexceptions
Added exception logger plugin for sabre connector
2014-01-27 07:48:40 -08:00
Robin Appelman 3c1ab66eda Reuse the calculated free_space in buildFileStorageStatistics 2014-01-27 15:56:57 +01:00
Morris Jobke 25305a535b Merge pull request #6958 from owncloud/localised_date
use localised date in notification mails
2014-01-27 04:54:30 -08:00
Morris Jobke d182b4f59f Merge pull request #6927 from owncloud/enc_dont_reload_page_on_decrypt
remove the form, it isn't needed here
2014-01-27 04:30:06 -08:00
Morris Jobke b4d11df843 Merge pull request #6930 from jcfischer/master
Add 'mail_from_address' configuration
2014-01-27 04:27:35 -08:00
Morris Jobke 6ee1250d27 Merge pull request #6933 from seberm/master
Add check for apc.enabled option
2014-01-27 04:25:31 -08:00
Morris Jobke 0a1708ba11 Merge pull request #6912 from owncloud/replace-webroot-in-css
Remove %webroot% from CSS
2014-01-27 04:11:15 -08:00
Bjoern Schiessle 2bb13a8db9 use localised date in notification mails 2014-01-27 12:47:54 +01:00
Vincent Petry 11ef12a106 Added exception logger plugin for sabre connector
Whenever an exception occurs in the sabre connector code or code called
by it, it will be logged.

This plugin approach is needed because Sabre already catches exceptions
to return them to the client in the XML response, so they don't appear
logged in the web server log.

This will make it much easier to debug syncing issues.
2014-01-27 11:40:17 +01:00
Jan-Christoph Borchardt 46745895ae Merge pull request #5153 from owncloud/core-em-to-px
Cleans up Core apps for relative(em) to absolute(px) styles.
2014-01-27 02:29:47 -08:00
Jan-Christoph Borchardt 6fbc73e673 Merge pull request #5152 from owncloud/files-em-to-px
Converts em to px values for styles in Files.
2014-01-27 02:28:01 -08:00
Björn Schießle 1d3da8b0ed Merge pull request #6916 from owncloud/encryption_update_filecache
[encryption] update file cache after the file was written
2014-01-27 01:37:52 -08:00
Martial Saunois c2ed8d5aa1 New user agent added for the Freebox.
The Freebox is the multimedia device of a french Internet provider: Free. This device provides a seedbox which uses the user agent "Mozilla/5.0". In the "Content-Disposition" header, if the "filename" key is used with the "filename*=UTF-8''" value, the seedbox does not take care about the header and saves the file name with the origin URL. This patch brings the support for the Freebox users.
2014-01-26 18:46:09 +01:00
raghunayyar 2a0e8329f9 Fixes settings.css and converts more styles. 2014-01-26 03:02:52 +05:30
raghunayyar 932e8f9f58 Fixes width of the dropdown menus as per computed styles. 2014-01-26 02:59:28 +05:30
Jan-Christoph Borchardt d94c9bc8da Merge pull request #6939 from owncloud/disable-password-autocomplete
prevent autofill for password change settings, prevent leak of existing password
2014-01-25 07:54:55 -08:00
Jan-Christoph Borchardt 150d3856a0 prevent autofill for password change settings, prevent leak of existing password, fix #6552 2014-01-24 18:58:56 +01:00
Jan-Christoph Borchardt c767ebcc03 fix multiselect bar being too short on big displays 2014-01-24 18:20:52 +01:00
Vincent Petry 3bea9b8ddd Merge pull request #6905 from owncloud/add_expiredate_to_linkshare
add expire date to link share if possible
2014-01-24 07:44:33 -08:00
Jens-Christian Fischer 3ca85cd841 updated config.sample.php with mail_from_address parameter 2014-01-24 16:24:52 +01:00
Morris Jobke dff2675efa Merge pull request #6923 from owncloud/files-maxuploadfieldstylefix
Fixed max upload size input field style
2014-01-24 07:05:50 -08:00
Björn Schießle 6875e3d9c7 Merge pull request #6921 from owncloud/trash_mimetype_size
increase size of mimetype column
2014-01-24 07:05:18 -08:00
Robin Appelman 1ab7ca0a19 Fix some phpdoc errors and rename interface 2014-01-24 16:01:19 +01:00
Bjoern Schiessle 83878b9a7d only update file cache with the unenecrypted size when the file was written 2014-01-24 16:01:00 +01:00
Robin Appelman fc5f20112e Add isReadable, isUpdateable, isDeletable, isShareable 2014-01-24 15:54:40 +01:00
Pellaeon Lin 19675c2c9d Fix variable name 2014-01-24 22:54:16 +08:00
Morris Jobke 1fe60e435e Merge pull request #6184 from owncloud/6051-ux-files-Move-File-Spinner
#6051 [ux][files] Move File Spinner
2014-01-24 06:53:53 -08:00
Otto Sabart 2f8ebd03b0 Add check for apc.enabled option
Sometimes it's not possible to disable APC entirely and some of
apc_functions are disabled. Only thing which is possible is
to disable apc.enable option.
2014-01-24 15:52:28 +01:00