summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #13969 from raimund-schluessler/masterMorris Jobke2015-02-261-4/+11
|\
| * Fix variable already definedRaimund Schlüßler2015-02-091-1/+1
| * Append search results to custom containerRaimund Schlüßler2015-02-081-4/+11
* | update 3rdparty to current masterMorris Jobke2015-02-261-0/+0
* | Merge pull request #14300 from owncloud/commandbusMorris Jobke2015-02-2617-4/+468
|\ \
| * | fix exception messageMorris Jobke2015-02-261-1/+1
| * | set max argument length to 4000Robin Appelman2015-02-252-2/+2
| * | Rename getAsyncCommandBus to getCommandBusRobin Appelman2015-02-253-3/+3
| * | prevent phpunit from messing with the bound $thisRobin Appelman2015-02-251-6/+17
| * | require command that do file access to be run sync when encryption is enabledRobin Appelman2015-02-251-0/+2
| * | Add FileAccess trait for commandsRobin Appelman2015-02-252-0/+43
| * | Allow apps to determine which commands should be run synchronous based on tra...Robin Appelman2015-02-252-1/+65
| * | add superclosure to thirdpartyRobin Appelman2015-02-251-0/+0
| * | throw an exception when trying to push a background job that wont fit in the ...Robin Appelman2015-02-251-0/+3
| * | expand cron argument column to 2048Robin Appelman2015-02-252-2/+2
| * | Add async command system to handle asynchronous operationsRobin Appelman2015-02-2511-2/+343
* | | Merge pull request #14208 from owncloud/oc-msg-remove-object-dependencyMorris Jobke2015-02-261-36/+71
|\ \ \
| * | | Remove dependency from arbitrary data object structure for easier usageJoas Schilling2015-02-201-36/+71
* | | | Merge pull request #14473 from owncloud/remove-uneeded-assignmentMorris Jobke2015-02-261-2/+0
|\ \ \ \
| * | | | Remove uneeded assignmentLukas Reschke2015-02-241-2/+0
* | | | | Merge pull request #14502 from owncloud/failing-mysql-master-testsThomas Müller2015-02-266-6/+17
|\ \ \ \ \
| * | | | | Sort the array to be sureJoas Schilling2015-02-261-1/+8
| * | | | | Reset the group backend aswellJoas Schilling2015-02-251-1/+7
| * | | | | Clear the local cache when we clear the backendsJoas Schilling2015-02-251-0/+1
| * | | | | Extend the class so the Filesystem is cleaned upJoas Schilling2015-02-253-4/+1
| | |_|/ / | |/| | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-26194-596/+352
* | | | | Merge pull request #14468 from owncloud/af-db-cleanupThomas Müller2015-02-2510-73/+262
|\ \ \ \ \
| * | | | | remove IDb interface from core class usageBernhard Posselt2015-02-253-5/+5
| * | | | | owncloud -> ownCloudThomas Müller2015-02-252-3/+3
| * | | | | deprecate getters for deprecated classBernhard Posselt2015-02-252-2/+3
| * | | | | fix tabs and spacesBernhard Posselt2015-02-251-119/+119
| * | | | | fix mappertestutilityBernhard Posselt2015-02-251-116/+120
| * | | | | use IDBConnection and close cursors after insert/update/deleteBernhard Posselt2015-02-253-53/+58
| * | | | | migrate to IDBConnectionBernhard Posselt2015-02-253-12/+191
|/ / / / /
* | | | | Merge pull request #14494 from owncloud/fix-oracle-masterLukas Reschke2015-02-251-41/+33
|\ \ \ \ \
| * | | | | using Doctrine\DBAL\Connection::executeUpdate()Thomas Müller2015-02-251-41/+33
| |/ / / /
* | | | | Merge pull request #14509 from owncloud/fix/14231Lukas Reschke2015-02-251-1/+7
|\ \ \ \ \
| * | | | | Show 404 page when accessing empty share URLLukas Reschke2015-02-251-1/+7
* | | | | | Merge pull request #14508 from owncloud/tagmanager-nouserVincent Petry2015-02-252-0/+15
|\ \ \ \ \ \
| * | | | | | Return null when requesting tags for null userVincent Petry2015-02-252-0/+15
| |/ / / / /
* | | | | | Merge pull request #14490 from owncloud/remove-unused-deprecated-codeClark Tomlinson2015-02-251-10/+0
|\ \ \ \ \ \
| * | | | | | Remove unused and deprecated CodeLukas Reschke2015-02-251-10/+0
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #14245 from cmeh/masterLukas Reschke2015-02-253-7/+7
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Typo: Missing "n"cmeh2015-02-241-1/+1
| * | | | | Cleaning-up messagescmeh2015-02-181-3/+3
| * | | | | Update setupchecks.jscmeh2015-02-161-1/+1
| * | | | | Message clean-upcmeh2015-02-161-3/+3
* | | | | | Merge pull request #14500 from owncloud/fileglobalgc-cleanupThomas Müller2015-02-253-28/+119
|\ \ \ \ \ \
| * | | | | | Cleanup garbage collection for global file cacheRobin Appelman2015-02-253-28/+119
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #10735 from owncloud/use_remote_addrRobin McCorkell2015-02-252-5/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |