Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-25 | 22 | -67/+92 |
* | Merge pull request #7768 from owncloud/trashempty-nocache | icewind1991 | 2014-03-24 | 1 | -17/+26 |
|\ | |||||
| * | catch the case where files_trashbin/files doesn't exist | Robin Appelman | 2014-03-24 | 1 | -1/+4 |
| * | More robust way to check if the folder is empty | Robin Appelman | 2014-03-17 | 1 | -3/+6 |
| * | Use a more efficient way to determine that the trashbin is empty that doesn't... | Robin Appelman | 2014-03-17 | 1 | -20/+23 |
* | | Merge pull request #7714 from owncloud/phpunit-config | icewind1991 | 2014-03-24 | 2 | -3/+10 |
|\ \ | |||||
| * | | Allow setting the config dir to use as enviroment variable for phpunit | Robin Appelman | 2014-03-13 | 2 | -3/+10 |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-24 | 89 | -1937/+1988 |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-23 | 28 | -52/+68 |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-22 | 116 | -271/+1440 |
* | | | Merge pull request #7844 from owncloud/fix_7803_blizzz | blizzz | 2014-03-21 | 3 | -2/+58 |
|\ \ \ | |||||
| * | | | add test for cloning and keeping configuration seperate | Arthur Schiwon | 2014-03-21 | 1 | -0/+54 |
| * | | | Use array_key_exists instead of isset, because the latter returns false if th... | Arthur Schiwon | 2014-03-21 | 1 | -2/+2 |
| * | | | On clone create a new instance of the Configuration | Arthur Schiwon | 2014-03-21 | 1 | -0/+2 |
* | | | | Merge pull request #7820 from owncloud/core-macwarning | Morris Jobke | 2014-03-21 | 2 | -1/+31 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Added warning for Mac OS on setup page | Vincent Petry | 2014-03-20 | 2 | -1/+31 |
* | | | | Merge pull request #7655 from owncloud/shared-unencryptedsize | Vincent Petry | 2014-03-21 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Fixed warning when browsing Shared folder | Vincent Petry | 2014-03-10 | 1 | -1/+1 |
* | | | | | Merge pull request #7611 from owncloud/fix-updater | Vincent Petry | 2014-03-21 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Use $installedVersion instead of $currentVersion | Lukas Reschke | 2014-03-17 | 1 | -1/+1 |
* | | | | | | Merge pull request #7823 from owncloud/fix_7796 | blizzz | 2014-03-21 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix duplicate ipauniqueid | Robin McCorkell | 2014-03-20 | 1 | -1/+1 |
| * | | | | | | Add FreeIPA UUID compatibility, fixes #7796 | Robin McCorkell | 2014-03-19 | 1 | -2/+2 |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-21 | 36 | -99/+111 |
* | | | | | | | Merge pull request #7794 from owncloud/extstorage-obfuscatepasswords | Lukas Reschke | 2014-03-20 | 6 | -86/+495 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Removed comment | Vincent Petry | 2014-03-20 | 1 | -2/+0 |
| * | | | | | | | Lazy load phpseclib in ext storage config | Vincent Petry | 2014-03-20 | 1 | -1/+3 |
| * | | | | | | | Fix typo in mount loading | Robin Appelman | 2014-03-20 | 1 | -1/+1 |
| * | | | | | | | Fixed ext storage password field order issue | Vincent Petry | 2014-03-19 | 2 | -3/+10 |
| * | | | | | | | Fixed ext storage unit test for groups | Vincent Petry | 2014-03-19 | 1 | -30/+46 |
| * | | | | | | | Added tests to check mount point list for a target user | Vincent Petry | 2014-03-19 | 2 | -7/+132 |
| * | | | | | | | Moved external storage mounting code to files_external app | Vincent Petry | 2014-03-19 | 3 | -74/+86 |
| * | | | | | | | Added IV for ext storage password encryption | Vincent Petry | 2014-03-19 | 2 | -10/+42 |
| * | | | | | | | Added password obfuscation for external storage config | Vincent Petry | 2014-03-19 | 3 | -3/+148 |
| * | | | | | | | Added ext storage unit tests for writing then reload the mount config | Vincent Petry | 2014-03-19 | 1 | -1/+73 |
* | | | | | | | | Merge pull request #7808 from owncloud/quota-usequotaevenwhenfreespaceunknown | Vincent Petry | 2014-03-20 | 2 | -1/+26 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Still return quota value when free space is unknown | Vincent Petry | 2014-03-19 | 2 | -1/+26 |
* | | | | | | | | | remove executable flag for file-upload.js | Morris Jobke | 2014-03-20 | 1 | -0/+0 |
* | | | | | | | | | Merge pull request #7814 from oskholl/master | Morris Jobke | 2014-03-20 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | |||||
| * | | | | | | | | Comment moved to prevent 'Line is too long' warning. | Oskar Hollmann | 2014-03-19 | 1 | -1/+2 |
| * | | | | | | | | Fix: 'Upload button tooltip doesn't disappear' | Oskar Hollmann | 2014-03-19 | 1 | -0/+1 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #7732 from owncloud/datafolderexistence | Vincent Petry | 2014-03-20 | 8 | -5/+152 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Increase version to trigger upgrade related to .ocdata | Vincent Petry | 2014-03-17 | 1 | -1/+1 |
| * | | | | | | | | Return 503 when a config/data dir error exists | Vincent Petry | 2014-03-14 | 2 | -0/+5 |
| * | | | | | | | | Added .ocdata file to check for data folder validity | Vincent Petry | 2014-03-14 | 5 | -4/+146 |
* | | | | | | | | | Merge pull request #7818 from owncloud/logException_undefined_variable | Morris Jobke | 2014-03-20 | 1 | -5/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix 'Undefined variable: message' in OCP\Util::logException | Thomas Tanghus | 2014-03-20 | 1 | -5/+2 |
* | | | | | | | | | | Merge pull request #7651 from owncloud/close-session-faster-master | Thomas Müller | 2014-03-20 | 22 | -15/+135 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' into close-session-faster-master | Thomas Müller | 2014-03-19 | 65 | -1016/+701 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | redefine reopen() in class \OC\Session\Internal to avoid accidental calls in ... | Thomas Müller | 2014-03-18 | 1 | -0/+3 |