OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
8,835 Commits
198 Branches
547 Tags
420 MiB
Commit Graph

8835 Commits (38c8bc7d9aca9b2241d79b88b01cd5e86cc27a83)

Author SHA1 Message Date
Weblate da5cf63daf Merge remote-tracking branch 'origin/develop' into develop 2018-01-20 11:44:21 +00:00
Марко М. Костић 67a4c6c487 Translated using Weblate (Serbian) 
Currently translated at 18.2% (179 of 981 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
 2018-01-20 11:44:21 +00:00
Matthew Hodgson 5125683041
Merge pull request #1713 from Half-Shot/hs/leave-room-warnings 
Show a warning if the user attempts to leave a room that is invite only
 2018-01-20 11:44:15 +00:00
Will Hunt 5206c9d18b Show a warning if the user attempts to leave a room that is invite only 2018-01-19 22:52:43 +00:00
David Baker 86e8334248 Try upgrading eslint-plugin-react 
Because 7.4.0 does not seem to be picking up the same set of
problems as 7.5.1
 2018-01-19 18:04:42 +00:00
Weblate aff1fcde90 Merge remote-tracking branch 'origin/develop' into develop 2018-01-19 14:49:55 +00:00
Luke Barnard a8320fe7e2
Merge pull request #1711 from matrix-org/luke/roomlist-beautiful-dnd 
Swap RoomList to react-beautiful-dnd
 2018-01-19 14:49:49 +00:00
lukebarnard 6106b3ce44 newOrder defaults `null`, allows check for `newOrder` on line 357 2018-01-19 14:12:27 +00:00
lukebarnard 54f6d305d7 Null-guard for newTag 2018-01-19 14:11:05 +00:00
Weblate e4b4a885ff Merge remote-tracking branch 'origin/develop' into develop 2018-01-19 14:07:23 +00:00
lukebarnard 75a1922731 Fix linting 2018-01-19 14:07:13 +00:00
lukebarnard 00dc077271 Remove react-dnd, revert fa14bc9 as no longer needed 2018-01-19 13:34:56 +00:00
Weblate 533e5482d8 Merge remote-tracking branch 'origin/develop' into develop 2018-01-19 10:39:51 +00:00
Марко М. Костић fba5d33923 Translated using Weblate (Serbian) 
Currently translated at 12.0% (118 of 981 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
 2018-01-19 10:39:50 +00:00
Matthew Hodgson 6c15bd8599 fix NPE when getGroupProfiles returns null 2018-01-19 10:39:38 +00:00
lukebarnard 6f0d799912 Fix indentation 2018-01-18 18:15:34 +00:00
lukebarnard 59f4661bfd Add comment 2018-01-18 18:01:31 +00:00
lukebarnard dfecad181a Swap RoomList to react-beautiful-dnd 2018-01-18 17:59:29 +00:00
Richard Lewis 23bef68a8f Fix duplicate message listeners 2018-01-18 13:16:06 +00:00
Richard Lewis 910623d287 Close context menu on resize. 2018-01-18 12:04:00 +00:00
Richard Lewis 917d85d603 Refer rest parameters 2018-01-18 12:03:24 +00:00
Richard Lewis 1293c53c4b Cleanup 2018-01-18 12:02:45 +00:00
Weblate 5adbedb28a Merge remote-tracking branch 'origin/develop' into develop 2018-01-18 10:22:26 +00:00
David Baker c090c2e7df
Merge pull request #1710 from matrix-org/t3chguy/roomColor 
don't pass back {} when we have no `org.matrix.room.color_scheme`
 2018-01-18 10:22:21 +00:00
Weblate 5fd7c30dbf Merge remote-tracking branch 'origin/develop' into develop 2018-01-18 09:57:38 +00:00
Matthew Hodgson 80d3edfbb3 simplify the 'send anyway' text, as 'mark devices known' is meaningless to users 2018-01-18 09:57:29 +00:00
Weblate 9e987337b7 Merge remote-tracking branch 'origin/develop' into develop 2018-01-17 23:28:22 +00:00
Matthew Hodgson d3292d9388 fix typos and NPE. fixes #5999 2018-01-17 23:28:14 +00:00
Weblate 0fb808ef99 Merge remote-tracking branch 'origin/develop' into develop 2018-01-17 19:28:56 +00:00
David Baker 27b27e3759
Merge pull request #1700 from matrix-org/dbkr/dont_paginate_while_decrypting 
Don't paginate whilst decrypting events
 2018-01-17 19:28:52 +00:00
Weblate d93518ac43 Merge remote-tracking branch 'origin/develop' into develop 2018-01-17 19:28:43 +00:00
David Baker 6b43b412ab
Merge pull request #1699 from matrix-org/dbkr/i18n_plural_fallback 
Fall back for missing i18n plurals
 2018-01-17 19:28:38 +00:00
Michael Telatynski 2f42e69b57 Merge branches 'develop' and 't3chguy/roomColor' of github.com:matrix-org/matrix-react-sdk into t3chguy/roomColor 2018-01-17 18:20:35 +00:00
Michael Telatynski b7204e79a7 fallback after receiving settings rather than {} because its truthy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-17 18:17:26 +00:00
Michael Telatynski 43bb8c561d add comment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-17 18:10:19 +00:00
Michael Telatynski b90a98b5c1 don't pass back {} when we have no `org.matrix.room.color_scheme` 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-17 18:06:19 +00:00
Richard Lewis f8d7ab10fa Handle non-m.room.message event types. 2018-01-17 17:19:20 +00:00
Weblate 816a77c089 Merge remote-tracking branch 'origin/develop' into develop 2018-01-17 17:10:55 +00:00
David Baker bd81ed6587
Merge pull request #1709 from matrix-org/luke/fix-group-store-redundant-requests 
Fix group store redundant requests
 2018-01-17 17:10:49 +00:00
lukebarnard 5f413ddf8b Do not fetch GroupStore resources if already fetching 2018-01-17 17:01:42 +00:00
lukebarnard 3ebf278cf3 Refactor GroupStore based on existing STATE_KEY concept 
by factoring out a lot of repeated code.
 2018-01-17 16:59:13 +00:00
Richard Lewis b6f85fbf92 Don't treat sticker messages as info messages. 2018-01-17 16:52:10 +00:00
Richard Lewis aa524c339d Update class names. 2018-01-17 15:49:36 +00:00
Richard Lewis fa336b7a99 Bring hide stickers icon to front when menu open. 2018-01-17 15:41:15 +00:00
Richard Lewis 5a4271268b Keep reference to stickers menu 2018-01-17 15:40:47 +00:00
Richard Lewis 3331c8af27 Use dispatcher ref for unregister call. 2018-01-17 15:40:04 +00:00
David Baker 47f3e511b6 Retest please 2018-01-17 11:01:50 +00:00
David Baker 621682a2db Retest please 2018-01-17 11:01:07 +00:00
Weblate 7486da3e53 Merge remote-tracking branch 'origin/develop' into develop 2018-01-17 10:57:44 +00:00
David Baker 792db43007
Merge pull request #1708 from matrix-org/luke/fix-tag-order-store-ignore-self-remote-echos 
Ignore remote echos caused by this client
 2018-01-17 10:57:39 +00:00