Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | .htaccess update making two rules non-capturing | Martin | 2016-06-03 | 1 | -2/+2 |
| | |||||
* | Merge pull request #24954 from ↵ | Vincent Petry | 2016-06-03 | 1 | -2/+3 |
|\ | | | | | | | | | owncloud/issue-24536-language-name-reused-for-fallback-languages Do not use the language name, when it's not the one from the language… | ||||
| * | Do not use the language name, when it's not the one from the language we want | Joas Schilling | 2016-06-01 | 1 | -2/+3 |
| | | |||||
* | | Merge pull request #24673 from owncloud/construct-path | Vincent Petry | 2016-06-03 | 1 | -4/+6 |
|\ \ | | | | | | | Construct path to the version file from the current directory and fil… | ||||
| * | | Construct path to the version file from the current directory and filename. ↵ | Victor Dubiniuk | 2016-06-02 | 1 | -4/+6 |
| | | | | | | | | | | | | Fixes #22450 | ||||
* | | | Merge pull request #24564 from owncloud/fix_21173_take_2 | Vincent Petry | 2016-06-03 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | normalize path in getInternalPath | ||||
| * | | | normalize path in getInternalPath | Georg Ehrke | 2016-06-02 | 1 | -0/+1 |
| |/ / | |||||
* / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-03 | 98 | -992/+978 |
|/ / | |||||
* | | Merge pull request #24935 from owncloud/2fa-block-dav | Vincent Petry | 2016-06-02 | 6 | -6/+80 |
|\ \ | | | | | | | block DAV if 2FA challenge needs to be solved first | ||||
| * | | block DAV if 2FA challenge needs to be solved first | Christoph Wurst | 2016-06-01 | 6 | -6/+80 |
| | | | |||||
* | | | Merge pull request #24940 from owncloud/fix-normalizedcachekey-keepunicode | Vincent Petry | 2016-06-02 | 3 | -2/+34 |
|\ \ \ | | | | | | | | | Add keepUnicode value in the cache key of normalizedPathCache | ||||
| * | | | Fix TestCase::invokePrivate to work with static classes | Vincent Petry | 2016-06-01 | 1 | -1/+6 |
| | | | | |||||
| * | | | Add keepUnicode value in the cache key of normalizedPathCache | Vincent Petry | 2016-06-01 | 2 | -1/+28 |
| | |/ | |/| | |||||
* | | | Merge pull request #24936 from owncloud/2fa-block-ocs | Vincent Petry | 2016-06-02 | 1 | -0/+4 |
|\ \ \ | | | | | | | | | block OCS if 2FA challenge needs to be solved first | ||||
| * | | | block OCS if 2FA challenge needs to be solved first | Christoph Wurst | 2016-06-01 | 1 | -0/+4 |
| |/ / | |||||
* | | | Merge pull request #24946 from ↵ | Vincent Petry | 2016-06-02 | 1 | -0/+5 |
|\ \ \ | | | | | | | | | | | | | | | | | owncloud/issue-24943-duplicate-downgrade-unsupported-message Do not show the hint when it's the same as the message | ||||
| * | | | Do not show the hint when it's the same as the message | Joas Schilling | 2016-06-01 | 1 | -0/+5 |
| |/ / | |||||
* | | | Merge pull request #24947 from owncloud/2fa-remember-redirect-url | Vincent Petry | 2016-06-02 | 7 | -18/+62 |
|\ \ \ | | | | | | | | | remember redirect_url when solving the 2FA challenge | ||||
| * | | | remember redirect_url when solving the 2FA challenge | Christoph Wurst | 2016-06-01 | 7 | -18/+62 |
| |/ / | |||||
* | | | Merge pull request #24949 from ↵ | Vincent Petry | 2016-06-02 | 1 | -0/+3 |
|\ \ \ | | | | | | | | | | | | | | | | | owncloud/ee-1325-internal-server-error-in-sync-client-on-forbidden-directurl Catch the ForbiddenException to make sure it gets handled | ||||
| * | | | Catch the ForbiddenException to make sure it gets handled | Joas Schilling | 2016-06-01 | 1 | -0/+3 |
| |/ / | |||||
* | | | Merge pull request #24953 from owncloud/fix-client-download-url | Vincent Petry | 2016-06-02 | 2 | -2/+2 |
|\ \ \ | | | | | | | | | Fix URL for client downloads | ||||
| * | | | Fix URL for client downloads | Joas Schilling | 2016-06-01 | 2 | -2/+2 |
| |/ / | |||||
* / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-02 | 50 | -104/+254 |
|/ / | |||||
* | | Merge pull request #24912 from owncloud/session-tokens-apache-auth | Vincent Petry | 2016-06-01 | 11 | -13/+116 |
|\ \ | |/ |/| | Create session tokens for apache auth users | ||||
| * | Create session tokens for apache auth users | Christoph Wurst | 2016-05-31 | 11 | -13/+116 |
| | | |||||
* | | Merge pull request #24869 from owncloud/ldap_capped_cache | Vincent Petry | 2016-06-01 | 1 | -2/+6 |
|\ \ | | | | | | | Use a capped memory cache for the user/group cache | ||||
| * | | Use a capped memory cache for the user/group cache | Roeland Jago Douma | 2016-05-30 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For #24403 When upgrading huge installations this can lead to memory problems as the cache will only grow and grow. Capping this memory will make sure we don't run out while during normal operation still basically cache everything. | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-01 | 42 | -38/+100 |
| | | | |||||
* | | | Update personal.php (#24923) | MTRichards | 2016-05-31 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #24851 from owncloud/ldap-static-method-log | Vincent Petry | 2016-05-31 | 1 | -3/+2 |
|\ \ \ | | | | | | | | | Hack to prevent infinite loop with LDAP + logging | ||||
| * | | | Hack to prevent infinite loop with LDAP + logging | Vincent Petry | 2016-05-31 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | | Forward port of a50619200c6a08929dbe802118a6afadb376b866 to 9.1/master | ||||
* | | | | Merge pull request #24907 from owncloud/properly-check-for-mbstring | Vincent Petry | 2016-05-31 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | Properly check for mbstring extension | ||||
| * | | | Properly check for mbstring extension | Lukas Reschke | 2016-05-31 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | mb_detect_encoding is in the fallback we ship in the polyfill library, mb_strcut is not. Thus this lead to a false positive and ownCloud would just break. | ||||
* | | | | Merge pull request #24904 from owncloud/ext-fix-smb | Vincent Petry | 2016-05-31 | 1 | -4/+2 |
|\ \ \ \ | |_|_|/ |/| | | | Fix SMB backend registration | ||||
| * | | | Fix SMB backend registration | Robin McCorkell | 2016-05-30 | 1 | -4/+2 |
| | | | | |||||
* | | | | Merge pull request #24822 from owncloud/fix-download-spinner | Vincent Petry | 2016-05-31 | 2 | -4/+4 |
|\ \ \ \ | | | | | | | | | | | fixes size of the download spinner | ||||
| * | | | | fixes size of the download spinner | Vincent Chan | 2016-05-30 | 2 | -4/+4 |
| | | | | | |||||
* | | | | | Merge pull request #24769 from ↵ | Vincent Petry | 2016-05-31 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/issue-24752-no-ui-message-when-integrity-disabled Only show message in the UI when the checker is enabled | ||||
| * | | | | | Only show message in the UI when the checker is enabled | Joas Schilling | 2016-05-23 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #22875 from owncloud/bz2-support | Vincent Petry | 2016-05-31 | 3 | -1/+5 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add bzip2 to known mimetypes | ||||
| * | | | | | | Add bzip2 to known mimetypes | Victor Dubiniuk | 2016-05-30 | 3 | -1/+5 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #24889 from ↵ | Vincent Petry | 2016-05-31 | 2 | -0/+22 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/add-warning-wrong-transaction-isolation-level Add a warning when the transaction isolation level is not READ_COMMITED | ||||
| * | | | | | | | Add a warning when the transaction isolation level is not READ_COMMITED | Joas Schilling | 2016-05-30 | 2 | -0/+22 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #24795 from ↵ | Vincent Petry | 2016-05-31 | 2 | -2/+3 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/issue-24789-reset-password-link-new-window Allow opening the password reset link in a new window when its a URL | ||||
| * | | | | | | | Allow opening the password reset link in a new window when its a URL | Joas Schilling | 2016-05-24 | 2 | -2/+3 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #24628 from owncloud/decryptall-checkifneedsprocessing | Vincent Petry | 2016-05-31 | 2 | -6/+13 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | [decrypt_all] Check if file needs to decrypted or not for speed up large oc setups. | ||||
| * | | | | | | | | fix unit tests | Björn Schießle | 2016-05-30 | 1 | -3/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | Use isEncrpyted() instead | Vincent Petry | 2016-05-30 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Respect oc coding style guide. | Christian Jürges | 2016-05-30 | 1 | -1/+1 |
| | | | | | | | | |