summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-09-2828-97/+166
|
* Merge pull request #11304 from owncloud/share-spinnerMorris Jobke2014-09-272-27/+112
|\ | | | | Added spinners in share dropdown
| * Prevent monkey clicking on labelsVincent Petry2014-09-261-0/+5
| | | | | | | | | | Clicking on labels while the spinner is there will not trigger the hidden checkbox any more.
| * 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
| | | | | | | | | | | | | | | | | | Added spinners for the following actions: - adding user - removing user - changing password - toggling allowing upload - setting a password
* | 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 appname in header bar
| * | for whitelabeled edition, show branding name (e.g. 'ownCloud') instead of ↵Jan-Christoph Borchardt2014-09-261-1/+7
| | | | | | | | | | | | appname in header bar
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-2736-15/+98
| | |
* | | Merge pull request #11311 from ↵Lukas Reschke2014-09-261-3/+21
|\ \ \ | |_|/ |/| | | | | | | | owncloud/fixing-unhandled-exception-cleanTmp-master catch and log exception in OC_Helper::cleanTmp()
| * | 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
| * | 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 memory
| * | 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 complain about non-writable datadirs before we're installed
| * | 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 Office
| * | | Clarify possible preview providers for type OfficeLukas Reschke2014-09-242-3/+11
| | | | | | | | | | | | | | | | a
* | | | Merge pull request #11287 from owncloud/kill-withMorris Jobke2014-09-241-3/+0
|\ \ \ \ | |/ / / |/| | | Disable external code coverage
| * | | 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...
| * | | Show a proper error message when trying to scan the filesystem for a non ↵Robin Appelman2014-09-241-1/+5
| | |/ | |/| | | | | | | existing user
* | | Merge pull request #11225 from owncloud/showLoginAgainInsteadOfJSONThomas Müller2014-09-241-1/+3
|\ \ \ | |/ / |/| | Show login again instead of JSON if CSRF check fails
| * | Show login again instead of JSON if CSRF check failsLukas Reschke2014-09-231-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Previously a JSON error page was shown to the user in-case the CSRF token was not valid. This was confusing and prevented people from login. With this at least the login page is shown again and not a JSON error message. I consider this as sufficient since adding a new error page just for this sake would uneededly make lib/base.php even more cluttered and this is a edge-case which optimally should anyways not happen that often. This can be tested by opening the login page, then clearing the cookies, and trying to login.
* | | Merge pull request #11229 from kofemann/for-upstreamLukas Reschke2014-09-241-9/+8
|\ \ \ | | | | | | | | user/backed: use pow of two for backed action constants
| * | | user/backed: use pow of two for backed action constantsTigran Mkrtchyan2014-09-231-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the current implementation limits number of possible backed actions to 8 as it uses pow of 16 for constants. This change introduces pow of two and allows up-to 32 actions to be defined. The old values are preserved for backward compatibility.
* | | | Merge pull request #11275 from owncloud/drop-if-eMorris Jobke2014-09-241-1/+1
|\ \ \ \ | | | | | | | | | | Drop only if exists
| * | | | 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 characters
| * | | | Check for blacklisted charactersLukas Reschke2014-09-231-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/11264 (This should in future get moved to the mountpoint class - but that is something for @icewind1991 ;-))
* | | | | Merge pull request #11254 from owncloud/fix-filepicker-home-iconVolkan Gezer2014-09-231-0/+2
|\ \ \ \ \ | |/ / / / |/| | | | fix filepicker home icon being partly hidden, fix #10169
| * | | | 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
|\ \ \ \ | | | | | | | | | | Do not show exception to the end-user - use a proper error page instead
| * | | | 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
| | | | | | | | | | | | | | | | | | | | Log the error instead of potentially leaking sensitive information
* | | | | Merge pull request #7051 from owncloud/postsetupajaxcheckVincent Petry2014-09-239-83/+146
|\ \ \ \ \ | |_|/ / / |/| | | | Moved WebDAV check to client side JS
| * | | | Moved WebDAV and internet checks to client side JSVincent Petry2014-09-239-83/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added setup checks in JavaScript - Moved isWebDAVWorking to JS using SetupChecks - Moved internet connection checks to an ajax call that goes through the server
* | | | | Merge pull request #11109 from owncloud/nstamm-patch-1Jan-Christoph Borchardt2014-09-231-1/+8
|\ \ \ \ \ | | | | | | | | | | | | DragnDrop Upload text style
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | The 8px margin was uggly.
* | | | | | Merge pull request #11222 from owncloud/store-users-timezone-masterThomas Müller2014-09-238-20/+417
|\ \ \ \ \ \ | | | | | | | | | | | | | | send browsers timezone back tp the server on login