mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-27 11:47:23 +03:00
Code Issues Projects Releases Packages Wiki Activity
14312 commits 217 branches 561 tags 411 MiB
Commit graph

14312 commits

This branch
This branch
All branches
Author SHA1 Message Date
Travis Ralston
2cd6d1ec6a Don't duplicate direct chats from other tags 
Fixes https://github.com/vector-im/riot-web/issues/8971
 2019-03-06 15:38:31 +00:00
David Baker
0b0b16da5c
Merge pull request #2761 from matrix-org/dbkr/rls-debugging 
Include tag name when warning about rooms running off lists
 2019-03-06 15:38:03 +00:00
Travis Ralston
ff72c3ba63 Include tag name when warning about rooms running off lists 2019-03-06 15:37:06 +00:00
David Baker
5c0c2fa8f3
Merge pull request #2760 from matrix-org/dbkr/upgraded-rooms 
Always insert rooms into lists when they get lost
 2019-03-06 15:36:31 +00:00
Travis Ralston
2ad11437d5 More clearly fix issues with room insertion to lists 
Instead of having a catch-all insert, try and fix the common cases with a bit more care.
 2019-03-06 15:35:35 +00:00
Travis Ralston
a34f3780f3 Always insert rooms into lists when they get lost 
Room upgrades, direct chats, etc all end up being lost in these scenarios. Instead of losing them to the list, try and put them into a relevant spot of the list.

Fixes https://github.com/vector-im/riot-web/issues/9020
 2019-03-06 15:35:29 +00:00
David Baker
1a7c313de7
Merge pull request #2759 from matrix-org/dbkr/fix_ctrl_k 
Fix the ctrl+k shortcut
 2019-03-06 15:13:57 +00:00
David Baker
3a41206e90 Fix the ctrl+k shortcut 
Fixes https://github.com/vector-im/riot-web/issues/9029
 2019-03-06 14:53:52 +00:00
David Baker
ce1a985233 v1.0.2 2019-03-06 11:26:42 +00:00
David Baker
4a785263e2 Prepare changelog for v1.0.2 2019-03-06 11:26:41 +00:00
David Baker
d83bce15a6 releaseed js-sdk 2019-03-06 11:19:06 +00:00
David Baker
051e5d392c
Merge pull request #2755 from matrix-org/dbkr/hosting_link_only_if_group_admin 
Only show hosting link if group admin
 2019-03-06 10:58:01 +00:00
David Baker
9a57e5c2f6
Merge pull request #2754 from matrix-org/dbkr/hosting_link_only_matrix_org 
Only show hosting link if domain == matrix.org
 2019-03-06 10:38:08 +00:00
David Baker
23f22617ed Only show hosting link if group admin 2019-03-06 10:32:30 +00:00
David Baker
610a6d935a Only show hosting link if domain == matrix.org 
Fixes https://github.com/vector-im/riot-web/issues/9059
 2019-03-06 10:22:19 +00:00
David Baker
a9402beb8f v1.0.2-rc.4 2019-03-05 19:17:52 +00:00
David Baker
2b2cb1504e Prepare changelog for v1.0.2-rc.4 2019-03-05 19:17:51 +00:00
David Baker
647260b1ab js-sdk rc.2 2019-03-05 19:07:22 +00:00
David Baker
52e5d15a5a
Merge pull request #2752 from matrix-org/dbkr/fix-user-not-existing 
Patch users not existing when opening settings
 2019-03-05 18:49:49 +00:00
Travis Ralston
b9bd8206c1 Patch users not existing when opening settings 
Fixes https://github.com/vector-im/riot-web/issues/9022
 2019-03-05 18:48:41 +00:00
David Baker
4c333f8c5f
Merge pull request #2751 from matrix-org/dbkr/devices_toggle_update_2 
Fix media device selectors not updating
 2019-03-05 18:46:05 +00:00
David Baker
cd4e22b3fd Fix media device selectors not updating 
Missed a setState

Fixes https://github.com/vector-im/riot-web/issues/9036
 2019-03-05 18:45:24 +00:00
