summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | Do not show exception to the end-userLukas Reschke2014-09-178-63/+74
* | | | Merge pull request #7051 from owncloud/postsetupajaxcheckVincent Petry2014-09-239-83/+146
|\ \ \ \ | |_|/ / |/| | |
| * | | Moved WebDAV and internet checks to client side JSVincent Petry2014-09-239-83/+146
* | | | Merge pull request #11109 from owncloud/nstamm-patch-1Jan-Christoph Borchardt2014-09-231-1/+8
|\ \ \ \
| * | | | adjust text size and opacity of drag'n'drop upload text styleJan-Christoph Borchardt2014-09-231-0/+4
| * | | | DragnDrop Upload text styleNicolas Stamm2014-09-161-1/+4
* | | | | Merge pull request #11222 from owncloud/store-users-timezone-masterThomas Müller2014-09-238-20/+417
|\ \ \ \ \
| * | | | | enhance formatDate function to accept an optional argument containing the tim...Thomas Müller2014-09-223-9/+45
| * | | | | date printed in the admin section regarding last execution time is already di...Thomas Müller2014-09-221-1/+1
| * | | | | send browsers timezone back tp the server on loginThomas Müller2014-09-224-10/+371
| | |_|_|/ | |/| | |
* | | | | Merge pull request #11234 from owncloud/fix-icon-classesJan-Christoph Borchardt2014-09-238-14/+23
|\ \ \ \ \
| * | | | | force show the loading icon in list for deletion, not only on hoverJan-Christoph Borchardt2014-09-221-0/+9
| * | | | | correct progress-icon to icon-loading-smallJan-Christoph Borchardt2014-09-224-10/+10
| * | | | | correct delete-icon to icon-delete, fix #11128Jan-Christoph Borchardt2014-09-227-14/+14
* | | | | | Merge pull request #11137 from owncloud/enc-pregfixVincent Petry2014-09-2310-113/+384
|\ \ \ \ \ \
| * | | | | | Fix share key finding algorithm in various casesVincent Petry2014-09-2310-113/+384
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #11241 from owncloud/use-lower-caseThomas Müller2014-09-232-2/+5
|\ \ \ \ \ \
| * | | | | | Use only lower-case lettersLukas Reschke2014-09-222-2/+5
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #11032 from owncloud/harden-redirectLukas Reschke2014-09-238-96/+302
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Do only follow HTTP and HTTPS redirectsLukas Reschke2014-09-228-96/+302
* | | | | | Merge pull request #11226 from owncloud/kill-postsetupcheck-masterVincent Petry2014-09-233-30/+4
|\ \ \ \ \ \
| * | | | | | remove post setup checkThomas Müller2014-09-223-30/+4
* | | | | | | Merge pull request #11224 from owncloud/fix_recovery_admin_userLukas Reschke2014-09-231-5/+4
|\ \ \ \ \ \ \
| * | | | | | | first check if a private key exists, if not it is always a recovery szenarioBjoern Schiessle2014-09-221-5/+4
| |/ / / / / /
* | | | | | | Merge pull request #11242 from owncloud/fix-10284Lukas Reschke2014-09-231-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Use non-empty defaultsVictor Dubiniuk2014-09-221-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-2321-17/+45
* | | | | | | Merge pull request #11227 from owncloud/fix-windows-pathThomas Müller2014-09-235-9/+12
|\ \ \ \ \ \ \
| * | | | | | | ignoring writedata test in windows.Clark Tomlinson2014-09-221-0/+3