OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
18,509 Commits
215 Branches
561 Tags
462 MiB
Commit Graph

18509 Commits (537bd3700d6565809964d53804b5785ce3f81e79)

Author SHA1 Message Date
Bruno Windels 4bd72b1494 dont let placeholder show scrollbar when composer is narrow 2019-10-02 11:36:56 +02:00
RiotRobot 4ca0b957a7 v1.6.2-rc.1 2019-10-02 10:26:31 +01:00
RiotRobot 07c83fe7c3 Prepare changelog for v1.6.2-rc.1 2019-10-02 10:26:31 +01:00
David Baker 3c5880e5ee use released js-sdk 2019-10-02 10:19:51 +01:00
Bruno Windels c8c4dc29d1
Merge pull request #3503 from matrix-org/bwindels/custom-themes-mvp 
Custom theming MVP
 2019-10-02 09:14:07 +00:00
Bruno Windels 27ca73bf63 add copyright headers 2019-10-02 11:06:31 +02:00
Bruno Windels fbc3f68fd2 remove old style 2019-10-02 11:06:31 +02:00
Bruno Windels 9e60e4b669
Update docs/settings.md 
Co-Authored-By: Travis Ralston <travpc@gmail.com>
 2019-10-02 09:00:24 +00:00
Travis Ralston 4b6c9168da
Merge pull request #3505 from aaronraimist/alias-dont-bold 
Don't mark a room as unread when someone adds an alias
 2019-10-01 17:08:29 -06:00
Travis Ralston 4c95b2063e
Merge pull request #3504 from matrix-org/t3chguy/fix_upgraderoom_slashcommand 
Fix upgraderoom slashcommand
 2019-10-01 17:07:49 -06:00
Travis Ralston a719623bb9 Appease the linter 2019-10-01 17:06:55 -06:00
Travis Ralston cf4fa068c4 Remove old string 2019-10-01 17:06:21 -06:00
Travis Ralston 4b0596b6b7 Apply lipstick to hidden image design 2019-10-01 17:00:01 -06:00
Aaron Raimist d0ce799798
Don't mark a room as unread when someone adds an alias 
https://github.com/vector-im/riot-web/issues/2321#issuecomment-508526884
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2019-10-01 15:08:38 -05:00
Michael Telatynski 8f3cef84fd Fix upgraderoom slashcommand 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-10-01 20:58:40 +01:00
Michael Telatynski c5fd92bfeb
Merge pull request #3501 from TheTimeWalker/patch-1 
Update stripped emoji and bump emojidata to 4.0.2
 2019-10-01 17:28:37 +01:00
Tony Stipanic cfff39b58b Update stripped emoji and bump emojidata to 4.0.2 2019-10-01 18:05:25 +02:00
Travis Ralston daef5f7574 Move setting to real settings 2019-10-01 09:32:42 -06:00
Travis Ralston 3c589cffec Merge branch 'develop' into travis/hide-images 2019-10-01 09:31:54 -06:00
Bruno Windels 8d767a712f remove obsolete strings 2019-10-01 17:31:20 +02:00
Bruno Windels 026733304e add doc for where default settings go in config file now we're here 2019-10-01 17:00:41 +02:00
Bruno Windels fc6a68cd1d add support for dark theme 2019-10-01 17:00:29 +02:00
Bruno Windels 15b7a5af31 fix contrast issue 
when badges with and without highlighted state have a very
different brightness (as they might do in dark mode), hardcoding
the fg color of a badge independent of it's highlighted state
to $accent-fg-color doesn't work well, so add an extra SASS
variable we can reassign to something more specific in the custom theme
 2019-10-01 16:58:14 +02:00
Travis Ralston 7d1a04cb12
Merge pull request #3500 from matrix-org/travis/permalinks 
Support local permalinks for unfederated instances
 2019-10-01 08:41:23 -06:00
