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

Commit Graph

  • c665c1170b Regenerate room lists when we get RoomMember.membership lukebarnard 2018-02-05 18:27:50 +00:00
  • d0972cdb1d Merge remote-tracking branch 'origin/develop' into dbkr/newer-eslint-for-working-no-bind David Baker 2018-02-05 18:09:48 +00:00
  • 9982efbd8f Regenerate room lists when we get m.direct lukebarnard 2018-02-05 18:06:29 +00:00
  • 415da3e6ab Merge branch 'develop' into luke/room-list-flux lukebarnard 2018-02-05 17:57:46 +00:00
  • 330ce0f02e On failure, regenerate state from sdk lukebarnard 2018-02-05 17:29:22 +00:00
  • 8c75bed687 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-02-05 14:28:03 +00:00
  • 481476f835 Translated using Weblate (Serbian) Марко М. Костић 2018-02-03 10:16:36 +00:00
  • 680a0191be Merge pull request #6067 from vector-im/t3chguy/fix_usercontent_pointer Luke Barnard 2018-02-05 14:27:57 +00:00
  • c1dad4579a Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-02-05 14:27:22 +00:00
  • 70afce73a7 Merge pull request #1726 from matrix-org/t3chguy/fix_usercontent_pointer Luke Barnard 2018-02-05 14:27:17 +00:00
  • 3abf1458fb Add cursor:pointer so that calculated CSS includes it for iframe style Michael Telatynski 2018-02-05 13:25:43 +00:00
  • 00b7cc512b Split MImageBody into MImageBody,MFileBody to match react-sdk and having the classnames match their components. Michael Telatynski 2018-02-05 13:25:09 +00:00
  • 0ec023b523 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-02-05 12:07:47 +00:00
  • 0d04c8dab5 Merge pull request #1717 from matrix-org/t3chguy/fix_3pid_dm_rooms David Baker 2018-02-05 12:07:43 +00:00
  • e508f06765 Add asset add / remove messaging clauses. Richard Lewis 2018-02-05 11:50:25 +00:00
  • 992c4771f4 Add button to remove all stickerpacks Richard Lewis 2018-02-05 11:49:44 +00:00
  • 34de3729fe Add method to remove all stickerpacks. Richard Lewis 2018-02-05 11:49:26 +00:00
  • 29962ed89d Add stickerpack strings. Richard Lewis 2018-02-05 11:48:48 +00:00
  • 81eca49266 Merge branch 'luke/room-list-flux' of github.com:matrix-org/matrix-react-sdk into luke/room-list-flux lukebarnard 2018-02-05 11:40:42 +00:00
  • ff8fcb3139 Merge branch 'develop' into luke/room-list-flux Luke Barnard 2018-02-05 11:39:39 +00:00
  • 5ddb0b9b4b Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-02-05 10:21:10 +00:00
  • ec3a37d9f3 Merge pull request #1729 from matrix-org/t3chguy/aliases_null_guard David Baker 2018-02-05 10:21:05 +00:00
  • 2d6dd988d6 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-02-05 10:14:28 +00:00
  • 3275a56013 Merge pull request #1718 from matrix-org/t3chguy/fix_memberlist_3pid_invites David Baker 2018-02-05 10:14:23 +00:00
  • e1296a076e Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-02-05 09:58:44 +00:00
  • 4133801390 Translated using Weblate (Serbian) Марко М. Костић 2018-02-03 11:51:18 +00:00
  • 03b137d425 Translated using Weblate (Catalan) Simó Albert i Beltran 2018-02-03 15:38:29 +00:00
  • 916ab68506 Merge pull request #1720 from matrix-org/t3chguy/nvl/fix_rich_reply_on_image David Baker 2018-02-05 09:58:37 +00:00
  • 2a58de5cfc Translated using Weblate (Dutch) Nathan van Beelen 2018-02-04 14:24:29 +00:00
  • d884596a1f Translated using Weblate (Dutch) Nathan van Beelen 2018-02-04 14:22:56 +00:00
  • c3b000a368 Translated using Weblate (Basque) Osoitz 2018-02-02 08:28:09 +00:00
  • d1a24ac87b guard against m.room.aliases events with no keys (redaction?) Michael Telatynski 2018-02-02 08:12:56 +00:00
  • 675bebee33 Translated using Weblate (French) Kévin C 2018-02-01 17:46:46 +00:00
  • cefd744aba Translated using Weblate (Hungarian) Szimszon 2018-02-01 16:15:47 +00:00
  • 325c9662c5 Translated using Weblate (German) Krombel 2018-02-01 15:12:52 +00:00
  • 41c9cb1c27 Translated using Weblate (German) Krombel 2018-02-01 15:11:44 +00:00
  • 8b35a7b10f Translated using Weblate (Russian) Andrey 2018-02-01 11:32:42 +00:00
  • 456aebe240 Merge pull request #6040 from sim6/sim6_catalan David Baker 2018-02-01 10:47:01 +00:00
  • 66e20298a7 Merge pull request #5777 from RiotTranslateBot/weblate-riot-web-riot-web David Baker 2018-02-01 10:45:56 +00:00
  • e51dbd49f9 Merge pull request #1728 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk David Baker 2018-02-01 10:38:08 +00:00
  • 497cf21c86 Translated using Weblate (Hungarian) David Baker 2018-02-01 10:31:44 +00:00
  • a6155c98ec Merge branch 'develop' of https://github.com/vector-im/riot-web into develop Weblate 2018-02-01 10:24:21 +00:00
  • a26473b722 Translated using Weblate (Serbian) Марко М. Костић 2018-01-26 20:35:06 +00:00
  • ed5162ef4e Translated using Weblate (Galician) Xose M 2018-01-29 13:41:07 +00:00
  • 930deaea9d Translated using Weblate (Chinese (Simplified)) Tong Hui 2018-01-27 16:55:36 +00:00
  • b80be62bb7 Translated using Weblate (Catalan) Simó Albert i Beltran 2018-01-29 20:47:05 +00:00
  • 11806f2aa2 Translated using Weblate (Basque) Osoitz 2018-01-28 19:52:43 +00:00
  • 0d229f015b Merge pull request #5718 from vector-im/t3chguy/devtools-118247 David Baker 2018-02-01 09:48:40 +00:00
  • ee81d6aea1 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-31 18:10:59 +00:00
  • 3a33eea5e9 Translated using Weblate (Dutch) Nathan van Beelen 2018-01-30 20:29:30 +00:00
  • 4c17b5f1c7 Merge pull request #1724 from matrix-org/t3chguy/nvl/rich_quoting_nullguard David Baker 2018-01-31 18:10:52 +00:00
  • f193b3ae2c Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-30 15:21:19 +00:00
  • cfd1f28258 Merge pull request #1722 from matrix-org/luke/load-tags-after-first-sync David Baker 2018-01-30 15:21:12 +00:00
  • 8a6727ea98 This is actually MFileBody not MImageBody, change classname Michael Telatynski 2018-01-30 10:55:23 +00:00
  • 1fa9e7420f Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-30 10:27:20 +00:00
  • 977dec40a3 Translated using Weblate (Serbian) Марко М. Костић 2018-01-26 20:50:25 +00:00
  • fd4fc883c1 Translated using Weblate (Hungarian) Szimszon 2018-01-25 15:24:21 +00:00
  • 5e34c8043f Translated using Weblate (German) Walter 2018-01-29 17:04:22 +00:00
  • 8d902010f8 Translated using Weblate (Galician) Xose M 2018-01-30 06:36:34 +00:00
  • 4afdefb926 Translated using Weblate (Dutch) Nathan van Beelen 2018-01-28 21:52:17 +00:00
  • 5c7bdcec4f Translated using Weblate (Catalan) Simó Albert i Beltran 2018-01-29 20:47:05 +00:00
  • 819dd93d1f Translated using Weblate (Basque) Osoitz 2018-01-29 18:08:49 +00:00
  • c7afaed3a7 Merge pull request #1725 from matrix-org/luke/fix-room-list-reordering David Baker 2018-01-30 10:27:13 +00:00
  • c5a3a02e1d Fix order calculation logic when reordering a room lukebarnard 2018-01-30 10:14:05 +00:00
  • 6dd63ae644 Null guard against falsey (non-null) props.node, to make react happy Michael Telatynski 2018-01-29 19:17:46 +00:00
  • 078d156824 Translated using Weblate (Ukrainian) Walter 2017-11-17 20:20:10 +00:00
  • 5764280588 Persist contentState when sending SlashCommand via MessageComposerInput Michael Telatynski 2018-01-29 09:08:11 +00:00
  • 56927b23e6 pass onWidgetLoad (which is required for SOME EventTileTypes) XXX: they should follow an interface, this is somewhat nasty Michael Telatynski 2018-01-28 22:12:34 +00:00
  • 88c4cb6eba Translated using Weblate (Chinese (Simplified)) Iru Cai (vimacs) 2018-01-08 02:02:11 +00:00
  • 40907ecf29 Use correct condition for getting account data after first sync lukebarnard 2018-01-26 19:39:06 +01:00
  • bc4f8c4c2a Translated using Weblate (Galician) Xose M 2018-01-16 11:00:45 +00:00
  • 6fa217742f Translated using Weblate (Catalan) d1d4c 2018-01-26 02:45:24 +00:00
  • 7ee205a447 Translated using Weblate (Catalan) d1d4c 2018-01-26 12:43:13 +00:00
  • 4820a195ab Remove logging lukebarnard 2018-01-26 09:15:03 +01:00
  • 18bf9ef598 Translated using Weblate (Catalan) Simó Albert i Beltran 2018-01-25 22:23:58 +00:00
  • f6c49a2472 Translated using Weblate (Catalan) Ramon Vilar 2018-01-25 16:10:51 +00:00
  • 73e3a594ac Prevent TagTiles from being dragged into other droppables lukebarnard 2018-01-25 22:52:19 +01:00
  • 37fe3ac676 Prevent RoomTiles from being dragged into other droppables lukebarnard 2018-01-25 22:51:40 +01:00
  • 2926154dce Modify LeftPanel to include a DragDropContext lukebarnard 2018-01-25 22:30:58 +01:00
  • 701abb6a21 Move management of room lists to RoomListStore lukebarnard 2018-01-25 22:16:03 +01:00
  • 200124569b Merge remote-tracking branch 'origin/t3chguy/devtools-118247' into t3chguy/devtools-118247 Michael Telatynski 2018-01-25 21:07:10 +00:00
  • 662a6297e7 FilteredList, now being a controlled component does not need state Michael Telatynski 2018-01-25 21:06:35 +00:00
  • d0e3319bd9 Remove DragDropContext from TagPanel and RoomList lukebarnard 2018-01-25 21:58:35 +01:00
  • 04bca93e0d Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/devtools-118247 Michael Telatynski 2018-01-25 20:59:31 +00:00
  • 815f52587b Move TagPanel out of LoggedInView lukebarnard 2018-01-25 21:53:34 +01:00
  • 38de8a129b Add transaction capability to asyncActions lukebarnard 2018-01-25 21:45:15 +01:00
  • 9223a5db9e Translated using Weblate (Catalan) d1d4c 2018-01-25 16:13:04 +00:00
  • e56b16f7d1 Add Catalan Simó Albert i Beltran 2018-01-25 18:25:46 +01:00
  • e78659642e Translated using Weblate (Hungarian) Szimszon 2018-01-23 07:09:24 +00:00
  • 56bd4b7d06 Fix not showing Invited section if all invites are 3PID Michael Telatynski 2018-01-25 12:18:02 +00:00
  • c86c12de40 Translated using Weblate (Basque) Osoitz 2018-01-22 19:23:52 +00:00
  • 3060ec1053 Use invite_3pid prop of createRoom instead of manual invite after create Michael Telatynski 2018-01-25 09:54:31 +00:00
  • dd4cef4c3e Translated using Weblate (Russian) Andrey 2018-01-22 18:31:43 +00:00
  • 00f52edf4c Translated using Weblate (Chinese (Traditional)) Jeff Huang 2018-01-23 05:16:28 +00:00
  • 899192b019 Translated using Weblate (French) Kévin C 2018-01-22 20:43:11 +00:00
  • 5c6a265b86 Translated using Weblate (Catalan) d1d4c 2018-01-24 16:37:44 +00:00
  • 6b62acd001 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-24 17:53:35 +00:00
  • b7c32ee1b5 Translated using Weblate (Serbian) Марко М. Костић 2018-01-23 20:59:39 +00:00
  • b0a3bd6591 Merge pull request #6017 from vector-im/t3chguy/rich_quoting_linear David Baker 2018-01-24 18:53:33 +01:00
  • d3100f9bc9 Translated using Weblate (Catalan) d1d4c 2018-01-24 17:53:21 +00:00