Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Migrate logic to dynamic controller | Lukas Reschke | 2016-06-27 | 2 | -34/+5 |
| | | | | Also adds support for having custom login backgrounds | ||||
* | write theme settings to database | Bjoern Schiessle | 2016-06-27 | 1 | -4/+33 |
| | |||||
* | Merge remote-tracking branch 'upstream/master' into master-upstream-sync | Lukas Reschke | 2016-06-26 | 1 | -5/+6 |
|\ | |||||
| * | redirect to new login route (#25099) | Christoph Wurst | 2016-06-21 | 1 | -5/+6 |
| | | | | | | | | | | | | * redirect to new login route * encode anchor in url and restore it client-side | ||||
* | | fix more strings | Morris Jobke | 2016-06-20 | 2 | -9/+5 |
| | | |||||
* | | Merge branch 'master' of https://github.com/owncloud/core into downstream-160611 | Arthur Schiwon | 2016-06-11 | 2 | -1/+8 |
|\| | |||||
| * | Check 2FA state for raw php files too | Christoph Wurst | 2016-06-10 | 2 | -1/+8 |
| | | |||||
* | | Downstream 2016-06-09 | Arthur Schiwon | 2016-06-09 | 3 | -16/+29 |
|\| | | | | | | | Merge branch 'master' of https://github.com/owncloud/core into downstream-160609 | ||||
| * | Merge pull request #25000 from owncloud/fix-email-login-dav | Vincent Petry | 2016-06-09 | 1 | -2/+2 |
| |\ | | | | | | | Allow login by email address via webdav as well | ||||
| | * | Allow login by email address via webdav as well - fixes #24791 | Thomas Müller | 2016-06-09 | 1 | -2/+2 |
| | | | |||||
| * | | Merge pull request #25014 from owncloud/admin-datadircheck-fix | Vincent Petry | 2016-06-09 | 1 | -13/+24 |
| |\ \ | | |/ | |/| | Use temporary htaccesstest.txt for data dir security check | ||||
| | * | Use temporary htaccesstest.txt for data dir security check | Vincent Petry | 2016-06-07 | 1 | -13/+24 |
| | | | |||||
| * | | dissalow symlinks in local storages that point outside the datadir | Robin Appelman | 2016-06-07 | 1 | -1/+3 |
| |/ | |||||
* | | Revert "Downstream 2016-06-08" | blizzz | 2016-06-09 | 1 | -3/+1 |
| | | |||||
* | | dissalow symlinks in local storages that point outside the datadir | Robin Appelman | 2016-06-09 | 1 | -1/+3 |
| | | |||||
* | | THIS IS NEXTCLOUD! adjusting the design | Jan-Christoph Borchardt | 2016-06-08 | 1 | -7/+7 |
| | | |||||
* | | Remove "Help" link from personal sidebar | Lukas Reschke | 2016-06-06 | 1 | -2/+4 |
|/ | | | | | | At the moment we want to hide the help link from the personal sidebar as it contains the original ownCloud documentation. Once we have our own documentation with our proper branding and so on we can reenable this. | ||||
* | Fix second check for quota size (#24989) | Joas Schilling | 2016-06-06 | 1 | -1/+1 |
| | |||||
* | Merge pull request #24936 from owncloud/2fa-block-ocs | Vincent Petry | 2016-06-02 | 1 | -0/+4 |
|\ | | | | | block OCS if 2FA challenge needs to be solved first | ||||
| * | block OCS if 2FA challenge needs to be solved first | Christoph Wurst | 2016-06-01 | 1 | -0/+4 |
| | | |||||
* | | Merge pull request #24946 from ↵ | Vincent Petry | 2016-06-02 | 1 | -0/+5 |
|\ \ | | | | | | | | | | | | | owncloud/issue-24943-duplicate-downgrade-unsupported-message Do not show the hint when it's the same as the message | ||||
| * | | Do not show the hint when it's the same as the message | Joas Schilling | 2016-06-01 | 1 | -0/+5 |
| |/ | |||||
* / | Fix URL for client downloads | Joas Schilling | 2016-06-01 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #24912 from owncloud/session-tokens-apache-auth | Vincent Petry | 2016-06-01 | 1 | -0/+2 |
|\ | | | | | Create session tokens for apache auth users | ||||
| * | Create session tokens for apache auth users | Christoph Wurst | 2016-05-31 | 1 | -0/+2 |
| | | |||||
* | | Properly check for mbstring extension | Lukas Reschke | 2016-05-31 | 1 | -1/+1 |
|/ | | | | mb_detect_encoding is in the fallback we ship in the polyfill library, mb_strcut is not. Thus this lead to a false positive and ownCloud would just break. | ||||
* | Update license headers | Lukas Reschke | 2016-05-26 | 30 | -67/+60 |
| | |||||
* | Changed labels of chunk TTL to mention chunks | Vincent Petry | 2016-05-24 | 1 | -1/+1 |
| | |||||
* | Move cache chunk TTL value to FileChunking class | Vincent Petry | 2016-05-24 | 1 | -1/+9 |
| | | | | This makes it less generic and only used for actual file chunking | ||||
* | Merge pull request #24750 from ↵ | Vincent Petry | 2016-05-23 | 1 | -12/+131 |
|\ | | | | | | | | | owncloud/lenz1111-share_download_range_requests_support Http Range requests support in downloads | ||||
| * | Code style and doc fix | Piotr Filiciak | 2016-05-23 | 1 | -6/+6 |
| | | |||||
| * | Http Range requests support in downloads | Piotr Filiciak | 2016-05-20 | 1 | -12/+131 |
| | | | | | | | | Http range requests support is required for video preview | ||||
* | | Add encoding wrapper as opt-in mount option | Vincent Petry | 2016-05-20 | 1 | -4/+2 |
| | | | | | | | | | | The encoding wrapper is now only applied when the mount option is set, disabled by default. | ||||
* | | Add wrapper for NFD encoding workaround | Vincent Petry | 2016-05-20 | 1 | -0/+9 |
|/ | |||||
* | Group fixup (#24621) | Roeland Douma | 2016-05-17 | 3 | -424/+8 |
| | | | | | | | | * Move used OC_Group_xx to \OC\Group * Add (deprecated) legacy wrapper in legacy, OC_Group_xx * Replace deprecated use of OC_Group_xx with \OC\Group\xx | ||||
* | Move functions.php to legacy | Roeland Jago Douma | 2016-05-13 | 2 | -1/+266 |
| | | | | This file should really be properly namespaced etc! | ||||
* | lib/private/ocs to PSR-4 (#24558) | Roeland Douma | 2016-05-12 | 5 | -0/+135 |
| | | | | | | | | | | | | | * Move OC_OCS_XX to legacy * Move \OC\OCS to PSR-4 * OC_OCS_xx to \OC\OCS\xx * Moved OC_OCS_xx to proper namespace * OC_OCS_xx is still there for legacy reasons as a wrapper * No calls to OC_OCS_xx in \OC\OCS\ | ||||
* | Merge pull request #24531 from owncloud/psr4-loading-for-install-and-commands | Thomas Müller | 2016-05-11 | 1 | -1/+2 |
|\ | | | | | Correctly register PSR-4 autoloading before install.php and loading commands | ||||
| * | Correctly register autoloading before install.php and loading commands | Joas Schilling | 2016-05-11 | 1 | -1/+2 |
| | | |||||
* | | fix PHPDoc and other minor issues | Christoph Wurst | 2016-05-11 | 1 | -1/+1 |
| | | |||||
* | | pass in $request on OCS api | Christoph Wurst | 2016-05-11 | 1 | -1/+2 |
| | | |||||
* | | fix setup | Christoph Wurst | 2016-05-11 | 1 | -32/+0 |
| | | |||||
* | | Add token auth for OCS APIs | Christoph Wurst | 2016-05-11 | 1 | -27/+16 |
| | | |||||
* | | Check if session token is valid and log user out if the check fails | Christoph Wurst | 2016-05-11 | 1 | -1/+1 |
| | | | | | | | | | | * Update last_activity timestamp of the session token * Check user backend credentials once in 5 minutes | ||||
* | | token based auth | Christoph Wurst | 2016-05-11 | 2 | -24/+4 |
|/ | | | | | | | | * Add InvalidTokenException * add DefaultTokenMapper and use it to check if a auth token exists * create new token for the browser session if none exists hash stored token; save user agent * encrypt login password when creating the token | ||||
* | Merge pull request #24433 from owncloud/user_psr4 | Thomas Müller | 2016-05-11 | 3 | -1/+96 |
|\ | | | | | lib/private/user to PSR-4 | ||||
| * | Add \OC\User\Backend | Roeland Jago Douma | 2016-05-10 | 1 | -132/+1 |
| | | | | | | | | | | Since some apps (ldap et al) still depend on OC_User_Backend this seemed like the cleanest approach. | ||||
| * | Move OC_User_Database to \OC\User\Database | Roeland Jago Douma | 2016-05-10 | 2 | -348/+1 |
| | | |||||
| * | Move OC_User_XX to legacy folder | Roeland Jago Douma | 2016-05-10 | 3 | -0/+573 |
| | | |||||
* | | Merge pull request #24379 from owncloud/remove-unneeded-code | Lukas Reschke | 2016-05-10 | 1 | -31/+0 |
|\ \ | |/ |/| | Remove unneeded private wrapper methods |