| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #1920 from ↵ | Roeland Jago Douma | 2016-10-26 | 4 | -4/+18 |
| |\ | | | | | | | | | nextcloud/legacy-pages-should-also-receive-the-nonce Add nonce also to legacy CSP | ||||
| | * | Identify Chromium as Chrome | Joas Schilling | 2016-10-26 | 3 | -3/+17 |
| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | Add nonce also to legacy CSP | Lukas Reschke | 2016-10-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | Pages that do not use the AppFramework have its CSP inherited from `\OC_Response::addSecurityHeaders`. While those are not many anymore, there are some examples such as the "Help" page. To stay completely backwards-compatible we should also add the nonce to the legacy CSP response. To test that open your browser console and open the help page. Without this you will get a JS error. With this you won't. Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | | Merge pull request #1925 from ↵ | Joas Schilling | 2016-10-26 | 1 | -0/+1 |
| |\ \ | | | | | | | | | | | | | nextcloud/issue-1874-allow-users-to-change-their-passwords-again Allow users to change their passwords again | ||||
| | * | | Allow users to change their passwords again | Joas Schilling | 2016-10-26 | 1 | -0/+1 |
| | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | Merge pull request #1738 from ↵ | Morris Jobke | 2016-10-26 | 16 | -185/+574 |
| |\ \ \ | | | | | | | | | | | | | | | | | nextcloud/comments-provide-displaynames-with-mentions comment mentions: show displayname not uid | ||||
| | * | | | fix JS test and introduce tests for rendering mentions to displaynames | Arthur Schiwon | 2016-10-25 | 1 | -8/+62 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| | * | | | avoid that all avatars are copied to the author row when editing comments | Arthur Schiwon | 2016-10-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| | * | | | add missing methods to test fake manager | Arthur Schiwon | 2016-10-20 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| | * | | | consolidate error handling | Arthur Schiwon | 2016-10-19 | 1 | -27/+41 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| | * | | | fix avatar displaying after submit (either edit or new) | Arthur Schiwon | 2016-10-19 | 1 | -3/+7 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| | * | | | display avatar (if enabled) alongside displaynames | Arthur Schiwon | 2016-10-19 | 2 | -1/+12 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| | * | | | fix regex | Arthur Schiwon | 2016-10-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| | * | | | improve regex, fixes replacements of usernames with same trunk | Arthur Schiwon | 2016-10-19 | 1 | -1/+12 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| | * | | | show displayname not uid in commit mentions | Arthur Schiwon | 2016-10-19 | 2 | -17/+76 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| | * | | | resolve displayname via manager and registerable resolvers | Arthur Schiwon | 2016-10-19 | 6 | -4/+198 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| | * | | | move mention extraction to (I)Comment and report mentions via DAV | Arthur Schiwon | 2016-10-19 | 7 | -149/+187 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| * | | | | Merge pull request #1923 from nextcloud/fix-template-url | Morris Jobke | 2016-10-26 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | Fix issue template url | ||||
| | * | | | | … and the raw version of it | blizzz | 2016-10-26 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Fix issue template url | blizzz | 2016-10-26 | 1 | -1/+1 |
| |/ / / / | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| * | | | | Merge pull request #1907 from nextcloud/downstream-26164 | Morris Jobke | 2016-10-26 | 3 | -5/+15 |
| |\ \ \ \ | | | | | | | | | | | Highlight files and update storage stats at end of upload (#26164) | ||||
| | * | | | | Highlight files and update storage stats at end of upload (#26164) | Vincent Petry | 2016-10-25 | 3 | -5/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Properly trigger the "stop" even from the uploader. Also update storage stats at the end of all uploads instead of for each upload. | ||||
| * | | | | | Merge pull request #1921 from nextcloud/ignore-htaccess | Morris Jobke | 2016-10-26 | 1 | -0/+1 |
| |\ \ \ \ \ | |_|_|/ / |/| | | | | Ignore .htaccess So no one commits the crappy 403 and 404 anymore | ||||
| | * | | | | So no one commits the crappy 403 and 404 anymore | Joas Schilling | 2016-10-26 | 1 | -0/+1 |
| | |/ / / | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | | Merge pull request #1355 from nextcloud/apps_flexbox | Morris Jobke | 2016-10-26 | 1 | -1/+11 |
| |\ \ \ \ | | | | | | | | | | | Use flexbox on app page | ||||
| | * | | | | Limit to apps list, add proper flex attributes | Felix Epp | 2016-10-25 | 1 | -3/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let app-name headline break, increase padding on the right for more visual clearance. Make experimental header full width Signed-off-by: Felix A. Epp <work@felixepp.de> | ||||
| | * | | | | Use flexbox on app page | Roeland Jago Douma | 2016-09-10 | 1 | -0/+3 |
| | | | | | | |||||
| * | | | | | Merge pull request #1914 from nextcloud/downstream-26468 | Morris Jobke | 2016-10-26 | 1 | -6/+1 |
| |\ \ \ \ \ | |_|_|_|/ |/| | | | | Remove all unneeded set_include_path() | ||||
| | * | | | | Remove all unneeded set_include_path() | Thomas Müller | 2016-10-25 | 1 | -6/+1 |
| | | |/ / | |/| | | |||||
| * | | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-10-26 | 160 | -372/+250 |
| | | | | | |||||
| * | | | | Merge pull request #1917 from nextcloud/ocjs_inline | Morris Jobke | 2016-10-26 | 15 | -32/+426 |
| |\ \ \ \ | | | | | | | | | | | Inline oc.js when possible! | ||||
| | * | | | | Missing returns + autoloader file | Lukas Reschke | 2016-10-25 | 5 | -2/+7 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| | * | | | | Inlince oc.js if possible! | Roeland Jago Douma | 2016-10-25 | 4 | -1/+32 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| | * | | | | Move browserSupportsCspV3 to CSPNonceManager | Roeland Jago Douma | 2016-10-25 | 6 | -28/+53 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| | * | | | | Move oc.js to a proper class | Roeland Jago Douma | 2016-10-25 | 4 | -4/+337 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | | | Merge pull request #1911 from nextcloud/downstream-26477 | Roeland Jago Douma | 2016-10-25 | 1 | -1/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | Fix malformed attribute in files app | ||||
| | * | | | | | Fix malformed attribute in files app | Vincent Petry | 2016-10-25 | 1 | -1/+1 |
| | | |/ / / | |/| | | | |||||
| * | | | | | Merge pull request #1913 from nextcloud/downstream-26441 | Roeland Jago Douma | 2016-10-25 | 3 | -17/+12 |
| |\ \ \ \ \ | |_|/ / / |/| | | | | Require to use at least desktop client 2.0 by default | ||||
| | * | | | | Set 2.0.0 as minimum requirement for the desktop client in config.sample.php | Thomas Müller | 2016-10-25 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Fix unit tests for BlockLegacyClientPlugin | Thomas Müller | 2016-10-25 | 1 | -15/+10 |
| | | | | | | |||||
| | * | | | | Require to use at least desktop client 2.0 by default | Thomas Müller | 2016-10-25 | 1 | -1/+1 |
| | |/ / / | |||||
| * | | | | Merge pull request #1910 from nextcloud/ignore-build-bin | Lukas Reschke | 2016-10-25 | 1 | -2/+3 |
| |\ \ \ \ | | | | | | | | | | | Add build/bin to gitignore | ||||
| | * | | | | Add build/bin to gitignore | Felix A. Epp | 2016-10-25 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When phantomjs and karma are not installed globally, they are installed into this folder. Signed-off-by: Felix A. Epp <work@felixepp.de> | ||||
| * | | | | | Merge pull request #1891 from nextcloud/downstream-26430 | Lukas Reschke | 2016-10-25 | 2 | -32/+37 |
| |\ \ \ \ \ | | | | | | | | | | | | | add upgrade command before repair, handle NeedsUpgradeException better | ||||
| | * | | | | | add upgrade command before repair, handle NeedsUpgradeExcaption better | Jörn Friedrich Dreyer | 2016-10-24 | 2 | -32/+37 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #1878 from nextcloud/downstream-25936 | Morris Jobke | 2016-10-25 | 2 | -7/+8 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Adjust unit tests to upstream | ||||
| | * | | | | | | [9.2] Add missing unit tests (#25936) | Thomas Müller | 2016-10-24 | 2 | -7/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adjust unit test execution after folder rename * Adjust login controller tests to match current behavior * Fix broken unit tests | ||||
| * | | | | | | | Merge pull request #1906 from nextcloud/downstream-26460 | Morris Jobke | 2016-10-25 | 2 | -24/+2 |
| |\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | Remove any detailed information about the exception in the browser er… | ||||
| | * | | | | | | Remove any detailed information about the exception in the browser error plugin | Thomas Müller | 2016-10-25 | 2 | -24/+2 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #1871 from nextcloud/use-csp-nonces | Morris Jobke | 2016-10-25 | 19 | -12/+302 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Use CSP nonces | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |