Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | drop OC\Preferences | Morris Jobke | 2015-02-04 | 1 | -181/+0 | |
| | |_|_|_|_|/ / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #13869 from owncloud/drop-oc-preferences | Vincent Petry | 2015-02-09 | 2 | -122/+0 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | drop OC_Preferences | Morris Jobke | 2015-02-04 | 2 | -122/+0 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #13973 from owncloud/enhancement/security/13366 | Lukas Reschke | 2015-02-09 | 5 | -29/+46 | |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | ||||||
| * | | | | | | | Respect `mod_unique_id` and refactor `OC_Request::getRequestId` | Lukas Reschke | 2015-02-09 | 5 | -29/+46 | |
| | |_|_|_|_|/ | |/| | | | | | ||||||
* | | | | | | | Merge pull request #13854 from owncloud/avatar-exists | Vincent Petry | 2015-02-09 | 2 | -6/+10 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add a better way to check if an avatar exists for the user | Robin Appelman | 2015-02-03 | 2 | -6/+10 | |
* | | | | | | | | Check directory handle before we use it | Robin Appelman | 2015-02-09 | 1 | -6/+8 | |
| |/ / / / / / |/| | | | | | | ||||||
* | | | | | | | Merge pull request #13948 from owncloud/cache-move-transaction | Lukas Reschke | 2015-02-08 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Use transactions when renaming directory contents | Robin Appelman | 2015-02-06 | 1 | -0/+2 | |
* | | | | | | | | Merge pull request #12283 from oparoz/sfnt-fonts | Morris Jobke | 2015-02-07 | 2 | -3/+5 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Updated the media type of some font types | Olivier Paroz | 2015-01-24 | 2 | -3/+5 | |
* | | | | | | | | | Merge pull request #13830 from owncloud/fix-redirect-404 | Morris Jobke | 2015-02-07 | 1 | -2/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Don't encode url unecessary twice | Lukas Reschke | 2015-02-02 | 1 | -2/+1 | |
| | |_|_|_|/ / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Normalize before processing | Lukas Reschke | 2015-02-06 | 2 | -8/+20 | |
| |_|/ / / / / / |/| | | | | | | | ||||||
* | | | | | | | | Merge pull request #13932 from owncloud/revert-sabredav-etag-master | Thomas Müller | 2015-02-06 | 3 | -20/+15 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | ||||||
| * | | | | | | | Revert "adding OC-ETag header" | Vincent Petry | 2015-02-05 | 3 | -20/+15 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #13881 from owncloud/upload_to_root_of_mountpoint | Björn Schießle | 2015-02-04 | 1 | -0/+5 | |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | ||||||
| * | | | | | | detect root of mountpoint also if the trailing slash is missed | Bjoern Schiessle | 2015-02-04 | 1 | -0/+5 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #13843 from owncloud/fix-files-disabled | Thomas Müller | 2015-02-03 | 3 | -0/+9 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | enabled disabled files app in repair step | Morris Jobke | 2015-02-03 | 3 | -2/+4 | |
| * | | | | | Disallow disabling of files app | Morris Jobke | 2015-02-03 | 2 | -0/+7 | |
* | | | | | | Merge pull request #13791 from owncloud/extstorage-fixdavexceptions | Thomas Müller | 2015-02-03 | 1 | -0/+22 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | Fix DAV exceptions, some will still return false now | Vincent Petry | 2015-01-30 | 1 | -0/+22 | |
* | | | | | | Merge pull request #13822 from owncloud/include-core-version-in-js-version-tag | Thomas Müller | 2015-02-02 | 1 | -2/+4 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | include core version into js/css version tag - fixes #13702 | Thomas Müller | 2015-02-02 | 1 | -2/+4 | |
* | | | | | | add libs which have no version number | Thomas Müller | 2015-02-02 | 1 | -4/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #13508 from owncloud/failed-delete-cache | Morris Jobke | 2015-01-30 | 1 | -3/+3 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Dont do a cache rename if we cant delete the source file | Robin Appelman | 2015-01-29 | 1 | -2/+2 | |
| * | | | | Dont remove a file from cache if the delete operation failed | Robin Appelman | 2015-01-29 | 1 | -1/+1 | |
* | | | | | Merge pull request #13772 from owncloud/closecursor-allconfig | Vincent Petry | 2015-01-29 | 1 | -0/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Close cursor after checking for existing config values | Vincent Petry | 2014-11-28 | 1 | -0/+1 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #13760 from owncloud/create_enc_key_for_remote_shares | Morris Jobke | 2015-01-29 | 1 | -9/+27 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | make sure that we always create a public share key for remote shares | Bjoern Schiessle | 2015-01-29 | 1 | -9/+27 | |
* | | | | | Merge pull request #13757 from owncloud/issue/13686-scroll-to-file-when-using... | Lukas Reschke | 2015-01-29 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Scroll to file in folder, when using "search in other places" link | Joas Schilling | 2015-01-29 | 1 | -1/+1 | |
* | | | | | | Merge pull request #13762 from owncloud/ignore_trailing_slash | Björn Schießle | 2015-01-29 | 1 | -0/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | remove trailing slash | Bjoern Schiessle | 2015-01-29 | 1 | -0/+1 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #13752 from owncloud/closecursor1 | Morris Jobke | 2015-01-29 | 2 | -0/+4 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Close cursor early in calculateFolderSize | Vincent Petry | 2014-11-28 | 2 | -0/+4 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Fix webdav put for single file webdav shares | Robin Appelman | 2015-01-29 | 1 | -3/+3 | |
* | | | | | | Fix resolving paths for views rooted in a file | Robin Appelman | 2015-01-29 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #13667 from owncloud/rename-always-update-cache | Robin Appelman | 2015-01-28 | 2 | -12/+14 | |
|\ \ \ \ \ | ||||||
| * | | | | | Update the cache when renaming even if we dont emit hooks | Robin Appelman | 2015-01-28 | 2 | -12/+14 | |
| |/ / / / | ||||||
* / / / / | Reference module with `.c` | Lukas Reschke | 2015-01-28 | 1 | -2/+2 | |
|/ / / / | ||||||
* | | | | Merge pull request #13700 from owncloud/dav-objecttree-required-a-collection | Morris Jobke | 2015-01-28 | 1 | -2/+2 | |
|\ \ \ \ | ||||||
| * | | | | let init() take an INode - fixes PHP message | Thomas Müller | 2015-01-27 | 1 | -2/+2 | |
* | | | | | Merge pull request #13717 from owncloud/storage-donotwrapnullstorage | Morris Jobke | 2015-01-28 | 1 | -1/+20 | |
|\ \ \ \ \ | ||||||
| * | | | | | Prevent wrapping null storage | Vincent Petry | 2015-01-27 | 1 | -1/+20 | |
* | | | | | | Merge pull request #13525 from owncloud/s2s-fixscanfileforbrokenstorage | Morris Jobke | 2015-01-28 | 2 | -2/+56 | |
|\ \ \ \ \ \ |