summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* don't assign variables in if conditionBjoern Schiessle2014-03-251-18/+17
* add todoBjoern Schiessle2014-03-251-1/+1
* always return an arrayBjoern Schiessle2014-03-252-17/+10
* seperate formatResults()Bjoern Schiessle2014-03-251-18/+31
* don't assign variables in if conditionsBjoern Schiessle2014-03-251-2/+4
* use variableBjoern Schiessle2014-03-251-6/+5
* seperate transformDBResultsBjoern Schiessle2014-03-251-24/+33
* seperate creation of select statementBjoern Schiessle2014-03-251-38/+44
* remove prepFileTarget() seems that it is no longer in useBjoern Schiessle2014-03-252-27/+0
* add a "helper" and a "hooks" class. Move constants needed by multiple classesBjoern Schiessle2014-03-256-355/+377
* added private share apiBjoern Schiessle2014-03-252-1647/+1944
* Merge pull request #7867 from owncloud/upload-dontclosesessionforencryptionThomas Müller2014-03-251-1/+4
|\
| * Fix public upload to not close session when encryption is onVincent Petry2014-03-241-1/+4
* | Merge pull request #7861 from owncloud/idn-domains-support-on-emails-masterThomas Müller2014-03-254-3/+50
|\ \
| * | use \OC_Mail::validateAddress() to validate the email address - fixes #7862Thomas Müller2014-03-243-3/+3
| * | idn have to be converted before being usedThomas Müller2014-03-242-0/+47
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-2522-67/+92
| |/ |/|
* | 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