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

8561 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Telatynski
222b01e000
Merge pull request #1691 from matrix-org/t3chguy/lazy_save_relatedGroupSettings 
only save RelatedGroupSettings if it was modified. Otherwise perms issue
 2018-01-05 11:53:30 +00:00
David Baker
350dab06a0
Merge pull request #1675 from turt2live/travis/fix-granular-again 
Fix a couple more issues with granular settings
 2018-01-05 11:48:32 +00:00
David Baker
242d84c63a
Merge pull request #1673 from matrix-org/t3chguy/fix_op_slashcommand_for_negatives 
Allow argument to op slashcommand to be negative as PLs can be -ve
 2018-01-05 11:28:52 +00:00
Michael Telatynski
a473971c7b
negate for less indentation 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-05 11:11:20 +00:00
Michael Telatynski
293bb15ccc
check PL and compare arrays rather than tracking changes 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-05 10:53:55 +00:00
David Baker
7787e57b42
Merge pull request #1645 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate.
 2018-01-05 10:38:18 +00:00
lukebarnard
7606e60188 Merge branch 'develop' into luke/perf-tag-panel-selected 2018-01-05 10:26:03 +00:00
Walter
8731bfd008 Translated using Weblate (Russian) 
Currently translated at 100.0% (958 of 958 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-01-05 10:24:02 +00:00
Walter
a7aa0a3b27 Translated using Weblate (Russian) 
Currently translated at 100.0% (958 of 958 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-01-04 21:33:41 +00:00
Weblate
ae3666143a Merge remote-tracking branch 'origin/develop' into develop 2018-01-04 18:26:10 +00:00
David Baker
c7accb732c
Merge pull request #1624 from matrix-org/t3chguy/room_dict_refactor 
make RoomDetailRow reusable for the Room Directory
 2018-01-04 18:26:06 +00:00
Weblate
493023a1bb Merge remote-tracking branch 'origin/develop' into develop 2018-01-04 18:19:42 +00:00
David Baker
50aeea8f05
Merge pull request #1686 from matrix-org/luke/fix-get-users-rooms-for-joined-groups 
Prefetch group data for all joined groups when RoomList mounts
 2018-01-04 18:19:37 +00:00
lukebarnard
f1b60287fb Merge branch 'develop' into luke/fix-get-users-rooms-for-joined-groups 2018-01-04 17:56:34 +00:00
Weblate
cde2a5e201 Merge remote-tracking branch 'origin/develop' into develop 2018-01-04 17:46:52 +00:00
lukebarnard
55bfff24c4 Fix forgotten rename during d5e2a73d99 2018-01-04 17:46:44 +00:00
Weblate
9c13a5a267 Merge remote-tracking branch 'origin/develop' into develop 2018-01-04 17:33:40 +00:00
David Baker
b34f360f96
Merge pull request #1690 from matrix-org/luke/remove-selected-room-prop 
Remove unused selectedRoom prop
 2018-01-04 17:33:36 +00:00
Weblate
36a2f4e8f9 Merge remote-tracking branch 'origin/develop' into develop 2018-01-04 17:08:06 +00:00
David Baker
5961cf3958
Merge pull request #1684 from matrix-org/luke/fix-tag-panel-shift-ctrl-click 
Fix shift and shift-ctrl click in TagPanel
 2018-01-04 17:08:01 +00:00
Weblate
7c86745fc3 Merge remote-tracking branch 'origin/develop' into develop 2018-01-04 16:49:22 +00:00
David Baker
c294e336b5
Merge pull request #1344 from matrix-org/t3chguy/hide_left_chats_memberinfo 
skip direct chats which either you or the target have left
 2018-01-04 16:49:17 +00:00
Michael Telatynski
831a3f7e42
Merge branch 'develop' into t3chguy/hide_left_chats_memberinfo 2018-01-04 16:41:16 +00:00
Michael Telatynski
e99477d486
naive translation rescue post-pluralisation 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-04 15:13:54 +00:00
Michael Telatynski
be48460595
Singularise unsent message prompt, if applicable 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-04 15:05:08 +00:00
Michael Telatynski
f63e6fdedf
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/single_unsent 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/components/structures/RoomStatusBar.js
#	src/components/structures/RoomView.js
#	src/i18n/strings/en_EN.json
 2018-01-04 15:03:11 +00:00
Michael Telatynski
f5f3c894d7
only save RelatedGroupSettings if it was modified. Otherwise perms issue 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-04 14:24:13 +00:00
lukebarnard
2282f5c26f Remove unused selectedRoom prop 2018-01-04 14:19:10 +00:00
lukebarnard
d5e2a73d99 Add alt condition back in, rename to specify igorance of shift 
because this is really what this function is for - we want to
ignore specifically shift but not necessarily alt (despite
this probably not having any real impact).
 2018-01-04 12:06:19 +00:00
lukebarnard
cdd1a57569 Calculate visible rooms when tags change 
instead of every time we getRoomLists
 2018-01-04 11:50:33 +00:00
lukebarnard
5c5307c665 Improve performance of tag panel selection (when tags are selected) 
Deselecting all tags is now slightly less performant than selecting a tag
but mostly due to the number of RoomTiles being rendered.

Swapping between different tags (a supposed common use-case) feels much
more spritely!
 2018-01-03 17:12:31 +00:00
Weblate
58e773031b Merge remote-tracking branch 'origin/develop' into develop 2018-01-03 15:48:49 +00:00
pincopallopino
77132bc7bd Translated using Weblate (Italian) 
Currently translated at 8.9% (86 of 958 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2018-01-03 15:48:48 +00:00
Luke Barnard
d3e47fa99d
Merge pull request #1682 from Nostradamos/fix_riot_web_4821 
Make scroll on paste in RTE compatible with https://github.com/vector-im/riot-web/pull/5900
 2018-01-03 15:48:43 +00:00
lukebarnard
2baacfa562 Handle case where ordering is not yet known 2018-01-03 14:12:28 +00:00
lukebarnard
a2bb240dcb Fetch group data for all tags instead of those selected 
so that tag switching is not delayed by fetching group data, i.e group members and rooms.
 2018-01-03 14:07:29 +00:00
Weblate
3d836a6d76 Merge remote-tracking branch 'origin/develop' into develop 2018-01-03 13:41:19 +00:00
Osoitz
08e6d123a2 Translated using Weblate (Basque) 
Currently translated at 100.0% (958 of 958 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-01-03 13:41:18 +00:00
Luke Barnard
63335f70e5
Merge pull request #1685 from matrix-org/dbkr/remove-double-fullstop 
Remove extra full stop
 2018-01-03 13:41:13 +00:00
David Baker
613e3b7ac1 Remove extra full stop 2018-01-03 11:57:49 +00:00
lukebarnard
d495519986 Fix shift-ctrl-click 
isOnlyCtrlOrCmdKeyEvent is predicated on !shiftKey, so another function was needed for cases where we ignore other keys
 2018-01-03 11:39:15 +00:00
lukebarnard
85cdd888e8 Combine TagOrderStore and FilterStore 
so that shift-click semantics can work. The store that computes the shift-click
rules has to be aware of the actual order of tags displayed, so they must be done
in the same store.
 2018-01-03 11:33:59 +00:00
nostradamos
2189fe9256 removed console.log 2018-01-03 01:52:02 +01:00
nostradamos
e543f55572 refactored code 2018-01-03 01:50:03 +01:00
Michael Telatynski
f67d405732
small refactor && warn on self-demotion 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-02 23:15:36 +00:00
nostradamos
36df3acf4d Merge remote-tracking branch 'origin/develop' into fix_riot_web_4821 2018-01-02 23:07:47 +01:00
nostradamos
03f88df66e Make the scrolling compatible with our riot-web fix for https://github.com/vector-im/riot-web/issues/4821 2018-01-02 22:44:18 +01:00
Weblate
dd9283f952 Merge remote-tracking branch 'origin/develop' into develop 2018-01-02 19:27:06 +00:00
lukebarnard
57fb09dfb7 Fix dodgy merge done in 874a7bf 
where develop branch should have been used for a chunk of code
 2018-01-02 19:26:56 +00:00
Weblate
8c885bbfee Merge remote-tracking branch 'origin/develop' into develop 2018-01-02 19:02:54 +00:00