mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-14 19:51:31 +03:00
Code Issues Projects Releases Packages Wiki Activity
6461 commits 219 branches 562 tags 474 MiB
Commit graph

6461 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Baker
681fd512d7 Lint 2017-07-07 13:46:05 +01:00
David Baker
c1833f9833 Merge remote-tracking branch 'origin/dbkr/my_groups' into dbkr/groups_better_groupview 2017-07-07 13:44:35 +01:00
David Baker
c21f90338d Merge remote-tracking branch 'origin/develop' into dbkr/groups_better_groupview 2017-07-07 12:02:15 +01:00
Luke Barnard
b420a8389d Merge pull request #1197 from matrix-org/dbkr/my_groups_withMatrixClient 
WithMatrixClient -> withMatrixClient
 2017-07-07 11:47:13 +01:00
David Baker
bc8c2d442b WithMatrixClient -> withMatrixClient 
because we're using it as a function rather than a React component
 2017-07-07 11:34:20 +01:00
Richard Lewis
e970b68859 Merge pull request #1194 from matrix-org/rxl881/apps 
Use app ID for element key and pass screen parameter to scalar.
 2017-07-07 11:28:39 +01:00
Richard Lewis
d1eab75cfc Trigger rebuild 2017-07-07 11:15:13 +01:00
David Baker
fea0a941ce Fix lint 2017-07-07 11:01:54 +01:00
David Baker
3b439d4bb2 Empty commit 
Please re-test against update riot-web
 2017-07-07 10:50:03 +01:00
David Baker
183f45bc1f Fix lint errors 2017-07-07 10:41:59 +01:00
David Baker
45986306cc Merge remote-tracking branch 'origin/develop' into dbkr/my_groups 2017-07-07 10:32:37 +01:00
David Baker
28c0daf51d Merge pull request #1148 from matrix-org/erikj/group_server 
Add group view page
 2017-07-07 10:31:14 +01:00
David Baker
8df6deee23 Empty commit 
please re-test with updated riot-web branch
 2017-07-07 10:23:20 +01:00
