Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #24127 from owncloud/handle-app-loading-error | Thomas Müller | 2016-04-20 | 4 | -7/+15 |
|\ | |||||
| * | In case an app has issues while loading the app is disabled and request proce... | Thomas Müller | 2016-04-20 | 1 | -2/+10 |
| * | Catch class Error on all root entrypoints | Thomas Müller | 2016-04-20 | 1 | -1/+1 |
| * | With PHP7 Throwable is the new base interface for all Exception and Error - w... | Thomas Müller | 2016-04-20 | 2 | -4/+4 |
* | | Merge pull request #23951 from owncloud/cleanlocks-chunk | Thomas Müller | 2016-04-20 | 1 | -7/+18 |
|\ \ | |||||
| * | | Let the querybuilder convert | Roeland Jago Douma | 2016-04-14 | 1 | -4/+2 |
| * | | chunk the cleaning up of shared locks | Robin Appelman | 2016-04-14 | 1 | -7/+20 |
* | | | Merge pull request #23919 from owncloud/cyclyc-share-dep-example | Thomas Müller | 2016-04-20 | 11 | -50/+211 |
|\ \ \ | |||||
| * | | | Move moveFromCache to CacheJail | Roeland Jago Douma | 2016-04-19 | 1 | -0/+16 |
| * | | | Move copy- and moveFromStorage to jail | Roeland Jago Douma | 2016-04-19 | 1 | -0/+26 |
| * | | | Only construct the storage when we start using it | Robin Appelman | 2016-04-19 | 5 | -16/+100 |
| * | | | Fix resolve path | Roeland Jago Douma | 2016-04-19 | 1 | -2/+7 |
| * | | | Fix related logic | Roeland Jago Douma | 2016-04-19 | 4 | -23/+47 |
| * | | | cache the scanner/updater/cache in the wrapper storage | Robin Appelman | 2016-04-19 | 2 | -12/+18 |
* | | | | Merge pull request #24098 from owncloud/fix_23782 | Thomas Müller | 2016-04-20 | 1 | -0/+2 |
|\ \ \ \ | |||||
| * | | | | When the scanner detects a file is changed clear checksum | Roeland Jago Douma | 2016-04-19 | 1 | -0/+2 |
| |/ / / | |||||
* | | / | Move \OC\Preview to PSR-4 | Roeland Jago Douma | 2016-04-20 | 25 | -0/+0 |
| |_|/ |/| | | |||||
* | | | Merge pull request #24075 from owncloud/no-html-on-cli | Lukas Reschke | 2016-04-20 | 2 | -8/+6 |
|\ \ \ | |||||
| * | | | In case of fatal php errors and other unhandled exceptions no html error page... | Thomas Müller | 2016-04-18 | 2 | -8/+6 |
* | | | | Merge pull request #24116 from owncloud/fix_24095 | Thomas Müller | 2016-04-20 | 1 | -3/+4 |
|\ \ \ \ | |||||
| * | | | | preserve information if it is a rename operation or not | Björn Schießle | 2016-04-20 | 1 | -3/+4 |
* | | | | | Merge pull request #23760 from owncloud/fix-setup-mysql | Thomas Müller | 2016-04-20 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Fix conditional check in MySQL setup | Robin McCorkell | 2016-04-20 | 1 | -1/+1 |
* | | | | | | Move \OC\Mail to PSR-4 | Roeland Jago Douma | 2016-04-20 | 2 | -0/+0 |
|/ / / / / | |||||
* | | | | | Merge pull request #24094 from owncloud/move_dummy_group_backend_to_test | Thomas Müller | 2016-04-20 | 1 | -213/+0 |
|\ \ \ \ \ | |||||
| * | | | | | Move the group dummy backend to test | Roeland Jago Douma | 2016-04-19 | 1 | -213/+0 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #24103 from owncloud/diagnostics_psr4 | Thomas Müller | 2016-04-20 | 6 | -0/+0 |
|\ \ \ \ \ | |||||
| * | | | | | Move \OC\Diagnostics to PSR-4 | Roeland Jago Douma | 2016-04-19 | 6 | -0/+0 |
* | | | | | | Merge pull request #23980 from owncloud/remember-email-when-setting-expiratio... | Jan-Christoph Borchardt | 2016-04-20 | 1 | -0/+1 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | extract mail view for sending share invitations | Christoph Wurst | 2016-04-19 | 1 | -0/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-20 | 2 | -8/+10 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #24079 from owncloud/console_psr4 | Thomas Müller | 2016-04-19 | 2 | -0/+0 |
|\ \ \ \ | |||||
| * | | | | Move \OC\Console to PSR-4 | Roeland Jago Douma | 2016-04-19 | 2 | -0/+0 |
| |/ / / | |||||
* | | | | Merge pull request #24004 from owncloud/dont-transfer-files-to-not-ready-user | Thomas Müller | 2016-04-19 | 2 | -0/+31 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Introduce isReadyForUser and verify in file transfer ownership - fixes #23786 | Thomas Müller | 2016-04-15 | 2 | -0/+31 |
* | | | | Merge pull request #24074 from owncloud/integritycheck_psr4 | Thomas Müller | 2016-04-19 | 7 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Fix use statement | Roeland Jago Douma | 2016-04-18 | 1 | -1/+1 |
| * | | | | Move OC\IntegrityCheck to PSR-4 | Roeland Jago Douma | 2016-04-18 | 7 | -0/+0 |
* | | | | | Merge pull request #23903 from owncloud/fix-user-data-folder-creation-for-apa... | Thomas Müller | 2016-04-19 | 1 | -0/+4 |
|\ \ \ \ \ | |||||
| * | | | | | Fixes #23899 | Thomas Müller | 2016-04-11 | 1 | -0/+4 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-19 | 4 | -16/+22 |
* | | | | | | Merge pull request #23973 from owncloud/share_move_post_delete_from_group_hook | Thomas Müller | 2016-04-19 | 7 | -48/+73 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Move post_removeFromGroup to shareManager | Roeland Jago Douma | 2016-04-13 | 7 | -48/+73 |
* | | | | | | | Move logout to controller | Lukas Reschke | 2016-04-18 | 6 | -35/+15 |
| |_|_|_|/ / |/| | | | | | |||||
* | | | | | | Merge pull request #23911 from owncloud/split-upgrade-command | Christoph Wurst | 2016-04-18 | 2 | -65/+134 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Remove deprecated HTTPHelper | Thomas Müller | 2016-04-18 | 1 | -8/+22 |
| * | | | | | Move version check code out of class Updater | Thomas Müller | 2016-04-18 | 2 | -65/+120 |
* | | | | | | Suggest cli based updater in case the instance is bigger - #23913 | Thomas Müller | 2016-04-18 | 1 | -12/+34 |
|/ / / / / | |||||
* | | | | | Merge pull request #23947 from owncloud/login-to-ctrl | Lukas Reschke | 2016-04-18 | 3 | -43/+20 |
|\ \ \ \ \ | |||||
| * | | | | | Keep used username in URL | Lukas Reschke | 2016-04-15 | 1 | -1/+8 |