Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4326 from nextcloud/downstream-27562 | Morris Jobke | 2017-04-13 | 2 | -5/+6 |
|\ | |||||
| * | Use constants | Joas Schilling | 2017-04-13 | 2 | -2/+2 |
| * | Reorder the entries of the log for easier reading | Juan Pablo Villafáñez | 2017-04-12 | 2 | -6/+7 |
* | | Merge pull request #4308 from nextcloud/lost-password-email | Lukas Reschke | 2017-04-13 | 2 | -3/+16 |
|\ \ | |||||
| * | | Update email template for lost password email | Morris Jobke | 2017-04-12 | 2 | -3/+16 |
* | | | Merge pull request #2424 from nextcloud/fix-login-controller-test-consolidate... | Morris Jobke | 2017-04-13 | 2 | -43/+55 |
|\ \ \ | |||||
| * | | | Improve PHPDoc | Morris Jobke | 2017-04-13 | 1 | -1/+1 |
| * | | | use known LockdownManager | Arthur Schiwon | 2017-04-06 | 1 | -1/+1 |
| * | | | Save correct login name | Arthur Schiwon | 2017-04-06 | 1 | -1/+8 |
| * | | | Add method to $methodsWithSensitiveParameters | Morris Jobke | 2017-04-06 | 1 | -0/+1 |
| * | | | don't regenerate Session ID twice, also fixes tests | Arthur Schiwon | 2017-04-06 | 1 | -4/+7 |
| * | | | regenerate session id on successful login, fixes integration test | Arthur Schiwon | 2017-04-06 | 1 | -0/+4 |
| * | | | do login routine only once when done via LoginController | Arthur Schiwon | 2017-04-06 | 1 | -43/+40 |
* | | | | Remove expired attempts | Lukas Reschke | 2017-04-13 | 2 | -12/+32 |
* | | | | Update static autoloadermap | Lukas Reschke | 2017-04-13 | 2 | -0/+12 |
* | | | | Move to dedicated MiddleWare | Lukas Reschke | 2017-04-13 | 3 | -38/+160 |
* | | | | Add isset() as it can be an empty result | Lukas Reschke | 2017-04-13 | 1 | -1/+1 |
* | | | | Register in ServerContainer | Lukas Reschke | 2017-04-13 | 2 | -18/+15 |
* | | | | Add support for ratelimiting via annotations | Lukas Reschke | 2017-04-13 | 9 | -108/+483 |
* | | | | Merge pull request #3966 from nextcloud/downstream-26570 | Lukas Reschke | 2017-04-13 | 1 | -2/+12 |
|\ \ \ \ | |||||
| * | | | | Check for boolean false and add tests | Morris Jobke | 2017-04-04 | 1 | -1/+1 |
| * | | | | OC_ -> NC_ | Morris Jobke | 2017-04-04 | 1 | -2/+2 |
| * | | | | Override config.php values through ENV variables (#26570) | Philipp Schaffrath | 2017-04-04 | 1 | -2/+12 |
* | | | | | Merge pull request #3043 from nextcloud/issue-3038-no-logentry-on-email-login | Morris Jobke | 2017-04-13 | 1 | -2/+19 |
|\ \ \ \ \ | |||||
| * | | | | | Dont create a log entry on email login | Joas Schilling | 2017-04-07 | 1 | -2/+19 |
* | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-04-13 | 50 | -100/+108 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Merge pull request #4307 from nextcloud/sharing-emails | Roeland Jago Douma | 2017-04-12 | 2 | -15/+103 |
|\ \ \ \ \ | |||||
| * | | | | | No newlines when heading is empty | Joas Schilling | 2017-04-12 | 2 | -3/+7 |
| * | | | | | make the plain text footer standard compliant and add a space after '--'. It ... | Bjoern Schiessle | 2017-04-12 | 1 | -1/+1 |
| * | | | | | Use instance name as alt-text | Joas Schilling | 2017-04-12 | 1 | -2/+2 |
| * | | | | | Don't duplicate the sentence with the header | Joas Schilling | 2017-04-12 | 2 | -3/+7 |
| * | | | | | Properly escape heading, body and button text | Morris Jobke | 2017-04-12 | 2 | -6/+12 |
| * | | | | | Add addBodyButton to add a single button to email templates | Morris Jobke | 2017-04-12 | 2 | -0/+74 |
* | | | | | | Merge pull request #4282 from nextcloud/oci-connect-string | Morris Jobke | 2017-04-12 | 2 | -24/+36 |
|\ \ \ \ \ \ | |||||
| * | | | | | | use the same oci connectstring in all code paths | Robin Appelman | 2017-04-10 | 2 | -24/+36 |
* | | | | | | | Merge pull request #4331 from nextcloud/query-builder-sum | Morris Jobke | 2017-04-12 | 2 | -0/+14 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add sub() to the query function builder | Robin Appelman | 2017-04-12 | 2 | -0/+14 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #4329 from nextcloud/move-out-shared-folder | Morris Jobke | 2017-04-12 | 3 | -43/+50 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | use unjailed path when moving files out of a shared storage | Robin Appelman | 2017-04-12 | 1 | -2/+9 |
| * | | | | | | | rename Jail::getSourcePath to getUnjailedPath to fix conflict with Local::get... | Robin Appelman | 2017-04-12 | 2 | -41/+41 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #4325 from nextcloud/downstream-27522 | Roeland Jago Douma | 2017-04-12 | 1 | -2/+4 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Optimize put - Dont try to fetch filecache for not existing filecache in encr... | Piotr M | 2017-04-12 | 1 | -2/+4 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #3614 from nextcloud/discover-federatedsharing-endpoints | Björn Schießle | 2017-04-12 | 7 | -10/+186 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Update autoloader | Roeland Jago Douma | 2017-04-11 | 2 | -0/+4 |
| * | | | | | | Do proper DI | Roeland Jago Douma | 2017-04-11 | 5 | -26/+3 |
| * | | | | | | remove discovery manager in favour of the OCSDiscoveryService | Bjoern Schiessle | 2017-04-11 | 3 | -10/+10 |
| * | | | | | | add tests for discovery service | Bjoern Schiessle | 2017-04-11 | 1 | -3/+3 |
| * | | | | | | provide public discovery service to discover OCS end-points on another server | Bjoern Schiessle | 2017-04-11 | 4 | -0/+195 |
* | | | | | | | Fix casing of same origin frame option | Joas Schilling | 2017-04-12 | 1 | -1/+1 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #4309 from nextcloud/remove-unused-code | Lukas Reschke | 2017-04-12 | 1 | -68/+0 |
|\ \ \ \ \ \ |