summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into files_encryptionBjörn Schießle2013-05-2154-214/+388
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2013-05-2124-64/+104
| * Merge pull request #3430 from owncloud/vcategory_renameThomas Müller2013-05-202-0/+42
| |\
| | * Add test for renaming non-existing category.Thomas Tanghus2013-05-201-0/+1
| | * Remove debug outputThomas Tanghus2013-05-201-1/+0
| | * Add rename() method to OC_VCategories.Thomas Tanghus2013-05-202-0/+42
| |/
| * [tx-robot] updated from transifexJenkins for ownCloud2013-05-2039-161/+248
* | fix path to 3rdparty appsBjörn Schießle2013-05-211-1/+2
* | fix path, needs to be relative to data/Björn Schießle2013-05-211-1/+1
* | move 3rdparty dependencies to appBjörn Schießle2013-05-215-3/+647
* | fix broken testsFlorin Peter2013-05-211-9/+0
* | cleanup unused code optimize testsFlorin Peter2013-05-213-15/+17
* | improved testsFlorin Peter2013-05-202-41/+13
* | added test for failed sharingFlorin Peter2013-05-204-1/+70
* | removed dead code for delShareKeyFlorin Peter2013-05-202-37/+15
* | key creation should never override a private or public keyFlorin Peter2013-05-201-1/+11
* | added legacy encryption testFlorin Peter2013-05-202-3/+46
* | Merge branch 'master' into files_encryptionFlorin Peter2013-05-20444-6627/+13411
|\|
| * Merge pull request #3399 from owncloud/fix_js_for_ieBernhard Posselt2013-05-191-3/+3
| |\
| | * cleanup after people who don't test in ieJörn Friedrich Dreyer2013-05-171-3/+3
| * | Merge pull request #3421 from owncloud/pre_login_passwordMichael Gapczynski2013-05-191-2/+2
| |\ \
| | * | Add password to pre_loginLukas Reschke2013-05-191-2/+2
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-1917-31/+45
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-18395-1737/+1878
| | |/ | |/|
| * | Merge pull request #3375 from owncloud/fix_for_SQLite3Result_object_in_post_a...FlorinPeter2013-05-171-4/+6
| |\ \
| | * | only connect share hooks if installation OC is installedFlorin Peter2013-05-171-4/+6
| | * | revert changesFlorin Peter2013-05-171-28/+25
| | * | fix for SQLite3Result::fetchArray(): The SQLite3Result object has not been c...Florin Peter2013-05-151-25/+28
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-1799-5101/+11469
| * | | Merge pull request #3302 from owncloud/ldap_configurable_username_n_uuidblizzz2013-05-169-4/+143
| |\ \ \
| | * \ \ Merge branch 'master' into ldap_configurable_username_n_uuidArthur Schiwon2013-05-13156-1103/+1717
| | |\ \ \
| | * | | | LDAP: fix display of numerical display namesArthur Schiwon2013-05-081-1/+1
| | * | | | LDAP: Implement clear mappings functionalityArthur Schiwon2013-05-084-1/+91
| | * | | | LDAP: implement UUID and internal username overrideArthur Schiwon2013-05-081-1/+19
| | * | | | LDAP: better variable nameArthur Schiwon2013-05-082-7/+11
| | * | | | LDAP: implement r+w for new settingsArthur Schiwon2013-05-081-2/+11
| | * | | | LDAP: add settings for UUID overrideArthur Schiwon2013-05-081-2/+5
| | * | | | LDAP: prepare settings for internal username attribute and clearing user mapp...Arthur Schiwon2013-05-072-0/+13
| | * | | | LDAP: Coypright infoArthur Schiwon2013-05-071-0/+2
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-1645-142/+167
| * | | | | Merge pull request #3371 from owncloud/fix-3353Thomas Müller2013-05-151-2/+2
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' into fix-3353Thomas Mueller2013-05-154-2/+99
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #3374 from owncloud/vobject_compound_propertyThomas Müller2013-05-153-1/+95
| |\ \ \ \ \ \
| | * | | | | | No unit test coverage reports for pgsql - this causes issues on Jenkins.Thomas Mueller2013-05-151-1/+6
| | * | | | | | Add Compound property to avoid double escaping values.Thomas Tanghus2013-05-152-0/+89
| * | | | | | | Merge pull request #3376 from owncloud/fix_for_disappearing_root_mount_pointThomas Müller2013-05-151-1/+4
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | fix for losing mount point "/"Florin Peter2013-05-151-1/+4
| |/ / / / / /
| | | * / / / Fix finding mount in background watcher, fixes #3353Michael Gapczynski2013-05-151-2/+2
| | |/ / / / | |/| | | |
| * | | | | Merge pull request #3366 from owncloud/contributing_add_contactsMichael Gapczynski2013-05-151-1/+2
| |\ \ \ \ \
| | * | | | | Add Contacts repo to CONTRIBUTING.mdThomas Tanghus2013-05-151-1/+2
| |/ / / / /