summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [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
| * | | | | | Merge branch 'master' into close-session-faster-masterThomas Müller2014-03-171502-48396/+80967
| |\ \ \ \ \ \
| * | | | | | | introduce reopen() method to be used for unit test execution only - right aft...Thomas Müller2014-03-172-5/+13
| * | | | | | | in case of phpunit executions calling header() and exit() is too badThomas Müller2014-03-141-3/+8
| * | | | | | | move session reset to endTest() - necessary because we need a valid session i...Thomas Müller2014-03-141-4/+2
| * | | | | | | adding StartSessionListener which initializes the session before each test ca...Thomas Müller2014-03-133-0/+49
| * | | | | | | PHPDoc updatedThomas Müller2014-03-102-2/+13
| * | | | | | | Merge branch 'master' into close-session-faster-masterThomas Müller2014-03-1012-170/+132
| |\ \ \ \ \ \ \
| * | | | | | | | fix close() implementation in \OC\Session\InternalThomas Müller2014-03-101-2/+9
| * | | | | | | | close the session for all DAV calls right after authentication - no need to w...Thomas Müller2014-03-101-1/+15
| * | | | | | | | close the session on all file operationsThomas Müller2014-03-1014-10/+16
| * | | | | | | | adding an explicit close method to class session - write operations (set and ...Thomas Müller2014-03-104-1/+20
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-20309-3359/+1973
* | | | | | | | | Merge pull request #7804 from jbtbnl/masterMorris Jobke2014-03-191-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Fix #7758jbtbnl2014-03-191-1/+1
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #7806 from owncloud/add-matroska-videoLukas Reschke2014-03-191-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Add mimetype for MKV videosLukas Reschke2014-03-191-0/+1
|/ / / / / / /
* | | | | | | Merge pull request #7557 from owncloud/issue/7297Vincent Petry2014-03-192-1/+21
|\ \ \ \ \ \ \
| * | | | | | | Use tipsy to display error when selecting a date in the pastJoas Schilling2014-03-191-2/+10
| * | | | | | | Do not allow setting an expiration date in the pastJoas Schilling2014-03-052-1/+13
* | | | | | | | Merge pull request #7800 from owncloud/filesort-performanceicewind19912014-03-193-11/+17
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Improve sorting performance of large lists of filesRobin Appelman2014-03-193-11/+17
|/ / / / / / /
* | | | | | | Merge pull request #7777 from owncloud/fix/7776Thomas Müller2014-03-191-0/+0
|\ \ \ \ \ \ \
| * | | | | | | updating 3rdparty submoduleThomas Müller2014-03-171-0/+0
| | |_|_|/ / / | |/| | | | |