Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4795 from owncloud/setup | Morris Jobke | 2014-02-04 | 1 | -1/+2 |
|\ | | | | | Move core setup code to controller class | ||||
| * | Merge branch 'master' into setup | Bart Visscher | 2014-01-31 | 1 | -72/+163 |
| |\ | | | | | | | | | | | | | Conflicts: core/setup.php | ||||
| * \ | Merge remote-tracking branch 'origin/master' into setup | Bart Visscher | 2013-10-02 | 1 | -3/+23 |
| |\ \ | |||||
| * | | | Move core setup code to controller class | Bart Visscher | 2013-09-10 | 1 | -1/+2 |
| | | | | |||||
* | | | | also load error handler if debugging is enabled | Bjoern Schiessle | 2014-02-03 | 1 | -1/+2 |
| |_|/ |/| | | |||||
* | | | 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 | ||||
* | | | | 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 | 1 | -2/+12 |
|/ / / | |||||
* | | | rename user-id to loginname to stay consistent | Thomas Müller | 2014-01-09 | 1 | -2/+2 |
| | | | |||||
* | | | Remove @ in order to get proper error handling | Thomas Müller | 2014-01-07 | 1 | -1/+1 |
| | | | |||||
* | | | require composer's autoload.php if present | Thomas Müller | 2014-01-05 | 1 | -2/+6 |
| | | | |||||
* | | | dont try to register background jobs if we haven't upgraded yet | Robin Appelman | 2013-12-13 | 1 | -44/+45 |
| | | | |||||
* | | | coding style | Arthur Schiwon | 2013-12-13 | 1 | -0/+1 |
| | | | |||||
* | | | coding style | Arthur Schiwon | 2013-12-13 | 1 | -1/+1 |
| | | | |||||
* | | | On webdav sesssions, loginname was compared to username which does not need ↵ | Arthur Schiwon | 2013-12-13 | 1 | -4/+3 |
| | | | | | | | | | | | | to match necessarily | ||||
* | | | Fix webroot for update page | Vincent Petry | 2013-12-13 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | On the update page, config.js was missing which caused oc_webroot to not be available. That would trigger the faulty oc_webroot fallback that didn't take URLs like "/owncloud/index.php/files/apps" into account. This fix adds config.js in the update page and also a fix for the oc_webroot fallback, in case it is used elsewhere. | ||||
* | | | Revert "Revert "Fix user's displayName being overwritten by (old) cookie"" | Morris Jobke | 2013-12-05 | 1 | -1/+0 |
| | | | | | | | | | | | | This reverts commit eba35d28cd974507f9e81e15430d3d33dbbd9973. | ||||
* | | | Revert "Fix user's displayName being overwritten by (old) cookie" | Morris Jobke | 2013-12-05 | 1 | -0/+1 |
| | | | | | | | | | | | | This reverts commit 2a7380cc21e56ce12b1a0e1460fabc978a83090b. | ||||
* | | | Fix user's displayName being overwritten by (old) cookie | Nico Kaiser | 2013-12-05 | 1 | -1/+0 |
| | | | |||||
* | | | merge master into single-user-mode | Robin Appelman | 2013-11-25 | 1 | -6/+21 |
|\ \ \ | |||||
| * | | | provide more cli friendly error messages | Robin Appelman | 2013-11-25 | 1 | -6/+21 |
| | | | | |||||
* | | | | Add "single user mode" which restricts access to users in the admin group | Robin Appelman | 2013-11-25 | 1 | -1/+18 |
|/ / / | | | | | | | | | | This can be enabled by setting 'singleuser' to true in config.php | ||||
* | | | Merge pull request #5773 from owncloud/fix-2152-master | Thomas Müller | 2013-11-21 | 1 | -7/+1 |
|\ \ \ | | | | | | | | | Make working en_US.UTF-8 locale a hard requirement | ||||
| * | | | Make working en_US.UTF-8 locale a hard requirement | Bart Visscher | 2013-11-08 | 1 | -7/+1 |
| | | | | |||||
* | | | | add trash bin and file versions delete hooks in OC::registerPreviewHooks | Georg Ehrke | 2013-11-12 | 1 | -0/+2 |
| | | | | |||||
* | | | | display the exception instead of meaningless message | Thomas Müller | 2013-11-04 | 1 | -8/+3 |
|/ / / | |||||
* | | | replace template function link_to_docs() with \OC_Helper::linkToDocs() | Thomas Mueller | 2013-11-02 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #5443 from owncloud/fix-autoloader-caching | Bart Visscher | 2013-11-01 | 1 | -0/+8 |
|\ \ \ | | | | | | | | | Remove Autoloader Cache Hack. Do not use Cache on Install. | ||||
| * | | | Only use autoloader cache when 'instanceid' is available. | Andreas Fischer | 2013-10-22 | 1 | -5/+9 |
| | | | | |||||
| * | | | Inject memoryCache into Autoloader. Remove recursion-prevention hack. | Andreas Fischer | 2013-10-22 | 1 | -1/+5 |
| | | | | |||||
* | | | | Make "Please contact your system administrator" a full sentence. | Andreas Fischer | 2013-11-01 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #3889 from owncloud/apps_preload | Morris Jobke | 2013-10-28 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Don't load the apps when we need to upgrade | ||||
| * | | | | Don't load the apps when we need to upgrade | Bart Visscher | 2013-06-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | The loading can call functions that require new tables, like oc_jobs | ||||
* | | | | | Merge pull request #5528 from frisco82/changeUpadateNotification | Thomas Müller | 2013-10-24 | 1 | -2/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | Changed update message to be more instructive | ||||
| * | | | | | Changed update message to be more instructive, changed update style to be ↵ | Ramiro Aparicio | 2013-10-24 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | less aggresive Fix br tags Improve english messages | ||||
* | | | | | | Merge pull request #5507 from owncloud/webdav-removeredirectfromindex | Thomas Müller | 2013-10-24 | 1 | -1/+5 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Remove WebDAV redirect from the root path | ||||
| * | | | | | Remove WebDAV redirect from the root path | Vincent Petry | 2013-10-24 | 1 | -1/+5 |
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will prevent people mounting the root path. They should use the full webdav path instead. Fixes #4923 | ||||
* / | | | | Fixed sharing dropdown placeholders in IE8/9 | Vincent Petry | 2013-10-23 | 1 | -0/+1 |
|/ / / / | | | | | | | | | | | | | Added jquery.placeholder shim to handle input field placeholders in IE8/9 | ||||
* | | | | introduce link_to_docs() and migrate links | Thomas Müller | 2013-10-21 | 1 | -1/+1 |
| | | | | |||||
* | | | | Use display name from magic cookie, fixes #4884 | Arthur Schiwon | 2013-10-18 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge branch 'master' into fixing-appframework-master | Thomas Müller | 2013-10-16 | 1 | -2/+8 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/private/appframework/middleware/security/securitymiddleware.php tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php | ||||
| * | | | | Include exception message in log entry when session fails to start | Tom Needham | 2013-10-12 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Handle ownCloud logging when data dir not created | Tom Needham | 2013-10-11 | 1 | -6/+2 |
| | | | | | |||||
| * | | | | Log the session exception when ownCloud is not installed | Tom Needham | 2013-10-11 | 1 | -3/+6 |
| | | | | | |||||
| * | | | | Merge pull request #4780 from AxelRb/master | Morris Jobke | 2013-10-10 | 1 | -0/+7 |
| |\ \ \ \ | | | | | | | | | | | | | On an auth failure the uid and the IP address should be logged to the st... | ||||
| | * | | | | changed the argument to false for getValue , reformated else statement | Axel Roenn | 2013-10-10 | 1 | -3/+2 |
| | | | | | | |||||
| | * | | | | Changed default behaviour to not log IP address in case of an auth failure. ↵ | Axel Roenn | 2013-09-10 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Can be configured in OC conf now. Log level changed to warning . |