aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | [master] Ignore certificate file if it starts with file://Lukas Reschke2016-04-212-0/+15
* | | | | | | Merge pull request #24174 from owncloud/repair_psr4Thomas Müller2016-04-2218-0/+0
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Move \OC\Repair to PSR-4Roeland Jago Douma2016-04-2118-0/+0
| | |_|_|_|/ | |/| | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-2230-0/+38
* | | | | | Merge pull request #24157 from owncloud/files-app-is-not-available-on-public-...Thomas Müller2016-04-211-6/+9
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | OCA.Files.App is not available on public pageChristoph Wurst2016-04-211-6/+9
| |/ / / /
* | | | | Merge pull request #24145 from owncloud/limit-cron-execution-timeVincent Petry2016-04-211-0/+8
|\ \ \ \ \
| * | | | | Make sure that CLI cron doesn't run for ever, but makes use of the next spawnJoas Schilling2016-04-211-0/+8
* | | | | | Merge pull request #24155 from owncloud/fix-birthday_calendar-aclThomas Müller2016-04-214-8/+27
|\ \ \ \ \ \
| * | | | | | Birthday calendar should never have write acl - fixes #24154Thomas Müller2016-04-214-8/+27
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #24111 from owncloud/chunk-users-in-background-jobsBjörn Schießle2016-04-213-56/+24
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Chunk the users correctly in the trashbin and versions background jobJoas Schilling2016-04-203-56/+24
* | | | | | Merge pull request #24138 from owncloud/revert-22760-tooltip-cssfixThomas Müller2016-04-211-1/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Revert "add word wrap to tooltips. Fixes #22746"Lukas Reschke2016-04-201-1/+0
* | | | | | Merge pull request #24135 from owncloud/also-write-htaccess-from-cliThomas Müller2016-04-211-7/+15
|\ \ \ \ \ \
| * | | | | | Write .htaccess also from CLILukas Reschke2016-04-201-7/+15
* | | | | | | Merge pull request #22791 from owncloud/enc_master_key_improvementsVincent Petry2016-04-217-75/+118
|\ \ \ \ \ \ \
| * | | | | | | replaceUserKeys() actually deletes the users keys -> update method name and d...Bjoern Schiessle2016-03-183-3/+5
| * | | | | | | only create and update user specific key if no master key is enabledBjoern Schiessle2016-03-187-72/+113
* | | | | | | | Merge pull request #24133 from owncloud/tagging_psr4Joas Schilling2016-04-212-0/+0
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Move \OC\Tagging to PSR-4Roeland Jago Douma2016-04-202-0/+0
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-21278-520/+560
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge pull request #24127 from owncloud/handle-app-loading-errorThomas Müller2016-04-209-18/+40
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | In case an app has issues while loading the app is disabled and request proce...Thomas Müller2016-04-201-2/+10
| * | | | | | Catch class Error on all root entrypointsThomas Müller2016-04-206-12/+26
| * | | | | | With PHP7 Throwable is the new base interface for all Exception and Error - w...Thomas Müller2016-04-202-4/+4
* | | | | | | Merge pull request #24132 from owncloud/fix-web-updaterThomas Müller2016-04-201-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Fix web updater - fixes #24115Thomas Müller2016-04-201-3/+3
* | | | | | | | Merge pull request #23990 from owncloud/heartbeat-debounceMorris Jobke2016-04-202-4/+12
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Debounce heartbeat ajax calls to lower the number of requestsChristoph Wurst2016-04-182-4/+12
* | | | | | | | Merge pull request #23951 from owncloud/cleanlocks-chunkThomas Müller2016-04-201-7/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | Let the querybuilder convertRoeland Jago Douma2016-04-141-4/+2
| * | | | | | | | chunk the cleaning up of shared locksRobin Appelman2016-04-141-7/+20
* | | | | | | | | Merge pull request #24081 from owncloud/migrate-deprecated-jquery-v1-functionsThomas Müller2016-04-2016-238/+30
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | replace $().attr('checked') by $().prop('checked', state) or $().is(':checked')Christoph Wurst2016-04-197-15/+15
| * | | | | | | | | replace $.parseJSON() by JSON.parse()Christoph Wurst2016-04-1911-220/+8
| * | | | | | | | | migrate jQuery.fn.unload()Christoph Wurst2016-04-191-1/+1
| * | | | | | | | | remove deprecated jQuery.browserChristoph Wurst2016-04-191-4/+8
* | | | | | | | | | Merge pull request #24064 from owncloud/update-3rdpartyThomas Müller2016-04-201-0/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update 3rdparty to remove unneeded filesMorris Jobke2016-04-201-0/+0
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge pull request #23919 from owncloud/cyclyc-share-dep-exampleThomas Müller2016-04-2037-1244/+1083
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Move moveFromCache to CacheJailRoeland Jago Douma2016-04-192-4/+16
| * | | | | | | | | | Move copy- and moveFromStorage to jailRoeland Jago Douma2016-04-192-20/+26
| * | | | | | | | | | Only construct the storage when we start using itRobin Appelman2016-04-196-23/+116
| * | | | | | | | | | Fix resolve pathRoeland Jago Douma2016-04-193-15/+8
| * | | | | | | | | | Fix testsRoeland Jago Douma2016-04-1918-723/+738
| * | | | | | | | | | Fix related logicRoeland Jago Douma2016-04-195-24/+48
| * | | | | | | | | | Move SharedStorage et al over to the shareManager and jailRoeland Jago Douma2016-04-198-456/+146
| * | | | | | | | | | cache the scanner/updater/cache in the wrapper storageRobin Appelman2016-04-192-12/+18
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #24098 from owncloud/fix_23782Thomas Müller2016-04-202-0/+22
|\ \ \ \ \ \ \ \ \ \