Dima/element-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Commit Graph

  • 9027780215 Show group name in flair tooltip if one is set Luke Barnard 2017-11-09 12:38:43 +00:00
  • 6eeb91ee2e Display group member profile (avatar/displayname) in ConfirmUserActionDialog Luke Barnard 2017-11-09 12:24:20 +00:00
  • d45940f204 Don't display widget iframes whilst loading. Richard Lewis 2017-11-09 10:02:00 +00:00
  • 9b7ab4b7bd Added translation using Weblate (Galician) Xose M 2017-11-09 06:24:11 +00:00
  • 81b085fbb8 Translated using Weblate (Galician) Xose M 2017-11-09 06:21:24 +00:00
  • 030633fa90 Merge remote-tracking branch 'matrix-org/develop' into travis/granular-settings Travis Ralston 2017-11-08 17:43:38 -07:00
  • 2711da28b4 Use the SettingsStore in the UnknownDeviceDialog Travis Ralston 2017-11-08 17:43:06 -07:00
  • f7da5836e1 Make blacklistUnverifiedDevices override the level order Travis Ralston 2017-11-08 17:41:32 -07:00
  • c7d8f3931f Revert notification toolbar setting Travis Ralston 2017-11-08 17:06:36 -07:00
  • 910a5f7e6c Translated using Weblate (Chinese (Traditional)) Jeff Huang 2017-11-08 22:56:22 +00:00
  • 8016fb82d7 Fix broken commit. Richard Lewis 2017-11-08 20:38:54 +00:00
  • 56581ef408 Fix various loadingElement related issues. Richard Lewis 2017-11-08 20:38:31 +00:00
  • b2b07d9370 Formatting Richard Lewis 2017-11-08 20:17:28 +00:00
  • 092ec1cc6c Prevent long topics from overflowing fixed height header. Richard Lewis 2017-11-08 20:03:35 +00:00
  • 106430f7b6 Move margin to AppTile elements so that it is only present with app tiles. Comment unused classes. Richard Lewis 2017-11-08 19:48:53 +00:00
  • 23c9324fa5 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-08 18:52:33 +00:00
  • be5e67245b Merge pull request #1594 from matrix-org/revert-1584-dbkr/udd_devices_from_sdk David Baker 2017-11-08 18:52:28 +00:00
  • 7b243bf64d Revert "UnknownDeviceDialog: get devices from SDK" David Baker 2017-11-08 18:49:50 +00:00
  • be0a76dbd6 Update variable name and JSdoc for improved clarity. Richard Lewis 2017-11-08 17:44:54 +00:00
  • ca1ffdfa9f Remove unused dep. Richard Lewis 2017-11-08 17:39:25 +00:00
  • 76570a0f14 Make long topics overflow in to a second, hidden column. Richard Lewis 2017-11-08 17:02:17 +00:00
  • e7fbad2236 Increase height to avoid content from overflowing (mx_RoomHeader_name.height + mx_RoomHeader_topic.max-height) Richard Lewis 2017-11-08 16:44:45 +00:00
  • 2fa1f16284 use new theme-aware tinter api Matthew Hodgson 2017-11-08 06:55:30 -08:00
  • 58ee4d0a76 rewrite the tinter to be ES6, and correctly cache fixups per theme Matthew Hodgson 2017-11-08 06:55:07 -08:00
  • 685e5b916b Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-08 14:04:32 +00:00
  • b575df7da7 Merge pull request #1591 from matrix-org/luke/groups-order-admins-first David Baker 2017-11-08 14:04:28 +00:00
  • e2a0cba6cb If group member privilege level is equal, disambiguate with displayname or userId Luke Barnard 2017-11-08 13:57:38 +00:00
  • 02cce94c2b Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-08 13:35:58 +00:00
  • 65cea53f3d Merge pull request #1592 from matrix-org/luke/groups-fix-accept-invite-refresh-members Luke Barnard 2017-11-08 13:35:53 +00:00
  • d583a12514 Translated using Weblate (German) Krombel 2017-11-08 12:59:27 +00:00
  • 569a3a3ac4 Translated using Weblate (French) Kévin C 2017-11-07 21:41:16 +00:00
  • e729bc431d Merge remote-tracking branch 'origin/develop' into matthew/status Matthew Hodgson 2017-11-08 04:29:52 -08:00
  • d4128af224 Merge remote-tracking branch 'origin/develop' into matthew/status Matthew Hodgson 2017-11-08 04:29:44 -08:00
  • e90419e40d Translated using Weblate (Slovak) Peter Vágner 2017-11-08 12:11:57 +00:00
  • 16991a8f68 Added translation using Weblate (Slovak) Peter Vágner 2017-11-08 12:10:20 +00:00
  • 447f23796c Translated using Weblate (Slovak) Peter Vágner 2017-11-08 12:04:47 +00:00
  • 3e3ebd6358 Fetch group members after accepting an invite Luke Barnard 2017-11-08 11:52:52 +00:00
  • e3e161fbea Order users in the group member list with admins first Luke Barnard 2017-11-08 11:51:58 +00:00
  • 100053ff3d Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-08 11:49:49 +00:00
  • 7075931c58 Merge pull request #1589 from matrix-org/luke/improve-room-address-picker Luke Barnard 2017-11-08 11:49:45 +00:00
  • 63c8d676cf Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-08 11:36:35 +00:00
  • 20a16d71b8 Merge pull request #1590 from matrix-org/luke/fix-flair-store-2 David Baker 2017-11-08 11:36:30 +00:00
  • f14f2f99ab Translated using Weblate (Slovak) Peter Vágner 2017-11-08 11:31:58 +00:00
  • 1c5e7f3048 Fix FlairStore getPublicisedGroupsCached to give the correct, existing promise Luke Barnard 2017-11-08 11:31:04 +00:00
  • 4a9752a482 Added translation using Weblate (Slovak) Peter Vágner 2017-11-08 11:21:21 +00:00
  • 1e7fc953b3 Ooops, also add the string to the default language file. Peter Vágner 2017-11-08 11:56:30 +01:00
  • b496eec523 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-08 10:55:59 +00:00
  • c1d9d3714a Fix not being able to filter community rooms - fixes vector-im/vector-web#5538 Luke Barnard 2017-11-08 10:55:51 +00:00
  • 8f2bb73229 Translated using Weblate (Hungarian) Szimszon 2017-11-07 19:41:02 +00:00
  • 077ca36b05 Rank rooms with shorter matching aliases first Luke Barnard 2017-11-08 10:47:45 +00:00
  • b3674f503d Do not search through room topics Luke Barnard 2017-11-08 10:32:48 +00:00
  • 59bf3b231c Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-08 10:24:05 +00:00
  • b788e759da Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-08 10:24:01 +00:00
  • 120e7b821f Merge pull request #1585 from matrix-org/luke/groups-inviter-profile Luke Barnard 2017-11-08 10:24:00 +00:00
  • 3ee45b21b8 Merge pull request #5543 from vector-im/luke/groups-inviter-profile Luke Barnard 2017-11-08 10:23:57 +00:00
  • 10778e075e Merge branch 'develop' into luke/groups-inviter-profile Luke Barnard 2017-11-08 10:10:43 +00:00
  • 4bb083d959 Style Luke Barnard 2017-11-08 10:08:04 +00:00
  • f53f9ed8ca inviterProfile = null initially Luke Barnard 2017-11-08 10:07:43 +00:00
  • 662a05e86f Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-08 10:04:45 +00:00
  • 8af90b052b Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-08 10:04:44 +00:00
  • 4c47f75918 Merge pull request #1587 from matrix-org/luke/groups-add-rooms-with-visibility Luke Barnard 2017-11-08 10:04:41 +00:00
  • 60de1dbffb Merge pull request #5546 from vector-im/luke/groups-add-rooms-with-visibility Luke Barnard 2017-11-08 10:04:38 +00:00
  • a29ab0976b Make the addresses heading on the aliases settings view translatable Peter Vágner 2017-11-08 10:23:11 +01:00
  • a79a687e59 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-07 22:46:15 +00:00
  • ce6957a288 Merge pull request #1581 from matrix-org/luke/groups-update-group-members-api Matthew Hodgson 2017-11-07 22:46:11 +00:00
  • 289b0c2b6a Merge branch 'develop' into travis/granular-settings Travis Ralston 2017-11-07 14:55:12 -07:00
  • d5d5b9e334 Translated using Weblate (French) Kévin C 2017-11-07 21:38:43 +00:00
  • 4e717f38d7 Translated using Weblate (Hungarian) Szimszon 2017-11-07 19:40:52 +00:00
  • 17e7dc8eed Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-07 18:55:38 +00:00
  • 8fbe50a1cf Merge pull request #1580 from matrix-org/luke/groups-new-group-settings Luke Barnard 2017-11-07 18:55:34 +00:00
  • 51ec12bfe9 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-07 18:53:08 +00:00
  • d777e370f2 Merge pull request #1583 from matrix-org/luke/groups-disable-rooms-whilst-editing Luke Barnard 2017-11-07 18:53:04 +00:00
  • 38b5b27aa9 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-07 18:52:43 +00:00
  • c7dba61d92 Merge pull request #5511 from turt2live/travis/more-pinned-css Matthew Hodgson 2017-11-07 18:52:39 +00:00
  • edc744067f Add checkbox to GroupAddressPicker for determining visibility of group rooms Luke Barnard 2017-11-07 18:51:41 +00:00
  • 26d9677bbe CSS for adding rooms to a group with visibility Luke Barnard 2017-11-07 18:49:28 +00:00
  • 85ea67494c Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-07 18:24:25 +00:00
  • 3b1726657f Merge pull request #1586 from turt2live/travis/message-pinning-fix1 Matthew Hodgson 2017-11-07 18:24:21 +00:00
  • 343ffa6b97 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-07 18:16:04 +00:00
  • 49a935881f Merge pull request #1584 from matrix-org/dbkr/udd_devices_from_sdk David Baker 2017-11-07 18:15:59 +00:00
  • e0ddd88ec9 Default to no read pins if there is no applicable account data Travis Ralston 2017-11-07 11:14:27 -07:00
  • beddf3a2cb Get rid of accidental merge stuff Travis Ralston 2017-11-07 11:05:29 -07:00
  • 144cbd144e Merge branch 'develop' into travis/more-pinned-css Travis Ralston 2017-11-07 11:04:22 -07:00
  • ffd83f1faf Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-07 17:56:17 +00:00
  • 002086de69 Translated using Weblate (Russian) Andrey 2017-11-07 16:14:01 +00:00
  • e14e0bf200 Merge pull request #1486 from turt2live/travis/pinned-notice Matthew Hodgson 2017-11-07 17:56:12 +00:00
  • 10f15dfc56 Unmounted guard David Baker 2017-11-07 17:10:40 +00:00
  • 80d4873542 Disable RoomDetailList in GroupView when editing Luke Barnard 2017-11-07 16:54:28 +00:00
  • 1bdc666197 Adjust CSS for GroupView Luke Barnard 2017-11-07 16:43:02 +00:00
  • ed709f52d1 Use the getProfileInfo API for group inviter profile Luke Barnard 2017-11-07 16:42:43 +00:00
  • ec560345c7 UnknownDeviceDialog: get devices from SDK David Baker 2017-11-07 16:37:43 +00:00
  • 142d23a099 Cap the read pin event IDs to 10 Travis Ralston 2017-11-07 09:16:19 -07:00
  • a72cc77e24 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-07 15:54:51 +00:00
  • 4c22f9a549 Translated using Weblate (German) Krombel 2017-11-07 13:35:15 +00:00
  • f280fe3c66 Merge pull request #5540 from vector-im/luke/group-rooms-tooltip Luke Barnard 2017-11-07 15:54:46 +00:00
  • 2c096f45c2 Translated using Weblate (French) Kévin C 2017-11-07 10:47:23 +00:00
  • ed34c1cc63 Translated using Weblate (German) Krombel 2017-11-07 13:33:46 +00:00
  • 397d7724e5 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-07 15:22:40 +00:00
  • a8ff8973f8 Translated using Weblate (Russian) Andrey 2017-11-07 11:00:44 +00:00
  • 4d9f946388 Merge pull request #1582 from matrix-org/luke/group-rooms-tooltip Luke Barnard 2017-11-07 15:22:35 +00:00