summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [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
|\ \ \ \
| * | | | improve error handling of webdavauthGeorg Ehrke2013-06-211-4/+4
* | | | | Merge pull request #3811 from owncloud/string_fixes_encryption_settingsLukas Reschke2013-06-211-5/+5
|\ \ \ \ \
| * | | | | fix some strings in the admin settings, it's not a 'recovery account' but a '...Björn Schießle2013-06-211-5/+5
|/ / / / /
* | | | | encryption is LDAP compatibleBjörn Schießle2013-06-211-1/+1
* | | | | Squashed commit of the following:Björn Schießle2013-06-212-9/+18
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-21295-605/+753
* | | | | Merge pull request #3796 from owncloud/gracefully_handle_teardown_in_scanner_...Thomas Müller2013-06-201-4/+6
|\ \ \ \ \
| * | | | | skip teardown if cache has not been set upJörn Friedrich Dreyer2013-06-201-4/+6
* | | | | | Merge pull request #3792 from owncloud/scanfolder-removeThomas Müller2013-06-202-0/+35
|\ \ \ \ \ \
| * | | | | | adding unit test for folder remove: testRemovedFolder()Thomas Mueller2013-06-201-0/+11
| * | | | | | Merge branch 'rescan-all' into scanfolder-removeThomas Mueller2013-06-202-15/+45
| |\ \ \ \ \ \
| * | | | | | | remove deleted files when re-scanning a folderRobin Appelman2013-06-202-0/+24
* | | | | | | | Merge pull request #3779 from shkdee/patch-1blizzz2013-06-201-1/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Update user.phpshkdee2013-06-181-1/+1
* | | | | | | | Merge pull request #3788 from owncloud/more_error_messagesBjörn Schießle2013-06-202-26/+28
|\ \ \ \ \ \ \ \
| * | | | | | | | always have a defined return valueBjörn Schießle2013-06-191-4/+4
| * | | | | | | | some more error messagesBjörn Schießle2013-06-191-5/+3
| * | | | | | | | add some more error messages, in case something went wrongBjörn Schießle2013-06-192-24/+28
* | | | | | | | | Merge pull request #3784 from owncloud/rescan-allThomas Müller2013-06-202-15/+45
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | use json to encode user listRobin Appelman2013-06-192-2/+2