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

Commit Graph

  • ed586bedbc Translated using Weblate (Czech) Jan Kudrik 2017-11-03 16:56:45 +00:00
  • d03f2826c3 Merge pull request #1574 from matrix-org/luke/fix-groups-rooms-list-view-room-dispatch Luke Barnard 2017-11-03 18:46:58 +00:00
  • 4d8f18742b Check against non-existant promise to resolve a user's groups Luke Barnard 2017-11-03 18:43:43 +00:00
  • d64fc4c842 Fix Flair not appearing due to missing this._usersInFlight Luke Barnard 2017-11-03 18:19:10 +00:00
  • 58f1757f0c Handle rooms with no aliases or canonical alias Luke Barnard 2017-11-03 17:52:36 +00:00
  • 98312a4647 Use, if possible, a room's canonical or first alias when viewing the room Luke Barnard 2017-11-03 17:37:13 +00:00
  • dad5023728 Translated using Weblate (Hungarian) Szimszon 2017-11-02 21:48:13 +00:00
  • 6796b5b70c Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-03 16:15:06 +00:00
  • 04614de139 Translated using Weblate (German) Bamstam 2017-11-03 16:09:54 +00:00
  • 038b3ed1eb Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-03 16:14:59 +00:00
  • abff4ee6b5 Merge pull request #1573 from matrix-org/luke/groups-add-style-to-create-group-dialog Luke Barnard 2017-11-03 16:14:59 +00:00
  • 5d9a1b42a6 Merge pull request #5505 from vector-im/luke/groups-add-style-to-create-group-dialog Luke Barnard 2017-11-03 16:14:54 +00:00
  • b88c13d527 Use prefixed class names to avoid collisions with other libraries Luke Barnard 2017-11-03 16:02:41 +00:00
  • 290a501523 Use prefixed class names to avoid collisions with other libraries Luke Barnard 2017-11-03 16:02:25 +00:00
  • 67bc346ebb Add CSS for CreateGroupDialog to give group ID input suffix and prefix style Luke Barnard 2017-11-03 15:39:24 +00:00
  • e84e4ed5f5 Add CSS classes to group ID input in CreateGroupDialog Luke Barnard 2017-11-03 15:38:12 +00:00
  • f96c0d8533 Translated using Weblate (German) Krombel 2017-11-03 15:30:58 +00:00
  • 6747390333 merge Matthew Hodgson 2017-11-03 15:12:24 +00:00
  • 923295973b Merge branch 'develop' into matthew/status Matthew Hodgson 2017-11-03 15:11:23 +00:00
  • 8518e2b056 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-03 14:40:10 +00:00
  • 49ee78dab1 Merge remote-tracking branch 'origin/develop' into dbkr/composer_at_room_pills David Baker 2017-11-03 14:39:52 +00:00
  • 04c866ce9c Fix #5359 - unbreakable topics not breaking Luke Barnard 2017-11-03 14:39:24 +00:00
  • 6a5162b047 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-03 14:30:06 +00:00
  • 43a23d7e89 Merge pull request #1568 from matrix-org/dbkr/autocomplete_provider_room David Baker 2017-11-03 14:29:59 +00:00
  • ec8afd185f Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-03 14:24:37 +00:00
  • 2c9a93a8ac Merge pull request #1572 from matrix-org/dbkr/fix_multiple_pills David Baker 2017-11-03 14:24:33 +00:00
  • f59ea648f0 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-03 14:11:16 +00:00
  • 3192c345be rethemedex Luke Barnard 2017-11-03 14:11:07 +00:00
  • 802ab16746 Fix multiple pills on one line David Baker 2017-11-03 14:06:59 +00:00
  • 1cc65044d4 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-03 13:54:04 +00:00
  • 6432792d86 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-03 13:54:01 +00:00
  • d0b3368445 Merge pull request #1570 from matrix-org/luke/fix-groups-invites-appearance Luke Barnard 2017-11-03 13:53:58 +00:00
  • 22b82182a7 Merge pull request #5504 from vector-im/luke/fix-groups-invites-appearance Luke Barnard 2017-11-03 13:53:56 +00:00
  • b2cd65e182 Fixes React warning Michael Telatynski 2017-11-03 12:30:58 +00:00
  • 151f9917b1 Fix group invites such that they look similar to room invites Luke Barnard 2017-11-03 12:19:37 +00:00
  • c60ff5d283 Fix group invites such that they look similar to room invites Luke Barnard 2017-11-03 12:15:33 +00:00
  • 41cd3f0412 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-03 12:03:18 +00:00
  • fefe157c56 Translated using Weblate (Hungarian) Szimszon 2017-11-02 21:48:13 +00:00
  • d43481d555 Translated using Weblate (German) Bamstam 2017-11-02 16:40:10 +00:00
  • a3d15e05b1 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-03 12:03:16 +00:00
  • 4511856d3b Merge pull request #1569 from matrix-org/luke/groups-fix-my-groups-layout Luke Barnard 2017-11-03 12:03:12 +00:00
  • 2c4c6e82bb Merge pull request #5501 from vector-im/luke/groups-fix-my-groups-layout Luke Barnard 2017-11-03 12:03:10 +00:00
  • 4d11e739b5 Comment 0px height and margin on joinBox Luke Barnard 2017-11-03 11:42:06 +00:00
  • f6974407e3 CSS for Your Communities scrollbar Luke Barnard 2017-11-03 11:22:29 +00:00
  • 71c59eff2c Add a GeminiScrollbar to Your Communities Luke Barnard 2017-11-03 11:19:29 +00:00
  • b559e123d7 Translated using Weblate (Hungarian) Szimszon 2017-11-02 21:39:39 +00:00
  • d4668d6c11 Translated using Weblate (French) Kévin C 2017-11-02 19:12:34 +00:00
  • 112c74a255 Add NotifProvider to offer @room as a completion David Baker 2017-11-02 18:54:25 +00:00
  • 853ada027d Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/widgetrendering Richard Lewis 2017-11-02 18:34:46 +00:00
  • 0e854ee356 Fix loading and initialisation spinners. Richard Lewis 2017-11-02 18:33:11 +00:00
  • 843d797ded Better type checking David Baker 2017-11-02 18:17:57 +00:00
  • 7f9967389d Pass room into Autocompleter David Baker 2017-11-02 18:15:26 +00:00
  • 6ad4bb80dd == David Baker 2017-11-02 18:14:46 +00:00
  • 3b58f0ca2a Ignore removed events David Baker 2017-11-02 18:14:21 +00:00
  • ee43c635d1 phrasing David Baker 2017-11-02 18:11:18 +00:00
  • 42589281d1 comment stub method David Baker 2017-11-02 18:10:13 +00:00
  • f7201e8dee Revert unintentional changes David Baker 2017-11-02 18:08:24 +00:00
  • 498b117d5a copyrights David Baker 2017-11-02 18:01:28 +00:00
  • 4953d4de4d Give autocomplete providers the room they're in David Baker 2017-11-02 17:51:08 +00:00
  • a52bb9d603 Pass URL to check. Richard Lewis 2017-11-02 17:27:59 +00:00
  • 322cd6a2f8 Translated using Weblate (German) Krombel 2017-11-02 16:34:43 +00:00
  • 7bbae89235 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-02 16:09:12 +00:00
  • 8800081cb9 Merge pull request #1567 from matrix-org/luke/fix-flair-store David Baker 2017-11-02 16:09:07 +00:00
  • 21e09840dc Fix multiple requests for publicised groups of given user Luke Barnard 2017-11-02 15:59:26 +00:00
  • ff3a555802 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-02 15:38:08 +00:00
  • 7c17ad8509 Merge pull request #1566 from matrix-org/luke/groups-room-publicity David Baker 2017-11-02 15:38:03 +00:00
  • 61287b5f08 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-02 15:37:58 +00:00
  • 69a82f7859 Merge pull request #5497 from vector-im/luke/groups-room-info David Baker 2017-11-02 15:37:52 +00:00
  • ee71c72685 Use margin to separate "perms" in the room directory Luke Barnard 2017-11-02 15:13:55 +00:00
  • 06ce467876 Add CSS for group room visibility label alignment Luke Barnard 2017-11-02 15:05:08 +00:00
  • 982e87e01c Communities are communities, wrap div for label alignment Luke Barnard 2017-11-02 15:04:40 +00:00
  • b13bff77cb Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-02 14:23:05 +00:00
  • d698f9f8fd Translated using Weblate (German) Bamstam 2017-11-02 13:07:36 +00:00
  • 8895ab7e5b Merge pull request #1564 from matrix-org/dbkr/pillify_at_room David Baker 2017-11-02 14:22:58 +00:00
  • c01ea56676 Add toggle to alter visibility of room-group association Luke Barnard 2017-11-02 13:40:07 +00:00
  • bf77b51b5e Merge branch 'develop' into luke/groups-room-publicity Luke Barnard 2017-11-02 13:39:33 +00:00
  • 790db94fd7 Add toggle to alter the visibility of a room-group association Luke Barnard 2017-11-02 13:25:55 +00:00
  • ac89b5dc5e Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-02 12:53:34 +00:00
  • fb8e41a9c1 Merge pull request #5494 from vector-im/dbkr/pillify_at_room Luke Barnard 2017-11-02 12:53:29 +00:00
  • 8387fe7326 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-02 11:10:50 +00:00
  • d9f19726a3 Translated using Weblate (German) Krombel 2017-11-02 10:00:36 +00:00
  • 6baf6af332 Merge pull request #1563 from matrix-org/luke/groups-room-info David Baker 2017-11-02 11:10:43 +00:00
  • 7ab3be0a11 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-02 11:07:06 +00:00
  • 2e8f960ee3 Merge pull request #5493 from vector-im/luke/groups-room-info David Baker 2017-11-02 11:07:00 +00:00
  • e909d859ab Merge branch 'develop' into luke/groups-room-info Luke Barnard 2017-11-02 10:56:33 +00:00
  • 65ea7a8460 Use more spercific selector instead of !important David Baker 2017-11-02 10:37:25 +00:00
  • 7ff50d01b8 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-01 22:18:10 +00:00
  • e68ab44596 Translated using Weblate (Russian) Andrey 2017-11-01 19:35:36 +00:00
  • 9b5fd76dc7 Translated using Weblate (Hungarian) Szimszon 2017-11-01 20:46:24 +00:00
  • b2ccf3fdf7 Translated using Weblate (German) Bamstam 2017-11-01 21:48:30 +00:00
  • 815b42f0ac Merge pull request #1565 from matrix-org/matthew/group-promise-npe Matthew Hodgson 2017-11-01 22:18:05 +00:00
  • 7d7cd30e46 turn NPE on flair resolution errors into a logged error Matthew Hodgson 2017-11-01 22:10:03 +00:00
  • 6586a6ff36 Translated using Weblate (Hungarian) Szimszon 2017-11-01 20:43:01 +00:00
  • 819122c111 Translated using Weblate (French) Kévin C 2017-11-01 20:04:13 +00:00
  • 44e408ca91 Translated using Weblate (French) Kévin C 2017-11-01 19:59:18 +00:00
  • cd84d86fd1 CSS for room notification pills David Baker 2017-11-01 19:45:59 +00:00
  • 4f8d6d8fbe Pillify room notifs in the timeline David Baker 2017-11-01 19:42:47 +00:00
  • 80f79e6b84 Generate translations Luke Barnard 2017-11-01 17:58:45 +00:00
  • fe495db6e2 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-01 17:44:09 +00:00
  • acd1f31010 Merge pull request #1484 from pafcu/departify Luke Barnard 2017-11-01 17:44:03 +00:00