Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | [master] Ignore certificate file if it starts with file:// | Lukas Reschke | 2016-04-21 | 2 | -0/+15 | |
* | | | | | | | Merge pull request #24174 from owncloud/repair_psr4 | Thomas Müller | 2016-04-22 | 18 | -0/+0 | |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | ||||||
| * | | | | | | Move \OC\Repair to PSR-4 | Roeland Jago Douma | 2016-04-21 | 18 | -0/+0 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-22 | 30 | -0/+38 | |
* | | | | | | Merge pull request #24157 from owncloud/files-app-is-not-available-on-public-... | Thomas Müller | 2016-04-21 | 1 | -6/+9 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | OCA.Files.App is not available on public page | Christoph Wurst | 2016-04-21 | 1 | -6/+9 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #24145 from owncloud/limit-cron-execution-time | Vincent Petry | 2016-04-21 | 1 | -0/+8 | |
|\ \ \ \ \ | ||||||
| * | | | | | Make sure that CLI cron doesn't run for ever, but makes use of the next spawn | Joas Schilling | 2016-04-21 | 1 | -0/+8 | |
* | | | | | | Merge pull request #24155 from owncloud/fix-birthday_calendar-acl | Thomas Müller | 2016-04-21 | 4 | -8/+27 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Birthday calendar should never have write acl - fixes #24154 | Thomas Müller | 2016-04-21 | 4 | -8/+27 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #24111 from owncloud/chunk-users-in-background-jobs | Björn Schießle | 2016-04-21 | 3 | -56/+24 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Chunk the users correctly in the trashbin and versions background job | Joas Schilling | 2016-04-20 | 3 | -56/+24 | |
* | | | | | | Merge pull request #24138 from owncloud/revert-22760-tooltip-cssfix | Thomas Müller | 2016-04-21 | 1 | -1/+0 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | ||||||
| * | | | | | Revert "add word wrap to tooltips. Fixes #22746" | Lukas Reschke | 2016-04-20 | 1 | -1/+0 | |
* | | | | | | Merge pull request #24135 from owncloud/also-write-htaccess-from-cli | Thomas Müller | 2016-04-21 | 1 | -7/+15 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Write .htaccess also from CLI | Lukas Reschke | 2016-04-20 | 1 | -7/+15 | |
* | | | | | | | Merge pull request #22791 from owncloud/enc_master_key_improvements | Vincent Petry | 2016-04-21 | 7 | -75/+118 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | replaceUserKeys() actually deletes the users keys -> update method name and d... | Bjoern Schiessle | 2016-03-18 | 3 | -3/+5 | |
| * | | | | | | | only create and update user specific key if no master key is enabled | Bjoern Schiessle | 2016-03-18 | 7 | -72/+113 | |
* | | | | | | | | Merge pull request #24133 from owncloud/tagging_psr4 | Joas Schilling | 2016-04-21 | 2 | -0/+0 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | ||||||
| * | | | | | | | Move \OC\Tagging to PSR-4 | Roeland Jago Douma | 2016-04-20 | 2 | -0/+0 | |
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-21 | 278 | -520/+560 | |
| |_|_|/ / / / |/| | | | | | | ||||||
* | | | | | | | Merge pull request #24127 from owncloud/handle-app-loading-error | Thomas Müller | 2016-04-20 | 9 | -18/+40 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | ||||||
| * | | | | | | 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 | 6 | -12/+26 | |
| * | | | | | | 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 #24132 from owncloud/fix-web-updater | Thomas Müller | 2016-04-20 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix web updater - fixes #24115 | Thomas Müller | 2016-04-20 | 1 | -3/+3 | |
* | | | | | | | | Merge pull request #23990 from owncloud/heartbeat-debounce | Morris Jobke | 2016-04-20 | 2 | -4/+12 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | Debounce heartbeat ajax calls to lower the number of requests | Christoph Wurst | 2016-04-18 | 2 | -4/+12 | |
* | | | | | | | | 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 #24081 from owncloud/migrate-deprecated-jquery-v1-functions | Thomas Müller | 2016-04-20 | 16 | -238/+30 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | replace $().attr('checked') by $().prop('checked', state) or $().is(':checked') | Christoph Wurst | 2016-04-19 | 7 | -15/+15 | |
| * | | | | | | | | | replace $.parseJSON() by JSON.parse() | Christoph Wurst | 2016-04-19 | 11 | -220/+8 | |
| * | | | | | | | | | migrate jQuery.fn.unload() | Christoph Wurst | 2016-04-19 | 1 | -1/+1 | |
| * | | | | | | | | | remove deprecated jQuery.browser | Christoph Wurst | 2016-04-19 | 1 | -4/+8 | |
* | | | | | | | | | | Merge pull request #24064 from owncloud/update-3rdparty | Thomas Müller | 2016-04-20 | 1 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Update 3rdparty to remove unneeded files | Morris Jobke | 2016-04-20 | 1 | -0/+0 | |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #23919 from owncloud/cyclyc-share-dep-example | Thomas Müller | 2016-04-20 | 37 | -1244/+1083 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Move moveFromCache to CacheJail | Roeland Jago Douma | 2016-04-19 | 2 | -4/+16 | |
| * | | | | | | | | | | Move copy- and moveFromStorage to jail | Roeland Jago Douma | 2016-04-19 | 2 | -20/+26 | |
| * | | | | | | | | | | Only construct the storage when we start using it | Robin Appelman | 2016-04-19 | 6 | -23/+116 | |
| * | | | | | | | | | | Fix resolve path | Roeland Jago Douma | 2016-04-19 | 3 | -15/+8 | |
| * | | | | | | | | | | Fix tests | Roeland Jago Douma | 2016-04-19 | 18 | -723/+738 | |
| * | | | | | | | | | | Fix related logic | Roeland Jago Douma | 2016-04-19 | 5 | -24/+48 | |
| * | | | | | | | | | | Move SharedStorage et al over to the shareManager and jail | Roeland Jago Douma | 2016-04-19 | 8 | -456/+146 | |
| * | | | | | | | | | | 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 | 2 | -0/+22 | |
|\ \ \ \ \ \ \ \ \ \ |