Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into migration_unit_tests | Bart Visscher | 2014-02-10 | 57 | -257/+705 |
|\ | |||||
| * | Merge pull request #6881 from owncloud/remove-user-storage-entry | Vincent Petry | 2014-02-10 | 2 | -0/+22 |
| |\ | |||||
| | * | Merge branch 'master' into remove-user-storage-entry | Robin Appelman | 2014-02-10 | 30 | -161/+335 |
| | |\ | |||||
| | * | | 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 |
| | * | | 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 |
| * | | | Merge pull request #6988 from owncloud/oc_api_fix_warinigs | Tom Needham | 2014-02-10 | 1 | -6/+12 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | getData() always needs to return an array | Bjoern Schiessle | 2014-02-07 | 1 | -6/+12 |
| * | | | Merge pull request #7131 from owncloud/issue/6269 | Thomas Müller | 2014-02-10 | 1 | -6/+6 |
| |\ \ \ | |||||
| | * | | | Change MySQL to MySQL/MariaDB in the frontend | Joas Schilling | 2014-02-07 | 1 | -6/+6 |
| * | | | | 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 | 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] | Jens-Christian Fischer | 2014-02-04 | 1 | -1/+2 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #6247 from owncloud/memcached-multiple-servers | Andreas Fischer | 2014-02-08 | 1 | -2/+10 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | 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 | 1 | -2/+2 |
| * | | | | | Merge pull request #7112 from owncloud/enc_fix_size_for_shared_files | Vincent Petry | 2014-02-07 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | replace 'size' with 'unencrypted_size' if encryption is enabled | Bjoern Schiessle | 2014-02-07 | 1 | -1/+1 |
| * | | | | | | 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 | Bjoern Schiessle | 2014-01-29 | 1 | -2/+2 |
| | | |_|/ / | | |/| | | | |||||
| * | | | | | Merge pull request #6952 from MartialGeek/add_freebox_support | Vincent Petry | 2014-02-06 | 2 | -1/+6 |
| |\ \ \ \ \ | |||||
| | * | | | | | The regexp of the Freebox user agent is now more strict. | Martial Saunois | 2014-01-29 | 1 | -1/+1 |
| | * | | | | | New user agent added for the Freebox. | Martial Saunois | 2014-01-26 | 2 | -1/+6 |
| * | | | | | | Merge pull request #6445 from owncloud/fix_5956 | Vincent Petry | 2014-02-06 | 1 | -2/+2 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | 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 #6235 from NCTU-NBA/pr-exceed_upload_limit_msg | Jan-Christoph Borchardt | 2014-02-04 | 2 | -12/+47 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'master' into pr-exceed_upload_limit_msg | Pellaeon Lin | 2014-01-30 | 102 | -518/+1141 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Separate PHP upload limit and free space | Pellaeon Lin | 2013-12-08 | 2 | -12/+47 |
| * | | | | | | | | | Merge pull request #6081 from owncloud/partfilewebdavfix | Vincent Petry | 2014-02-04 | 1 | -1/+14 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Allow getting info or renaming part files through WebDAV | Vincent Petry | 2014-01-23 | 1 | -1/+14 |
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
| * | | | | | | | | | Merge pull request #4795 from owncloud/setup | Morris Jobke | 2014-02-04 | 3 | -26/+8 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Remove unused functions from OC_Helper | Bart Visscher | 2014-01-31 | 1 | -23/+0 |
| | * | | | | | | | | | Merge branch 'master' into setup | Bart Visscher | 2014-01-31 | 280 | -3205/+6752 |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | | | |||||
| | * | | | | | | | | | Merge remote-tracking branch 'origin/master' into setup | Bart Visscher | 2013-10-02 | 350 | -1308/+8644 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into setup | Bart Visscher | 2013-09-12 | 6 | -28/+38 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Check for failure in creating htaccessWorking testfile | Bart Visscher | 2013-09-10 | 1 | -4/+8 |
| | * | | | | | | | | | | | Move core setup code to controller class | Bart Visscher | 2013-09-10 | 1 | -1/+2 |
| * | | | | | | | | | | | | Merge pull request #6647 from owncloud/memcache-public | icewind1991 | 2014-02-04 | 7 | -28/+73 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | Fix some phpdoc errors and rename interface | Robin Appelman | 2014-01-24 | 3 | -5/+9 |
| | * | | | | | | | | | | | | Merge branch 'master' into memcache-public | Robin Appelman | 2014-01-22 | 14 | -18/+113 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Merge branch 'master' into memcache-public | Robin Appelman | 2014-01-15 | 9 | -49/+56 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into memcache-public | Robin Appelman | 2014-01-09 | 21 | -27/+171 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | Use $server->getMemCacheFactory() in ldap connection | Robin Appelman | 2014-01-09 | 1 | -0/+9 |
| | * | | | | | | | | | | | | | | Also update the OCP\IServerContainer | Robin Appelman | 2014-01-08 | 2 | -4/+4 |
| | * | | | | | | | | | | | | | | get the memorycache factory from OCP\Server instead of a cache instance | Robin Appelman | 2014-01-08 | 2 | -6/+22 |
| | * | | | | | | | | | | | | | | Remove the static dependency on OC_Util from Memcache | Robin Appelman | 2014-01-06 | 4 | -2/+23 |
| | * | | | | | | | | | | | | | | Use APCIterator for Memcache\APC::clear() | Robin Appelman | 2014-01-06 | 2 | -26/+8 |