summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-05-2039-161/+248
|
* Merge pull request #3399 from owncloud/fix_js_for_ieBernhard Posselt2013-05-191-3/+3
|\ | | | | cleanup after people who don't test in ie
| * 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_login
| * | Add password to pre_loginLukas Reschke2013-05-191-2/+2
| | | | | | | | | | | | | | | I need this to intercept passwords for my WIP multi-factor authentication app.
* | | [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 ↵FlorinPeter2013-05-171-4/+6
|\ \ | | | | | | | | | | | | owncloud/fix_for_SQLite3Result_object_in_post_addToGroup fix for SQLite3Result::fetchArray() on setup
| * | 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 ↵Florin Peter2013-05-151-25/+28
| | | | | | | | | | | | correctly initialised in post_addToGroup
* | | [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
|\ \ \ | | | | | | | | Ldap configurable username n uuid
| * \ \ 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 ↵Arthur Schiwon2013-05-072-0/+13
| | | | | | | | | | | | | | | | | | | | mappings
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | Fix finding mount in background watcher, fixes #3353
| * \ \ \ \ 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add Compound property to avoid double escaping values.
| * | | | | | 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 disappearing root mount point on lib/files/filesystem.php
| * | | | | | 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.md
| * | | | | Add Contacts repo to CONTRIBUTING.mdThomas Tanghus2013-05-151-1/+2
|/ / / / /
* / / / / [tx-robot] updated from transifexJenkins for ownCloud2013-05-15133-2828/+3136
|/ / / /
* | | | Merge pull request #2821 from owncloud/fix-2159-rename-to-sharedThomas Müller2013-05-143-19/+230
|\ \ \ \ | | | | | | | | | | fix allowed rename of folder in root directory to reserved name "Shared"
| * | | | [files] add private declaration of $viewMorris Jobke2013-05-141-0/+1
| | | | |
| * | | | [files] fix mock creation and remove hardcoded 'require' statementMorris Jobke2013-05-122-7/+2
| | | | |
| * | | | [files] rename lib to "App"Morris Jobke2013-05-123-7/+7
| | | | |
| * | | | [files] ownCloud typoMorris Jobke2013-05-121-1/+1
| | | | |
| * | | | [files] rename test class and add rename testMorris Jobke2013-05-121-1/+22
| | | | |
| * | | | [files] remove realpath in testMorris Jobke2013-05-121-1/+1
| | | | |
| * | | | [files] rename testsMorris Jobke2013-05-121-0/+99
| | | | |
| * | | | [files] remove normalizePath on rename and dependency injectionMorris Jobke2013-05-122-7/+8
| | | | |
| * | | | [files] kill stripslashesMorris Jobke2013-05-121-3/+3
| | | | |
| * | | | [files] fix typosMorris Jobke2013-05-121-5/+5
| | | | |
| * | | | [files] refactoringMorris Jobke2013-05-122-19/+111
| | | | |
| * | | | string comparisionMorris Jobke2013-05-121-1/+1
| | | | |
| * | | | wrong root dir nameMorris Jobke2013-05-121-2/+2
| | | | |
| * | | | fix allowed rename of folder in root directory to reserved name "Shared"Morris Jobke2013-05-121-2/+4
| | | | | | | | | | | | | | | | | | | | refs #2159
* | | | | fix history template, print_unescaped() needs to include closing tagsBjörn Schießle2013-05-141-4/+4
| | | | |