summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3886 from owncloud/disable-public-upload-if-encryption-en...Thomas Müller2013-06-281-1/+5
|\
| * for now we disable public upload in case encryption is enabledThomas Mueller2013-06-281-1/+5
* | Merge pull request #3881 from owncloud/archive_tar_php5.5Morris Jobke2013-06-281-0/+6
|\ \
| * | Skip Test_Archive_TAR in php 5.5 for nowBart Visscher2013-06-281-0/+6
* | | Merge pull request #3884 from owncloud/fixing-unittests-masterMorris Jobke2013-06-283-0/+23
|\ \ \
| * | | make phpunit happy - adding assertsThomas Mueller2013-06-281-0/+18
| * | | make PHPUnit happy and add assertsThomas Mueller2013-06-281-0/+2
| * | | TimedJob: make PhpUnit happy with assertsThomas Mueller2013-06-281-0/+3
* | | | Merge pull request #3892 from owncloud/static-streamwrappericewind19912013-06-283-57/+78
|\ \ \ \
| * | | | better unit tests for static stream wrapperRobin Appelman2013-06-282-12/+68
| * | | | fix is_file and is_dir for the static streamwrapperRobin Appelman2013-06-281-45/+6
| * | | | add option to clear the files in the static streamwrapperRobin Appelman2013-06-281-0/+4
* | | | | Merge pull request #1044 from owncloud/fix_extra_slashBart Visscher2013-06-281-1/+5
|\ \ \ \ \
| * | | | | update to !==Bart Visscher2013-06-281-1/+1
| * | | | | only encodeURIComponent onceJörn Friedrich Dreyer2013-02-091-2/+2
| * | | | | Check if extra / is necessary for the folder URLMichael Gapczynski2013-02-091-1/+5
* | | | | | Merge pull request #3832 from owncloud/oracle_sql_fixesJörn Friedrich Dreyer2013-06-281-1/+7
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Oracle doesn't know & as bitwise ANDBart Visscher2013-06-281-6/+8
| * | | | | for oracle use BITAND() instead of & in sharing permissions sqlJörn Friedrich Dreyer2013-06-241-3/+7
* | | | | | Merge pull request #3838 from rgeber/masterJörn Friedrich Dreyer2013-06-2812-170/+586
|\ \ \ \ \ \
| * | | | | | Added file-upload to GIT repoRoman Geber2013-06-262-8/+351
| * | | | | | Public upload featureRoman Geber2013-06-2511-169/+242
* | | | | | | Merge pull request #3799 from owncloud/fix_pdo_statement_wrapper_numrows_on_m...Bart Visscher2013-06-287-43/+76
|\ \ \ \ \ \ \
| * | | | | | | one if lessJörn Friedrich Dreyer2013-06-271-5/+2
| * | | | | | | use assertEquals number of rows in db testsJörn Friedrich Dreyer2013-06-241-4/+4
| * | | | | | | fix numRows usage in files_encryptionJörn Friedrich Dreyer2013-06-241-15/+3
| * | | | | | | fix numRows usage in core libJörn Friedrich Dreyer2013-06-242-2/+2
| * | | | | | | fix numRows usage in user_ldapJörn Friedrich Dreyer2013-06-242-7/+5
| * | | | | | | make PDOStatementWrapper return number of updated rows on INSERT, UPDATE or D...Jörn Friedrich Dreyer2013-06-241-15/+65
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #3843 from owncloud/sabre-exceptionsThomas Müller2013-06-282-3/+27
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Sabre: throw exceptions when delete/create/write operations are not permittedRobin Appelman2013-06-252-3/+27
* | | | | | | Merge pull request #3865 from owncloud/fix_test_for_oracleBart Visscher2013-06-281-1/+25
|\ \ \ \ \ \ \
| * | | | | | | fix type of numeric columnsJörn Friedrich Dreyer2013-06-261-0/+24
| * | | | | | | check item id is setJörn Friedrich Dreyer2013-06-261-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #3839 from owncloud/unix_timestamp_replacement_for_oracleBart Visscher2013-06-281-0/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | manuall calculate unix_timestamp for oracleJörn Friedrich Dreyer2013-06-251-0/+1
| | |_|/ / / | |/| | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-28526-1049/+1060
* | | | | | Merge pull request #3872 from bantu/phpunit-xml-distJörn Friedrich Dreyer2013-06-272-1/+4
|\ \ \ \ \ \
| * | | | | | gitignore: Fix typo + adjust comment format.Andreas Fischer2013-06-271-1/+1
| * | | | | | PHPUnit: Add tests/phpunit.xml to gitignore.Andreas Fischer2013-06-271-0/+3
| * | | | | | PHPUnit: Allow developers to use their own custom phpunit.xml file.Andreas Fischer2013-06-271-0/+0
* | | | | | | Merge pull request #3576 from owncloud/jquery.multiselect-1.13Thomas Tanghus2013-06-272-54/+101
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Forgot the css.Thomas Tanghus2013-06-041-1/+1
| * | | | | | Update to jquery.multiselect 1.13Thomas Tanghus2013-06-021-53/+100
* | | | | | | Merge pull request #3847 from bantu/phpunit-json-listener-removalThomas Müller2013-06-271-3/+0
|\ \ \ \ \ \ \
| * | | | | | | phpunit: Remove PHPUnit_Util_Log_JSON which spammed to stdout on console.Andreas Fischer2013-06-251-3/+0
| | |_|_|/ / / | |/| | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-27543-3481/+3525
| |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #3855 from owncloud/fixing-3853-masterVicDeo2013-06-262-3/+4
|\ \ \ \ \ \
| * | | | | | move javascript variables 'oc_current_user' and 'oc_requesttoken' to js.js - ...Thomas Mueller2013-06-262-3/+4
|/ / / / / /
* / / / / / [tx-robot] updated from transifexJenkins for ownCloud2013-06-26545-1201/+1273
|/ / / / /