Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #17273 from owncloud/s2s-catchmoreexceptiontypes | Vincent Petry | 2015-07-01 | 1 | -13/+7 |
|\ | |||||
| * | Catch more error codes thrown by federated shares | Vincent Petry | 2015-07-01 | 1 | -13/+7 |
* | | Merge pull request #15363 from owncloud/ext-ocp | Morris Jobke | 2015-07-01 | 9 | -49/+70 |
|\ \ | |/ |/| | |||||
| * | Use OCP classes as much as possible in files_external | Robin McCorkell | 2015-07-01 | 9 | -49/+70 |
|/ | |||||
* | Merge pull request #17088 from owncloud/add-verbosity-to-upgrade | Morris Jobke | 2015-07-01 | 3 | -0/+16 |
|\ | |||||
| * | [Repair] add repair info for changed collation | Morris Jobke | 2015-06-24 | 1 | -0/+1 |
| * | [upgrade] add verbosity check and show repair info & steps | Morris Jobke | 2015-06-24 | 2 | -0/+15 |
* | | Merge pull request #17093 from owncloud/upgrade-timestamp | Morris Jobke | 2015-07-01 | 2 | -3/+119 |
|\ \ | |||||
| * | | Use a OutputFormatter instead of hacking into writeln() | Joas Schilling | 2015-06-24 | 2 | -49/+133 |
| * | | Use logtimezone and logdateformat | Joas Schilling | 2015-06-24 | 1 | -2/+5 |
| * | | [upgrade] show timestamp for output during upgrade | Morris Jobke | 2015-06-24 | 1 | -14/+43 |
| |/ | |||||
* | | Merge pull request #17078 from owncloud/fix-initial-server-host | Morris Jobke | 2015-07-01 | 2 | -8/+96 |
|\ \ | |||||
| * | | Fix undefined offset | Lukas Reschke | 2015-06-22 | 2 | -8/+96 |
* | | | Merge pull request #16535 from rullzer/ocs_share_api_url | Morris Jobke | 2015-07-01 | 2 | -0/+55 |
|\ \ \ | |||||
| * | | | OCS Share API link shares now always have an url | Roeland Jago Douma | 2015-05-22 | 2 | -0/+55 |
* | | | | Merge pull request #16406 from owncloud/enc-strlenperffix | Morris Jobke | 2015-07-01 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Small perf tweak in strlen loop | Vincent Petry | 2015-05-18 | 1 | -1/+1 |
* | | | | | Merge pull request #15569 from owncloud/remove-getetag-properties | Morris Jobke | 2015-07-01 | 3 | -0/+138 |
|\ \ \ \ \ | |||||
| * | | | | | Remove unneeded getetag entries in properties table | Morris Jobke | 2015-06-25 | 3 | -0/+138 |
* | | | | | | Merge pull request #15506 from rullzer/core_apps_oc_log2ocp_util | Morris Jobke | 2015-07-01 | 12 | -33/+33 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Move core apps from OC_Log::write to OCP\Util | Roeland Jago Douma | 2015-05-18 | 12 | -33/+33 |
* | | | | | | | Merge pull request #15475 from rullzer/files_sharing_OCP_DB | Morris Jobke | 2015-07-01 | 7 | -14/+14 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Move files sharing app (mostly) to OCP\DB | Roeland Jago Douma | 2015-05-18 | 7 | -14/+14 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #17224 from owncloud/webdav-handle-ServerNotAvailableExcep... | Vincent Petry | 2015-07-01 | 2 | -29/+86 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Avoid namespace clash | Thomas Müller | 2015-06-30 | 1 | -5/+4 |
| * | | | | | | | Fixing content type detection and handle all local printErrorPage calls | Thomas Müller | 2015-06-30 | 1 | -12/+29 |
| * | | | | | | | Adding request specific exception handling - now with WebDAV responses - refs... | Thomas Müller | 2015-06-30 | 1 | -7/+33 |
| * | | | | | | | Adding exception handling for ServerNotAvailableException - refs #17192 | Thomas Müller | 2015-06-30 | 1 | -18/+33 |
* | | | | | | | | Merge pull request #17259 from owncloud/chunk-cleanupgracefulonlock | Vincent Petry | 2015-07-01 | 3 | -10/+107 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Catch cache garbage collection exception on postLogin | Vincent Petry | 2015-06-30 | 1 | -2/+8 |
| * | | | | | | | | Test for chunk cache garbage collection | Vincent Petry | 2015-06-30 | 1 | -5/+89 |
| * | | | | | | | | Do not try clearing locked files in cache folder | Vincent Petry | 2015-06-30 | 1 | -3/+10 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #17264 from owncloud/use-mb-functions | Thomas Müller | 2015-07-01 | 2 | -4/+11 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Use UTF-8 mode for preg_split and preg_replace | Lukas Reschke | 2015-07-01 | 2 | -4/+11 |
* | | | | | | | | | 8.1 RC2v8.1RC2 | C Montero-Luque | 2015-06-30 | 1 | -2/+2 |
* | | | | | | | | | Merge pull request #17255 from owncloud/fix-17119 | Thomas Müller | 2015-07-01 | 9 | -1/+389 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | tests solidity | Arthur Schiwon | 2015-06-30 | 3 | -0/+24 |
| * | | | | | | | | adjust unit test | Arthur Schiwon | 2015-06-30 | 1 | -0/+4 |
| * | | | | | | | | integration test | Arthur Schiwon | 2015-06-30 | 5 | -0/+331 |
| * | | | | | | | | ensure groups match filter when using memberOf to read users group, refs #17119 | Arthur Schiwon | 2015-06-26 | 2 | -1/+30 |
* | | | | | | | | | Merge pull request #17256 from owncloud/locking-disablecallbackwrapperwhendis... | Vincent Petry | 2015-06-30 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Do not set callback wrapper when locking is disabled | Vincent Petry | 2015-06-30 | 1 | -1/+4 |
* | | | | | | | | | | Merge pull request #17225 from owncloud/fix_12106 | Björn Schießle | 2015-06-30 | 1 | -3/+19 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | if it is a mount point we need to get the path from the mount manager | Bjoern Schiessle | 2015-06-30 | 1 | -3/+19 |
* | | | | | | | | | | Merge pull request #17251 from owncloud/issue-17247-filesize-stat-failed-for-... | Vincent Petry | 2015-06-30 | 1 | -2/+6 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Perform the filesize only when the file exists | Joas Schilling | 2015-06-30 | 1 | -2/+6 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #17189 from owncloud/files-straypartfilesonexception | Morris Jobke | 2015-06-30 | 4 | -61/+416 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Unlock first path on rename if second path is locked | Vincent Petry | 2015-06-29 | 2 | -1/+39 |
| * | | | | | | | | | Cleanup part file after upload exception | Vincent Petry | 2015-06-29 | 2 | -60/+377 |
* | | | | | | | | | | Merge pull request #17249 from owncloud/file-cache-is-a-icache | Joas Schilling | 2015-06-30 | 2 | -1/+5 |
|\ \ \ \ \ \ \ \ \ \ |