Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
* | Merge pull request #6099 from owncloud/fix_source_not_found_warnings | Morris Jobke | 2013-11-28 | 5 | -24/+72 |
|\ | |||||
| * | use better coding style | Bjoern Schiessle | 2013-11-28 | 1 | -1/+2 |
| * | correctFolder() already resolves the dirname internally | Bjoern Schiessle | 2013-11-28 | 1 | -1/+1 |
| * | make sure that we don't try to access an already deleted files, fixes some fi... | Bjoern Schiessle | 2013-11-28 | 5 | -25/+72 |
* | | Merge pull request #6106 from owncloud/fix_preview_creation | Morris Jobke | 2013-11-28 | 3 | -19/+37 |
|\ \ | |||||
| * | | remove duplicate | Bjoern Schiessle | 2013-11-28 | 1 | -1/+0 |
| * | | add PHPDoc for setMimetype() | Bjoern Schiessle | 2013-11-28 | 1 | -0/+4 |
| * | | 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 |
| * | | we need to be able to set the mimetype manually | Bjoern Schiessle | 2013-11-28 | 1 | -15/+22 |
| |/ | |||||
* | | Merge pull request #6090 from ganomi/summaryfix | ganomi | 2013-11-28 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fix filellist/rename/summary problem | ganomi | 2013-11-27 | 1 | -1/+1 |
* | | | 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 | Vincent Petry | 2013-11-28 | 2 | -0/+15 |
* | | | | Merge pull request #6098 from owncloud/files-renamediriconfix | Morris Jobke | 2013-11-28 | 1 | -0/+6 |
|\ \ \ \ | |||||
| * | | | | Fixed directory icon after rename | Vincent Petry | 2013-11-28 | 1 | -0/+6 |
* | | | | | Merge pull request #6100 from owncloud/fix_loginnameusage | Morris Jobke | 2013-11-28 | 1 | -4/+5 |
|\ \ \ \ \ | |||||
| * | | | | | loginname is not necessarily username | Arthur Schiwon | 2013-11-28 | 1 | -4/+5 |
| |/ / / / | |||||
* / / / / | ownCloud 6 RC1v6.0.0RC1 | Frank Karlitschek | 2013-11-28 | 1 | -2/+2 |
|/ / / / | |||||
* | | | | Merge pull request #6089 from owncloud/files-mimetyperefreshafterrename | Frank Karlitschek | 2013-11-28 | 5 | -26/+87 |
|\ \ \ \ | |||||
| * | | | | 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 |
| * | | | | Redetect mime type whenever extension is renamed | Vincent Petry | 2013-11-27 | 2 | -0/+14 |
* | | | | | Merge pull request #6096 from owncloud/files-txtextfornewfiles | Vincent Petry | 2013-11-28 | 2 | -5/+15 |
|\ \ \ \ \ | |||||
| * | | | | | 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 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #6070 from ganomi/showstars | Frank Karlitschek | 2013-11-28 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Show stars as placeholder | ganomi | 2013-11-26 | 1 | -1/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #6072 from owncloud/mssql-fix-schema-migration-oc6 | Frank Karlitschek | 2013-11-28 | 1 | -0/+2 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | on mssql the schema migration sometimes fails due to an already existing tran... | Thomas Mueller | 2013-11-26 | 1 | -0/+2 |
* | | | | | Merge pull request #6094 from owncloud/enc_fix_reshares | Vincent Petry | 2013-11-28 | 1 | -2/+2 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | fix path reconstruction for reshares | Bjoern Schiessle | 2013-11-27 | 1 | -2/+2 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #6084 from owncloud/fix-app-routing | Thomas Müller | 2013-11-28 | 1 | -1/+5 |
|\ \ \ \ | |||||
| * | | | | Fix getRawPathInfo for the '/' edge case | Robin Appelman | 2013-11-27 | 1 | -1/+5 |
| * | | | | fix custom routes defined by apps | Robin Appelman | 2013-11-27 | 1 | -1/+1 |
* | | | | | Merge pull request #6048 from owncloud/encryption_initial_enc_indicator | Morris Jobke | 2013-11-27 | 6 | -17/+89 |
|\ \ \ \ \ | |||||
| * | | | | | improve encryption message | Morris Jobke | 2013-11-27 | 3 | -2/+6 |
| * | | | | | 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 | 2 | -1/+3 |
| * | | | | | switch to large spinner | Bjoern Schiessle | 2013-11-27 | 3 | -2/+7 |
| * | | | | | switch from "name" attribute to "id" | Bjoern Schiessle | 2013-11-27 | 2 | -3/+3 |
| * | | | | | Merge branch 'master' into encryption_initial_enc_indicator | Bjoern Schiessle | 2013-11-27 | 33 | -156/+720 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| * | | | | | with the latest changes in master $this-userID is always the correct ID, so w... | Bjoern Schiessle | 2013-11-27 | 2 | -25/+21 |
| * | | | | | Merge branch 'master' into encryption_initial_enc_indicator | Bjoern Schiessle | 2013-11-26 | 289 | -1892/+3226 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| * | | | | | added a small version of the dark loading gif, looks nicer on the blue backgr... | Bjoern Schiessle | 2013-11-26 | 2 | -1/+1 |
| * | | | | | 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 |