| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Move logic into new class with DI | Joas Schilling | 2017-04-13 | 2 | -80/+155 |
| | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | Send an email on password change | Joas Schilling | 2017-04-13 | 1 | -4/+42 |
| | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | Add activities when email or password is changed | Joas Schilling | 2017-04-13 | 5 | -0/+352 |
| | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | Merge pull request #3966 from nextcloud/downstream-26570 | Lukas Reschke | 2017-04-13 | 2 | -2/+33 |
| |\ | | | | | Override config.php values through environment variables | ||||
| | * | Check for boolean false and add tests | Morris Jobke | 2017-04-04 | 2 | -1/+16 |
| | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| | * | OC_ -> NC_ | Morris Jobke | 2017-04-04 | 2 | -3/+3 |
| | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| | * | Override config.php values through ENV variables (#26570) | Philipp Schaffrath | 2017-04-04 | 2 | -2/+18 |
| | | | | | | | | | | | | | | | | | * added functionality to override config.php values with 'OC_' prefixed environment variables * use getenv to read environment variables since apache does not set $_ENV variables, fixed test Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | | Merge pull request #3043 from nextcloud/issue-3038-no-logentry-on-email-login | Morris Jobke | 2017-04-13 | 3 | -58/+83 |
| |\ \ | | | | | | | Dont create a log entry on email login | ||||
| | * | | Dont create a log entry on email login | Joas Schilling | 2017-04-07 | 3 | -58/+83 |
| | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-04-13 | 174 | -836/+902 |
| | | | | |||||
| * | | | Merge pull request #4338 from nextcloud/handlebars-min | Lukas Reschke | 2017-04-12 | 5 | -9192/+34 |
| |\ \ \ | | | | | | | | | Move to handlebars.min.js | ||||
| | * | | | Move to handlebars.min.js | Roeland Jago Douma | 2017-04-12 | 5 | -9192/+34 |
| |/ / / | | | | | | | | | | | | | | | | core.js is now below 1mb! Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | Merge pull request #4307 from nextcloud/sharing-emails | Roeland Jago Douma | 2017-04-12 | 16 | -279/+388 |
| |\ \ \ | | | | | | | | | New emails for sharebymail | ||||
| | * | | | Fix unit tests | Morris Jobke | 2017-04-12 | 5 | -13/+19 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| | * | | | Dont add click-button text for plaintext mails | Joas Schilling | 2017-04-12 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | | | No newlines when heading is empty | Joas Schilling | 2017-04-12 | 2 | -3/+7 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | | | make the plain text footer standard compliant and add a space after '--'. It ↵ | Bjoern Schiessle | 2017-04-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | also adds a line break in front so that there is some spacing between the mail body and the footer Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| | * | | | Use instance name as alt-text | Joas Schilling | 2017-04-12 | 5 | -5/+9 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | | | Don't duplicate the sentence with the header | Joas Schilling | 2017-04-12 | 3 | -4/+8 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | | | Use new email design for sharebymail emails | Morris Jobke | 2017-04-12 | 5 | -250/+39 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| | * | | | Properly escape heading, body and button text | Morris Jobke | 2017-04-12 | 2 | -6/+12 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| | * | | | Add addBodyButton to add a single button to email templates | Morris Jobke | 2017-04-12 | 5 | -0/+295 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | | | | Merge pull request #4335 from nextcloud/jquery-ui-min | Lukas Reschke | 2017-04-12 | 5 | -29698/+9 |
| |\ \ \ \ | | | | | | | | | | | Moved to jquery-ui.custom.min.js | ||||
| | * | | | | Moved to jquery-ui.custom.min.js | Roeland Jago Douma | 2017-04-12 | 5 | -29698/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shaves off about 200kb of the default loaded js libs Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | | | 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 | ||||
| | * | | | | | use the same oci connectstring in all code paths | Robin Appelman | 2017-04-10 | 2 | -24/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| * | | | | | | Merge pull request #4306 from nextcloud/followup-3905 | Roeland Jago Douma | 2017-04-12 | 1 | -0/+13 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Favorites integration tests for shared files | ||||
| | * | | | | | | Favorites integration tests for shared files | Morris Jobke | 2017-04-12 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | | | | | | | Merge pull request #4331 from nextcloud/query-builder-sum | Morris Jobke | 2017-04-12 | 2 | -0/+14 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Add sum() to the query function builder | ||||
| | * | | | | | | Add sub() to the query function builder | Robin Appelman | 2017-04-12 | 2 | -0/+14 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| * | | | | | | Merge pull request #4329 from nextcloud/move-out-shared-folder | Morris Jobke | 2017-04-12 | 5 | -49/+56 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix moving files out of a shared folder | ||||
| | * | | | | | | use unjailed path when moving files out of a shared storage | Robin Appelman | 2017-04-12 | 1 | -2/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| | * | | | | | | rename Jail::getSourcePath to getUnjailedPath to fix conflict with ↵ | Robin Appelman | 2017-04-12 | 4 | -47/+47 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Local::getSourcePath Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| * | | | | | | Merge pull request #4325 from nextcloud/downstream-27522 | Roeland Jago Douma | 2017-04-12 | 2 | -6/+13 |
| |\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Optimize put - Dont try to fetch filecache for not existing filecache… | ||||
| | * | | | | | Simplify the test | Joas Schilling | 2017-04-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | | | | | Optimize put - Dont try to fetch filecache for not existing filecache in ↵ | Piotr M | 2017-04-12 | 2 | -6/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | encription | ||||
| * | | | | | | Merge pull request #3614 from nextcloud/discover-federatedsharing-endpoints | Björn Schießle | 2017-04-12 | 34 | -509/+502 |
| |\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Discover federatedsharing endpoints | ||||
| | * | | | | | Update autoloader | Roeland Jago Douma | 2017-04-11 | 2 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| | * | | | | | Do proper DI | Roeland Jago Douma | 2017-04-11 | 17 | -39/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| | * | | | | | give old end-points a seperate name | Bjoern Schiessle | 2017-04-11 | 2 | -2/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| | * | | | | | fix constructor | Bjoern Schiessle | 2017-04-11 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| | * | | | | | remove discovery manager in favour of the OCSDiscoveryService | Bjoern Schiessle | 2017-04-11 | 18 | -468/+81 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| | * | | | | | add tests for discovery service | Bjoern Schiessle | 2017-04-11 | 2 | -3/+102 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| | * | | | | | adjust existing tests | Bjoern Schiessle | 2017-04-11 | 4 | -12/+42 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| | * | | | | | get addressbook url and carddav user from remote server | Bjoern Schiessle | 2017-04-11 | 3 | -21/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| | * | | | | | use discovered end-point for trusted servers | Bjoern Schiessle | 2017-04-11 | 2 | -6/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| | * | | | | | provide public discovery service to discover OCS end-points on another server | Bjoern Schiessle | 2017-04-11 | 4 | -0/+195 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | | | | | | Merge pull request #4323 from nextcloud/downstream-27613 | Roeland Jago Douma | 2017-04-12 | 2 | -6/+12 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Allow file upload when storage is unlimited | ||||
| | * | | | | | | Allow file upload when storage is unlimited | Joas Schilling | 2017-04-12 | 2 | -6/+12 |
| | | |/ / / / | |/| | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | | | | Merge pull request #4324 from nextcloud/downstream-27581-27602 | Roeland Jago Douma | 2017-04-12 | 4 | -5/+5 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | Fix casing of same origin frame option | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |