summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6907 from owncloud/webdav-logexceptionsThomas Müller2014-01-273-5/+59
|\ | | | | Added exception logger plugin for sabre connector
| * Added exception logger plugin for sabre connectorVincent Petry2014-01-273-5/+59
| | | | | | | | | | | | | | | | | | | | | | Whenever an exception occurs in the sabre connector code or code called by it, it will be logged. This plugin approach is needed because Sabre already catches exceptions to return them to the client in the XML response, so they don't appear logged in the web server log. This will make it much easier to debug syncing issues.
* | Merge pull request #6930 from jcfischer/masterMorris Jobke2014-01-271-0/+5
|\ \ | | | | | | Add 'mail_from_address' configuration
| * | added function documentationJens-Christian Fischer2014-01-241-0/+4
| | |
| * | Add 'mail_from_address' configurationJens-Christian Fischer2014-01-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In environments where there are rules for the email addresses, the "from address" that owncloud uses has to be configurable. This patch adds a new configuration variable 'mail_from_address'. If it is configured, owncloud will use this as the sender of *all* emails. (OwnCloud uses 'sharing-noreply' and 'password-noreply' by default). By using the 'mail_from_address' configuration, only this email address will be used.
* | | Merge pull request #6933 from seberm/masterMorris Jobke2014-01-271-0/+2
|\ \ \ | | | | | | | | Add check for apc.enabled option
| * | | Add check for apc.enabled optionOtto Sabart2014-01-241-0/+2
| |/ / | | | | | | | | | | | | | | | Sometimes it's not possible to disable APC entirely and some of apc_functions are disabled. Only thing which is possible is to disable apc.enable option.
* | | Merge pull request #6912 from owncloud/replace-webroot-in-cssMorris Jobke2014-01-271-0/+1
|\ \ \ | |/ / |/| | Remove %webroot% from CSS
| * | 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 tests
| * | Added Javascript unit testsVincent Petry2014-01-161-0/+1
| | | | | | | | | | | | | | | | | | | | | - added karma utility to run jasmine unit tests - added Sinon library (for stubs/mocks/fakeserver) - added a few unit tests for core and files - added autotest-js.sh script
* | | 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"
| | * | Revert "use getAppWebPath() in here as well"Thomas Müller2014-01-201-1/+1
| | | | | | | | | | | | | | | | This reverts commit 6254f0a403e315461f8e20ebccf71cb91e9313a3.
| * | | 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 ↵Thomas Müller2014-01-213-1/+27
| | | | | | | | | | | | | | | | | | | | matter if the user really exists - OCP\JSON::checkUserExists($owner); introduces a ready to use check which will bail out with an JSON error
* | | | | 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
|\ \ \ | | | | | | | | Load a separate config (if present) when running unit tests
| * | | 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 streams
| * | | Fixed quota wrapper to not wrap failed fopen streamsVincent Petry2014-01-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling fopen() on some storage types, these return false instead of throwing an exception. This fix makes sure that in case the stream wasn't opened (for example when a file doesn't exist any more) the stream isn't wrapped. Also added 'rb' as another case that doesn't need to be wrapped. Fixes #6832
* | | | Merge pull request #6676 from aseques/check_internet_proxyThomas Müller2014-01-191-0/+5
|\ \ \ \ | |/ / / |/| | | Fix internet detection to use OC_Util::getUrlContent
| * | | 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
|\ \ \ \ | | | | | | | | | | Fix activation of unknown apps
| * | | | 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
|\ \ \ \ | |/ / / |/| | | \OCP\Share::unshareAll() fix
| * | | Unshare all will now delete all shares for the item, instead of only for a ↵ben-denham2014-01-061-1/+9
| | | | | | | | | | | | | | | | single owner.
* | | | Merge pull request #6744 from owncloud/fix_ocs_response_messagesThomas Müller2014-01-151-20/+22
|\ \ \ \ | | | | | | | | | | keep response message
| * | | | 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 scanning
| * | | | 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 size
| * | | | Fix calculated folder size to use unencrypted sizeVincent Petry2014-01-091-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The encrypted size was used when calculating folder sizes. This fix now also sums up the unencrypted size and shows that one when available.
* | | | | 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 rename
| * | | | Removed special handling of part files in shared storage renameVincent Petry2014-01-081-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the issue introduced by the transfer id which itself wasn't taken into account by the shortcut code for part file in the shared storage class.
* | | | | 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
|\ \ \ \ | | | | | | | | | | add command line option to get user number statistics
| * | | | Infowarning about 32bitArthur Schiwon2014-01-081-0/+1
| | | | |
| * | | | add tests for user countingArthur Schiwon2014-01-081-0/+9
| | | | |