summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1738 from nextcloud/comments-provide-displaynames-with-me...Morris Jobke2016-10-2616-185/+574
|\
| * fix JS test and introduce tests for rendering mentions to displaynamesArthur Schiwon2016-10-251-8/+62
| * avoid that all avatars are copied to the author row when editing commentsArthur Schiwon2016-10-211-1/+1
| * add missing methods to test fake managerArthur Schiwon2016-10-201-0/+4
| * consolidate error handlingArthur Schiwon2016-10-191-27/+41
| * fix avatar displaying after submit (either edit or new)Arthur Schiwon2016-10-191-3/+7
| * display avatar (if enabled) alongside displaynamesArthur Schiwon2016-10-192-1/+12
| * fix regexArthur Schiwon2016-10-191-1/+1
| * improve regex, fixes replacements of usernames with same trunkArthur Schiwon2016-10-191-1/+12
| * show displayname not uid in commit mentionsArthur Schiwon2016-10-192-17/+76
| * resolve displayname via manager and registerable resolversArthur Schiwon2016-10-196-4/+198
| * move mention extraction to (I)Comment and report mentions via DAVArthur Schiwon2016-10-197-149/+187
* | Merge pull request #1923 from nextcloud/fix-template-urlMorris Jobke2016-10-261-1/+1
|\ \
| * | … and the raw version of itblizzz2016-10-261-1/+1
| * | Fix issue template urlblizzz2016-10-261-1/+1
|/ /
* | Merge pull request #1907 from nextcloud/downstream-26164Morris Jobke2016-10-263-5/+15
|\ \
| * | Highlight files and update storage stats at end of upload (#26164)Vincent Petry2016-10-253-5/+15
* | | Merge pull request #1921 from nextcloud/ignore-htaccessMorris Jobke2016-10-261-0/+1
|\ \ \
| * | | So no one commits the crappy 403 and 404 anymoreJoas Schilling2016-10-261-0/+1
| |/ /
* | | Merge pull request #1355 from nextcloud/apps_flexboxMorris Jobke2016-10-261-1/+11
|\ \ \
| * | | Limit to apps list, add proper flex attributesFelix Epp2016-10-251-3/+10
| * | | Use flexbox on app pageRoeland Jago Douma2016-09-101-0/+3
* | | | Merge pull request #1914 from nextcloud/downstream-26468Morris Jobke2016-10-261-6/+1
|\ \ \ \
| * | | | Remove all unneeded set_include_path()Thomas Müller2016-10-251-6/+1
| | |/ / | |/| |
* | | | [tx-robot] updated from transifexNextcloud bot2016-10-26160-372/+250
* | | | Merge pull request #1917 from nextcloud/ocjs_inlineMorris Jobke2016-10-2615-32/+426
|\ \ \ \
| * | | | Missing returns + autoloader fileLukas Reschke2016-10-255-2/+7
| * | | | Inlince oc.js if possible!Roeland Jago Douma2016-10-254-1/+32
| * | | | Move browserSupportsCspV3 to CSPNonceManagerRoeland Jago Douma2016-10-256-28/+53
| * | | | Move oc.js to a proper classRoeland Jago Douma2016-10-254-4/+337
* | | | | Merge pull request #1911 from nextcloud/downstream-26477Roeland Jago Douma2016-10-251-1/+1
|\ \ \ \ \
| * | | | | Fix malformed attribute in files appVincent Petry2016-10-251-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #1913 from nextcloud/downstream-26441Roeland Jago Douma2016-10-253-17/+12
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Set 2.0.0 as minimum requirement for the desktop client in config.sample.phpThomas Müller2016-10-251-1/+1
| * | | | Fix unit tests for BlockLegacyClientPluginThomas Müller2016-10-251-15/+10
| * | | | Require to use at least desktop client 2.0 by defaultThomas Müller2016-10-251-1/+1
| |/ / /
* | | | Merge pull request #1910 from nextcloud/ignore-build-binLukas Reschke2016-10-251-2/+3
|\ \ \ \
| * | | | Add build/bin to gitignoreFelix A. Epp2016-10-251-2/+3
* | | | | Merge pull request #1891 from nextcloud/downstream-26430Lukas Reschke2016-10-252-32/+37
|\ \ \ \ \
| * | | | | add upgrade command before repair, handle NeedsUpgradeExcaption betterJörn Friedrich Dreyer2016-10-242-32/+37
* | | | | | Merge pull request #1878 from nextcloud/downstream-25936Morris Jobke2016-10-252-7/+8
|\ \ \ \ \ \
| * | | | | | [9.2] Add missing unit tests (#25936)Thomas Müller2016-10-242-7/+8
* | | | | | | Merge pull request #1906 from nextcloud/downstream-26460Morris Jobke2016-10-252-24/+2
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Remove any detailed information about the exception in the browser error pluginThomas Müller2016-10-252-24/+2
* | | | | | | Merge pull request #1871 from nextcloud/use-csp-noncesMorris Jobke2016-10-2519-12/+302
|\ \ \ \ \ \ \
| * | | | | | | Update autoload files 🙈Morris Jobke2016-10-242-2/+2
| * | | | | | | Add ContentSecurityPolicyNonceManagerLukas Reschke2016-10-249-4/+130
| * | | | | | | Add support for CSP noncesLukas Reschke2016-10-2414-12/+176
* | | | | | | | Merge pull request #1890 from nextcloud/downstream-25428Morris Jobke2016-10-252-2/+28
|\ \ \ \ \ \ \ \
| * | | | | | | | Add check for linux osLukas Reschke2016-10-251-1/+5