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

Commit Graph

  • bb64e9a18b Merge pull request #5137 from vector-im/luke/fix-header-button-key-prop-warning Luke Barnard 2017-09-28 11:26:54 +01:00
  • 010b8d8be6 Merge branch 'luke/lint-jsx-curly-spacing' of github.com:matrix-org/matrix-react-sdk into luke/lint-jsx-curly-spacing Luke Barnard 2017-09-28 11:23:19 +01:00
  • 6b9a2909df Add rule to enforce spacing in curly brackets in JSX children Luke Barnard 2017-09-28 11:21:06 +01:00
  • 3c99b2af3d Fix ability to invite existing mx users Luke Barnard 2017-09-28 10:55:09 +01:00
  • e70336af11 Add rule to enforce JSX tag spacing Luke Barnard 2017-09-28 10:27:03 +01:00
  • 1699c37fcf Merge pull request #1434 from matrix-org/luke/fix-address-picker-error-message Luke Barnard 2017-09-28 10:08:36 +01:00
  • 6eedf8b073 Add eslint rule to disallow spaces inside of curly braces Luke Barnard 2017-09-28 10:02:40 +01:00
  • e9cf25f946 Remove "You have entered an invalid contact..." from translations Luke Barnard 2017-09-27 17:55:04 +01:00
  • 38fdd155f0 Construct address picker message using provided validAddressTypes Luke Barnard 2017-09-27 17:11:30 +01:00
  • c7728bd9ad Add eslint rule to disallow spaces inside of curly braces Luke Barnard 2017-09-28 10:02:40 +01:00
  • f9a92ad15a Lint Luke Barnard 2017-09-28 10:02:16 +01:00
  • ce13837216 Remove key prop pass-thru on HeaderButton Luke Barnard 2017-09-28 09:46:10 +01:00
  • 26ce62250b Translated using Weblate (Portuguese) Carlos 2017-09-21 16:12:50 +00:00
  • 25cf115533 Update docs with _td() and some other recommendations Stefan Parviainen 2017-09-27 22:01:56 +02:00
  • 1f66baca4b Remove "You have entered an invalid contact..." from translations Luke Barnard 2017-09-27 17:55:04 +01:00
  • 9c86a655ca Add button to get to MyGroups Luke Barnard 2017-09-27 17:46:53 +01:00
  • 929c8627d3 Add button to get to MyGroups (view_my_groups or path #/groups) Luke Barnard 2017-09-27 17:45:49 +01:00
  • 3a8bfbf7e0 Construct address picker message using provided validAddressTypes Luke Barnard 2017-09-27 17:11:30 +01:00
  • 19e4e245c2 Merge pull request #1433 from matrix-org/luke/fix-groups-summary-rooms-with-no-avatar Luke Barnard 2017-09-27 16:34:03 +01:00
  • ac76154518 Merge pull request #1432 from matrix-org/luke/groups-add-rooms-by-id Luke Barnard 2017-09-27 16:20:32 +01:00
  • f3b6b2cc06 Fix GroupView summary rooms displaying without avatars Luke Barnard 2017-09-27 16:18:15 +01:00
  • d52355f80e Implement adding rooms to a group (or group summary) by room ID Luke Barnard 2017-09-27 15:30:58 +01:00
  • 2d8bc783b0 Merge pull request #1431 from matrix-org/luke/feature-flair-tooltip David Baker 2017-09-27 14:44:25 +01:00
  • 3d30cc3733 Merge pull request #1430 from matrix-org/luke/groups-fix-feature-self Luke Barnard 2017-09-27 14:43:50 +01:00
  • f528e147e3 Give flair avatars a tooltip = the group ID Luke Barnard 2017-09-27 14:35:59 +01:00
  • 1d5f2bec65 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-09-27 13:15:32 +00:00
  • 1740319b7a Add margin to flair avatars to separate them Luke Barnard 2017-09-27 14:15:21 +01:00
  • e3405cfd95 shouldOmitSelf -> includeSelf Luke Barnard 2017-09-27 11:52:05 +01:00
  • 6bc9b32ab7 Fix ability to feature self in a group summary Luke Barnard 2017-09-27 11:04:41 +01:00
  • 540885474a Translated using Weblate (English (United States)) Riot Administration 2017-09-27 02:37:22 +00:00
  • 1ca9102442 Fix spinner appearing above RP header Luke Barnard 2017-09-27 10:36:44 +01:00
  • fb344bc606 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-09-27 09:32:13 +00:00
  • 2adf08dee0 CSS for GroupView: align "save"/"cancel" buttons in settings Luke Barnard 2017-09-27 10:31:27 +01:00
  • 35cb52febc Fix merge conflict Stefan Parviainen 2017-09-27 08:41:37 +02:00
  • fcd4a1c7c6 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2017-09-20 00:01:38 +00:00
  • 6bbf751f4b Translated using Weblate (English (United States)) Riot Administration 2017-09-27 02:37:01 +00:00
  • 42840c1e3c Translated using Weblate (Catalan) Roger Pueyo Centelles 2017-09-27 00:08:14 +00:00
  • c99299ab6f Translated using Weblate (Russian) Andrey 2017-09-20 05:40:09 +00:00
  • e446f50618 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-09-26 17:16:02 +00:00
  • f64f293cdb Merge pull request #5125 from vector-im/luke/groups-add-rooms David Baker 2017-09-26 18:15:54 +01:00
  • 3bdf347a08 Merge pull request #1429 from matrix-org/luke/groups-add-rooms David Baker 2017-09-26 18:15:50 +01:00
  • 1b12602ea5 Merge branch 'develop' into luke/groups-add-rooms Luke Barnard 2017-09-26 17:12:52 +01:00
  • 20d65535c0 Use all known rooms instead of public rooms Luke Barnard 2017-09-26 17:11:54 +01:00
  • c7d4c87c62 Merge pull request #1428 from matrix-org/dbkr/fix_publicity David Baker 2017-09-26 15:05:16 +01:00
  • 8ec1c3ecf4 lint David Baker 2017-09-26 14:58:49 +01:00
  • ddab8d7b5c Implement "Add room to group" feature Luke Barnard 2017-09-26 14:49:13 +01:00
  • 8d0983ab02 Fix group membership publicity David Baker 2017-09-26 14:46:57 +01:00
  • 888e3abc75 Implement "Add room to group" feature Luke Barnard 2017-09-26 14:35:38 +01:00
  • bc659032e6 Translated using Weblate (Chinese (Simplified)) Iru Cai (vimacs) 2017-09-26 07:47:39 +00:00
  • bb5551aeda Translated using Weblate (Chinese (Simplified)) Iru Cai (vimacs) 2017-09-26 07:42:54 +00:00
  • cfc830b294 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-09-25 16:00:06 +00:00
  • 94855c0f48 Merge pull request #4967 from vector-im/rob/electron-screensharing David Baker 2017-09-25 17:00:00 +01:00
  • 79af97011c Merge pull request #1355 from matrix-org/rob/electron-screensharing David Baker 2017-09-25 16:59:56 +01:00
  • 110993cc67 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-09-25 15:37:50 +00:00
  • 798558e5cc Merge pull request #5117 from vector-im/luke/refactor-right-panel-header-buttons David Baker 2017-09-25 16:37:44 +01:00
  • f79b8e0c71 ElectronPlatform: Import desktopCapturer explicitly Robert Swain 2017-09-25 17:19:04 +02:00
  • 44c0fb77da Merge branch 'develop' into rob/electron-screensharing Robert Swain 2017-09-25 17:16:21 +02:00
  • 24de01e21d AppTile: Test if widgetUrl startsWith instead of has a substring Robert Swain 2017-09-25 17:14:25 +02:00
  • bfdb92ff6b Nit: Re-order property Luke Barnard 2017-09-25 16:13:54 +01:00
  • 6e49926228 AppTile: Do not test for electron platform Robert Swain 2017-09-25 17:13:18 +02:00
  • 77f30aacf9 Re-add clickPhase for FilePanel header button Luke Barnard 2017-09-25 16:13:13 +01:00
  • 7f1d8834a2 Add setupScreenSharingForIframe to BasePlatform Robert Swain 2017-09-25 17:12:37 +02:00
  • b42cf74216 Merge pull request #1424 from matrix-org/t3chguy/delint&DRY_TextForEvent Luke Barnard 2017-09-25 16:08:13 +01:00
  • fd7e81193e Less coupling between HeaderButton and RightPanel Luke Barnard 2017-09-25 16:06:46 +01:00
  • b047f1caaa Merge branch 'develop' into rob/electron-screensharing Robert Swain 2017-09-25 17:02:30 +02:00
  • 796924ef35 Fix typo as found by Luke Michael Telatynski 2017-09-25 15:49:48 +01:00
  • 2ab860f487 Merge pull request #1427 from matrix-org/luke/feature-flair-cache-bust David Baker 2017-09-25 15:39:06 +01:00
  • 20c731f627 Bust the flair caches after 30mins Luke Barnard 2017-09-25 15:21:56 +01:00
  • d9c2f6e610 Merge pull request #1426 from matrix-org/dbkr/profile_in_group_member_info David Baker 2017-09-25 15:14:30 +01:00
  • 0b96871be4 Lint David Baker 2017-09-25 15:07:02 +01:00
  • af2df77b8e Merge pull request #1418 from matrix-org/luke/groups-summary-store David Baker 2017-09-25 14:59:32 +01:00
  • 7149510c4e Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-09-25 13:53:29 +00:00
  • f5e7059c1b Translated using Weblate (French) Kévin C 2017-09-25 11:56:10 +00:00
  • 377740901f Translated using Weblate (Czech) Jan Kudrik 2017-09-23 15:34:32 +00:00
  • 75fef3f21a Merge pull request #5104 from vector-im/dbkr/publicity_toggle Luke Barnard 2017-09-25 14:53:23 +01:00
  • e42e7bd3ad Merge pull request #1419 from matrix-org/dbkr/publicity_toggle Luke Barnard 2017-09-25 14:52:57 +01:00
  • 58ec732fb3 Add width/height/resizeMethod params David Baker 2017-09-25 14:51:21 +01:00
  • 56bb932a9b Translated using Weblate (French) Kévin C 2017-09-25 13:33:27 +00:00
  • 1bd200f1b1 Merge pull request #1417 from matrix-org/dbkr/member_list_show_more Luke Barnard 2017-09-25 14:50:33 +01:00
  • 83e6218930 Remove listeners from group summary store on unmount Luke Barnard 2017-09-25 14:49:12 +01:00
  • 8e7d58797d _loadGroupFromServer -> _initGroupSummaryStore Luke Barnard 2017-09-25 14:48:49 +01:00
  • 28e9fdc873 rebase in progress; onto 7137ba71 Luke Barnard 2017-09-25 14:42:44 +01:00
  • 5b312ffb03 Show displayname / avatar in group member info David Baker 2017-09-25 14:38:43 +01:00
  • 7137ba7188 Refactor right panel header buttons Luke Barnard 2017-09-25 14:13:02 +01:00
  • 1a82f121c0 lint David Baker 2017-09-25 13:17:07 +01:00
  • 7dfff429f2 Translated using Weblate (Ukrainian) Walter 2017-09-23 18:25:18 +00:00
  • 38f884f285 Translated using Weblate (French) Kévin C 2017-09-24 23:36:51 +00:00
  • 175fed490f Merge pull request #1425 from matrix-org/rav/memberlist_fixes David Baker 2017-09-25 11:08:56 +01:00
  • e2f8bb2ec0 Fix NPE in MemberList Richard van der Hoff 2017-09-25 10:25:21 +01:00
  • b8dca58f4f Pass matrixClient as an argument to GSS constructor Luke Barnard 2017-09-25 10:02:13 +01:00
  • c8922ba7f5 This file was hurting my eyes. Delint and DRY Michael Telatynski 2017-09-25 09:48:00 +01:00
  • 6795ee84e1 Translated using Weblate (French) Kévin C 2017-09-24 10:20:16 +00:00
  • b9584cd421 Translated using Weblate (French) Bruno Bigras 2017-09-23 19:10:38 +00:00
  • 9413b1537c Translated using Weblate (French) Bruno Bigras 2017-09-23 19:18:18 +00:00
  • 2b5b708057 Translate unknown presence label Stefan Parviainen 2017-09-24 10:14:04 +02:00
  • dbae5a66e3 Use translation in img alt text Stefan Parviainen 2017-09-24 09:43:52 +02:00
  • 14bce1119c Make theme names translatable Stefan Parviainen 2017-09-23 21:36:10 +02:00
  • 198dc7ea5c Translated using Weblate (Czech) Jan Kudrik 2017-09-23 15:39:09 +00:00
  • 26af29183e Merge pull request #1422 from pafcu/var-typofix David Baker 2017-09-23 18:01:06 +01:00
  • b424eea573 Remove unnecessary strings Stefan Parviainen 2017-09-23 17:02:26 +02:00