Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3886 from owncloud/disable-public-upload-if-encryption-en... | Thomas Müller | 2013-06-28 | 1 | -1/+5 |
|\ | |||||
| * | for now we disable public upload in case encryption is enabled | Thomas Mueller | 2013-06-28 | 1 | -1/+5 |
* | | Merge pull request #3881 from owncloud/archive_tar_php5.5 | Morris Jobke | 2013-06-28 | 1 | -0/+6 |
|\ \ | |||||
| * | | Skip Test_Archive_TAR in php 5.5 for now | Bart Visscher | 2013-06-28 | 1 | -0/+6 |
* | | | Merge pull request #3884 from owncloud/fixing-unittests-master | Morris Jobke | 2013-06-28 | 3 | -0/+23 |
|\ \ \ | |||||
| * | | | make phpunit happy - adding asserts | Thomas Mueller | 2013-06-28 | 1 | -0/+18 |
| * | | | make PHPUnit happy and add asserts | Thomas Mueller | 2013-06-28 | 1 | -0/+2 |
| * | | | TimedJob: make PhpUnit happy with asserts | Thomas Mueller | 2013-06-28 | 1 | -0/+3 |
* | | | | Merge pull request #3892 from owncloud/static-streamwrapper | icewind1991 | 2013-06-28 | 3 | -57/+78 |
|\ \ \ \ | |||||
| * | | | | better unit tests for static stream wrapper | Robin Appelman | 2013-06-28 | 2 | -12/+68 |
| * | | | | fix is_file and is_dir for the static streamwrapper | Robin Appelman | 2013-06-28 | 1 | -45/+6 |
| * | | | | add option to clear the files in the static streamwrapper | Robin Appelman | 2013-06-28 | 1 | -0/+4 |
* | | | | | Merge pull request #1044 from owncloud/fix_extra_slash | Bart Visscher | 2013-06-28 | 1 | -1/+5 |
|\ \ \ \ \ | |||||
| * | | | | | update to !== | Bart Visscher | 2013-06-28 | 1 | -1/+1 |
| * | | | | | only encodeURIComponent once | Jörn Friedrich Dreyer | 2013-02-09 | 1 | -2/+2 |
| * | | | | | Check if extra / is necessary for the folder URL | Michael Gapczynski | 2013-02-09 | 1 | -1/+5 |
* | | | | | | Merge pull request #3832 from owncloud/oracle_sql_fixes | Jörn Friedrich Dreyer | 2013-06-28 | 1 | -1/+7 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Oracle doesn't know & as bitwise AND | Bart Visscher | 2013-06-28 | 1 | -6/+8 |
| * | | | | | for oracle use BITAND() instead of & in sharing permissions sql | Jörn Friedrich Dreyer | 2013-06-24 | 1 | -3/+7 |
* | | | | | | Merge pull request #3838 from rgeber/master | Jörn Friedrich Dreyer | 2013-06-28 | 12 | -170/+586 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Added file-upload to GIT repo | Roman Geber | 2013-06-26 | 2 | -8/+351 |
| * | | | | | | Public upload feature | Roman Geber | 2013-06-25 | 11 | -169/+242 |
* | | | | | | | Merge pull request #3799 from owncloud/fix_pdo_statement_wrapper_numrows_on_m... | Bart Visscher | 2013-06-28 | 7 | -43/+76 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | one if less | Jörn Friedrich Dreyer | 2013-06-27 | 1 | -5/+2 |
| * | | | | | | | use assertEquals number of rows in db tests | Jörn Friedrich Dreyer | 2013-06-24 | 1 | -4/+4 |
| * | | | | | | | fix numRows usage in files_encryption | Jörn Friedrich Dreyer | 2013-06-24 | 1 | -15/+3 |
| * | | | | | | | fix numRows usage in core lib | Jörn Friedrich Dreyer | 2013-06-24 | 2 | -2/+2 |
| * | | | | | | | fix numRows usage in user_ldap | Jörn Friedrich Dreyer | 2013-06-24 | 2 | -7/+5 |
| * | | | | | | | make PDOStatementWrapper return number of updated rows on INSERT, UPDATE or D... | Jörn Friedrich Dreyer | 2013-06-24 | 1 | -15/+65 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #3843 from owncloud/sabre-exceptions | Thomas Müller | 2013-06-28 | 2 | -3/+27 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Sabre: throw exceptions when delete/create/write operations are not permitted | Robin Appelman | 2013-06-25 | 2 | -3/+27 |
* | | | | | | | Merge pull request #3865 from owncloud/fix_test_for_oracle | Bart Visscher | 2013-06-28 | 1 | -1/+25 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fix type of numeric columns | Jörn Friedrich Dreyer | 2013-06-26 | 1 | -0/+24 |
| * | | | | | | | check item id is set | Jörn Friedrich Dreyer | 2013-06-26 | 1 | -1/+1 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge pull request #3839 from owncloud/unix_timestamp_replacement_for_oracle | Bart Visscher | 2013-06-28 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | manuall calculate unix_timestamp for oracle | Jörn Friedrich Dreyer | 2013-06-25 | 1 | -0/+1 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-28 | 526 | -1049/+1060 |
* | | | | | | Merge pull request #3872 from bantu/phpunit-xml-dist | Jörn Friedrich Dreyer | 2013-06-27 | 2 | -1/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | gitignore: Fix typo + adjust comment format. | Andreas Fischer | 2013-06-27 | 1 | -1/+1 |
| * | | | | | | PHPUnit: Add tests/phpunit.xml to gitignore. | Andreas Fischer | 2013-06-27 | 1 | -0/+3 |
| * | | | | | | PHPUnit: Allow developers to use their own custom phpunit.xml file. | Andreas Fischer | 2013-06-27 | 1 | -0/+0 |
* | | | | | | | Merge pull request #3576 from owncloud/jquery.multiselect-1.13 | Thomas Tanghus | 2013-06-27 | 2 | -54/+101 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Forgot the css. | Thomas Tanghus | 2013-06-04 | 1 | -1/+1 |
| * | | | | | | Update to jquery.multiselect 1.13 | Thomas Tanghus | 2013-06-02 | 1 | -53/+100 |
* | | | | | | | Merge pull request #3847 from bantu/phpunit-json-listener-removal | Thomas Müller | 2013-06-27 | 1 | -3/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | phpunit: Remove PHPUnit_Util_Log_JSON which spammed to stdout on console. | Andreas Fischer | 2013-06-25 | 1 | -3/+0 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-27 | 543 | -3481/+3525 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | Merge pull request #3855 from owncloud/fixing-3853-master | VicDeo | 2013-06-26 | 2 | -3/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | move javascript variables 'oc_current_user' and 'oc_requesttoken' to js.js - ... | Thomas Mueller | 2013-06-26 | 2 | -3/+4 |
|/ / / / / / | |||||
* / / / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-26 | 545 | -1201/+1273 |
|/ / / / / |