summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
| |_|/ / |/| | |
* | | | 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 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
* | | | | fixing typo in redirection query stringst3so2014-01-121-1/+1
| |/ / / |/| | |
* | | | Merge pull request #6687 from owncloud/sharing-fixpartfilehandlingVincent Petry2014-01-091-1/+4
|\ \ \ \
| * | | | Removed special handling of part files in shared storage renameVincent Petry2014-01-081-1/+4
* | | | | rename user-id to loginname to stay consistentThomas Müller2014-01-091-2/+2
* | | | | set login name within apache auth backendThomas Müller2014-01-091-0/+2
* | | | | fixing PHPDoc and use cameCase namesThomas Müller2014-01-091-7/+7
| |/ / / |/| | |
* | | | Merge pull request #6681 from owncloud/userreportblizzz2014-01-084-7/+56
|\ \ \ \
| * | | | Infowarning about 32bitArthur Schiwon2014-01-081-0/+1
| * | | | add tests for user countingArthur Schiwon2014-01-081-0/+9
| * | | | if backends have the same class name, sum their users up instead of overwritingArthur Schiwon2014-01-081-1/+5
| * | | | Introduce user count action to user managementArthur Schiwon2014-01-073-7/+42
* | | | | Fix ownCloud for php5.3.xThomas Müller2014-01-081-1/+2
* | | | | Prevent deleting storage rootVincent Petry2014-01-081-0/+13
| |/ / / |/| | |
* | | | Merge branch 'master' into disable-mod_pagespeedThomas Müller2014-01-081-1/+1
|\ \ \ \
| * \ \ \ Merge pull request #6673 from owncloud/master-quota-insufficientstorageforfil...Vincent Petry2014-01-081-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Now also preventing to override "files" dir size with -1Vincent Petry2014-01-071-1/+1
* | | | | turn off mod_pagespeedThomas Müller2014-01-081-0/+3
|/ / / /
* | | | Merge pull request #6594 from owncloud/kill-index.php-from-urlJörn Friedrich Dreyer2014-01-073-4/+28
|\ \ \ \ | |/ / / |/| | |