summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 #3865 from owncloud/fix_test_for_oracleBart Visscher2013-06-281-1/+25
|\ | | | | | | Fix sharing test for oracle
| * 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
|\ \ | | | | | | manually calculate unix_timestamp for oracle
| * | 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
|\ \ \ | | | | | | | | Use phpunit.xml.dist instead of phpunit.xml ...
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | The order of precedence of configuration files for PHPUnit is: - phpunit.xml (allowing custom user defined configuration) - phpunit.xml.dist (configuration distributed with the software)
* | | | Merge pull request #3576 from owncloud/jquery.multiselect-1.13Thomas Tanghus2013-06-272-54/+101
|\ \ \ \ | |/ / / |/| | | Update to jquery.multiselect 1.13
| * | | 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
| * | | | 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....
| * | | | move javascript variables 'oc_current_user' and 'oc_requesttoken' to js.js - ↵Thomas Mueller2013-06-262-3/+4
|/ / / / | | | | | | | | | | | | fixes #3853
* / / / [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 to render error pages
| * | | 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 audited
| * | | 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 updates
| * | | 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 cache
| * | | | 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
|\ \ \ | | | | | | | | Correct new user display name output
| * | | 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 webdavauth
| * | | | 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 of the encryption app
| * | | | | fix some strings in the admin settings, it's not a 'recovery account' but a ↵Björn Schießle2013-06-211-5/+5
|/ / / / / | | | | | | | | | | | | | | | 'recovery key'
* | | | | encryption is LDAP compatibleBjörn Schießle2013-06-211-1/+1
| | | | |
* | | | | Squashed commit of the following:Björn Schießle2013-06-212-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 1345201c9da99a82f198e41fba24da6b0d7ae59a Author: Björn Schießle <schiessle@owncloud.com> Date: Thu Jun 20 16:27:46 2013 +0200 add l10n support commit bf2c79c8de8710e839a4a55642a91874c374fa1c Author: Björn Schießle <schiessle@owncloud.com> Date: Thu Jun 20 16:19:10 2013 +0200 only init session if openssl extension is loaded commit cbd52af6afbaa310bb1a534db64ff5e476dfd5d7 Author: Björn Schießle <schiessle@owncloud.com> Date: Thu Jun 20 12:25:40 2013 +0200 first disable app and than show error page commit 55baf593179c433642de59552592e6b0f1932880 Author: Björn Schießle <schiessle@owncloud.com> Date: Thu Jun 20 12:17:34 2013 +0200 typo fixed commit 1d9bef0b058e7cc3d511b81ae12d5a07660c75b2 Author: Björn Schießle <schiessle@owncloud.com> Date: Thu Jun 20 12:15:40 2013 +0200 move dependency check to the encryption app commit c186e95da526f0470e20f014f1bd9513db5518ff Author: Björn Schießle <schiessle@owncloud.com> Date: Thu Jun 20 11:13:11 2013 +0200 make sure that openssl is installed and loaded
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-21295-605/+753
| | | | |
* | | | | Merge pull request #3796 from ↵Thomas Müller2013-06-201-4/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | owncloud/gracefully_handle_teardown_in_scanner_test skip teardown if cache has not been set up
| * | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | remove deleted files when re-scanning a folder
| * | | | | | 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
| | | | | | | |