Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #7207 from owncloud/fileinfo-serializable | Morris Jobke | 2014-02-14 | 1 | -5/+1 |
|\ | |||||
| * | remove the JsonSerializable interface from \OC\Files\FileInfo | Robin Appelman | 2014-02-14 | 1 | -5/+1 |
* | | Merge pull request #7204 from owncloud/groupexists-duplicate | Thomas Müller | 2014-02-14 | 1 | -8/+6 |
|\ \ | |/ |/| | |||||
| * | Fix test cases for group manager | Robin Appelman | 2014-02-14 | 1 | -2/+2 |
| * | remove duplicate call to groupExists | Robin Appelman | 2014-02-14 | 1 | -6/+4 |
* | | Merge pull request #6748 from owncloud/fileinfo | icewind1991 | 2014-02-14 | 2 | -18/+213 |
|\ \ | |/ |/| | |||||
| * | merge master into fileinfo | Robin Appelman | 2014-01-29 | 16 | -75/+160 |
| |\ | |||||
| * | | Add isReadable, isUpdateable, isDeletable, isShareable | Robin Appelman | 2014-01-24 | 1 | -1/+37 |
| * | | Merge branch 'master' into fileinfo | Robin Appelman | 2014-01-17 | 2 | -21/+23 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into fileinfo | Robin Appelman | 2014-01-14 | 2 | -6/+18 |
| |\ \ \ | |||||
| * | | | | add Support for passing a FileInfo instance to View->putFileInfo | Robin Appelman | 2014-01-13 | 2 | -1/+8 |
| * | | | | remove ArrayAccess, JsonSerializable from the public part of FileInfo | Robin Appelman | 2014-01-13 | 1 | -2/+2 |
| * | | | | Add a FileInfo class which holds all info of a file and return that from getF... | Robin Appelman | 2014-01-13 | 2 | -17/+169 |
* | | | | | suppress error msg caused by php bug | Georg Ehrke | 2014-02-14 | 4 | -4/+4 |
* | | | | | Merge pull request #4624 from owncloud/convert-oc_appconfig | Thomas Müller | 2014-02-13 | 4 | -91/+241 |
|\ \ \ \ \ | |||||
| * | | | | | Add explicit sorting | Robin Appelman | 2014-02-11 | 1 | -2/+4 |
| * | | | | | Merge branch 'master' into convert-oc_appconfig | Robin Appelman | 2014-02-11 | 12 | -21/+117 |
| |\ \ \ \ \ | |||||
| * | | | | | | Add caching to appconfig | Robin Appelman | 2014-02-07 | 2 | -16/+48 |
| * | | | | | | use the 'new' server container for appconfig | Robin Appelman | 2014-02-07 | 214 | -5212/+3653 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Move legacy file to correct location | Bart Visscher | 2013-10-02 | 1 | -0/+120 |
| * | | | | | | | Merge branch 'master' into convert-oc_appconfig | Bart Visscher | 2013-10-02 | 2 | -72/+93 |
* | | | | | | | | Merge pull request #6964 from owncloud/storagestatistics-reuse | icewind1991 | 2014-02-12 | 1 | -6/+10 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into storagestatistics-reuse | Robin Appelman | 2014-02-10 | 11 | -18/+32 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | merge master into storagestatistics-reuse | Robin Appelman | 2014-02-05 | 14 | -141/+233 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Reuse the calculated free_space in buildFileStorageStatistics | Robin Appelman | 2014-01-27 | 1 | -3/+6 |
* | | | | | | | | | | | Merge pull request #7075 from owncloud/quota-storagexsendfile | Vincent Petry | 2014-02-11 | 4 | -1/+25 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Added isLocal() method to storage, used for xsendfile | Vincent Petry | 2014-02-06 | 4 | -1/+25 |
| | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into remove-user-storage-entry | Robin Appelman | 2014-02-10 | 25 | -156/+263 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | | | |||||
| * | | | | | | | | | | 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 #6997 from owncloud/fix_l10n_warnings | Thomas Müller | 2014-02-07 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | |