Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #7649 from owncloud/routing-public | Thomas Müller | 2014-03-17 | 1 | -19/+1 |
|\ | | | | | Move routing classes to an interface and expose it in the public api | ||||
| * | switch OC::getRouter usages to OC::$server->getRouter | Robin Appelman | 2014-03-10 | 1 | -9/+1 |
| | | |||||
| * | Move the router classes to a namespace and expose it with a public interface | Robin Appelman | 2014-03-10 | 1 | -12/+2 |
| | | |||||
* | | use preDelete instead of postDelete hook | Georg Ehrke | 2014-03-13 | 1 | -1/+4 |
|/ | |||||
* | Merge pull request #7583 from owncloud/trusteddomainerrorpage | Vincent Petry | 2014-03-07 | 1 | -0/+16 |
|\ | | | | | [master] Show warning page when accessing server from an untrusted domain | ||||
| * | Show warning page when accessing server from an untrusted domain | Vincent Petry | 2014-03-06 | 1 | -0/+16 |
| | | | | | | | | | | Added early check for the requested domain host and show a warning page if the domain is not trusted. | ||||
* | | Merge branch 'master' into fix-7307 | Thomas Müller | 2014-03-06 | 1 | -1/+2 |
|\| | | | | | | | | | | | Conflicts: core/js/router.js settings/js/admin.js | ||||
| * | Config to disable basic_auth username chacking | kondou | 2014-02-26 | 1 | -1/+2 |
| | | | | | | | | This can be confusing and/or annoying | ||||
* | | Replace OC.Router.generate() with OC.generateUrl() | Thomas Müller | 2014-03-02 | 1 | -1/+0 |
|/ | |||||
* | Merge pull request #3760 from IMM0rtalis/remove_logout_redirect_slash | Bart Visscher | 2014-02-26 | 1 | -1/+2 |
|\ | | | | | - removed slash-adding for logout-header-redirect | ||||
| * | - add slash if webroot is an empty string | Florian Scholz | 2013-06-25 | 1 | -1/+2 |
| | | | | | | | | - added comment | ||||
| * | - removed slash-adding for logout-header-redirect | Florian Scholz | 2013-06-17 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into no-css-js-delivery-via-php | Thomas Müller | 2014-02-21 | 1 | -0/+1 |
|\ \ | |||||
| * | | reduce width of searchbox on mobile, fix overlap, fix #7282 | Jan-Christoph Borchardt | 2014-02-20 | 1 | -0/+1 |
| | | | |||||
* | | | kill $coreStyles and $coreScripts | Thomas Müller | 2014-02-20 | 1 | -4/+0 |
| | | | |||||
* | | | kill old minimizer code | Thomas Müller | 2014-02-20 | 1 | -22/+4 |
|/ / | |||||
* | | polish documentation based on scrutinizer patches | Jörn Friedrich Dreyer | 2014-02-06 | 1 | -1/+1 |
| | | |||||
* | | 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 |
| | | | | |