Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add the icon for the default sections | Joas Schilling | 2017-01-19 | 3 | -11/+32 |
| | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | Allow apps to specify an icon with the sections via the API | Joas Schilling | 2017-01-19 | 2 | -0/+39 |
| | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | add action to existing brute force protection | Bjoern Schiessle | 2017-01-18 | 1 | -3/+3 |
| | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
* | handle optional annotation parameters | Bjoern Schiessle | 2017-01-18 | 2 | -3/+20 |
| | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
* | Fix the regex for annotations with values | Joas Schilling | 2017-01-18 | 1 | -1/+1 |
| | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | introduce brute force protection for api calls | Bjoern Schiessle | 2017-01-18 | 3 | -11/+37 |
| | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
* | Merge pull request #3116 from nextcloud/spreed-turnserver-secret-is-sensitive | Lukas Reschke | 2017-01-17 | 1 | -0/+4 |
|\ | | | | | Make sure the spreed TURN server secret stays a secret | ||||
| * | Make sure the spreed TURN server secret stays a secret | Joas Schilling | 2017-01-17 | 1 | -0/+4 |
| | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | Merge pull request #3075 from nils/debug-no-versionhash | Joas Schilling | 2017-01-17 | 1 | -3/+12 |
|\ \ | | | | | | | Do not add version hash in debug mode | ||||
| * | | [Enhancement] Do not add version hash in debug mode | Nils | 2017-01-15 | 1 | -3/+12 |
| | | | | | | | | | | | | Signed-off-by: Nils <git@to.nilsschnabel.de> | ||||
* | | | Merge pull request #3106 from nextcloud/spreed-calls-are-objects | Joas Schilling | 2017-01-17 | 1 | -0/+25 |
|\ \ \ | |_|/ |/| | | Define spreed calls | ||||
| * | | Add call-type in case the information shall be used for styling or something ↵ | Joas Schilling | 2017-01-17 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | else in the future Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | Define spreed calls | Joas Schilling | 2017-01-16 | 1 | -0/+19 |
| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | Merge pull request #1594 from nextcloud/markdown-support-for-app-descriptions | Joas Schilling | 2017-01-17 | 1 | -31/+9 |
|\ \ \ | | | | | | | | | Markdown support for app descriptions | ||||
| * | | | Fix tests | Joas Schilling | 2017-01-13 | 1 | -8/+8 |
| | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | Remove the magic parsing of the description | Joas Schilling | 2017-01-13 | 1 | -24/+2 |
| | |/ | |/| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | Merge pull request #3023 from ↵ | Christoph Wurst | 2017-01-17 | 4 | -10/+57 |
|\ \ \ | | | | | | | | | | | | | | | | | nextcloud/issue-2915-filter-out-sensitive-appconfigs Filter out sensitive appconfig values | ||||
| * | | | Fix tests | Joas Schilling | 2017-01-12 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | Filter out sensitive appconfig values | Joas Schilling | 2017-01-11 | 3 | -9/+57 |
| | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-01-17 | 2 | -0/+10 |
| |_|/ |/| | | |||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-01-16 | 4 | -12/+12 |
| |/ |/| | |||||
* | | Merge pull request #3051 from ↵ | Joas Schilling | 2017-01-13 | 1 | -0/+12 |
|\ \ | | | | | | | | | | | | | nextcloud/issue-2831-change-row-format-before-collation Change the row-format before changing the collation | ||||
| * | | Change the row-format before changing the collation | Joas Schilling | 2017-01-12 | 1 | -0/+12 |
| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | Merge pull request #2918 from nextcloud/encryption-recovery-improvements | Morris Jobke | 2017-01-13 | 2 | -0/+45 |
|\ \ \ | |/ / |/| | | create new encryption keys on password reset and backup the old one | ||||
| * | | create new encryption keys on password reset and backup the old one | Bjoern Schiessle | 2017-01-10 | 2 | -0/+45 |
| | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-01-11 | 4 | -6/+14 |
| | | | |||||
* | | | Merge pull request #2849 from nextcloud/downstream-add-two-factor-exception | Roeland Jago Douma | 2017-01-11 | 3 | -0/+40 |
|\ \ \ | | | | | | | | | Downstream add two factor exception | ||||
| * | | | Update autoloader | Roeland Jago Douma | 2017-01-11 | 2 | -0/+2 |
| | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | fix coding style and increase code coverage | Christoph Wurst | 2017-01-11 | 1 | -12/+13 |
| | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
| * | | | Update TwoFactorException.php | Cornelius Kölbel | 2017-01-11 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | | | Add a TwoFactorException | Cornelius Kölbel | 2017-01-11 | 1 | -0/+37 |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | A Two Factor third party App may throw a TwoFactorException() with a more detailed error message in case the authentication fails. The 2FA Controller will then display the message of this Exception to the user. Working on #26593 Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
* | | | Merge pull request #3007 from Loki3000/master | Roeland Jago Douma | 2017-01-11 | 3 | -4/+19 |
|\ \ \ | |/ / |/| | | Remove non required db requests | ||||
| * | | remove non required sql requests | Loki3000 | 2017-01-10 | 1 | -3/+8 |
| | | | | | | | | | | | | | | | ``` SELECT `appid`, `configkey`, `configvalue` FROM `preferences` WHERE `userid` = ''; ``` | ||||
| * | | spaces added | Loki3000 | 2017-01-10 | 1 | -1/+1 |
| | | | |||||
| * | | spaces added | Loki3000 | 2017-01-10 | 1 | -1/+1 |
| | | | |||||
| * | | allowed '0' uid | Loki3000 | 2017-01-10 | 1 | -1/+1 |
| | | | |||||
| * | | allowed '0' uid | Loki3000 | 2017-01-10 | 1 | -2/+2 |
| | | | |||||
| * | | fix spaces | Loki3000 | 2017-01-10 | 1 | -1/+1 |
| | | | |||||
| * | | fix brackets | Loki3000 | 2017-01-10 | 1 | -2/+4 |
| | | | |||||
| * | | remove non required db requests | Loki3000 | 2017-01-10 | 1 | -1/+6 |
| | | | |||||
| * | | remove non required db requests | Loki3000 | 2017-01-10 | 1 | -1/+4 |
| | | | |||||
* | | | Merge pull request #2744 from nextcloud/oc_26324 | Roeland Jago Douma | 2017-01-11 | 1 | -52/+53 |
|\ \ \ | | | | | | | | | [downstream] Fix DAV stat cache to properly cache 404 | ||||
| * | | | Fix DAV stat cache to properly cache 404 | Vincent Petry | 2017-01-05 | 1 | -52/+53 |
| | | | | | | | | | | | | | | | | | | | | | | | | 404 errors were not properly cached due to catching the wrong exception. Now catching ClientHttpException and checking the error code. In case of 404, adjust the stat cache accordingly. | ||||
* | | | | Merge pull request #2745 from nextcloud/oc_26590 | Roeland Jago Douma | 2017-01-11 | 1 | -5/+16 |
|\ \ \ \ | | | | | | | | | | | [downstream] Skip local shares in bkg scan and occ files:scan (#26590) | ||||
| * | | | | Only check for local shared storages | Roeland Jago Douma | 2017-01-10 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | | Skip local shares in bkg scan and occ files:scan (#26590) | Vincent Petry | 2017-01-10 | 1 | -5/+15 |
| | |_|/ | |/| | | | | | | | | | | | | | | Local shares should only be scanned when doing it for the owner to avoid repeatedly rescanning the same shared storage over and over again for every recipient. | ||||
* | | | | Merge pull request #2951 from nextcloud/handle-nextcloud-log-type-gracefully | Roeland Jago Douma | 2017-01-11 | 2 | -8/+25 |
|\ \ \ \ | |/ / / |/| | | | Handle log_type "nextcloud" more gracefully | ||||
| * | | | Better fallback for unknown log types | Joas Schilling | 2017-01-10 | 1 | -9/+10 |
| | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | Add tests | Joas Schilling | 2017-01-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | Handle log_type "nextcloud" more gracefully | Joas Schilling | 2017-01-05 | 2 | -8/+24 |
| |/ / | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> |