aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* .htaccess update making two rules non-capturingMartin2016-06-031-2/+2
|
* Merge pull request #24954 from ↵Vincent Petry2016-06-031-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 wantJoas Schilling2016-06-011-2/+3
| |
* | Merge pull request #24673 from owncloud/construct-pathVincent Petry2016-06-031-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 Dubiniuk2016-06-021-4/+6
| | | | | | | | | | | | Fixes #22450
* | | Merge pull request #24564 from owncloud/fix_21173_take_2Vincent Petry2016-06-031-0/+1
|\ \ \ | | | | | | | | normalize path in getInternalPath
| * | | normalize path in getInternalPathGeorg Ehrke2016-06-021-0/+1
| |/ /
* / / [tx-robot] updated from transifexJenkins for ownCloud2016-06-0398-992/+978
|/ /
* | Merge pull request #24935 from owncloud/2fa-block-davVincent Petry2016-06-026-6/+80
|\ \ | | | | | | block DAV if 2FA challenge needs to be solved first
| * | block DAV if 2FA challenge needs to be solved firstChristoph Wurst2016-06-016-6/+80
| | |
* | | Merge pull request #24940 from owncloud/fix-normalizedcachekey-keepunicodeVincent Petry2016-06-023-2/+34
|\ \ \ | | | | | | | | Add keepUnicode value in the cache key of normalizedPathCache
| * | | Fix TestCase::invokePrivate to work with static classesVincent Petry2016-06-011-1/+6
| | | |
| * | | Add keepUnicode value in the cache key of normalizedPathCacheVincent Petry2016-06-012-1/+28
| | |/ | |/|
* | | Merge pull request #24936 from owncloud/2fa-block-ocsVincent Petry2016-06-021-0/+4
|\ \ \ | | | | | | | | block OCS if 2FA challenge needs to be solved first
| * | | block OCS if 2FA challenge needs to be solved firstChristoph Wurst2016-06-011-0/+4
| |/ /
* | | Merge pull request #24946 from ↵Vincent Petry2016-06-021-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 messageJoas Schilling2016-06-011-0/+5
| |/ /
* | | Merge pull request #24947 from owncloud/2fa-remember-redirect-urlVincent Petry2016-06-027-18/+62
|\ \ \ | | | | | | | | remember redirect_url when solving the 2FA challenge
| * | | remember redirect_url when solving the 2FA challengeChristoph Wurst2016-06-017-18/+62
| |/ /
* | | Merge pull request #24949 from ↵Vincent Petry2016-06-021-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 handledJoas Schilling2016-06-011-0/+3
| |/ /
* | | Merge pull request #24953 from owncloud/fix-client-download-urlVincent Petry2016-06-022-2/+2
|\ \ \ | | | | | | | | Fix URL for client downloads
| * | | Fix URL for client downloadsJoas Schilling2016-06-012-2/+2
| |/ /
* / / [tx-robot] updated from transifexJenkins for ownCloud2016-06-0250-104/+254
|/ /
* | Merge pull request #24912 from owncloud/session-tokens-apache-authVincent Petry2016-06-0111-13/+116
|\ \ | |/ |/| Create session tokens for apache auth users
| * Create session tokens for apache auth usersChristoph Wurst2016-05-3111-13/+116
| |
* | Merge pull request #24869 from owncloud/ldap_capped_cacheVincent Petry2016-06-011-2/+6
|\ \ | | | | | | Use a capped memory cache for the user/group cache
| * | Use a capped memory cache for the user/group cacheRoeland Jago Douma2016-05-301-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 transifexJenkins for ownCloud2016-06-0142-38/+100
| | |
* | | Update personal.php (#24923)MTRichards2016-05-311-1/+1
| | |
* | | Merge pull request #24851 from owncloud/ldap-static-method-logVincent Petry2016-05-311-3/+2
|\ \ \ | | | | | | | | Hack to prevent infinite loop with LDAP + logging
| * | | Hack to prevent infinite loop with LDAP + loggingVincent Petry2016-05-311-3/+2
| | | | | | | | | | | | | | | | Forward port of a50619200c6a08929dbe802118a6afadb376b866 to 9.1/master
* | | | Merge pull request #24907 from owncloud/properly-check-for-mbstringVincent Petry2016-05-311-1/+1
|\ \ \ \ | |/ / / |/| | | Properly check for mbstring extension
| * | | Properly check for mbstring extensionLukas Reschke2016-05-311-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-smbVincent Petry2016-05-311-4/+2
|\ \ \ \ | |_|_|/ |/| | | Fix SMB backend registration
| * | | Fix SMB backend registrationRobin McCorkell2016-05-301-4/+2
| | | |
* | | | Merge pull request #24822 from owncloud/fix-download-spinnerVincent Petry2016-05-312-4/+4
|\ \ \ \ | | | | | | | | | | fixes size of the download spinner
| * | | | fixes size of the download spinnerVincent Chan2016-05-302-4/+4
| | | | |
* | | | | Merge pull request #24769 from ↵Vincent Petry2016-05-311-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 enabledJoas Schilling2016-05-231-1/+1
| | | | | |
* | | | | | Merge pull request #22875 from owncloud/bz2-supportVincent Petry2016-05-313-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add bzip2 to known mimetypes
| * | | | | | Add bzip2 to known mimetypesVictor Dubiniuk2016-05-303-1/+5
| | | | | | |
* | | | | | | Merge pull request #24889 from ↵Vincent Petry2016-05-312-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_COMMITEDJoas Schilling2016-05-302-0/+22
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #24795 from ↵Vincent Petry2016-05-312-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 URLJoas Schilling2016-05-242-2/+3
| | | | | | | |
* | | | | | | | Merge pull request #24628 from owncloud/decryptall-checkifneedsprocessingVincent Petry2016-05-312-6/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [decrypt_all] Check if file needs to decrypted or not for speed up large oc setups.
| * | | | | | | | fix unit testsBjörn Schießle2016-05-301-3/+4
| | | | | | | | |
| * | | | | | | | Use isEncrpyted() insteadVincent Petry2016-05-301-1/+1
| | | | | | | | |
| * | | | | | | | Respect oc coding style guide.Christian Jürges2016-05-301-1/+1
| | | | | | | | |