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

6180 Commits (70824960ee6b7618409031161db3c97629b9cad4)

Author SHA1 Message Date
Osoitz 5872f2389f Translated using Weblate (Basque) 
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/eu/
 2017-08-03 06:30:46 +00:00
Jeff Huang da2b3c067b Translated using Weblate (Chinese (Traditional)) 
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/zh_Hant/
 2017-08-03 06:11:15 +00:00
Richard Lewis 5752345b80 Merge pull request #1263 from matrix-org/rxl881/warnings 
Display warning if widget is mixed content
 2017-08-02 17:30:46 +01:00
Richard Lewis 7599bde1f6 Fix logging line length. 2017-08-02 17:05:46 +01:00
Luke Barnard 700dd51584 Merge pull request #1267 from matrix-org/luke/fix-complete-after-blocks 
Account for `\n` after each block
 2017-08-02 16:41:47 +01:00
Kegan Dougal c914f1607b scalar-develop is a scalar URL 2017-08-02 14:35:14 +01:00
Luke Barnard 1512aff326 Add comments 2017-08-02 11:06:02 +01:00
Luke Barnard 2c86086444 Account for `\n` after each block 
when converting from text offsets to selection state.

fixes vector-im/riot-web#4728
 2017-08-02 10:51:34 +01:00
Luke Barnard 9010f96e60 Merge pull request #1266 from matrix-org/luke/fix-ac-providers-sort 
When sorting completions, use matched string, not entire query
 2017-08-02 10:36:47 +01:00
Luke Barnard 72c1cf9288 When sorting completions, use matched string, not entire query 
Otherwise the results vary depending on where you start autocompleting in your message. We only care about the matched string.
 2017-08-02 10:09:00 +01:00
Luke Barnard b632c9132c Merge pull request #1265 from matrix-org/luke/fix-room-completions-order 
Order room completions more intuitively
 2017-08-02 10:05:17 +01:00
Luke Barnard dbade448c1 Don't try to match query against roomId 
We only care about aliases.
 2017-08-02 09:40:00 +01:00
Luke Barnard 8053d2933a Order room completions more intuitively 
by index of the query in displayedAlias and then length of displayedAlias. (So that aliases where the query appears earlier in the string appear first and if the query is in the same index for two aliases, the shorter one appears first).
 2017-08-02 09:35:07 +01:00
Richard Lewis 48faf72fdc Disable eslint rule 2017-08-01 21:00:18 +01:00
Luke Barnard ff378cc85a Merge pull request #1264 from matrix-org/luke/fix-rte-emoji-sorting 
Adjust emoji sorting such that exact matches/prefixes appear first
 2017-08-01 17:58:54 +01:00
Richard Lewis 2ab6bc84a7 Improve clarity 2017-08-01 17:49:41 +01:00
Richard Lewis f0224460d2 Fix comparison and handle case where app has permission to load but content is mixed protocol. 2017-08-01 17:48:02 +01:00
David Baker e6f3164348 Merge pull request #1262 from matrix-org/luke/upgrade-dep-draft-js 
Upgrade draft-js from 0.9.1 to 0.10.1
 2017-08-01 17:46:09 +01:00
Richard Lewis d29610bdd2 Fix boolean comparison. 2017-08-01 17:45:06 +01:00
Richard Lewis f57b0d4cc7 Fix invalid translation 2017-08-01 17:43:38 +01:00
Luke Barnard ff95542549 Adjust emoji sorting such that exact matches/prefixes appear first 
fixes https://github.com/vector-im/riot-web/issues/4704
 2017-08-01 17:36:41 +01:00
Richard Lewis bc4d979d1e Display warning if widget is mixed content 2017-08-01 17:29:29 +01:00
Osoitz 240a3545d0 Translated using Weblate (Basque) 
Currently translated at 29.2% (268 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2017-08-01 16:11:16 +00:00
Osoitz 2a82201551 Translated using Weblate (Basque) 
Currently translated at 17.1% (157 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2017-08-01 16:06:46 +00:00
Luke Barnard a40a86669a Merge pull request #1260 from matrix-org/luke/fix-rte-pills-not-updating 
Use componentWillReceiveProps to update pill state when props change
 2017-08-01 16:30:25 +01:00
Osoitz 435455c9f0 Added translation using Weblate (Basque) 2017-08-01 15:29:58 +00:00
Luke Barnard 630c2968eb Use componentWillReceiveProps 2017-08-01 16:20:32 +01:00
Luke Barnard 71abd3aff8 Revert setting of `key` 2017-08-01 16:14:12 +01:00
Luke Barnard 1001c39da9 Upgrade draft-js from 0.8.1 to 0.10.1 
This fixes vector-im/riot-web#4675

Some APIs have become deprecated in this version but are still usable ( see https://draftjs.org/docs/v0-10-api-migration.html )
 2017-08-01 16:02:28 +01:00
Luke Barnard 7fcb8c5ff0 Merge pull request #1261 from matrix-org/luke/fix-agressive-emoji-auto-replace 
Only auto-replace emoji following ^ or \s
 2017-08-01 15:56:42 +01:00
Richard Lewis 546173d246 Fix scalar token 2017-08-01 15:53:42 +01:00
Luke Barnard 438b63bee2 Only auto-replace emoji following ^ or \s 
So as not to cause issues when typing e.g. `This is what was tested: ` (the "d:" used to be transformed into an emoji)
 2017-08-01 14:26:30 +01:00
Luke Barnard 9e71ba26c4 Add `key` prop to RTE decorated entities (Pills and links) 
This will cause a re-render when the URL of the pill/link changes.

fixes vector-im/riot-web#4718
 2017-08-01 13:51:08 +01:00
Richard Lewis abae43b65e Merge pull request #1257 from matrix-org/rxl881/widgetPermissions 
Widget permissions
 2017-08-01 12:13:09 +01:00
Richard Lewis 5f8e86197f Check that wurl is scalar, before checking for curl 2017-08-01 12:00:03 +01:00
Richard Lewis 596efb6062 Fix missing comma 2017-08-01 11:42:50 +01:00
Richard Lewis 46755de962 Fix event type. 2017-08-01 11:41:41 +01:00
Richard Lewis 15f39040a0 Simplify canUserModifyWidgets API 2017-08-01 11:39:17 +01:00
Michael Telatynski 62af06104d
resolve -> reject because semantics. 2017-07-31 14:22:05 +01:00
Michael Telatynski f310d4446c
i18n the title of the set mxid dialog 2017-07-31 13:31:07 +01:00
Michael Telatynski 25d1d21d93
copy logic from RegistrationForm to detect invalid localparts 2017-07-31 13:28:43 +01:00
Michael Telatynski 4bdaa15c47
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/i18n_analytics 2017-07-28 21:01:59 +01:00
Richard Lewis a310ff3bab Add ToDo item. 2017-07-28 18:21:23 +01:00
Richard Lewis 6aa1d923ce Add comment 2017-07-28 16:48:13 +01:00
Richard Lewis 9935dd0051 Add comment to explain "fullWidth" component porperty. 2017-07-28 16:46:21 +01:00
Richard Lewis 8529a21f5c Translate "Allow" 2017-07-28 16:42:07 +01:00
Richard Lewis 700ef34e95 Translate warning 2017-07-28 16:39:18 +01:00
Richard Lewis 4308d2c635 Inline setState. 2017-07-28 16:36:06 +01:00
Richard Lewis 50ad80ad86 Use ES6 style import 2017-07-28 16:24:32 +01:00
Richard Lewis 2e6fb1f956 Fix license header 2017-07-28 16:23:49 +01:00