| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fix imagerotate and move loadFromBase64() one up. | kondou | 2014-02-12 | 1 | -4/+3 |
| | | | | | | | | imagerotate() with third parameter being -1 does not seem to work in PHP 5.5 loadFromBase64() one up, so debug-logs aren't spammed (as much) with urlencoded base64-data from loadFromFile() debug output. | ||||
| * | Merge pull request #6964 from owncloud/storagestatistics-reuse | icewind1991 | 2014-02-12 | 2 | -9/+14 |
| |\ | | | | | Reuse the calculated free_space in buildFileStorageStatistics | ||||
| | * | Merge branch 'master' into storagestatistics-reuse | Robin Appelman | 2014-02-10 | 12 | -19/+33 |
| | |\ | |||||
| | * \ | merge master into storagestatistics-reuse | Robin Appelman | 2014-02-05 | 18 | -145/+297 |
| | |\ \ | |||||
| | * | | | Reuse the calculated free_space in buildFileStorageStatistics | Robin Appelman | 2014-01-27 | 2 | -6/+10 |
| | | | | | |||||
| * | | | | Merge pull request #7075 from owncloud/quota-storagexsendfile | Vincent Petry | 2014-02-11 | 5 | -1/+36 |
| |\ \ \ \ | | | | | | | | | | | Added isLocal() method to storage, used for xsendfile | ||||
| | * | | | | Added isLocal() method to storage, used for xsendfile | Vincent Petry | 2014-02-06 | 5 | -1/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added isLocal() method to Storage to find out whether the storage is local or not. This method is used for the x-sendfile logic to find out whether to add the headers. | ||||
| * | | | | | fix DI | Arthur Schiwon | 2014-02-11 | 1 | -4/+6 |
| | | | | | | |||||
| * | | | | | Inject logger | Arthur Schiwon | 2014-02-11 | 1 | -3/+6 |
| | | | | | | |||||
| * | | | | | wrong tld | Arthur Schiwon | 2014-02-11 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | sort following entries in alphabetical order | Arthur Schiwon | 2014-02-11 | 1 | -3/+4 |
| | | | | | | |||||
| * | | | | | move sorter into a class | Arthur Schiwon | 2014-02-11 | 1 | -0/+53 |
| | | | | | | |||||
| * | | | | | 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 | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
| | | | | | | | |||||
| * | | | | | | 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 #7131 from owncloud/issue/6269 | Thomas Müller | 2014-02-10 | 1 | -6/+6 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Change MySQL to MariaDB/MySQL in the frontend | ||||
| | * | | | | | | Change MySQL to MySQL/MariaDB in the frontend | Joas Schilling | 2014-02-07 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #6247 from owncloud/memcached-multiple-servers | Andreas Fischer | 2014-02-08 | 1 | -2/+10 |
| |\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 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 | ||||
| | * | | | | | | | | 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 | ||||
| | * | | | | | | | 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 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | New user agent added for the Freebox. | ||||
| | * | | | | | | | The regexp of the Freebox user agent is now more strict. | Martial Saunois | 2014-01-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A new unit test has been added in consequence. | ||||
| | * | | | | | | | 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 #6235 from NCTU-NBA/pr-exceed_upload_limit_msg | Jan-Christoph Borchardt | 2014-02-04 | 2 | -12/+47 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Change misleading message when file size exceeds upload limit | ||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' into pr-exceed_upload_limit_msg | Pellaeon Lin | 2014-01-30 | 102 | -518/+1141 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/templates/index.php apps/files_sharing/templates/public.php | ||||
| | * | | | | | | | | | 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 | ||||
| | * | | | | | | | | | | Allow getting info or renaming part files through WebDAV | Vincent Petry | 2014-01-23 | 1 | -1/+14 |
| | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When mounting an ownCloud (backend OC) inside another ownCloud (frontend OC), the frontend OC will use WebDAV to upload file, which will create part files. These part files need to be accessible for the frontend OC to rename them to the actual file name. This fix leaves the file cache untouched but gives direct access to part file info when requested. This means that part file can be accessed only when their path and name are known. These won't appear in file listtings. Fixes #6068 | ||||
| * | | | | | | | | | | Merge pull request #4795 from owncloud/setup | Morris Jobke | 2014-02-04 | 3 | -26/+8 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Move core setup code to controller class | ||||
| | * | | | | | | | | | | Remove unused functions from OC_Helper | Bart Visscher | 2014-01-31 | 1 | -23/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | init_var and init_radio where only used in the installation template | ||||
| | * | | | | | | | | | | Merge branch 'master' into setup | Bart Visscher | 2014-01-31 | 280 | -3205/+6752 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/setup.php | ||||
| | * | | | | | | | | | | 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 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/util.php | ||||
| | * | | | | | | | | | | | | Check for failure in creating htaccessWorking testfile | Bart Visscher | 2013-09-10 | 1 | -4/+8 |
| | | | | | | | | | | | | | | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |