c07057d1d4
Extract props we don't want to pass to BaseAvatar
2017-06-30 16:05:19 +01:00
e5c1aeb14c
Make the Groups page look more like the design
2017-06-30 13:59:49 +01:00
3892362386
Make my groups page a bit saner
2017-06-29 18:30:16 +01:00
84e13d5437
Add GroupAvatar to handle fallback images etc.
...
And a few misc tidyups
2017-06-29 17:51:38 +01:00
d6ecec1987
Behave better on rooms with no avatar / name
...
Also add translation strings
2017-06-29 17:17:43 +01:00
f99c540b3d
Groups page / Create Group dialog
2017-06-29 17:03:05 +01:00
a2ff289ed8
Add 'groups' page
2017-06-28 13:56:18 +01:00
aa7a113324
More PR feedback
2017-06-27 13:41:43 +01:00
87fac367ac
quote consistency
2017-06-27 13:37:59 +01:00
6c9716637e
Fix linting errors
2017-06-27 13:13:00 +01:00
2aeaaf26ca
remove inline css
2017-06-27 11:52:23 +01:00
971f7ad045
Fix avatars
2017-06-27 10:32:21 +01:00
867b47f4a2
PR feedback: remove phases
2017-06-27 10:28:46 +01:00
f0aaca0a31
Fix some PR feedback
2017-06-27 10:05:05 +01:00
c033d5defd
Missing React import
2017-06-27 09:58:29 +01:00
09b1012388
Merge remote-tracking branch 'origin/develop' into erikj/group_server
2017-06-26 17:49:06 +01:00
812b3643de
Add message for HSes that don't support groups
...
Also add an unrelated missed translation
2017-06-26 17:47:17 +01:00
a26498bc6c
Make 'group not found' work
2017-06-26 17:38:10 +01:00
f9b37208a3
Merge pull request #1147 from matrix-org/matthew/stuck-unread
...
fix one major cause of stuck unread notifications
2017-06-26 14:57:25 +01:00
edae66fd3a
fix one major cause of stuck unread notifications
2017-06-26 14:28:56 +01:00
bbd85891f4
Merge pull request #1146 from matrix-org/luke/fix-rte-strikeout
...
RTE: Use <del> for strikeout
2017-06-26 11:38:04 +01:00
d4034105a4
Revert support for ~~gh strikeout~~
2017-06-26 10:10:31 +01:00
7998602f42
Merge pull request #1145 from matrix-org/luke/fix-rte-tab-complete-after-join
...
Update tab-complete state onRoom received after joining
2017-06-26 10:05:35 +01:00
c1bceb81d2
Merge branch 'develop' into luke/fix-rte-strikeout
2017-06-26 09:41:17 +01:00
f091d209b9
Merge branch 'develop' into luke/fix-rte-tab-complete-after-join
2017-06-26 09:39:49 +01:00
caa0250d30
Merge pull request #1144 from matrix-org/rte-fixes2
...
RTE Fixes
2017-06-26 09:38:14 +01:00
3cdc7c9114
Add copyright headers
2017-06-23 18:30:16 +01:00
f0f4a16e97
Translate autocomplete delay
2017-06-23 18:28:02 +01:00
9404dd30c5
Use <del> for strikeout
...
We've swapped to commonmark, which uses <del> instead of ~~ for strikeout, so make the RTE insert <del> when we apply strikeout. Also, when ~~ is inserted, transform them into <del> for simplicity. This means giving an input of ~~test~~ is effectively the same as giving an input of <del>test</del>.
2017-06-23 18:19:06 +01:00
c0e48c72fc
Remove dep on liblevenstein
...
While we don't actually use it
2017-06-23 18:03:32 +01:00
ddb84f034e
Update tab-complete state onRoom received after joining
...
As opposed to doing it when the component mounts.
Fixes https://github.com/vector-im/riot-web/issues/3700 (hopefully)
2017-06-23 17:52:50 +01:00
89afcfd897
Linting
2017-06-23 17:35:07 +01:00
004d4828f8
Make the tests pass
...
sendTextMessage is not called when RTE Markdown is enabled, but rather sendHtmlMessage
2017-06-23 17:08:37 +01:00
2efa099de2
Use function from HTMLUtils for sanitizing
...
Encapsulates things a little nicer
2017-06-23 17:02:54 +01:00
738f261d5d
Add missing translations for RTE ops
2017-06-23 16:14:22 +01:00
87609582c6
Merge branch 'develop' into rte-fixes2
...
Conflicts:
package.json
src/autocomplete/CommandProvider.js
src/autocomplete/UserProvider.js
src/components/structures/RoomView.js
src/components/structures/UserSettings.js
src/components/views/rooms/MessageComposerInput.js
2017-06-23 15:30:06 +01:00
0207f3cc02
Merge pull request #1143 from matrix-org/luke/fix-login-multiple-fields
...
Only submit phone number when phone loginType is selected
2017-06-23 14:48:52 +01:00
ec36a348be
comment why we send the empty string
2017-06-23 14:48:15 +01:00
c51255da40
Submit empty string username when on phone number login
2017-06-23 14:34:19 +01:00
f5353fcdc5
Only submit phone number when phone loginType is selected
...
Otherwise submit a phoneNumber and phoneCountry of `null` (when logging in with email or username).
Fixes https://github.com/vector-im/riot-web/issues/4000
2017-06-23 13:43:52 +01:00
cddac3516b
Merge pull request #1142 from matrix-org/dbkr/fix_potential_start_client_race_2
...
Fix potential race in setting client listeners
2017-06-23 12:56:14 +01:00
8f3eb89f8b
Fix potential race in setting client listeners
2017-06-23 10:48:21 +01:00
75ef80ecd4
Merge remote-tracking branch 'origin/develop' into erikj/group_server
2017-06-23 09:51:24 +01:00
ae053e88c7
fix broken vars
2017-06-22 21:59:33 +01:00
cc3ad5972c
Merge pull request #1141 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
...
Update from Weblate.
2017-06-22 21:42:26 +01:00
4b5deaf17f
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop
...
Conflicts:
src/i18n/strings/fr.json
2017-06-22 20:39:48 +00:00
cc89d8318e
Translated using Weblate (Ukrainian)
...
Currently translated at 18.3% (168 of 915 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
2017-06-22 20:22:03 +00:00
7bf10760e7
Translated using Weblate (Turkish)
...
Currently translated at 100.0% (915 of 915 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2017-06-22 20:22:03 +00:00
e5ecd168d7
Translated using Weblate (Thai)
...
Currently translated at 64.6% (592 of 915 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/th/
2017-06-22 20:22:03 +00:00
eb76b1ae24
Translated using Weblate (Russian)
...
Currently translated at 100.0% (915 of 915 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-06-22 20:22:03 +00:00
David Baker