summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-03-27176-1740/+1781
* Merge pull request #7893 from owncloud/no-routed-link-for-css-filesThomas Müller2014-03-261-1/+1
|\
| * css files are not to be routed through index.php anymoreThomas Müller2014-03-261-1/+1
* | Merge pull request #7896 from Xenopathic/misc_text_fixesThomas Müller2014-03-264-5/+5
|\ \
| * | Miscellaneous text fixes for core appsRobin McCorkell2014-03-264-5/+5
| |/
* | Merge pull request #7889 from owncloud/routing-warningVincent Petry2014-03-261-1/+1
|\ \ | |/ |/|
| * fix undefined index warning in routerRobin Appelman2014-03-261-1/+1
* | Merge pull request #7888 from owncloud/extstorage-multiplemountpointconfigVincent Petry2014-03-263-51/+242
|\ \
| * | Fix merging of external storage configurationsVincent Petry2014-03-263-51/+242
| |/
* | Merge pull request #7885 from owncloud/extstorage-prettyprintjsonVincent Petry2014-03-261-1/+6
|\ \ | |/ |/|
| * Pretty print mount.json when possibleVincent Petry2014-03-261-1/+6
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-03-26125-5946/+10973
* Merge pull request #7748 from owncloud/postgresversionwarningThomas Müller2014-03-251-0/+35
|\
| * fixing code styleThomas Müller2014-03-251-2/+1
| * Log exception when PostgreSQL version check failedVincent Petry2014-03-241-1/+3
| * Added PostgreSQL version warning on upgradeVincent Petry2014-03-171-0/+34
* | Merge pull request #7864 from owncloud/routing-performanceThomas Müller2014-03-256-27/+106
|\ \
| * | update type hint in PHPDocThomas Müller2014-03-252-2/+3
| * | Fix routes getting lost when loading app routes twiceRobin Appelman2014-03-251-7/+9
| * | fix incorect arrayRobin Appelman2014-03-251-1/+1
| * | Only load core routes for ocs and settingsRobin Appelman2014-03-251-1/+2
| * | Only load core routes when matching a core routeRobin Appelman2014-03-241-3/+5
| * | Cache generated urls for routesRobin Appelman2014-03-241-0/+43
| * | Only load routes from the apps we needRobin Appelman2014-03-242-14/+38
| * | Load the routes when matching or generating a route instead of when creating ...Robin Appelman2014-03-243-7/+13
* | | Merge pull request #7325 from owncloud/recursive-mkdir-localThomas Müller2014-03-252-2/+2
|\ \ \
| * \ \ Merge branch 'master' into recursive-mkdir-localRobin Appelman2014-02-2143-184/+523
| |\ \ \
| * | | | Also make "regular" local storage's mkdir recursiveRobin Appelman2014-02-201-1/+1
| * | | | Recursive mkdir fixes #7047Joshua Medeiros2014-02-201-1/+1
* | | | | Merge pull request #7420 from owncloud/cachehooks-firstThomas Müller2014-03-254-14/+28
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into cachehooks-firstRobin Appelman2014-03-131568-49537/+81566
| |\ \ \ \ \
| * | | | | | Fix check if fileinfo is validRobin Appelman2014-03-061-1/+1
| * | | | | | Fix updater when getFileInfo failsRobin Appelman2014-03-031-1/+4
| * | | | | | Also send explicit cache hooks when calling file_put_contents with a resourceRobin Appelman2014-02-281-0/+3
| * | | | | | Manually triger the filecache update hooks before any other hookRobin Appelman2014-02-263-12/+20
* | | | | | | Merge pull request #7477 from owncloud/foldersize-reuseThomas Müller2014-03-256-16/+29
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into foldersize-reuseRobin Appelman2014-03-111480-49207/+79239
| |\ \ \ \ \ \ \
| * | | | | | | | Check if fields we need are actually set to prevent errorsRobin Appelman2014-03-032-3/+3
| * | | | | | | | Remove assert since the root size of the home storage is no longer calculatedRobin Appelman2014-03-031-1/+0
| * | | | | | | | Allow re-using already known fileinfo when calculating folder sizesRobin Appelman2014-02-285-13/+27
* | | | | | | | | Merge pull request #7772 from owncloud/filter_more_jsconsoleVicDeo2014-03-251-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Replace console.time/timeEndThomas Tanghus2014-03-171-1/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge pull request #7689 from owncloud/last_cron_logVincent Petry2014-03-256-8/+47
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move success/error squircles to settingskondou2014-03-212-7/+9
| * | | | | | | | | Merge branch 'master' of https://github.com/owncloud/core into last_cron_logkondou2014-03-21592-6594/+7409
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use OC_Util::formatDate()kondou2014-03-121-1/+1
| * | | | | | | | | | Move cron status to the right of the headingkondou2014-03-122-18/+22
| * | | | | | | | | | Log last cron executionkondou2014-03-125-0/+33
* | | | | | | | | | | Merge pull request #7867 from owncloud/upload-dontclosesessionforencryptionThomas Müller2014-03-251-1/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix public upload to not close session when encryption is onVincent Petry2014-03-241-1/+4