Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #6129 from owncloud/chunking-fixtouchafterassemble | Frank Karlitschek | 2013-11-29 | 1 | -1/+1 |
|\ | |||||
| * | Fixed touch after chunk assembling | Vincent Petry | 2013-11-29 | 1 | -1/+1 |
* | | Merge pull request #6127 from owncloud/minimum_php_version | Morris Jobke | 2013-11-29 | 1 | -4/+4 |
|\ \ | |/ |/| | |||||
| * | make 5.3.8 the minimum supported version. This fixes several issues with brok... | Frank Karlitschek | 2013-11-29 | 1 | -4/+4 |
|/ | |||||
* | Merge pull request #5984 from owncloud/nav-scrollbar | Frank Karlitschek | 2013-11-29 | 2 | -5/+12 |
|\ | |||||
| * | Fix for IE - an ugly horizontal scrollbar appears | Morris Jobke | 2013-11-27 | 2 | -0/+6 |
| * | fix navbar | Morris Jobke | 2013-11-27 | 1 | -1/+0 |
| * | prevent shift of app names caused by scrollbar, part 2 | Jan-Christoph Borchardt | 2013-11-27 | 1 | -1/+3 |
| * | prevent shift of app titles caused by scrollbar | Jan-Christoph Borchardt | 2013-11-27 | 1 | -0/+1 |
| * | always show app navigation scrollbar when too many apps in there | Jan-Christoph Borchardt | 2013-11-27 | 1 | -5/+4 |
* | | Merge pull request #6077 from owncloud/fix-api-documentation | Frank Karlitschek | 2013-11-29 | 3 | -2/+31 |
|\ \ | |||||
| * | | add comment from @DeepDiver | Morris Jobke | 2013-11-27 | 1 | -2/+1 |
| * | | API doc for contacts manager, server container and share | Morris Jobke | 2013-11-27 | 3 | -2/+32 |
* | | | Merge pull request #6111 from owncloud/non-floating-trash-button-chrome | Frank Karlitschek | 2013-11-29 | 3 | -3/+5 |
|\ \ \ | |||||
| * | | | Fix resize issue for trash button in chrome and overflowing spinner in .updat... | Morris Jobke | 2013-11-28 | 3 | -3/+5 |
* | | | | 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 |
| | |_|_|/ | |/| | | |