David Baker
1deb406294 Fix race 2017-07-07 10:12:06 +01:00
Luke Barnard
32a01b54b8 Merge branch 'develop' into erikj/group_server 2017-07-07 10:08:49 +01:00
Richard Lewis
0a1647e5c6 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/apps 2017-07-07 09:48:24 +01:00
Bamstam
b414db06e0 Translated using Weblate (German) 
Currently translated at 100.0% (916 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-07-07 07:27:02 +00:00
Luke Barnard
7fdbec4046 Merge pull request #1195 from matrix-org/luke/fix-rte-emoji-suggestions2 
Alter EMOJI_REGEX to include end of string ($)
 2017-07-06 21:59:44 +01:00
David Baker
fa37d03db6 Improve the Group View page 
Show the rooms in the group in thir various categories, etc
 2017-07-06 19:13:14 +01:00
Luke Barnard
0a4f8ffead Alter EMOJI_REGEX to include end of string ($) 
Fixes https://github.com/vector-im/riot-web/issues/4529 because the match must include the remainder of the query.
 2017-07-06 18:11:46 +01:00
David Baker
282b63d0cf Merge pull request #1193 from matrix-org/luke/fix-create-room-preview 
Fix vector-im/riot-web#4526 by pretending to join when creating a room
 2017-07-06 17:58:30 +01:00
Luke Barnard
a921059432 Fix vector-im/riot-web#4526 by pretending to join 
I thought about adding separate dispatches to prevent confusion but if anyone adds anything that listens to existing dispatches, they really ought to be grep-ing the world for said dispatch actions.
 2017-07-06 17:40:27 +01:00
Richard Lewis
d091550ccb Use app ID for element key and pass screen parameter to scalar. 2017-07-06 15:59:59 +01:00
Luke Barnard
6404f7603c Merge pull request #1192 from matrix-org/t3chguy/markdown_allow_u 
Allow underline through MD and in RTE (MD) using <u> which works with CM
 2017-07-06 14:08:01 +01:00
Luke Barnard
d9a67355d2 Merge pull request #1190 from matrix-org/luke/fix-rte-paste-html-md-on 
Only insert HTML into the composer in RTE mode
 2017-07-06 13:59:52 +01:00
Michael Telatynski
ff7ae5b995
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/markdown_allow_u 2017-07-06 13:56:20 +01:00
Luke Barnard
2aa5a3a09c Merge pull request #1191 from matrix-org/t3chguy/room-settings-unban-no-pl 
only show unban button in RoomSettings if user has sufficient PL to do so
 2017-07-06 13:54:52 +01:00
Michael Telatynski
fcd8321a63
Allow underline through MD and in RTE (MD) using <u> which works with CM 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-06 13:49:13 +01:00
Michael Telatynski
6149b37245
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-settings-unban-no-pl 2017-07-06 13:30:40 +01:00
Michael Telatynski
c6d9ec42a2
only show unban button in RoomSettings if user has sufficient PL to do so 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-06 12:51:55 +01:00
Luke Barnard
bdefb35c64 Only insert HTML into the composer in RTE mode 
If MD mode is enabled, paste the plaintext equivalent.
 2017-07-06 11:52:02 +01:00
Luke Barnard
3e93930dcc Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop 2017-07-06 11:18:10 +01:00
Luke Barnard
6b6af3f148 Remove RTE content_state logging 2017-07-06 11:17:54 +01:00
Richard van der Hoff
c29863362f Merge pull request #1189 from matrix-org/rav/fix_duplicate_preview_key 
Fix a React duplicate key error
 2017-07-06 11:08:03 +01:00
Richard van der Hoff
4f8d9d869e mention preserving ordering in comment 2017-07-06 10:47:15 +01:00
Kegan Dougal
42ba3ff410 Linting 2017-07-06 10:44:32 +01:00
Richard van der Hoff
6a2d6b2e6e Fix a React duplicate key error 
If a single message contains the same link twice, we get an error from React
about the clashing keys. De-dup the links to keep it quiet.
 2017-07-06 10:02:25 +01:00
Kegsay
e0e321783b Append the scalar_token to the widget URL if the widget URL is a scalar URL (#1182) 2017-07-06 09:28:48 +01:00
Luke Barnard
0bf1124f1b Merge pull request #1181 from matrix-org/luke/fix-rte-draft-persist 
Implement MessageComposerStore to persist composer state when room switching
 2017-07-05 18:24:27 +01:00
Luke Barnard
7f1d8e3c90 Merge pull request #1188 from matrix-org/luke/feature-rte-visual-bell 
Add visual feedback for when there are no completions available
 2017-07-05 18:23:10 +01:00
Luke Barnard
14ddf4e2aa Merge pull request #1187 from matrix-org/luke/fix-rte-emoji-filter-supported 
Filter out unsupported emoji from the emoji meta data
 2017-07-05 18:21:50 +01:00
Luke Barnard
29e793f591 Merge pull request #1180 from matrix-org/luke/fix-rte-force-immediately 
When hitting "tab" use an autocompleteDelay of 0
 2017-07-05 18:20:48 +01:00
Luke Barnard
89d0ec4de8 Merge pull request #1179 from matrix-org/luke/fix-query-matcher-empty-query 
Don't try to match with an empty query string
 2017-07-05 18:20:25 +01:00
Luke Barnard
d78168d407 Add visual feedback for when there are no completions available 
Attempts to kep parity with old composer by using the same #faa colour but uses an animation instead of a js timeout.

Fixes https://github.com/vector-im/riot-web/issues/4490
 2017-07-05 18:14:22 +01:00
Luke Barnard
2de4dd7b71 Filter out unsupported emoji from the emoji meta data 
Because apparently emojione provides meta data for more than the emojis it supports itself.

Fixes https://github.com/vector-im/riot-web/issues/4504
 2017-07-05 17:09:16 +01:00
Richard van der Hoff
b52a6a693a Merge pull request #1186 from matrix-org/rav/startup_logging 
Add some logging to track down flaky test
 2017-07-05 16:29:03 +01:00
Richard van der Hoff
a20ed2f632 Add some logging to track down flaky test 
We had a test failure where apparently the MatrixClient failed to start
... let's try and figure out why.
 2017-07-05 16:20:21 +01:00
Richard van der Hoff
769752e0b3 Merge pull request #1185 from matrix-org/rav/fix_reactsdk_build 
Run the riot-web tests against js-sdk develop
 2017-07-05 15:58:05 +01:00
Richard van der Hoff
458e0a38bc Run the riot-web tests against js-sdk develop 
When running the riot-web builds, use the develop version of js-sdk instead of
the latest release, to improve our chances of compatibility.
 2017-07-05 15:43:33 +01:00
Richard van der Hoff
b32cb174a9 Merge pull request #1184 from matrix-org/rav/chrome_headless 
Use Chrome instead of PhantomJS for tests
 2017-07-05 15:20:08 +01:00