Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1214 from Raydiation/master | Bernhard Posselt | 2013-01-19 | 1 | -0/+17 |
|\ | | | | | Load Classpaths of apps before appinfo/routes.php | ||||
| * | spaces to tabs | Bernhard Posselt | 2013-01-17 | 1 | -12/+12 |
| | | |||||
| * | load classpaths of apps before routes | Bernhard Posselt | 2013-01-17 | 1 | -0/+17 |
| | | |||||
* | | Typo fix (comment) /lib/base.php | davidgumberg | 2013-01-18 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1181 from owncloud/return-503-in-maintenance | Thomas Müller | 2013-01-18 | 1 | -0/+6 |
|\ \ | |/ |/| | in case of maintenance the error page returns http status 503. | ||||
| * | in case of maintenance the error page returns http status 503. | Thomas Mueller | 2013-01-14 | 1 | -0/+6 |
| | | | | | | | | | | This is necessary to enable the desktop sync client to react properly. Currently the SabreDAV plugin OC_Connector_Sabre_MaintenancePlugin is not executed because this error page is returned before the SabreDAV code is executed | ||||
* | | Spaces to tabs | Bart Visscher | 2013-01-16 | 1 | -676/+676 |
|/ | |||||
* | Only show the version updating to instead of worrying about converting ↵ | Michael Gapczynski | 2013-01-04 | 1 | -2/+1 |
| | | | | internal to a formatted version | ||||
* | Add back check if installed around background jobs | Michael Gapczynski | 2013-01-04 | 1 | -2/+4 |
| | |||||
* | Basic update progress of database update only | Michael Gapczynski | 2013-01-03 | 1 | -37/+12 |
| | |||||
* | Rearrange code to prepare for updater feedback | Michael Gapczynski | 2013-01-03 | 1 | -37/+63 |
| | |||||
* | Check if oc_token cookie exists before trying to use it | Michael Gapczynski | 2013-01-02 | 1 | -1/+3 |
| | |||||
* | setting the timezone is now part of the login process and true part of the core. | Thomas Müller | 2012-12-20 | 1 | -697/+719 |
| | |||||
* | add a check and a warning if setlocale is working | Frank Karlitschek | 2012-12-19 | 1 | -0/+5 |
| | |||||
* | set the session name to the instance id - which is unique | Thomas Mueller | 2012-12-12 | 1 | -0/+3 |
| | | | | | Conflicts: lib/base.php | ||||
* | Autoload classes with 'OC' namespace prefix. | Thomas Tanghus | 2012-12-11 | 1 | -0/+3 |
| | |||||
* | Merge pull request #182 from owncloud/fix-redirect | Bart Visscher | 2012-12-07 | 1 | -1/+7 |
|\ | | | | | Make the redirect_url working again | ||||
| * | Remove uneeded new line | Lukas Reschke | 2012-11-01 | 1 | -1/+0 |
| | | |||||
| * | Check for redirect_url for logged in users | Lukas Reschke | 2012-11-01 | 1 | -0/+7 |
| | | | | | | | | This checks if there is a redirect_url for logged in users | ||||
| * | Make the redirect_url working again | Lukas Reschke | 2012-10-31 | 1 | -1/+1 |
| | | | | | | | | Fixes #160 | ||||
* | | Merge pull request #647 from owncloud/fix_app_settings_navigation | Thomas Müller | 2012-12-05 | 1 | -1/+0 |
|\ \ | | | | | | | Move loading of all the apps to setting the active navigation entry. | ||||
| * | | Move loading of all the apps to setting the active navigation entry. | Bart Visscher | 2012-11-30 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | We can't do the loading before matching the route, because some routes need to do the loading after matching of the route. For example the navigation detection of the app settings page. | ||||
* | | | minified version no longer available | Thomas Mueller | 2012-12-04 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #401 from owncloud/share_hooks | Jörn Friedrich Dreyer | 2012-11-28 | 1 | -7/+31 |
|\ \ | | | | | | | Create functions to install standard hooks | ||||
| * | | Rename install hook functions to register hook | Bart Visscher | 2012-11-15 | 1 | -9/+9 |
| | | | |||||
| * | | Create functions to install standard hooks | Bart Visscher | 2012-11-13 | 1 | -7/+31 |
| | | | | | | | | | | | | | | | Also use these in tests that needs them Fix #151 | ||||
* | | | When using routing in apps, no apps are loaded in the left navigation tree. ↵ | Bernhard Posselt | 2012-11-15 | 1 | -0/+1 |
|/ / | | | | | | | To fix this: load apps for matching a request | ||||
* | | Merge pull request #157 from owncloud/setup | Bart Visscher | 2012-11-12 | 1 | -14/+2 |
|\ \ | | | | | | | Make lib/setup.php usable outside of install setup | ||||
| * | | DRY for creating htaccess to protect data-directory | Bart Visscher | 2012-10-30 | 1 | -3/+1 |
| | | | |||||
| * | | Separate control code from class definition | Bart Visscher | 2012-10-30 | 1 | -11/+1 |
| |/ | |||||
* | | Added CRUDS permissions to the OCP namespace. Implements issue #345 | Thomas Tanghus | 2012-11-11 | 1 | -2/+4 |
| | | |||||
* | | Fix WebDAV (and Android Client) not being able to authorize on Debian ↵ | Stefan Seidel | 2012-11-09 | 1 | -0/+4 |
| | | | | | | | | Squeeze + mod_fcgid installs. | ||||
* | | Style: Remove all the dangling white spaces | Felix Moeller | 2012-11-04 | 1 | -2/+2 |
| | | |||||
* | | Checkstyle: Fix last six NewlineBeforeOpenBrace | Felix Moeller | 2012-11-04 | 1 | -4/+2 |
| | | |||||
* | | Merge pull request #238 from fmms/checkstyle04 | Thomas Müller | 2012-11-04 | 1 | -4/+4 |
|\ \ | | | | | | | Checkstyle fixes | ||||
| * | | Checkstyle fixes: NoSpaceAfterComma | Felix Moeller | 2012-11-04 | 1 | -4/+4 |
| |/ | |||||
* | | Merge pull request #178 from owncloud/JustOneCSRFTokenPerSession | Lukas Reschke | 2012-11-04 | 1 | -2/+0 |
|\ \ | |/ |/| | Just one CSRF token per session | ||||
| * | Create only one CSRF token per session | Lukas Reschke | 2012-10-31 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | Before, the CSRF token expired every hour. We had a script in place which should refresh the token but this don't worked in every case. (Laptop sleeping etc.) With this commit, the token will only get once created for every session so that the "Token expired" warning shouldn't appear. | ||||
* | | Don't use OC_Setup as it will show up the installer | Lukas Reschke | 2012-10-29 | 1 | -1/+5 |
| | | |||||
* | | Generate .htaccess when upgrading from old versions | Lukas Reschke | 2012-10-29 | 1 | -0/+6 |
|/ | | | | | | | When upgrading from old ownCloud versions like 2.x the .htaccess is not generated - which exposes the data to the internet. This fix will generate a .htaccess when upgrading. (And no one exists) Fixes #127 | ||||
* | Fix introduced style errors | Bart Visscher | 2012-10-27 | 1 | -1/+2 |
| | |||||
* | Merge remote-tracking branch 'git://github.com/susinths/SabreDAV_1.7.1.git' | Bart Visscher | 2012-10-27 | 1 | -0/+3 |
|\ | | | | | | | | | Conflicts: lib/base.php | ||||
| * | Update Sabre to version 1.7.1 | Susinthiran Sithamparanathan | 2012-10-17 | 1 | -0/+5 |
| | | |||||
* | | Merge branch 'routing' | Bart Visscher | 2012-10-27 | 1 | -11/+42 |
|\ \ | | | | | | | | | | | | | | | | Conflicts: core/lostpassword/index.php core/lostpassword/resetpassword.php | ||||
| * | | Change Symfony/Component/Routing from submodule to composer fetching | Bart Visscher | 2012-10-27 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'master' into routing | Bart Visscher | 2012-10-17 | 1 | -26/+85 |
| |\| | | | | | | | | | | | | | | | | | | | Conflicts: lib/search/provider/file.php settings/ajax/changepassword.php settings/settings.php | ||||
| * | | Implement routing on javascript side | Bart Visscher | 2012-10-05 | 1 | -0/+1 |
| | | | |||||
| * | | Merge branch 'master' into routing | Bart Visscher | 2012-09-28 | 1 | -0/+2 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into routing | Bart Visscher | 2012-09-28 | 1 | -5/+7 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/filelist.js core/js/js.js lib/ocs.php | ||||
| * | | | | Remove redundant loadApps | Bart Visscher | 2012-09-07 | 1 | -1/+0 |
| | | | | |