Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #6907 from owncloud/webdav-logexceptions | Thomas Müller | 2014-01-27 | 3 | -5/+59 |
|\ | | | | | Added exception logger plugin for sabre connector | ||||
| * | Added exception logger plugin for sabre connector | Vincent Petry | 2014-01-27 | 3 | -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/master | Morris Jobke | 2014-01-27 | 1 | -0/+5 |
|\ \ | | | | | | | Add 'mail_from_address' configuration | ||||
| * | | added function documentation | Jens-Christian Fischer | 2014-01-24 | 1 | -0/+4 |
| | | | |||||
| * | | Add 'mail_from_address' configuration | Jens-Christian Fischer | 2014-01-24 | 1 | -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/master | Morris Jobke | 2014-01-27 | 1 | -0/+2 |
|\ \ \ | | | | | | | | | Add check for apc.enabled option | ||||
| * | | | Add check for apc.enabled option | Otto Sabart | 2014-01-24 | 1 | -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-css | Morris Jobke | 2014-01-27 | 1 | -0/+1 |
|\ \ \ | |/ / |/| | | Remove %webroot% from CSS | ||||
| * | | add icons.css file, first step to get rid of %webroot% | Jan-Christoph Borchardt | 2014-01-23 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #6736 from owncloud/tests-jsunittests | Thomas Müller | 2014-01-23 | 1 | -0/+1 |
|\ \ \ | |_|/ |/| | | Added Javascript unit tests | ||||
| * | | Added Javascript unit tests | Vincent Petry | 2014-01-16 | 1 | -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-master | Thomas Müller | 2014-01-21 | 4 | -2/+28 |
|\ \ \ | |||||
| * \ \ | Merge pull request #6844 from owncloud/fix-css-loading-master | Jörn Friedrich Dreyer | 2014-01-21 | 1 | -1/+1 |
| |\ \ \ | | |_|/ | |/| | | Revert "use getAppWebPath() in here as well" | ||||
| | * | | Revert "use getAppWebPath() in here as well" | Thomas Müller | 2014-01-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | This reverts commit 6254f0a403e315461f8e20ebccf71cb91e9313a3. | ||||
| * | | | Merge branch 'master' into fix-setupfs-only-for-existing-users-master | Thomas Müller | 2014-01-21 | 1 | -1/+1 |
| |\ \ \ | |||||
| * | | | | OC_Util::setupFS($user) will create a data dir for the given string - no ↵ | Thomas Müller | 2014-01-21 | 3 | -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-master | Thomas Müller | 2014-01-21 | 1 | -1/+1 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | use 'download.zip' as default name for zip downloads instead of 'owncloud.zip' | Jörn Friedrich Dreyer | 2014-01-21 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | fixing comment + adding unit test for checkPasswordProtectedShare | Thomas Müller | 2014-01-21 | 1 | -1/+7 |
| | | | | |||||
* | | | | in case no share is found for the given token we can return right away | Thomas Müller | 2014-01-21 | 1 | -0/+3 |
| | | | | |||||
* | | | | adding password protection check to getShareByToken() | Thomas Müller | 2014-01-21 | 1 | -4/+32 |
|/ / / | |||||
* | | | Merge pull request #6820 from owncloud/phpunit-test-config | Thomas Müller | 2014-01-20 | 4 | -5/+14 |
|\ \ \ | | | | | | | | | Load a separate config (if present) when running unit tests | ||||
| * | | | Move test config folder to tests/config | Robin Appelman | 2014-01-20 | 1 | -2/+2 |
| | | | | |||||
| * | | | Load a separate config (if present) when running unit tests | Robin Appelman | 2014-01-17 | 4 | -5/+14 |
| | | | | |||||
* | | | | Reuse the data retrieved from the cache in checkUpdate | Robin Appelman | 2014-01-20 | 2 | -4/+7 |
| | | | | |||||
* | | | | Merge pull request #6838 from owncloud/core-quotawrapperfailedfopenfix | Vincent Petry | 2014-01-20 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | Fixed quota wrapper to not wrap failed fopen streams | ||||
| * | | | Fixed quota wrapper to not wrap failed fopen streams | Vincent Petry | 2014-01-19 | 1 | -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_proxy | Thomas Müller | 2014-01-19 | 1 | -0/+5 |
|\ \ \ \ | |/ / / |/| | | | Fix internet detection to use OC_Util::getUrlContent | ||||
| * | | | Disabled internet checking as mentioned when in proxy mode | Joan | 2014-01-10 | 1 | -0/+5 |
| | | | | |||||
* | | | | Merge pull request #6784 from owncloud/fix-activation-of-unknown-apps | Morris Jobke | 2014-01-18 | 1 | -0/+3 |
|\ \ \ \ | | | | | | | | | | | Fix activation of unknown apps | ||||
| * | | | | error handling in case a requested app doesn't exists | Thomas Müller | 2014-01-15 | 1 | -0/+3 |
| | | | | | |||||
* | | | | | show link to app documentation | Bjoern Schiessle | 2014-01-17 | 1 | -0/+4 |
| |_|/ / |/| | | | |||||
* | | | | Merge pull request #6644 from ben-denham/unshare-all-fix | Björn Schießle | 2014-01-16 | 1 | -1/+9 |
|\ \ \ \ | |/ / / |/| | | | \OCP\Share::unshareAll() fix | ||||
| * | | | Unshare all will now delete all shares for the item, instead of only for a ↵ | ben-denham | 2014-01-06 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | | single owner. | ||||
* | | | | Merge pull request #6744 from owncloud/fix_ocs_response_messages | Thomas Müller | 2014-01-15 | 1 | -20/+22 |
|\ \ \ \ | | | | | | | | | | | keep response message | ||||
| * | | | | keep response message | Bjoern Schiessle | 2014-01-13 | 1 | -20/+22 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #6768 from owncloud/scanner-use-storage-mtime | Vincent Petry | 2014-01-15 | 1 | -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 scanning | Robin Appelman | 2014-01-14 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #6704 from owncloud/encryptedfoldersizecalc | Vincent Petry | 2014-01-14 | 1 | -5/+17 |
|\ \ \ \ \ | |/ / / / |/| | | | | Fix calculated folder size to use unencrypted size | ||||
| * | | | | Fix calculated folder size to use unencrypted size | Vincent Petry | 2014-01-09 | 1 | -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 transifex | Thomas Müller | 2014-01-13 | 1 | -12/+0 |
| | | | | | |||||
* | | | | | fixing typo in redirection query string | st3so | 2014-01-12 | 1 | -1/+1 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #6687 from owncloud/sharing-fixpartfilehandling | Vincent Petry | 2014-01-09 | 1 | -1/+4 |
|\ \ \ \ | | | | | | | | | | | Removed special handling of part files in shared storage rename | ||||
| * | | | | Removed special handling of part files in shared storage rename | Vincent Petry | 2014-01-08 | 1 | -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 consistent | Thomas Müller | 2014-01-09 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | set login name within apache auth backend | Thomas Müller | 2014-01-09 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | fixing PHPDoc and use cameCase names | Thomas Müller | 2014-01-09 | 1 | -7/+7 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #6681 from owncloud/userreport | blizzz | 2014-01-08 | 4 | -7/+56 |
|\ \ \ \ | | | | | | | | | | | add command line option to get user number statistics | ||||
| * | | | | Infowarning about 32bit | Arthur Schiwon | 2014-01-08 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | add tests for user counting | Arthur Schiwon | 2014-01-08 | 1 | -0/+9 |
| | | | | |