Commit Graph

62531 Commits

Author SHA1 Message Date
David Baker 4b206a0117 Merge pull request #1604 from matrix-org/revert-1547-dbkr/username_to_lower
Revert "Lowercase all usernames"
2017-11-11 16:08:27 +00:00
David Baker 39763d668c Revert "Lowercase all usernames" 2017-11-11 15:59:43 +00:00
David Baker bce4815851 Initialise unread messages value correctly 2017-11-11 15:57:20 +00:00
Matthew Hodgson a0cdaf29f9 Merge remote-tracking branch 'origin/develop' into matthew/status 2017-11-10 15:29:42 -08:00
Matthew Hodgson 47d9e7f2a1 Merge remote-tracking branch 'origin/develop' into matthew/status 2017-11-10 15:29:37 -08:00
Richard Lewis d7ceddfe61 Revert unintended merge commit. 2017-11-10 21:43:34 +00:00
Richard Lewis 42bb54b202 Set widget menu bar background colour. 2017-11-10 21:41:35 +00:00
Richard Lewis 7a42e844d1 Remove unused styling. 2017-11-10 20:16:32 +00:00
Richard Lewis 43fb359d8f Vertically align menu bar items. 2017-11-10 20:12:30 +00:00
Richard Lewis 31e0cde900 Improve hover border. 2017-11-10 20:12:12 +00:00
Richard Lewis 53143cb033 Center icons in menu bar. 2017-11-10 17:26:57 +00:00
Richard Lewis 7eeb7babc4 White edit icon (to avoid having to use css filters to invert). 2017-11-10 17:26:33 +00:00
Richard Lewis 883ec159e2 Add yellow warning triangle image. 2017-11-10 17:25:56 +00:00
Luke Barnard ef9f2f7ce6 v0.13.0-rc.2 v0.13.0-rc.2 2017-11-10 16:53:03 +00:00
Luke Barnard d9bb6c52b4 Prepare changelog for v0.13.0-rc.2 2017-11-10 16:53:03 +00:00
Luke Barnard ea0cfa92b4 v0.13.0-rc.2 2017-11-10 16:52:24 +00:00
Luke Barnard 150fa43735 Bump react-sdk dep 2017-11-10 16:51:05 +00:00
Luke Barnard 718f48ba04 Merge branch 'develop' into release-v0.13.0 2017-11-10 16:50:11 +00:00
Luke Barnard 21ead6e48e v0.11.0-rc.2 2017-11-10 16:45:30 +00:00
Luke Barnard 34fec5bd57 Prepare changelog for v0.11.0-rc.2 2017-11-10 16:45:30 +00:00
Luke Barnard 477133a3fb Merge branch 'develop' into release-v0.11.0 2017-11-10 16:38:24 +00:00
Weblate 1b21b8cce2 Merge remote-tracking branch 'origin/develop' into develop 2017-11-10 16:24:25 +00:00
Luke Barnard 73e7581fc6 Merge pull request #5566 from vector-im/luke/groups-enable
Make groups a fully-fleged baked-in feature
2017-11-10 16:24:19 +00:00
Richard Lewis 83373bcf6e Merge branch 'develop' of https://github.com/vector-im/riot-web into rxl881/visualCue 2017-11-10 16:22:33 +00:00
Weblate 7cada3b227 Merge remote-tracking branch 'origin/develop' into develop 2017-11-10 16:19:40 +00:00
Luke Barnard b3ddec4131 Merge pull request #1603 from matrix-org/luke/groups-enable
Make groups a fully-fleged baked-in feature
2017-11-10 16:19:35 +00:00
Richard Lewis 29abb5eed0 Center mixed content warnings in panel. 2017-11-10 16:15:31 +00:00
Luke Barnard a96bfee9f2 Remove unused UserSettingsStore import 2017-11-10 16:12:27 +00:00
Luke Barnard 1c82df216e Ignore unused React when using JSX 2017-11-10 16:11:59 +00:00
Luke Barnard ceda5939f9 Remember to import React 2017-11-10 15:55:55 +00:00
Luke Barnard 853d33a93a Make groups a fully-fleged baked-in feature 2017-11-10 15:42:11 +00:00
Luke Barnard 277a6dee10 Make groups a fully-fleged baked-in feature 2017-11-10 15:38:50 +00:00
Weblate 25bff3f4b1 Merge remote-tracking branch 'origin/develop' into develop 2017-11-10 15:21:04 +00:00
Weblate ed6d1f5a2e Merge remote-tracking branch 'origin/develop' into develop 2017-11-10 15:08:53 +00:00
Tong Hui 0f8df97a47 Translated using Weblate (Chinese (Simplified))
Currently translated at 70.4% (654 of 928 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
2017-11-10 15:08:52 +00:00
Tong Hui 71d0ecf37d Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (217 of 217 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hans/
2017-11-10 14:14:56 +00:00
Luke Barnard 5c9dd17d21 v0.13.0-rc.1 v0.13.0-rc.1 2017-11-10 13:44:55 +00:00
Luke Barnard b494b458bb Prepare changelog for v0.13.0-rc.1 2017-11-10 13:44:55 +00:00
Luke Barnard 0630d856f8 v0.13.0-rc.1 2017-11-10 13:44:08 +00:00
Luke Barnard 1008ede4d1 Bump matrix-react/js-sdk deps 2017-11-10 13:42:31 +00:00
Luke Barnard 07b6c55982 v0.11.0-rc.1 2017-11-10 13:40:17 +00:00
Luke Barnard a47f92c0c6 Prepare changelog for v0.11.0-rc.1 2017-11-10 13:40:16 +00:00
Luke Barnard b68b60c04c Bump js-sdk dep 2017-11-10 13:37:12 +00:00
Luke Barnard 6e1cf6ce17 Merge pull request #1548 from matrix-org/rxl881/widgetrendering
Improve widget rendering on prop updates
2017-11-10 12:41:20 +00:00
Luke Barnard 74c6ebc5c6 Merge pull request #1595 from matrix-org/luke/groups-show-user-profile-on-action
Display group member profile (avatar/displayname) in ConfirmUserActionDialog
2017-11-10 12:31:47 +00:00
David Baker d2549b621c Merge pull request #1602 from matrix-org/dbkr/nullcheck_atroom_rule
Don't crash if there isn't a room notif rule
2017-11-10 11:57:43 +00:00
Luke Barnard 981ca458ec Merge pull request #1596 from matrix-org/luke/groups-show-name-in-flair-tootip
Show group name in flair tooltip if one is set
2017-11-10 11:51:45 +00:00
Richard Lewis ba8a9f2a43 Comment length 2017-11-10 11:50:14 +00:00
David Baker ff5e00d244 Don't crash if there isn't a room notif rule 2017-11-10 11:50:00 +00:00
Luke Barnard 6deeaf94d6 group name not required 2017-11-10 11:43:05 +00:00