aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix public upload to not close session when encryption is onVincent Petry2014-03-241-1/+4
* Merge pull request #7768 from owncloud/trashempty-nocacheicewind19912014-03-241-17/+26
|\
| * catch the case where files_trashbin/files doesn't existRobin Appelman2014-03-241-1/+4
| * More robust way to check if the folder is emptyRobin Appelman2014-03-171-3/+6
| * Use a more efficient way to determine that the trashbin is empty that doesn't...Robin Appelman2014-03-171-20/+23
* | Merge pull request #7714 from owncloud/phpunit-configicewind19912014-03-242-3/+10
|\ \
| * | Allow setting the config dir to use as enviroment variable for phpunitRobin Appelman2014-03-132-3/+10
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-2489-1937/+1988
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-2328-52/+68
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-22116-271/+1440
* | | Merge pull request #7844 from owncloud/fix_7803_blizzzblizzz2014-03-213-2/+58
|\ \ \
| * | | add test for cloning and keeping configuration seperateArthur Schiwon2014-03-211-0/+54
| * | | Use array_key_exists instead of isset, because the latter returns false if th...Arthur Schiwon2014-03-211-2/+2
| * | | On clone create a new instance of the ConfigurationArthur Schiwon2014-03-211-0/+2
* | | | Merge pull request #7820 from owncloud/core-macwarningMorris Jobke2014-03-212-1/+31
|\ \ \ \ | |/ / / |/| | |
| * | | Added warning for Mac OS on setup pageVincent Petry2014-03-202-1/+31
* | | | Merge pull request #7655 from owncloud/shared-unencryptedsizeVincent Petry2014-03-211-1/+1
|\ \ \ \
| * | | | Fixed warning when browsing Shared folderVincent Petry2014-03-101-1/+1
* | | | | Merge pull request #7611 from owncloud/fix-updaterVincent Petry2014-03-211-1/+1
|\ \ \ \ \
| * | | | | Use $installedVersion instead of $currentVersionLukas Reschke2014-03-171-1/+1
* | | | | | Merge pull request #7823 from owncloud/fix_7796blizzz2014-03-211-2/+2
|\ \ \ \ \ \
| * | | | | | Fix duplicate ipauniqueidRobin McCorkell2014-03-201-1/+1
| * | | | | | Add FreeIPA UUID compatibility, fixes #7796Robin McCorkell2014-03-191-2/+2
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-2136-99/+111
* | | | | | | Merge pull request #7794 from owncloud/extstorage-obfuscatepasswordsLukas Reschke2014-03-206-86/+495
|\ \ \ \ \ \ \
| * | | | | | | Removed commentVincent Petry2014-03-201-2/+0
| * | | | | | | Lazy load phpseclib in ext storage configVincent Petry2014-03-201-1/+3
| * | | | | | | Fix typo in mount loadingRobin Appelman2014-03-201-1/+1
| * | | | | | | Fixed ext storage password field order issueVincent Petry2014-03-192-3/+10
| * | | | | | | Fixed ext storage unit test for groupsVincent Petry2014-03-191-30/+46
| * | | | | | | Added tests to check mount point list for a target userVincent Petry2014-03-192-7/+132
| * | | | | | | Moved external storage mounting code to files_external appVincent Petry2014-03-193-74/+86
| * | | | | | | Added IV for ext storage password encryptionVincent Petry2014-03-192-10/+42
| * | | | | | | Added password obfuscation for external storage configVincent Petry2014-03-193-3/+148
| * | | | | | | Added ext storage unit tests for writing then reload the mount configVincent Petry2014-03-191-1/+73
* | | | | | | | Merge pull request #7808 from owncloud/quota-usequotaevenwhenfreespaceunknownVincent Petry2014-03-202-1/+26
|\ \ \ \ \ \ \ \
| * | | | | | | | Still return quota value when free space is unknownVincent Petry2014-03-192-1/+26
* | | | | | | | | remove executable flag for file-upload.jsMorris Jobke2014-03-201-0/+0
* | | | | | | | | Merge pull request #7814 from oskholl/masterMorris Jobke2014-03-201-0/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Comment moved to prevent 'Line is too long' warning.Oskar Hollmann2014-03-191-1/+2
| * | | | | | | | Fix: 'Upload button tooltip doesn't disappear'Oskar Hollmann2014-03-191-0/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #7732 from owncloud/datafolderexistenceVincent Petry2014-03-208-5/+152
|\ \ \ \ \ \ \ \
| * | | | | | | | Increase version to trigger upgrade related to .ocdataVincent Petry2014-03-171-1/+1
| * | | | | | | | Return 503 when a config/data dir error existsVincent Petry2014-03-142-0/+5
| * | | | | | | | Added .ocdata file to check for data folder validityVincent Petry2014-03-145-4/+146
* | | | | | | | | Merge pull request #7818 from owncloud/logException_undefined_variableMorris Jobke2014-03-201-5/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix 'Undefined variable: message' in OCP\Util::logExceptionThomas Tanghus2014-03-201-5/+2
* | | | | | | | | | Merge pull request #7651 from owncloud/close-session-faster-masterThomas Müller2014-03-2022-15/+135
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge branch 'master' into close-session-faster-masterThomas Müller2014-03-1965-1016/+701
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | redefine reopen() in class \OC\Session\Internal to avoid accidental calls in ...Thomas Müller2014-03-181-0/+3