Bruno Windels c1edd6d0b5 apply new pallete with 13 colors 2019-10-01 15:31:43 +02:00
Bruno Windels 558f8daeeb support custom themes from setting 
also move theme setting code from MatrixChat to own file.
 2019-10-01 15:21:22 +02:00
Bruno Windels 79d4434c9f remove custom color pickers 2019-10-01 15:20:11 +02:00
J. Ryan Stinnett 617a5290f9 Change back to develop branch for deps 2019-10-01 13:30:13 +01:00
Michael Telatynski 891eb7af3f
Merge pull request #3499 from matrix-org/t3chguy/accessibility2 
Accessibility fixes to the LeftPanel
 2019-10-01 12:21:45 +01:00
Michael Telatynski 2d6461d376
Merge pull request #3497 from matrix-org/t3chguy/autocomplete_a11y 
Make Autocomplete more accessible to screen reader users
 2019-10-01 12:07:39 +01:00
David Baker d369e1ff5c
Merge pull request #3496 from matrix-org/bwindels/fix-ac-bis 
Fix: even more resilience to detect slash commands
 2019-10-01 11:52:36 +01:00
David Baker a75fd1801c
Merge pull request #3486 from matrix-org/t3chguy/fixes 
Fix PropTypes usage, sdk import path and GroupMemberTile letter-avatar
 2019-10-01 11:49:32 +01:00
RiotRobot e457ef3679 v1.6.1 2019-10-01 11:40:47 +01:00
RiotRobot ca18e167db Prepare changelog for v1.6.1 2019-10-01 11:40:46 +01:00
RiotRobot fa12b60c4a Upgrade to JS SDK 2.4.1 2019-10-01 11:35:33 +01:00
J. Ryan Stinnett e7cfafad07
Merge pull request #3502 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate
 2019-10-01 11:22:00 +01:00
Besnik Bleta d3264b03e0 Translated using Weblate (Albanian) 
Currently translated at 99.7% (1807 of 1812 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2019-10-01 10:20:59 +00:00
Weblate decc2cbf6a Merge branch 'origin/develop' into Weblate. 2019-10-01 09:04:16 +00:00
J. Ryan Stinnett 6424edfe55
Merge pull request #3489 from matrix-org/jryans/terms-dialog-tweaks 
Adjust details of terms dialog
 2019-10-01 10:04:09 +01:00
Travis Ralston 0862ad029d Fix permalinks test 2019-09-30 21:15:31 -06:00
Travis Ralston f903f431ed Fix BigEmoji handling for permalinks 
OR doesn't give us the right thing, but AND does.
 2019-09-30 21:08:34 -06:00
Travis Ralston 6b09c3e9e6 Appease the linter 2019-09-30 21:03:16 -06:00
Travis Ralston fc66e69c02 Rename RoomPermalinkCreator -> Permalinks due to scope 
The file handles more than just a RoomPermalinkCreator, so we should name it accordingly.
 2019-09-30 20:39:58 -06:00
Travis Ralston 6f5ccd4c12 Minor comment updates 2019-09-30 20:38:03 -06:00
Travis Ralston 6e6f8a13e1 Handle BigEmoji permalinks better 
Now that permalinks could be not-matrix.to we should be safer in what we'll allow.
 2019-09-30 20:37:50 -06:00
Travis Ralston ce0a534db1 Fix pills for CIDER too 2019-09-30 20:37:24 -06:00
Travis Ralston 2824f468d9 Update pill processing to handle better permalinks 2019-09-30 20:27:51 -06:00
Travis Ralston 2cb0b4903a Converge on permalink processing for HtmlUtils and linkify-matrix 2019-09-30 20:17:54 -06:00
Travis Ralston ff4eee5239 Minor cleanup of getPermalinkConstructor 2019-09-30 16:09:19 -06:00
Travis Ralston 6656ef112f Rework /join to parse permalinks more safely 
They might not be matrix.to anymore, so parse them more correctly.
 2019-09-30 16:06:56 -06:00