summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #11324 from owncloud/tryToCreateDatadirectoryLukas Reschke2014-09-291-1/+6
|\
| * Try to create datadirectory to test whether the .htaccess worksLukas Reschke2014-09-261-1/+6
* | [tx-robot] updated from transifexJenkins for ownCloud2014-09-2930-19/+78
* | Merge pull request #11322 from owncloud/adding-unittest-helperThomas Müller2014-09-291-0/+28
|\ \
| * | Adding test helper to test private methodsClark Tomlinson2014-09-261-0/+28
| |/
* | Merge pull request #11335 from danbartram/imp_logrotate_conf_exampleMorris Jobke2014-09-281-1/+2
|\ \
| * | Clear up confusion of log_rotate_size config valueDan Bartram2014-09-271-1/+2
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-2828-97/+166
|/ /
* | Merge pull request #11304 from owncloud/share-spinnerMorris Jobke2014-09-272-27/+112
|\ \
| * | Prevent monkey clicking on labelsVincent Petry2014-09-261-0/+5
| * | Add ID to markup to have the checkboxes in the right positionLukas Reschke2014-09-261-5/+5
| * | Added spinners in share dropdownVincent Petry2014-09-262-22/+102
* | | Merge pull request #11319 from owncloud/header-owncloud-nameMorris Jobke2014-09-271-1/+7
|\ \ \
| * | | for whitelabeled edition, show branding name (e.g. 'ownCloud') instead of app...Jan-Christoph Borchardt2014-09-261-1/+7
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-2736-15/+98
| |_|/ |/| |
* | | Merge pull request #11311 from owncloud/fixing-unhandled-exception-cleanTmp-m...Lukas Reschke2014-09-261-3/+21
|\ \ \ | |_|/ |/| |
| * | catch and log exception in OC_Helper::cleanTmp()Thomas Müller2014-09-261-3/+21
* | | Merge pull request #11285 from owncloud/dav-permissions-createThomas Müller2014-09-264-1/+72
|\ \ \ | |/ / |/| |
| * | Fix dav permissions for folders without create permissionsRobin Appelman2014-09-252-1/+56
| * | Expose creatable permissions trough fileinfoRobin Appelman2014-09-252-0/+16
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-2621-72/+119
* | | Merge pull request #11282 from owncloud/scanner-memory-stable7Robin Appelman2014-09-251-7/+12
|\ \ \ | |_|/ |/| |
| * | Don't keep the full info of all children in memoryRobin Appelman2014-09-241-7/+12
* | | Merge pull request #10934 from owncloud/datadir-write-setupVincent Petry2014-09-256-57/+126
|\ \ \ | |_|/ |/| |
| * | Don't test for htaccess if we cant write into the datadir anywayRobin Appelman2014-09-181-10/+12
| * | Check for writable datadir during setupRobin Appelman2014-09-181-3/+13
| * | Don't complain about non-writable datadirs before we're installedRobin Appelman2014-09-182-17/+56
| * | Inject config into checkserver and cleanup testsRobin Appelman2014-09-184-29/+47
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-25138-37/+369
* | | Merge pull request #11286 from owncloud/clarify-possible-formatsMorris Jobke2014-09-242-3/+11
|\ \ \
| * | | Clarify possible preview providers for type OfficeLukas Reschke2014-09-242-3/+11
* | | | Merge pull request #11287 from owncloud/kill-withMorris Jobke2014-09-241-3/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Disable external code coverageLukas Reschke2014-09-241-3/+0
|/ / /
* | | Merge pull request #11281 from owncloud/scanner-unkown-userClark Tomlinson2014-09-241-1/+5
|\ \ \
| * | | Show a proper error message when trying to scan the filesystem for a non exis...Robin Appelman2014-09-241-1/+5
| | |/ | |/|
* | | Merge pull request #11225 from owncloud/showLoginAgainInsteadOfJSONThomas Müller2014-09-241-1/+3
|\ \ \ | |/ / |/| |
| * | Show login again instead of JSON if CSRF check failsLukas Reschke2014-09-231-1/+3
* | | Merge pull request #11229 from kofemann/for-upstreamLukas Reschke2014-09-241-9/+8
|\ \ \
| * | | user/backed: use pow of two for backed action constantsTigran Mkrtchyan2014-09-231-9/+8
* | | | Merge pull request #11275 from owncloud/drop-if-eMorris Jobke2014-09-241-1/+1
|\ \ \ \
| * | | | Drop only if existsLukas Reschke2014-09-241-1/+1
|/ / / /
* | | | autotest.sh shall not terminate if mysql db could not be droppedThomas Müller2014-09-241-1/+1
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-24128-601/+388
* | | | Merge pull request #11265 from owncloud/fix-11264Morris Jobke2014-09-241-0/+6
|\ \ \ \
| * | | | Check for blacklisted charactersLukas Reschke2014-09-231-0/+6
* | | | | Merge pull request #11254 from owncloud/fix-filepicker-home-iconVolkan Gezer2014-09-231-0/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | fix filepicker home icon being partly hidden, fix #10169Jan-Christoph Borchardt2014-09-231-0/+2
| | |/ / | |/| |
* | | | Merge pull request #11019 from owncloud/do-not-show-exception-to-enduserLukas Reschke2014-09-238-63/+75
|\ \ \ \
| * | | | fix error message templateMorris Jobke2014-09-171-0/+1
| * | | | replace horizontal rules with whitespaceJan-Christoph Borchardt2014-09-171-3/+4