aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* sort expected result in testsRobin Appelman2014-02-131-0/+2
|
* Add explicit sortingRobin Appelman2014-02-111-2/+4
|
* Merge branch 'master' into convert-oc_appconfigRobin Appelman2014-02-1133-58/+266
|\
| * intendationArthur Schiwon2014-02-111-5/+5
| |
| * fix DIArthur Schiwon2014-02-112-5/+8
| |
| * Inject loggerArthur Schiwon2014-02-112-3/+13
| |
| * wrong tldArthur Schiwon2014-02-111-1/+1
| |
| * test for share dialoge sorterArthur Schiwon2014-02-111-0/+40
| |
| * sort following entries in alphabetical orderArthur Schiwon2014-02-111-3/+4
| |
| * move sorter into a classArthur Schiwon2014-02-112-24/+56
| |
| * respect coding guidelinesArthur Schiwon2014-02-111-1/+1
| |
| * on filtering the share box users and groups whose name begins with the ↵Arthur Schiwon2014-02-111-0/+24
| | | | | | | | search term shall appear on top, fixes #6430
| * Merge pull request #6881 from owncloud/remove-user-storage-entryVincent Petry2014-02-102-0/+22
| |\ | | | | | | Also remove the user's home storage from the storage table when deleting a user
| | * Merge branch 'master' into remove-user-storage-entryRobin Appelman2014-02-10160-5729/+17301
| | |\
| | * | Also clean up the filecache table when deleting a storage entryRobin Appelman2014-02-031-0/+6
| | | |
| | * | Revert "Use Cache->clear to cleanup the filecache for removed users"Robin Appelman2014-02-031-10/+5
| | | | | | | | | | | | | | | | This reverts commit 5a5b6f187e719e6c0bac5e64c411eb74e6d28389.
| | * | Use Cache->clear to cleanup the filecache for removed usersRobin Appelman2014-01-221-5/+10
| | | |
| | * | Also remove the user's home storage from the storage table when deleting a userRobin Appelman2014-01-212-0/+16
| | | |
| * | | LDAP: improve debug messageArthur Schiwon2014-02-101-1/+2
| | | |
| * | | LDAP: also try MS AD's thumbnailPhoto when looking for an avatar imageArthur Schiwon2014-02-101-6/+24
| | | |
| * | | Merge pull request #6988 from owncloud/oc_api_fix_warinigsTom Needham2014-02-101-6/+12
| |\ \ \ | | | | | | | | | | [ocs API] getData() always needs to return an array
| | * | | getData() always needs to return an arrayBjoern Schiessle2014-02-071-6/+12
| | | | |
| * | | | Merge pull request #7134 from owncloud/issue/5794Morris Jobke2014-02-101-2/+2
| |\ \ \ \ | | |_|_|/ | |/| | | Make google drive client secret and dropbox api secret a password field
| | * | | Make google drive client secret and dropbox api secret a password fieldJoas Schilling2014-02-071-2/+2
| | | | | | | | | | | | | | | | | | | | Fix issue #5794
| * | | | Merge pull request #7140 from owncloud/enc_dont_login_during_encryptionMorris Jobke2014-02-101-1/+8
| |\ \ \ \ | | | | | | | | | | | | refuse login as long as the initial encryption is running
| | * | | | refuse login as long as the initial encryption is runningBjoern Schiessle2014-02-101-1/+8
| | | | | |
| * | | | | LDAP: add documentation info in info.xmlArthur Schiwon2014-02-101-0/+3
| | | | | |
| * | | | | Merge pull request #7126 from nickvergessen/issue/6683Vincent Petry2014-02-102-4/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | Only add files to file list when uploading to current directory
| | * | | | | Only add files to file list when uploading to current directoryJoas Schilling2014-02-072-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Issue #6683
| * | | | | | Rephrase and clarify log messageArthur Schiwon2014-02-101-1/+1
| | | | | | |
| * | | | | | Wizard: enable base DN for editing, if not base DN could have been detected. ↵Arthur Schiwon2014-02-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also part of fix for #6670
| * | | | | | Wizard: disable LDAP referrals, fixes #6670Arthur Schiwon2014-02-101-0/+1
| | | | | | |
| * | | | | | throw an info message, when base dn test failedArthur Schiwon2014-02-101-0/+4
| | | | | | |
| * | | | | | LDAP: extend LDAP wrapper search method for sizelimit, improves performance ↵Arthur Schiwon2014-02-102-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | in wizard
| * | | | | | Merge pull request #7131 from owncloud/issue/6269Thomas Müller2014-02-102-7/+7
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Change MySQL to MariaDB/MySQL in the frontend
| | * | | | | | Change MySQL to MySQL/MariaDB in the frontendJoas Schilling2014-02-072-7/+7
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | Fix issue #6269
| * | | | | | Merge pull request #7066 from owncloud/check_svg_installedThomas Müller2014-02-104-4/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | properly check if pdf and svg modules are installed
| | * | | | | | properly check if pdf and svg modules are installedGeorg Ehrke2014-02-044-4/+4
| | | | | | | |
| * | | | | | | Merge pull request #7071 from jcfischer/masterThomas Müller2014-02-101-1/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | close statement in MimeType detection is executed [#7069]
| | * | | | | | | close statement in MimeType detection is executed [#7069]Jens-Christian Fischer2014-02-041-1/+2
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | close statement was never executed due to it being after a return statement.
| * | | | | | | Merge pull request #7133 from owncloud/fix-implied-evalThomas Müller2014-02-103-9/+7
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix implied evals and doubled definition of variable
| | * | | | | | | Fix implied evals and doubled definition of variableMorris Jobke2014-02-073-9/+7
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #7119 fixes #7120 fixes #7121 fixes #7122
| * | | | | | | Merge pull request #6247 from owncloud/memcached-multiple-serversAndreas Fischer2014-02-082-4/+18
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for multiple memcached servers. * owncloud/memcached-multiple-servers: Readd support for memcached_server config variable. Add support for multiple memcached servers.
| | * | | | | | Readd support for memcached_server config variable.Andreas Fischer2014-01-101-1/+9
| | | | | | | |
| | * | | | | | Add support for multiple memcached servers.Andreas Fischer2014-01-102-4/+10
| | | | | | | |
| * | | | | | | name users after testBjoern Schiessle2014-02-071-2/+2
| | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #7112 from owncloud/enc_fix_size_for_shared_filesVincent Petry2014-02-073-4/+22
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | replace 'size' with 'unencrypted_size' if encryption is enabled
| | * | | | | | replace 'size' with 'unencrypted_size' if encryption is enabledBjoern Schiessle2014-02-073-4/+22
| | | | | | | |
| * | | | | | | Merge pull request #6997 from owncloud/fix_l10n_warningsThomas Müller2014-02-071-2/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | change order of issubdirectory() calls to avoid error messages for non-apps
| | * | | | | | change order of issubdirectory() calls to avoid error messages for non-appsBjoern Schiessle2014-01-291-2/+2
| | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-09 17:46:35 +0000