Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-28 | 28 | -97/+166 |
| | |||||
* | Merge pull request #11304 from owncloud/share-spinner | Morris Jobke | 2014-09-27 | 2 | -27/+112 |
|\ | | | | | Added spinners in share dropdown | ||||
| * | Prevent monkey clicking on labels | Vincent Petry | 2014-09-26 | 1 | -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 position | Lukas Reschke | 2014-09-26 | 1 | -5/+5 |
| | | |||||
| * | Added spinners in share dropdown | Vincent Petry | 2014-09-26 | 2 | -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-name | Morris Jobke | 2014-09-27 | 1 | -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 Borchardt | 2014-09-26 | 1 | -1/+7 |
| | | | | | | | | | | | | appname in header bar | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-27 | 36 | -15/+98 |
| | | | |||||
* | | | Merge pull request #11311 from ↵ | Lukas Reschke | 2014-09-26 | 1 | -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üller | 2014-09-26 | 1 | -3/+21 |
| | | | |||||
* | | | Merge pull request #11285 from owncloud/dav-permissions-create | Thomas Müller | 2014-09-26 | 4 | -1/+72 |
|\ \ \ | |/ / |/| | | Fix dav permissions for folders | ||||
| * | | Fix dav permissions for folders without create permissions | Robin Appelman | 2014-09-25 | 2 | -1/+56 |
| | | | |||||
| * | | Expose creatable permissions trough fileinfo | Robin Appelman | 2014-09-25 | 2 | -0/+16 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-26 | 21 | -72/+119 |
| | | | |||||
* | | | Merge pull request #11282 from owncloud/scanner-memory-stable7 | Robin Appelman | 2014-09-25 | 1 | -7/+12 |
|\ \ \ | |_|/ |/| | | Don't keep the full info of all children in memory | ||||
| * | | Don't keep the full info of all children in memory | Robin Appelman | 2014-09-24 | 1 | -7/+12 |
| | | | |||||
* | | | Merge pull request #10934 from owncloud/datadir-write-setup | Vincent Petry | 2014-09-25 | 6 | -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 anyway | Robin Appelman | 2014-09-18 | 1 | -10/+12 |
| | | | |||||
| * | | Check for writable datadir during setup | Robin Appelman | 2014-09-18 | 1 | -3/+13 |
| | | | |||||
| * | | Don't complain about non-writable datadirs before we're installed | Robin Appelman | 2014-09-18 | 2 | -17/+56 |
| | | | |||||
| * | | Inject config into checkserver and cleanup tests | Robin Appelman | 2014-09-18 | 4 | -29/+47 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-25 | 138 | -37/+369 |
| | | | |||||
* | | | Merge pull request #11286 from owncloud/clarify-possible-formats | Morris Jobke | 2014-09-24 | 2 | -3/+11 |
|\ \ \ | | | | | | | | | Clarify possible preview providers for type Office | ||||
| * | | | Clarify possible preview providers for type Office | Lukas Reschke | 2014-09-24 | 2 | -3/+11 |
| | | | | | | | | | | | | | | | | a | ||||
* | | | | Merge pull request #11287 from owncloud/kill-with | Morris Jobke | 2014-09-24 | 1 | -3/+0 |
|\ \ \ \ | |/ / / |/| | | | Disable external code coverage | ||||
| * | | | Disable external code coverage | Lukas Reschke | 2014-09-24 | 1 | -3/+0 |
|/ / / | |||||
* | | | Merge pull request #11281 from owncloud/scanner-unkown-user | Clark Tomlinson | 2014-09-24 | 1 | -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 Appelman | 2014-09-24 | 1 | -1/+5 |
| | |/ | |/| | | | | | | | existing user | ||||
* | | | Merge pull request #11225 from owncloud/showLoginAgainInsteadOfJSON | Thomas Müller | 2014-09-24 | 1 | -1/+3 |
|\ \ \ | |/ / |/| | | Show login again instead of JSON if CSRF check fails | ||||
| * | | Show login again instead of JSON if CSRF check fails | Lukas Reschke | 2014-09-23 | 1 | -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-upstream | Lukas Reschke | 2014-09-24 | 1 | -9/+8 |
|\ \ \ | | | | | | | | | user/backed: use pow of two for backed action constants | ||||
| * | | | user/backed: use pow of two for backed action constants | Tigran Mkrtchyan | 2014-09-23 | 1 | -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-e | Morris Jobke | 2014-09-24 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Drop only if exists | ||||
| * | | | | Drop only if exists | Lukas Reschke | 2014-09-24 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | autotest.sh shall not terminate if mysql db could not be dropped | Thomas Müller | 2014-09-24 | 1 | -1/+1 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-24 | 128 | -601/+388 |
| | | | | |||||
* | | | | Merge pull request #11265 from owncloud/fix-11264 | Morris Jobke | 2014-09-24 | 1 | -0/+6 |
|\ \ \ \ | | | | | | | | | | | Check for blacklisted characters | ||||
| * | | | | Check for blacklisted characters | Lukas Reschke | 2014-09-23 | 1 | -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-icon | Volkan Gezer | 2014-09-23 | 1 | -0/+2 |
|\ \ \ \ \ | |/ / / / |/| | | | | fix filepicker home icon being partly hidden, fix #10169 | ||||
| * | | | | fix filepicker home icon being partly hidden, fix #10169 | Jan-Christoph Borchardt | 2014-09-23 | 1 | -0/+2 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #11019 from owncloud/do-not-show-exception-to-enduser | Lukas Reschke | 2014-09-23 | 8 | -63/+75 |
|\ \ \ \ | | | | | | | | | | | Do not show exception to the end-user - use a proper error page instead | ||||
| * | | | | fix error message template | Morris Jobke | 2014-09-17 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | replace horizontal rules with whitespace | Jan-Christoph Borchardt | 2014-09-17 | 1 | -3/+4 |
| | | | | | |||||
| * | | | | Do not show exception to the end-user | Lukas Reschke | 2014-09-17 | 8 | -63/+74 |
| | | | | | | | | | | | | | | | | | | | | Log the error instead of potentially leaking sensitive information | ||||
* | | | | | Merge pull request #7051 from owncloud/postsetupajaxcheck | Vincent Petry | 2014-09-23 | 9 | -83/+146 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Moved WebDAV check to client side JS | ||||
| * | | | | Moved WebDAV and internet checks to client side JS | Vincent Petry | 2014-09-23 | 9 | -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-1 | Jan-Christoph Borchardt | 2014-09-23 | 1 | -1/+8 |
|\ \ \ \ \ | | | | | | | | | | | | | DragnDrop Upload text style | ||||
| * | | | | | adjust text size and opacity of drag'n'drop upload text style | Jan-Christoph Borchardt | 2014-09-23 | 1 | -0/+4 |
| | | | | | | |||||
| * | | | | | DragnDrop Upload text style | Nicolas Stamm | 2014-09-16 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | The 8px margin was uggly. | ||||
* | | | | | | Merge pull request #11222 from owncloud/store-users-timezone-master | Thomas Müller | 2014-09-23 | 8 | -20/+417 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | send browsers timezone back tp the server on login |