Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | | | | | | | |||||
| * | | | | | | | | Check if file needs to decrypted or not for speed up large oc setups. | Christian Jürges | 2016-05-30 | 1 | -3/+9 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #16688 from owncloud/tests-dockerapachewebdav | Vincent Petry | 2016-05-31 | 3 | -7/+160 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | Add morrisjobke/webdav docker container for external storage tests | ||||
| * | | | | | | | Fix webdav test env scripts to also work on CI | Vincent Petry | 2016-05-30 | 2 | -7/+24 |
| | | | | | | | | |||||
| * | | | | | | | Check whether remote DAV server accepted the mtime on touch | Vincent Petry | 2016-05-30 | 1 | -1/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ownCloud as remote DAV always accepts the mtime on touch, but other servers like Apache's DAV server doesn't. The latter doesn't give any visible hint in its response to detect this case, so this fix does a subsequent PROPFIND to check whether the mtime was actually set. Since a touch() operation seldom happens (only on uploads), the minor performance loss should hopefully be acceptable. | ||||
| * | | | | | | | Fix webdav destination header when overwriting folders | Vincent Petry | 2016-05-30 | 1 | -6/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The trailing slash is needed when talking to Apache's mod_dav server | ||||
| * | | | | | | | Add morrisjobke/webdav docker container for external storage tests | Vincent Petry | 2016-05-30 | 2 | -0/+110 |
| |/ / / / / / | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-31 | 22 | -14/+134 |
| | | | | | | | |||||
* | | | | | | | Fix for #23066 (#24689) | Torben Dannhauer | 2016-05-31 | 3 | -4/+8 |
| |_|_|_|/ / |/| | | | | | |||||
* | | | | | | Merge pull request #20150 from pellaeon/pr-droppable-hover-visual-cue | Vincent Petry | 2016-05-30 | 4 | -3/+11 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Add visual cue when moving draggable item over droppable item, | ||||
| * | | | | | Fix breadcrumb background right arrow due to incorrect background-image syntax | Pellaeon Lin | 2016-05-21 | 1 | -1/+3 |
| | | | | | | |||||
| * | | | | | Make entire file tr droppable, | Pellaeon Lin | 2016-05-21 | 2 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | so that .canDrop will highlight the entire row when drag hover | ||||
| * | | | | | Add visual cue when moving draggable item over droppable item, | Pellaeon Lin | 2016-05-21 | 3 | -2/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | ie. breadcrumb and filenameTd | ||||
* | | | | | | Allow setting debug as loglevel via occ log_manage (#24834) | Joas Schilling | 2016-05-30 | 1 | -1/+2 |
| |_|/ / / |/| | | | | |||||
* | | | | | [testing] Allow to lock a file without the lock being killed at the end of ↵ | Joas Schilling | 2016-05-30 | 4 | -0/+312 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the request (#22823) * Allow to lock a file without the lock being killed at the end of the request * Make DB locking detectable | ||||
* | | | | | trigger size calculation after scanning (#24875) | Robin Appelman | 2016-05-30 | 1 | -0/+6 |
| |_|_|/ |/| | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-30 | 26 | -76/+40 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-29 | 16 | -8/+56 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-28 | 20 | -54/+116 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-27 | 62 | -30/+298 |
| | | | | |||||
* | | | | Merge pull request #24796 from owncloud/fix-mailmap | Lukas Reschke | 2016-05-26 | 856 | -1041/+1629 |
|\ \ \ \ | | | | | | | | | | | Adjust mail entries | ||||
| * | | | | Update license headers | Lukas Reschke | 2016-05-26 | 855 | -1026/+1609 |
| | | | | | |||||
| * | | | | Add new mailmap file | Lukas Reschke | 2016-05-26 | 1 | -15/+20 |
|/ / / / | |||||
* | | | | One more PSR-4 fix (#24852) | Joas Schilling | 2016-05-26 | 1 | -6/+6 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-26 | 48 | -222/+540 |
| | | | |