summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* merge master into fileinfoRobin Appelman2014-01-2920-84/+235
|\
| * Merge pull request #6903 from owncloud/fix-ms-office-iconsJan-Christoph Borchardt2014-01-292-62/+63
| |\
| | * Add icons for mdb and accdb files.Andreas Fischer2014-01-232-0/+3
| | * Fix icons for xml,ppt,dot,dotx files.Andreas Fischer2014-01-232-0/+4
| | * Remove duplicate mimetypes while keeping previous behaviour.Andreas Fischer2014-01-231-5/+0
| | * Bring mimetype list into alphabetical order.Andreas Fischer2014-01-231-62/+61
| * | Merge pull request #6907 from owncloud/webdav-logexceptionsThomas Müller2014-01-273-5/+59
| |\ \
| | * | Added exception logger plugin for sabre connectorVincent Petry2014-01-273-5/+59
| | |/
| * | Merge pull request #6930 from jcfischer/masterMorris Jobke2014-01-271-0/+5
| |\ \
| | * | added function documentationJens-Christian Fischer2014-01-241-0/+4
| | * | Add 'mail_from_address' configurationJens-Christian Fischer2014-01-241-0/+1
| * | | Merge pull request #6933 from seberm/masterMorris Jobke2014-01-271-0/+2
| |\ \ \
| | * | | Add check for apc.enabled optionOtto Sabart2014-01-241-0/+2
| | |/ /
| * | | Merge pull request #6912 from owncloud/replace-webroot-in-cssMorris Jobke2014-01-271-0/+1
| |\ \ \ | | |/ / | |/| |
| | * | add icons.css file, first step to get rid of %webroot%Jan-Christoph Borchardt2014-01-231-0/+1
| * | | Merge pull request #6736 from owncloud/tests-jsunittestsThomas Müller2014-01-231-0/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Added Javascript unit testsVincent Petry2014-01-161-0/+1
| * | | Merge branch 'master' into fixing-gallery-password-protected-access-masterThomas Müller2014-01-214-2/+28
| |\ \ \
| | * \ \ Merge pull request #6844 from owncloud/fix-css-loading-masterJörn Friedrich Dreyer2014-01-211-1/+1
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Revert "use getAppWebPath() in here as well"Thomas Müller2014-01-201-1/+1
| | * | | Merge branch 'master' into fix-setupfs-only-for-existing-users-masterThomas Müller2014-01-211-1/+1
| | |\ \ \
| | * | | | OC_Util::setupFS($user) will create a data dir for the given string - no matt...Thomas Müller2014-01-213-1/+27
| * | | | | Merge branch 'master' into fixing-gallery-password-protected-access-masterThomas Müller2014-01-211-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | use 'download.zip' as default name for zip downloads instead of 'owncloud.zip'Jörn Friedrich Dreyer2014-01-211-1/+1
| | |/ / /
| * | | | fixing comment + adding unit test for checkPasswordProtectedShareThomas Müller2014-01-211-1/+7
| * | | | in case no share is found for the given token we can return right awayThomas Müller2014-01-211-0/+3
| * | | | adding password protection check to getShareByToken()Thomas Müller2014-01-211-4/+32
| |/ / /
| * | | Merge pull request #6820 from owncloud/phpunit-test-configThomas Müller2014-01-204-5/+14
| |\ \ \
| | * | | Move test config folder to tests/configRobin Appelman2014-01-201-2/+2
| | * | | Load a separate config (if present) when running unit testsRobin Appelman2014-01-174-5/+14
| * | | | Reuse the data retrieved from the cache in checkUpdateRobin Appelman2014-01-202-4/+7
| * | | | Merge pull request #6838 from owncloud/core-quotawrapperfailedfopenfixVincent Petry2014-01-201-1/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fixed quota wrapper to not wrap failed fopen streamsVincent Petry2014-01-191-1/+1
| * | | | Merge pull request #6676 from aseques/check_internet_proxyThomas Müller2014-01-191-0/+5
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Disabled internet checking as mentioned when in proxy modeJoan2014-01-101-0/+5
| * | | | Merge pull request #6784 from owncloud/fix-activation-of-unknown-appsMorris Jobke2014-01-181-0/+3
| |\ \ \ \
| | * | | | error handling in case a requested app doesn't existsThomas Müller2014-01-151-0/+3
| * | | | | show link to app documentationBjoern Schiessle2014-01-171-0/+4
| | |_|/ / | |/| | |
* | | | | Add isReadable, isUpdateable, isDeletable, isShareableRobin Appelman2014-01-242-1/+65
* | | | | Merge branch 'master' into fileinfoRobin Appelman2014-01-173-22/+32
|\| | | |
| * | | | Merge pull request #6644 from ben-denham/unshare-all-fixBjörn Schießle2014-01-161-1/+9
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Unshare all will now delete all shares for the item, instead of only for a si...ben-denham2014-01-061-1/+9
| * | | | Merge pull request #6744 from owncloud/fix_ocs_response_messagesThomas Müller2014-01-151-20/+22
| |\ \ \ \
| | * | | | keep response messageBjoern Schiessle2014-01-131-20/+22
| | | |_|/ | | |/| |
| * | | | Merge pull request #6768 from owncloud/scanner-use-storage-mtimeVincent Petry2014-01-151-1/+1
| |\ \ \ \
| | * | | | Use storage_mtime when determining if we can reuse cached data while scanningRobin Appelman2014-01-141-1/+1
* | | | | | Merge branch 'master' into fileinfoRobin Appelman2014-01-143-18/+18
|\| | | | |
| * | | | | Merge pull request #6704 from owncloud/encryptedfoldersizecalcVincent Petry2014-01-141-5/+17
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fix calculated folder size to use unencrypted sizeVincent Petry2014-01-091-5/+17
| * | | | | remove ru_RU - it has bee removed from transifexThomas Müller2014-01-131-12/+0