David Baker
ff4963e662
Merge pull request #2750 from matrix-org/dbkr/shameless_plugging_2 
Support linking to hosting providers
 2019-03-05 18:34:54 +00:00
David Baker
b6579131b8 Add the image 2019-03-05 18:33:28 +00:00
David Baker
7aa451067e Add utm_campaign to the hosting links 
According to where in the app the link was clicked
 2019-03-05 18:33:22 +00:00
David Baker
dc0eff38fd Lint 2019-03-05 18:33:16 +00:00
David Baker
d888445ec7 Support linking to hosting providers 
From link in app config
 2019-03-05 18:32:56 +00:00
David Baker
133dfe0807 v1.0.2-rc.3 2019-03-01 17:36:10 +00:00
David Baker
738bc4d2d5 Prepare changelog for v1.0.2-rc.3 2019-03-01 17:36:10 +00:00
David Baker
784f468d94
Merge pull request #2733 from matrix-org/travis/misc-roomlist 
Misc room list improvements & invite fix
 2019-03-01 17:28:30 +00:00
David Baker
9d2ef8a3cd v1.0.2-rc.2 2019-03-01 12:17:26 +00:00
David Baker
e8213bc5c3 Prepare changelog for v1.0.2-rc.2 2019-03-01 12:17:25 +00:00
David Baker
4f430db981
Merge pull request #2730 from matrix-org/dbkr/langs_file_resolve_alias 
Use webpack alias to resolve the languages file
 2019-03-01 12:13:31 +00:00
David Baker
4f84311bde Use $webapp rather than Webapp 2019-03-01 12:03:04 +00:00
David Baker
f2328904cd stray semicolon 2019-03-01 11:48:48 +00:00
David Baker
53aceaa412 Add fallback for languages file 
So we're not completely dependent on the alias being set
 2019-03-01 11:44:44 +00:00
David Baker
63c6f600bf Use webpack alias to resolve the languages file 
Hopefully this will end up simpler than having to figure out in
riot-web what the relative path is from react-sdk's
src/languageHandler.js to riot-web's webapp directory.
 2019-03-01 11:30:50 +00:00
Travis Ralston
805676a511 Don't lose invites when multiple are pending 2019-02-28 14:03:28 -07:00
Travis Ralston
872cdaa9b3 Use the already available state for checking if custom tags are enabled 2019-02-28 14:03:28 -07:00
Travis Ralston
b1e16e9f49 Fix stacktrace when starting riot up with rooms 
Settings can trigger before we're ready, so don't generate the room list. This also includes a comment to signify to future people that we need to track settings still.
 2019-02-28 13:55:20 -07:00
Travis Ralston
b2f4de4488
Merge pull request #2716 from matrix-org/travis/what-even-is-a-category 
Move complex part of room sorting to a dedicated function
 2019-02-28 13:36:09 -07:00
Travis Ralston
a3342a5790 Standardize on "Category" being the canonical term for room list sections 2019-02-28 13:24:05 -07:00
David Baker
52a2fe1c9c v1.0.2-rc.1 2019-02-28 14:43:36 +00:00
David Baker
89ad006d2d Prepare changelog for v1.0.2-rc.1 2019-02-28 14:43:35 +00:00
David Baker
95675461c8 js-sdk rc.1 2019-02-28 14:37:43 +00:00
Jason Robinson
c4c9c77330
Merge pull request #2718 from matrix-org/jaywink/stickerpicker-button-warning 
Remove unnecessary ref from Stickerpicker
 2019-02-28 16:23:09 +02:00
David Baker
3fa4ecade9
Merge pull request #2720 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate
 2019-02-28 14:22:17 +00:00
David Baker
76eba5a9cf Translated using Weblate (English (United States)) 
Currently translated at 48.8% (758 of 1552 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/en_US/
 2019-02-28 14:21:08 +00:00
David Baker
66f9a2cbe1
Merge pull request #2715 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate.
 2019-02-28 14:08:31 +00:00
Weblate
e445ef7b1e [matrix] -> Matrix 2019-02-28 14:05:20 +00:00