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

8765 Commits (14d52c9f250c970e358e702ba0c76f8b6e32d208)

Author SHA1 Message Date
David Baker 6902cb5648
Merge pull request #1693 from matrix-org/luke/pref-tag-panel-selected2 
Cache isConfCallRoom
 2018-01-05 16:16:10 +00:00
lukebarnard 5ac1d8ce81 Merge branch 'develop' into luke/pref-tag-panel-selected2 2018-01-05 15:57:43 +00:00
Weblate 7fc21f4423 Merge remote-tracking branch 'origin/develop' into develop 2018-01-05 15:55:29 +00:00
David Baker 587a6f8e2b
Merge pull request #1687 from matrix-org/luke/perf-tag-panel-selected 
Improve performance of tag panel selection (when tags are selected)
 2018-01-05 15:55:24 +00:00
Weblate c0d14904ef Merge remote-tracking branch 'origin/develop' into develop 2018-01-05 15:26:27 +00:00
Osoitz f6b24b749f Translated using Weblate (Basque) 
Currently translated at 100.0% (961 of 961 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-01-05 15:26:26 +00:00
Luke Barnard 8c84c3f929
Merge pull request #1680 from matrix-org/t3chguy/hide_roomstatusbar 
Hide status bar on visible->hidden transition
 2018-01-05 15:26:22 +00:00
lukebarnard 8509db1bda Cache isConfCallRoom 
This only needs to be calculated one per room
 2018-01-05 14:53:04 +00:00
Osoitz 1e66f4f0ed Translated using Weblate (Basque) 
Currently translated at 100.0% (961 of 961 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-01-05 14:31:24 +00:00
Kévin C f1850d188e Translated using Weblate (French) 
Currently translated at 100.0% (961 of 961 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/

Correction (Seul -> Seules)
 2018-01-05 13:17:33 +00:00
lukebarnard 8ade357349 Handle newly added rooms and removed rooms. 2018-01-05 12:33:26 +00:00
Andrey 44d920afc8 Translated using Weblate (Russian) 
Currently translated at 100.0% (961 of 961 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-01-05 12:27:22 +00:00
Weblate 8a805187dc Merge remote-tracking branch 'origin/develop' into develop 2018-01-05 12:24:14 +00:00
David Baker 845dda8f48
Merge pull request #1692 from matrix-org/t3chguy/pr-revival/turt2live/single_unsent 
[revived] Singularise unsent message prompt, if applicable
 2018-01-05 12:24:06 +00:00
Weblate 58c1118993 Merge remote-tracking branch 'origin/develop' into develop 2018-01-05 12:18:19 +00:00
Andrey d3624886a7 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 12:18:19 +00:00
Michael Telatynski c61d09464a
Merge pull request #1683 from matrix-org/t3chguy/memberinfo_warn_demote_self 
small refactor && warn on self-demotion
 2018-01-05 12:18:15 +00:00
Michael Telatynski 9f295b7a86
fix typo 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-05 12:03:46 +00:00
Michael Telatynski 558a90a359
comment out RoomView.onStatusBarHidden 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-05 11:58:42 +00:00
Michael Telatynski a8bd4bf858
add comment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-05 11:56:18 +00:00
David Baker 5aed77c752
Merge pull request #1677 from aidalgol/PropTypes 
Remove use of deprecated React.PropTypes
 2018-01-05 11:53:55 +00:00
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
Richard Lewis 54d128658e Comment logging. 2018-01-04 23:00:10 +00:00
Richard Lewis 57247493d9 Remove unused deps. 2018-01-04 22:59:50 +00:00
Richard Lewis d256e473eb Fix header and remove unused deps. 2018-01-04 22:51:49 +00:00
Richard Lewis 7b313b7acf Comment logging. 2018-01-04 22:38:52 +00:00
Richard Lewis d652f117fb Remove click handlers etc. 2018-01-04 22:36:29 +00:00
Richard Lewis 1c8586e802 Add sticker message rendering. 2018-01-04 22:21:38 +00:00
Richard Lewis 54671ab67e Send m.sticker messages 2018-01-04 21:57:24 +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
Richard Lewis d20aebfbd7 Correctly handle sticker message events. 2018-01-04 18:58:55 +00:00
Richard Lewis da199da798 Merge branch 'rxl881/snapshot' of https://github.com/matrix-org/matrix-react-sdk into rxl881/snapshot 2018-01-04 18:43:18 +00:00
Richard Lewis 32aecd0630 Fix event call 2018-01-04 18:43:08 +00:00
Richard Lewis eb4053bc99 Handle sticker message payloads 2018-01-04 18:41:47 +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