Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #6148 from owncloud/fix_trash_restore | Vincent Petry | 2013-12-02 | 4 | -18/+39 |
|\ | | | | | Fix restore anbd delete operations in trash bin | ||||
| * | check explicitely all possible dir values | Bjoern Schiessle | 2013-12-02 | 1 | -2/+3 |
| | | |||||
| * | set delete all to true if a complete folder was deleted | Bjoern Schiessle | 2013-12-02 | 1 | -1/+2 |
| | | |||||
| * | fix delete files from trash bin | Bjoern Schiessle | 2013-12-02 | 3 | -16/+34 |
| | | |||||
| * | fix restore from files in sub-folders | Bjoern Schiessle | 2013-11-29 | 2 | -2/+3 |
| | | |||||
* | | Adjust files_encryption requirements to the new core requirement (PHP 5.3.8). | Andreas Fischer | 2013-11-29 | 1 | -8/+1 |
| | | |||||
* | | Merge pull request #6123 from owncloud/extstorage-deletedirs2 | Vincent Petry | 2013-11-29 | 3 | -7/+33 |
|\ \ | | | | | | | Fixed FTP and SMB to use rmdir() when deleting folders | ||||
| * | | Fixed FTP and SMB to use rmdir() when deleting folders | Vincent Petry | 2013-11-29 | 3 | -7/+33 |
| |/ | | | | | | | | | | | | | | | | | | | | | Some storages need to use different calls for deleting files or folders, usually unlink() and rmdir(). Fixes #4532 (SMB dir deletion) Fixes #5941 (FTP dir deletion) Note that the extra is_dir() should be fast because it's read from the stat cache. | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-11-29 | 8 | -3/+23 |
| | | |||||
* | | Merge pull request #6111 from owncloud/non-floating-trash-button-chrome | Frank Karlitschek | 2013-11-29 | 1 | -1/+1 |
|\ \ | |/ |/| | Fix resize issue for trash button in chrome and overflowing spinner in .... | ||||
| * | Fix resize issue for trash button in chrome and overflowing spinner in ↵ | Morris Jobke | 2013-11-28 | 1 | -1/+1 |
| | | | | | | | | | | | | .update class fixes #6108 | ||||
* | | Merge pull request #6099 from owncloud/fix_source_not_found_warnings | Morris Jobke | 2013-11-28 | 4 | -23/+67 |
|\ \ | | | | | | | make sure that we don't try to access an already deleted files | ||||
| * | | use better coding style | Bjoern Schiessle | 2013-11-28 | 1 | -1/+2 |
| | | | |||||
| * | | make sure that we don't try to access an already deleted files, fixes some ↵ | Bjoern Schiessle | 2013-11-28 | 4 | -23/+66 |
| | | | | | | | | | | | | file source not found warnings | ||||
* | | | Merge pull request #6106 from owncloud/fix_preview_creation | Morris Jobke | 2013-11-28 | 2 | -4/+11 |
|\ \ \ | |_|/ |/| | | Fix preview creation | ||||
| * | | remove duplicate | Bjoern Schiessle | 2013-11-28 | 1 | -1/+0 |
| | | | |||||
| * | | detect mimetype from the original filename, without the versioning timestamp | Bjoern Schiessle | 2013-11-28 | 1 | -2/+3 |
| | | | |||||
| * | | detect mimetype from the original filename, without the delete timestamp | Bjoern Schiessle | 2013-11-28 | 1 | -2/+9 |
| |/ | |||||
* | | Merge pull request #6090 from ganomi/summaryfix | ganomi | 2013-11-28 | 1 | -1/+1 |
|\ \ | | | | | | | Fix filellist/rename/summary problem | ||||
| * | | Fix filellist/rename/summary problem | ganomi | 2013-11-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Fixes #6055 This contribution is MIT licensed! | ||||
* | | | Merge pull request #6097 from owncloud/extstorage-ftptrailingslash | Morris Jobke | 2013-11-28 | 2 | -0/+15 |
|\ \ \ | | | | | | | | | Add trailing slash in FTP root path when missing | ||||
| * | | | Add trailing slash in FTP root path when missing | Vincent Petry | 2013-11-28 | 2 | -0/+15 |
| | | | | | | | | | | | | | | | | Fixes #6093 | ||||
* | | | | Merge pull request #6098 from owncloud/files-renamediriconfix | Morris Jobke | 2013-11-28 | 1 | -0/+6 |
|\ \ \ \ | | | | | | | | | | | Fixed directory icon after rename | ||||
| * | | | | Fixed directory icon after rename | Vincent Petry | 2013-11-28 | 1 | -0/+6 |
| | | | | | |||||
* | | | | | loginname is not necessarily username | Arthur Schiwon | 2013-11-28 | 1 | -4/+5 |
|/ / / / | |||||
* | | | | Merge pull request #6089 from owncloud/files-mimetyperefreshafterrename | Frank Karlitschek | 2013-11-28 | 3 | -26/+73 |
|\ \ \ \ | | | | | | | | | | | Redetect mime type whenever extension is renamed | ||||
| * | | | | Fixed unit tests for ajax rename | Vincent Petry | 2013-11-27 | 1 | -19/+44 |
| | | | | | |||||
| * | | | | Update file list entry on rename | Vincent Petry | 2013-11-27 | 2 | -7/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever a file is renamed, if the extension changes, the mime type and preview might change. This fix passes the updated info to the client that updates it. | ||||
* | | | | | Merge pull request #6096 from owncloud/files-txtextfornewfiles | Vincent Petry | 2013-11-28 | 2 | -5/+15 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | New file box now has default file name + extension | ||||
| * | | | | Moved new file extension out of the translated string | Vincent Petry | 2013-11-28 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | New file box now has default file name + extension | Vincent Petry | 2013-11-28 | 2 | -5/+15 |
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever a user creates a file or folder in the web UI, the input field will contain a default file name, pre-selected up to the extension for easier typing. The purpose is mostly to prevent users creating text files without an extension. Fixes #6045 | ||||
* | | | | Merge pull request #6094 from owncloud/enc_fix_reshares | Vincent Petry | 2013-11-28 | 1 | -2/+2 |
|\ \ \ \ | |/ / / |/| | | | fix path reconstruction for reshares | ||||
| * | | | fix path reconstruction for reshares | Bjoern Schiessle | 2013-11-27 | 1 | -2/+2 |
| |/ / | |||||
* | | | Merge pull request #6048 from owncloud/encryption_initial_enc_indicator | Morris Jobke | 2013-11-27 | 4 | -16/+75 |
|\ \ \ | | | | | | | | | show a message at the log-in screen if inital encryption take place | ||||
| * | | | improve encryption message | Morris Jobke | 2013-11-27 | 1 | -1/+1 |
| | | | | |||||
| * | | | some small js fixes | Bjoern Schiessle | 2013-11-27 | 1 | -2/+2 |
| | | | | |||||
| * | | | add spinner to the template so that it can be loaded in time | Bjoern Schiessle | 2013-11-27 | 1 | -1/+1 |
| | | | | |||||
| * | | | switch to large spinner | Bjoern Schiessle | 2013-11-27 | 1 | -2/+2 |
| | | | | |||||
| * | | | switch from "name" attribute to "id" | Bjoern Schiessle | 2013-11-27 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'master' into encryption_initial_enc_indicator | Bjoern Schiessle | 2013-11-27 | 20 | -144/+426 |
| |\| | | |||||
| * | | | with the latest changes in master $this-userID is always the correct ID, so ↵ | Bjoern Schiessle | 2013-11-27 | 2 | -25/+21 |
| | | | | | | | | | | | | | | | | we no longer need the extra parameter | ||||
| * | | | Merge branch 'master' into encryption_initial_enc_indicator | Bjoern Schiessle | 2013-11-26 | 15 | -27/+118 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | added a small version of the dark loading gif, looks nicer on the blue ↵ | Bjoern Schiessle | 2013-11-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | background | ||||
| * | | | use POST instead of GET | Bjoern Schiessle | 2013-11-26 | 2 | -3/+3 |
| | | | | |||||
| * | | | fix typo in var name | Bjoern Schiessle | 2013-11-26 | 1 | -1/+1 |
| | | | | |||||
| * | | | remove debug output | Bjoern Schiessle | 2013-11-25 | 1 | -1/+0 |
| | | | | |||||
| * | | | show a message at the log-in screen if inital encryption take place | Bjoern Schiessle | 2013-11-25 | 4 | -6/+70 |
| | | | | |||||
* | | | | Merge pull request #6088 from owncloud/fix_public_previews | Björn Schießle | 2013-11-27 | 1 | -3/+7 |
|\ \ \ \ | | | | | | | | | | | fix public preview creation if a user is logged in | ||||
| * | | | | fix public preview creation if a user ios logged in | Bjoern Schiessle | 2013-11-27 | 1 | -3/+7 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #6039 from owncloud/trashbin_move_file_to_owners_trash | Björn Schießle | 2013-11-27 | 4 | -39/+116 |
|\ \ \ \ | | | | | | | | | | | move files to owners trash |