summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-10-1688-1453/+776
* Merge pull request #11570 from owncloud/backport-11408-masterLukas Reschke2014-10-159-207/+532
|\
| * fixing typosThomas Müller2014-10-142-1/+2
| * Refactor MailSettings controllerLukas Reschke2014-10-149-207/+531
* | Merge pull request #11565 from owncloud/fix-behaviourOnOSXLukas Reschke2014-10-151-1/+1
|\ \
| * | Add darwin to if blockLukas Reschke2014-10-141-1/+1
| |/
* | Merge pull request #11528 from owncloud/use-raw-urlLukas Reschke2014-10-153-3/+7
|\ \
| * | Use `rawurlencode` since this seems to be expected by cURLLukas Reschke2014-10-143-3/+7
| |/
* | Merge pull request #11596 from owncloud/in_cli_mode_return_true_for_ishtacces...Jörn Friedrich Dreyer2014-10-151-1/+1
|\ \
| * | in cli mode return true for isHtaccessWorkingJörn Friedrich Dreyer2014-10-151-1/+1
|/ /
* | Merge pull request #10426 from owncloud/enhanced-apps-managementJan-Christoph Borchardt2014-10-1534-504/+1135
|\ \
| * | introduce new app page layoutThomas Müller2014-10-1534-504/+1135
|/ /
* | Merge pull request #11538 from owncloud/webdav-creatable-infoVincent Petry2014-10-151-1/+1
|\ \
| * | Use the cached fileinfo to get creatable permissionsRobin Appelman2014-10-131-1/+1
* | | Merge pull request #11541 from owncloud/usersession-activeuser-setsessionVincent Petry2014-10-152-44/+75
|\ \ \
| * | | Add unit testRobin Appelman2014-10-131-33/+63
| * | | Unset the cached active user when using a different session objectRobin Appelman2014-10-131-11/+12
| |/ /
* | | Merge pull request #11548 from owncloud/extstorage-ocfieldsVincent Petry2014-10-153-2/+93
|\ \ \
| * | | Allow specifying protocol in ext storage OC configVincent Petry2014-10-133-2/+93
| |/ /
* | | Merge pull request #11590 from owncloud/publiclinkscrollanimatefixVincent Petry2014-10-151-1/+7
|\ \ \
| * | | Use body element when animating scroll in public pageVincent Petry2014-10-151-1/+7
|/ / /
* | / [tx-robot] updated from transifexJenkins for ownCloud2014-10-1512-12/+12
| |/ |/|
* | Merge pull request #11556 from owncloud/cache-js-and-cssJörn Friedrich Dreyer2014-10-141-0/+5
|\ \
| * | adding cache control headers for css and js - fixes #11496Thomas Müller2014-10-141-0/+5
* | | Merge pull request #11534 from owncloud/issue/11500Vincent Petry2014-10-143-1/+12
|\ \ \
| * | | Set overwritemailurl* configs on setupJoas Schilling2014-10-143-1/+12
| |/ /
* / / [tx-robot] updated from transifexJenkins for ownCloud2014-10-1416-63/+70
|/ /
* | Merge pull request #11543 from owncloud/closeSessionForAppsLoadingThomas Müller2014-10-131-0/+1
|\ \
| * | Close session when loading appsLukas Reschke2014-10-131-0/+1
* | | Merge pull request #11546 from owncloud/users-deletewithfilecacheVincent Petry2014-10-131-1/+1
|\ \ \
| * | | Retrieve storage numeric id earlier when still availableVincent Petry2014-10-131-1/+1
| | |/ | |/|
* | | Merge pull request #11542 from owncloud/fix_failing_unit_testsBjörn Schießle2014-10-131-2/+3
|\ \ \
| * | | distinguish between file dependent shares and other sharesBjoern Schiessle2014-10-131-2/+3
| |/ /
* | | Merge pull request #11537 from owncloud/filenamewithzeroesVincent Petry2014-10-131-1/+1
|\ \ \ | |/ / |/| |
| * | Fixed array detection on public downloadVincent Petry2014-10-131-1/+1
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2014-10-1315-15/+15
* | Merge pull request #11367 from owncloud/removeIsMimeSupportedLukas Reschke2014-10-121-3/+1
|\ \
| * | Remove uneeded slicing of elementLukas Reschke2014-09-301-3/+1
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-1216-14/+107
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-1117-63/+82
* | | Merge pull request #11507 from owncloud/versioning_expireBjörn Schießle2014-10-101-0/+3
|\ \ \
| * | | make sure that we always delete oldest firstBjoern Schiessle2014-10-091-0/+3
* | | | Merge pull request #11380 from owncloud/fix_performance_issue_sharingBjörn Schießle2014-10-104-18/+213
|\ \ \ \ | |_|_|/ |/| | |
| * | | try to get path from filesystemBjoern Schiessle2014-10-101-0/+5
| * | | fix performance issuesBjoern Schiessle2014-10-103-18/+208
* | | | Merge pull request #11499 from owncloud/ldap-warningwhenuidismissingLukas Reschke2014-10-101-0/+4
|\ \ \ \
| * | | | Log warning when no uid was found for userVincent Petry2014-10-091-0/+4
* | | | | Merge pull request #11480 from owncloud/ldap-enterkey-deletefixJan-Christoph Borchardt2014-10-103-3/+3
|\ \ \ \ \
| * | | | | Prevent button click when enter key is pressed in LDAP wizardVincent Petry2014-10-083-3/+3
* | | | | | Merge pull request #11501 from Ansud/masterVincent Petry2014-10-101-1/+2
|\ \ \ \ \ \