| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into migration_unit_tests | Bart Visscher | 2014-02-10 | 304 | -6752/+19604 |
| |\ | |||||
| | * | Merge pull request #6881 from owncloud/remove-user-storage-entry | Vincent Petry | 2014-02-10 | 2 | -0/+22 |
| | |\ | | | | | | | Also remove the user's home storage from the storage table when deleting a user | ||||
| | | * | Merge branch 'master' into remove-user-storage-entry | Robin Appelman | 2014-02-10 | 160 | -5729/+17301 |
| | | |\ | |||||
| | | * | | Also clean up the filecache table when deleting a storage entry | Robin Appelman | 2014-02-03 | 1 | -0/+6 |
| | | | | | |||||
| | | * | | Revert "Use Cache->clear to cleanup the filecache for removed users" | Robin Appelman | 2014-02-03 | 1 | -10/+5 |
| | | | | | | | | | | | | | | | | | This reverts commit 5a5b6f187e719e6c0bac5e64c411eb74e6d28389. | ||||
| | | * | | Use Cache->clear to cleanup the filecache for removed users | Robin Appelman | 2014-01-22 | 1 | -5/+10 |
| | | | | | |||||
| | | * | | Also remove the user's home storage from the storage table when deleting a user | Robin Appelman | 2014-01-21 | 2 | -0/+16 |
| | | | | | |||||
| | * | | | LDAP: improve debug message | Arthur Schiwon | 2014-02-10 | 1 | -1/+2 |
| | | | | | |||||
| | * | | | LDAP: also try MS AD's thumbnailPhoto when looking for an avatar image | Arthur Schiwon | 2014-02-10 | 1 | -6/+24 |
| | | | | | |||||
| | * | | | Merge pull request #6988 from owncloud/oc_api_fix_warinigs | Tom Needham | 2014-02-10 | 1 | -6/+12 |
| | |\ \ \ | | | | | | | | | | | [ocs API] getData() always needs to return an array | ||||
| | | * | | | getData() always needs to return an array | Bjoern Schiessle | 2014-02-07 | 1 | -6/+12 |
| | | | | | | |||||
| | * | | | | Merge pull request #7134 from owncloud/issue/5794 | Morris Jobke | 2014-02-10 | 1 | -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 field | Joas Schilling | 2014-02-07 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | Fix issue #5794 | ||||
| | * | | | | Merge pull request #7140 from owncloud/enc_dont_login_during_encryption | Morris Jobke | 2014-02-10 | 1 | -1/+8 |
| | |\ \ \ \ | | | | | | | | | | | | | refuse login as long as the initial encryption is running | ||||
| | | * | | | | refuse login as long as the initial encryption is running | Bjoern Schiessle | 2014-02-10 | 1 | -1/+8 |
| | | | | | | | |||||
| | * | | | | | LDAP: add documentation info in info.xml | Arthur Schiwon | 2014-02-10 | 1 | -0/+3 |
| | | | | | | | |||||
| | * | | | | | Merge pull request #7126 from nickvergessen/issue/6683 | Vincent Petry | 2014-02-10 | 2 | -4/+6 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Only add files to file list when uploading to current directory | ||||
| | | * | | | | | Only add files to file list when uploading to current directory | Joas Schilling | 2014-02-07 | 2 | -4/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Issue #6683 | ||||
| | * | | | | | | Rephrase and clarify log message | Arthur Schiwon | 2014-02-10 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Wizard: enable base DN for editing, if not base DN could have been detected. ↵ | Arthur Schiwon | 2014-02-10 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also part of fix for #6670 | ||||
| | * | | | | | | Wizard: disable LDAP referrals, fixes #6670 | Arthur Schiwon | 2014-02-10 | 1 | -0/+1 |
| | | | | | | | | |||||
| | * | | | | | | throw an info message, when base dn test failed | Arthur Schiwon | 2014-02-10 | 1 | -0/+4 |
| | | | | | | | | |||||
| | * | | | | | | LDAP: extend LDAP wrapper search method for sizelimit, improves performance ↵ | Arthur Schiwon | 2014-02-10 | 2 | -4/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in wizard | ||||
| | * | | | | | | Merge pull request #7131 from owncloud/issue/6269 | Thomas Müller | 2014-02-10 | 2 | -7/+7 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Change MySQL to MariaDB/MySQL in the frontend | ||||
| | | * | | | | | | Change MySQL to MySQL/MariaDB in the frontend | Joas Schilling | 2014-02-07 | 2 | -7/+7 |
| | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | Fix issue #6269 | ||||
| | * | | | | | | Merge pull request #7066 from owncloud/check_svg_installed | Thomas Müller | 2014-02-10 | 4 | -4/+4 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | properly check if pdf and svg modules are installed | ||||
| | | * | | | | | | properly check if pdf and svg modules are installed | Georg Ehrke | 2014-02-04 | 4 | -4/+4 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge pull request #7071 from jcfischer/master | Thomas Müller | 2014-02-10 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | close statement in MimeType detection is executed [#7069] | ||||
| | | * | | | | | | | close statement in MimeType detection is executed [#7069] | Jens-Christian Fischer | 2014-02-04 | 1 | -1/+2 |
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | close statement was never executed due to it being after a return statement. | ||||
| | * | | | | | | | Merge pull request #7133 from owncloud/fix-implied-eval | Thomas Müller | 2014-02-10 | 3 | -9/+7 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix implied evals and doubled definition of variable | ||||
| | | * | | | | | | | Fix implied evals and doubled definition of variable | Morris Jobke | 2014-02-07 | 3 | -9/+7 |
| | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #7119 fixes #7120 fixes #7121 fixes #7122 | ||||
| | * | | | | | | | Merge pull request #6247 from owncloud/memcached-multiple-servers | Andreas Fischer | 2014-02-08 | 2 | -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 Fischer | 2014-01-10 | 1 | -1/+9 |
| | | | | | | | | | |||||
| | | * | | | | | | Add support for multiple memcached servers. | Andreas Fischer | 2014-01-10 | 2 | -4/+10 |
| | | | | | | | | | |||||
| | * | | | | | | | name users after test | Bjoern Schiessle | 2014-02-07 | 1 | -2/+2 |
| | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | | Merge pull request #7112 from owncloud/enc_fix_size_for_shared_files | Vincent Petry | 2014-02-07 | 3 | -4/+22 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | replace 'size' with 'unencrypted_size' if encryption is enabled | ||||
| | | * | | | | | | replace 'size' with 'unencrypted_size' if encryption is enabled | Bjoern Schiessle | 2014-02-07 | 3 | -4/+22 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge pull request #6997 from owncloud/fix_l10n_warnings | Thomas Müller | 2014-02-07 | 1 | -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-apps | Bjoern Schiessle | 2014-01-29 | 1 | -2/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | Update README.md | Thomas Müller | 2014-02-07 | 1 | -0/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Update README.md | Thomas Müller | 2014-02-07 | 1 | -1/+2 |
| | | |_|_|/ / / | |/| | | | | | |||||
| | * | | | | | | Merge pull request #6952 from MartialGeek/add_freebox_support | Vincent Petry | 2014-02-06 | 3 | -1/+21 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | New user agent added for the Freebox. | ||||
| | | * | | | | | | The regexp of the Freebox user agent is now more strict. | Martial Saunois | 2014-01-29 | 2 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A new unit test has been added in consequence. | ||||
| | | * | | | | | | Unit tests added for the new Freebox user agent. | Martial Saunois | 2014-01-28 | 1 | -0/+10 |
| | | | | | | | | | |||||
| | | * | | | | | | New user agent added for the Freebox. | Martial Saunois | 2014-01-26 | 2 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Freebox is the multimedia device of a french Internet provider: Free. This device provides a seedbox which uses the user agent "Mozilla/5.0". In the "Content-Disposition" header, if the "filename" key is used with the "filename*=UTF-8''" value, the seedbox does not take care about the header and saves the file name with the origin URL. This patch brings the support for the Freebox users. | ||||
| | * | | | | | | | Merge pull request #6445 from owncloud/fix_5956 | Vincent Petry | 2014-02-06 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | fix issue with logging non utf8 chars | ||||
| | | * | | | | | | | encode imagePath and fix documentation of loadFromFile | Georg Ehrke | 2014-01-11 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| | | * | | | | | | | fix issue with logging non utf8 chars | Georg Ehrke | 2013-12-16 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge pull request #7099 from owncloud/fix-autoconfig-master | Thomas Müller | 2014-02-06 | 1 | -4/+5 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | fixing autoconfig handling | ||||
| | | * | | | | | | | | fixing autoconfig handling | Thomas Müller | 2014-02-05 | 1 | -4/+5 |
| | | | | | | | | | | | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| aboutsummaryrefslogtreecommitdiffstats |