summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | 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
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | log as index, not remoteJörn Friedrich Dreyer2013-06-251-2/+2
* | | | | | | | | | | | | | Merge pull request #3750 from owncloud/dummy_session_for_errorsThomas Müller2013-06-251-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Init dummy session firstVictor Dubiniuk2013-06-171-3/+3
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-25544-1141/+1237
* | | | | | | | | | | | | Merge pull request #3826 from owncloud/fix_webdav_locking_for_oracleThomas Müller2013-06-242-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | use to_char when comparing clob to string on oracle, use execute auditedJörn Friedrich Dreyer2013-06-242-2/+6
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #3818 from owncloud/update-trigger-cliThomas Müller2013-06-241-0/+22
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add a CLI script for manually triggering checking a folder for updatesRobin Appelman2013-06-231-0/+22
* | | | | | | | | | | | | Merge pull request #3822 from owncloud/graceful_teardown_of_cacheThomas Müller2013-06-241-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | graceful teardown of cacheJörn Friedrich Dreyer2013-06-241-1/+3
|/ / / / / / / / / / / / /
* / / / / / / / / / / / / [tx-robot] updated from transifexJenkins for ownCloud2013-06-24534-1110/+1111
|/ / / / / / / / / / / /
* | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-23479-1465/+1489
* | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-22240-1018/+1678
* | | | | | | | | | | | Merge pull request #3766 from owncloud/fix_display_name_editThomas Müller2013-06-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Replace display name onlyVictor Dubiniuk2013-06-181-1/+1
* | | | | | | | | | | | | Merge pull request #3810 from owncloud/improve_webdavauthThomas Müller2013-06-211-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \