Commit Graph

7241 Commits

Author SHA1 Message Date
Bjoern Schiessle 91254c304d name users after test 2014-02-07 18:07:38 +01:00
Bjoern Schiessle a8943ad022 replace 'size' with 'unencrypted_size' if encryption is enabled 2014-02-07 12:53:13 +01:00
Vincent Petry aff1cafaca Merge pull request #7089 from owncloud/sharing-searchbymime
Fixed searchByMime in shared cache
2014-02-06 14:15:00 +01:00
Pellaeon Lin 946fccc0dd Remove unused template variable assignment of files_sharing/template/public.php 2014-02-06 12:26:36 +08:00
Pellaeon Lin 8c56e21ced Move template variable assignment to correct place 2014-02-06 12:06:16 +08:00
Jan-Christoph Borchardt b0692af29a Merge pull request #7064 from owncloud/files-scrolltopafterupdate
Scroll to the top after switching dir
2014-02-05 16:13:55 +01:00
Björn Schießle 697b25f165 Merge pull request #7032 from owncloud/enc_fix_delete
Encryption replace delete proxy with pre/post hooks and add tests
2014-02-05 14:26:52 +01:00
Vincent Petry fa5ddc3e18 Fixed searchByMime in shared cache
- searchByMime now correctly returns files recursively search through
  all the dirs
- added unit test for searchByMime
2014-02-05 13:29:06 +01:00
Thomas Müller 6d3b61f388 Merge pull request #7011 from owncloud/jshint
Added .jshintrc
2014-02-04 12:11:32 -08:00
Vincent Petry fe2a63ffd4 Scroll to the top after switching dir
Fixes #7061
2014-02-04 18:59:43 +01:00
Jan-Christoph Borchardt 0609f30d1c Merge pull request #6235 from NCTU-NBA/pr-exceed_upload_limit_msg
Change misleading message when file size exceeds upload limit
2014-02-04 08:04:19 -08:00
icewind1991 a27529709b Merge pull request #6647 from owncloud/memcache-public
Add Memcache to the public api
2014-02-04 05:38:53 -08:00
Jan-Christoph Borchardt 3692260174 Merge pull request #7055 from owncloud/ellipsize-modified-date
ellipsize long modified dates to make room for showing delete button
2014-02-03 15:57:00 -08:00
Jan-Christoph Borchardt b56dbbe0e5 fix misalignment of modified dates, shift to right 2014-02-03 17:26:49 +01:00
Jan-Christoph Borchardt 6d7d3c16d0 ellipsize long modified dates to make room for showing delete button, fix #7040 2014-02-03 17:24:44 +01:00
Björn Schießle 9a0d7c5be4 Merge pull request #7014 from owncloud/fix_ocs_share_api
remove needless element tag from the ocs share api
2014-02-03 08:02:54 -08:00
Bjoern Schiessle 97921d0c25 add function to extract filename from sharekey name + tests 2014-02-03 13:39:05 +01:00
Bjoern Schiessle fe5f512272 added tests for the delete hooks if the trash bin is disabled 2014-02-01 20:08:23 +01:00
Bjoern Schiessle bef58f5361 don't expect OC_FilesystemView, this is depreciated 2014-01-31 20:39:52 +01:00
Bjoern Schiessle 4d1086c35f better error detection and don't use glob() 2014-01-31 20:39:11 +01:00
Bjoern Schiessle 5610842e56 move unlink proxy to a hook which handles pre and post conditions 2014-01-31 20:38:35 +01:00
Georg Ehrke 1f30bffba3 Merge pull request #7017 from owncloud/trashpreview
Fixed image preview in trashbin subdirs
2014-01-31 07:29:08 -08:00
raghunayyar 5ccb395ec6 Makes Rename Icon Width 44px for touch sourfaces. 2014-01-31 12:33:00 +05:30
Vincent Petry c5767b67b1 Fixed image preview in trashbin subdirs 2014-01-30 17:03:13 +01:00
Pellaeon Lin 099b71c712 Merge branch 'master' into pr-exceed_upload_limit_msg
Conflicts:
	apps/files/templates/index.php
	apps/files_sharing/templates/public.php
2014-01-30 22:50:20 +08:00
Vincent Petry ba1b9df8a9 Fixed file name validation unit test + added newline
- fixed file name validation unit test
- added "\n" as forbidden character in isFileNameValid()
2014-01-30 13:40:01 +01:00
Vincent Petry d36a2ff9ee Added .jshintrc
- Also fixes a few JSHint warnings in files app
- Added "global" comment on top of files app to suppress warning and
  also inform devs about what globals are use
2014-01-30 13:40:01 +01:00
Bjoern Schiessle f9d9a62e58 remove needless element tag 2014-01-30 13:34:41 +01:00
Vincent Petry bc598f1919 Updated unit tests for rename action
- rename action is now checked inside of ".nametext" element
- added test to ensure that display() correctly resets all actions
  including the rename one
2014-01-30 10:07:08 +01:00
raghunayyar 85e67be0aa Rename action now appears as pencil icon 2014-01-30 10:07:08 +01:00
Jan-Christoph Borchardt 271088a7a2 Merge pull request #6777 from owncloud/mobile-style
Mobile style for public links: files, folders, picture sets
2014-01-29 09:17:02 -08:00
Jan-Christoph Borchardt edea7781b7 make header scroll up for single shares, more view of content on small screens 2014-01-29 17:20:55 +01:00
Thomas Müller 7655728ddf - adding class to header div: share-folder or share-file
- for supported previews are shown with a size of 500px; icons with a size of 128px
2014-01-29 16:52:30 +01:00
Morris Jobke afa00318bc Merge pull request #6900 from owncloud/files-errormessagewhentargetfoldermissing
Added error message for when target folder was removed
2014-01-29 07:48:50 -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
Pellaeon Lin 929c930b0a Use $storageInfo['free'] 2014-01-29 21:24:31 +08: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
Jan-Christoph Borchardt 8f81f007cd fix horizontal scrollbar appearing when footer is too long, footer wraps now 2014-01-29 11:06:19 +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
Bjoern Schiessle cd4e044f66 public upload is also possible with encryption enabled, since OC6 2014-01-28 17:28:20 +01: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
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
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