Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [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 |
|/ / | |||||
* | | log as index, not remote | Jörn Friedrich Dreyer | 2013-06-25 | 1 | -2/+2 |
* | | Merge pull request #3750 from owncloud/dummy_session_for_errors | Thomas Müller | 2013-06-25 | 1 | -3/+3 |
|\ \ | |||||
| * | | Init dummy session first | Victor Dubiniuk | 2013-06-17 | 1 | -3/+3 |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-25 | 544 | -1141/+1237 |
* | | | Merge pull request #3826 from owncloud/fix_webdav_locking_for_oracle | Thomas Müller | 2013-06-24 | 2 | -2/+6 |
|\ \ \ | |||||
| * | | | use to_char when comparing clob to string on oracle, use execute audited | Jörn Friedrich Dreyer | 2013-06-24 | 2 | -2/+6 |
|/ / / | |||||
* | | | Merge pull request #3818 from owncloud/update-trigger-cli | Thomas Müller | 2013-06-24 | 1 | -0/+22 |
|\ \ \ | |||||
| * | | | Add a CLI script for manually triggering checking a folder for updates | Robin Appelman | 2013-06-23 | 1 | -0/+22 |
* | | | | Merge pull request #3822 from owncloud/graceful_teardown_of_cache | Thomas Müller | 2013-06-24 | 1 | -1/+3 |
|\ \ \ \ | |||||
| * | | | | graceful teardown of cache | Jörn Friedrich Dreyer | 2013-06-24 | 1 | -1/+3 |
|/ / / / | |||||
* / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-24 | 534 | -1110/+1111 |
|/ / / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-23 | 479 | -1465/+1489 |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-22 | 240 | -1018/+1678 |
* | | | Merge pull request #3766 from owncloud/fix_display_name_edit | Thomas Müller | 2013-06-21 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Replace display name only | Victor Dubiniuk | 2013-06-18 | 1 | -1/+1 |
* | | | | Merge pull request #3810 from owncloud/improve_webdavauth | Thomas Müller | 2013-06-21 | 1 | -4/+4 |
|\ \ \ \ | |||||
| * | | | | improve error handling of webdavauth | Georg Ehrke | 2013-06-21 | 1 | -4/+4 |
* | | | | | Merge pull request #3811 from owncloud/string_fixes_encryption_settings | Lukas Reschke | 2013-06-21 | 1 | -5/+5 |
|\ \ \ \ \ | |||||
| * | | | | | fix some strings in the admin settings, it's not a 'recovery account' but a '... | Björn Schießle | 2013-06-21 | 1 | -5/+5 |
|/ / / / / | |||||
* | | | | | encryption is LDAP compatible | Björn Schießle | 2013-06-21 | 1 | -1/+1 |
* | | | | | Squashed commit of the following: | Björn Schießle | 2013-06-21 | 2 | -9/+18 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-21 | 295 | -605/+753 |
* | | | | | Merge pull request #3796 from owncloud/gracefully_handle_teardown_in_scanner_... | Thomas Müller | 2013-06-20 | 1 | -4/+6 |
|\ \ \ \ \ | |||||
| * | | | | | skip teardown if cache has not been set up | Jörn Friedrich Dreyer | 2013-06-20 | 1 | -4/+6 |
* | | | | | | Merge pull request #3792 from owncloud/scanfolder-remove | Thomas Müller | 2013-06-20 | 2 | -0/+35 |
|\ \ \ \ \ \ | |||||
| * | | | | | | adding unit test for folder remove: testRemovedFolder() | Thomas Mueller | 2013-06-20 | 1 | -0/+11 |
| * | | | | | | Merge branch 'rescan-all' into scanfolder-remove | Thomas Mueller | 2013-06-20 | 2 | -15/+45 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | remove deleted files when re-scanning a folder | Robin Appelman | 2013-06-20 | 2 | -0/+24 |
* | | | | | | | | Merge pull request #3779 from shkdee/patch-1 | blizzz | 2013-06-20 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Update user.php | shkdee | 2013-06-18 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #3788 from owncloud/more_error_messages | Björn Schießle | 2013-06-20 | 2 | -26/+28 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | always have a defined return value | Björn Schießle | 2013-06-19 | 1 | -4/+4 |
| * | | | | | | | | some more error messages | Björn Schießle | 2013-06-19 | 1 | -5/+3 |
| * | | | | | | | | add some more error messages, in case something went wrong | Björn Schießle | 2013-06-19 | 2 | -24/+28 |
* | | | | | | | | | Merge pull request #3784 from owncloud/rescan-all | Thomas Müller | 2013-06-20 | 2 | -15/+45 |
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||||
| * | | | | | | | | use json to encode user list | Robin Appelman | 2013-06-19 | 2 | -2/+2 |