| Commit message (Expand) | Author | Age | Files | Lines |
* | reduce code duplication, fix parse error, prevent page reload on hitting ente... | Thomas Müller | 2014-04-07 | 1 | -0/+1 |
* | Merge pull request #7879 from owncloud/sharing_cleanup_public_api | Vincent Petry | 2014-03-28 | 1 | -4/+4 |
|\ |
|
| * | add a "helper" and a "hooks" class. Move constants needed by multiple classes | Bjoern Schiessle | 2014-03-25 | 1 | -4/+4 |
* | | Merge pull request #7107 from owncloud/load-apps-proper-master | Thomas Müller | 2014-03-28 | 1 | -18/+6 |
|\ \
| |/
|/| |
|
| * | all authentication apps are loaded at first - everything else relies on these... | Thomas Müller | 2014-03-21 | 1 | -1/+2 |
| * | Merge branch 'master' into load-apps-proper-master | Thomas Müller | 2014-03-21 | 1 | -46/+28 |
| |\ |
|
| * | | Within OC:init() the minimum set of apps is loaded - which is filesystem, aut... | Thomas Müller | 2014-02-06 | 1 | -11/+4 |
| * | | remove some more global variable $RUNTIME_NOAPPS | Thomas Müller | 2014-02-06 | 1 | -5/+0 |
| * | | remove global variable $RUNTIME_NOAPPS - it's just superfluous | Thomas Müller | 2014-02-06 | 1 | -2/+1 |
* | | | Merge pull request #7714 from owncloud/phpunit-config | icewind1991 | 2014-03-24 | 1 | -1/+3 |
|\ \ \
| |_|/
|/| | |
|
| * | | Allow setting the config dir to use as enviroment variable for phpunit | Robin Appelman | 2014-03-13 | 1 | -1/+3 |
* | | | Merge pull request #7732 from owncloud/datafolderexistence | Vincent Petry | 2014-03-20 | 1 | -0/+1 |
|\ \ \ |
|
| * | | | Return 503 when a config/data dir error exists | Vincent Petry | 2014-03-14 | 1 | -0/+1 |
| |/ / |
|
* | | | Merge pull request #7649 from owncloud/routing-public | Thomas Müller | 2014-03-17 | 1 | -19/+1 |
|\ \ \ |
|
| * | | | 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 |
|\ \ |
|
| * | | Show warning page when accessing server from an untrusted domain | Vincent Petry | 2014-03-06 | 1 | -0/+16 |
* | | | Merge branch 'master' into fix-7307 | Thomas Müller | 2014-03-06 | 1 | -1/+2 |
|\| | |
|
| * | | Config to disable basic_auth username chacking | kondou | 2014-02-26 | 1 | -1/+2 |
* | | | 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 |
|\ \ |
|
| * | | - add slash if webroot is an empty string | Florian Scholz | 2013-06-25 | 1 | -1/+2 |
| * | | - 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 |
|\ \ |
|
| * \ | Merge branch 'master' into setup | Bart Visscher | 2014-01-31 | 1 | -72/+163 |
| |\ \ |
|
| * \ \ | 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 |
|\ \ \ \ |
|
| * | | | | 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 | Vincent Petry | 2014-01-16 | 1 | -0/+1 |
* | | | | | 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 t... | Arthur Schiwon | 2013-12-13 | 1 | -4/+3 |
* | | | | Fix webroot for update page | Vincent Petry | 2013-12-13 | 1 | -0/+1 |
* | | | | Revert "Revert "Fix user's displayName being overwritten by (old) cookie"" | Morris Jobke | 2013-12-05 | 1 | -1/+0 |