Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #8171 from owncloud/fix-import | Bernhard Posselt | 2014-05-02 | 1 | -0/+1 |
|\ | | | | | be nice and use a relative import so people can use the class without fi... | ||||
| * | add class Pimple to autloader | Thomas Müller | 2014-04-28 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #7852 from josh4trunks/basic_auth_fix | Thomas Müller | 2014-04-28 | 1 | -13/+14 |
|\ \ | | | | | | | Fixes login / logout when HTTP Basic Headers are avilable. | ||||
| * | | Fixed Typo | josh4trunks | 2014-04-03 | 1 | -1/+1 |
| | | | |||||
| * | | Don't always $cookie_path, only set it when needed | josh4trunks | 2014-04-03 | 1 | -3/+2 |
| | | | |||||
| * | | cookie would be useless if value is not set | josh4trunks | 2014-04-03 | 1 | -1/+1 |
| | | | |||||
| * | | Don't to set the cookie it wasn't needed. | josh4trunks | 2014-04-03 | 1 | -1/+1 |
| | | | |||||
| * | | Fixes login / logout when HTTP Basic Headers are avilable. | josh4trunks | 2014-04-03 | 1 | -13/+15 |
| | | | |||||
* | | | Remove an added t by the github webeditor | Lukas Reschke | 2014-04-27 | 1 | -1/+1 |
| | | | | | | | | | Notice to myself: Stick to my IDE. | ||||
* | | | Grammatical fixes | Lukas Reschke | 2014-04-27 | 1 | -2/+2 |
| | | | |||||
* | | | Clarify the trusted_domain error page | Lukas Reschke | 2014-04-26 | 1 | -1/+1 |
| | | | |||||
* | | | This adds one more missing untranslated text from lib/share | Volkan Gezer | 2014-04-24 | 1 | -2/+3 |
| | | | | | | | | | | | | Also displays the untrusted domain warning in English | ||||
* | | | Some more PHPDoc fixes | Lukas Reschke | 2014-04-21 | 1 | -1/+34 |
| | | | |||||
* | | | Fix typo | Lukas Reschke | 2014-04-14 | 1 | -1/+1 |
| | | | | | | | | | Thanks @DeepDiver1975 | ||||
* | | | Typo + Line breaks | Lukas Reschke | 2014-04-13 | 1 | -5/+3 |
| | | | |||||
* | | | Move security headers to base.php | Lukas Reschke | 2014-04-13 | 1 | -0/+31 |
| |/ |/| | | | | | | | Some headers were currently only added to the templates but not to other components (e.g. SabreDAV / JSON / etc...) The migration to base.php ensures that the headers are served to all requests passing base.php | ||||
* | | reduce code duplication, fix parse error, prevent page reload on hitting ↵ | Thomas Müller | 2014-04-07 | 1 | -0/+1 |
|/ | | | | enter while changing the display name - refs #8085 | ||||
* | Merge pull request #7879 from owncloud/sharing_cleanup_public_api | Vincent Petry | 2014-03-28 | 1 | -4/+4 |
|\ | | | | | sharing api cleanup, first step | ||||
| * | add a "helper" and a "hooks" class. Move constants needed by multiple classes | Bjoern Schiessle | 2014-03-25 | 1 | -4/+4 |
| | | | | | | | | to a "constants" class | ||||
* | | Merge pull request #7107 from owncloud/load-apps-proper-master | Thomas Müller | 2014-03-28 | 1 | -18/+6 |
|\ \ | |/ |/| | Load apps proper master | ||||
| * | all authentication apps are loaded at first - everything else relies on ↵ | Thomas Müller | 2014-03-21 | 1 | -1/+2 |
| | | | | | | | | these apps | ||||
| * | Merge branch 'master' into load-apps-proper-master | Thomas Müller | 2014-03-21 | 1 | -46/+28 |
| |\ | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/ajax/rawlist.php cron.php ocs/v1.php | ||||
| * | | Within OC:init() the minimum set of apps is loaded - which is filesystem, ↵ | Thomas Müller | 2014-02-06 | 1 | -11/+4 |
| | | | | | | | | | | | | authentication and logging | ||||
| * | | 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 | ||||
| * | | 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 |
|\ \ \ | | | | | | | | | Added .ocdata file to check for data folder validity | ||||
| * | | | 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 |
|\ \ \ | | | | | | | | | 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 |
| | | | | |