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

Commit Graph

  • 85a590ad5a Remove trailing comma in JSON Michael Telatynski 2017-10-04 23:41:54 +01:00
  • bf6a3470b4 Merge branch 'develop' of github.com:vector-im/riot-web into set_default_federate_by_settings Michael Telatynski 2017-10-04 22:35:58 +01:00
  • 7492f2dffa Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into set_default_federate_by_settings Michael Telatynski 2017-10-04 22:35:29 +01:00
  • 2ba0a801c4 Merge pull request #1449 from matrix-org/luke/groups-store Luke Barnard 2017-10-04 18:11:11 +01:00
  • cbb36b163b Typo Luke Barnard 2017-10-04 18:05:40 +01:00
  • c1318e9102 Only maintain one GroupStore in the GroupStoreCache Luke Barnard 2017-10-04 17:51:38 +01:00
  • b16eb1713e Typo Luke Barnard 2017-10-04 17:01:44 +01:00
  • 4017fa7f1d Factor-out GroupStore and create GroupStoreCache Luke Barnard 2017-10-04 16:56:35 +01:00
  • 3d7b1cb382 Merge pull request #5164 from vector-im/luke/fix-no-roomlist-placeholders Luke Barnard 2017-10-04 16:13:45 +01:00
  • 70bbf2df7a Fix bug that made sub list placeholders not show for ILAG etc. Luke Barnard 2017-10-04 15:58:40 +01:00
  • 6875005e30 Merge pull request #1448 from matrix-org/luke/fix-related-groups-in-labs Luke Barnard 2017-10-04 15:00:08 +01:00
  • ed74ac394b Put related groups UI behind groups labs flag Luke Barnard 2017-10-04 14:35:13 +01:00
  • a400c03768 Merge pull request #1447 from matrix-org/luke/feature-flair-related-only Luke Barnard 2017-10-04 14:24:59 +01:00
  • 54ba164862 Merge pull request #1446 from matrix-org/luke/feature-related-groups-ui Luke Barnard 2017-10-04 14:21:48 +01:00
  • 0c6b5776ec Remove commented imports Luke Barnard 2017-10-04 14:09:51 +01:00
  • 02e7287123 Remove constraint on groups being local, remove logging Luke Barnard 2017-10-04 14:08:31 +01:00
  • 8d46b19916 Restrict Flair in the timeline to related groups of the room Luke Barnard 2017-10-04 14:06:49 +01:00
  • 9f39a15163 Merge pull request #1445 from matrix-org/luke/fix-editable-item-list Luke Barnard 2017-10-04 13:22:46 +01:00
  • 7be5e685f7 Implement UI for editing related groups of a room Luke Barnard 2017-10-04 13:19:57 +01:00
  • 9e3954865a Fix a couple of bugs with EditableItemList Luke Barnard 2017-10-04 13:15:38 +01:00
  • 56c366ebd3 Merge pull request #5161 from vector-im/luke/refactor-editable-list-from-alias-settings Luke Barnard 2017-10-04 10:56:21 +01:00
  • 1938a767a2 Merge pull request #1444 from matrix-org/luke/refactor-editable-list-from-alias-settings Luke Barnard 2017-10-04 10:56:17 +01:00
  • 28b8582bd6 Merge branch 'develop' into luke/refactor-editable-list-from-alias-settings Luke Barnard 2017-10-04 10:37:45 +01:00
  • a9d308004e Factor out EditableItemList component from AliasSettings Luke Barnard 2017-10-04 10:30:09 +01:00
  • 4e9694be6d Maintain "blur to add" function to match previous UX Luke Barnard 2017-10-04 10:28:26 +01:00
  • 407a632a8d Fix typo Luke Barnard 2017-10-04 10:26:43 +01:00
  • a75fa7fd3e Translated using Weblate (Russian) Walter 2017-10-03 12:36:48 +00:00
  • 44162d5c8a Translated using Weblate (Portuguese (Brazil)) Danilo Resende 2017-10-03 22:20:56 +00:00
  • ec414147d1 Merge pull request #5110 from pafcu/mark-and-remove-translations Luke Barnard 2017-10-04 10:24:36 +01:00
  • d25ebfb844 Remove cruft from EIL Luke Barnard 2017-10-04 10:15:44 +01:00
  • 5abf30f373 Translated using Weblate (Ukrainian) Walter 2017-10-03 12:47:27 +00:00
  • a9a2b60dfc Translated using Weblate (Russian) Walter 2017-10-03 12:35:30 +00:00
  • 00a89f8263 Translated using Weblate (Portuguese (Brazil)) Danilo Resende 2017-10-03 22:14:16 +00:00
  • 011aadcb94 Merge pull request #1421 from pafcu/develop Luke Barnard 2017-10-04 10:09:09 +01:00
  • 8243c39d83 Factor out EditableItemList from AliasSettings Luke Barnard 2017-10-04 10:00:01 +01:00
  • 23c1a3233b Translated using Weblate (Portuguese (Brazil)) Danilo Resende 2017-10-03 22:19:33 +00:00
  • 9680bcb117 Implement reviewer suggestions pafcu 2017-10-03 18:22:58 +02:00
  • f040a248d6 Translated using Weblate (German) Bamstam 2017-10-03 14:33:59 +00:00
  • 171353a87d Translated using Weblate (Ukrainian) Walter 2017-09-22 13:31:51 +00:00
  • 65e73c71cd Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-10-03 10:45:12 +00:00
  • 3b8ad0e12e Translated using Weblate (Malayalam) syamkumar 2017-10-03 07:05:59 +00:00
  • 834801e9d7 Translated using Weblate (Galician) Xose M 2017-10-02 11:59:43 +00:00
  • 233a611c22 Translated using Weblate (Dutch) Nathan van Beelen 2017-09-30 09:37:11 +00:00
  • fa0a87ae39 Translated using Weblate (Thai) Pitchaya Boonsarngsuk 2017-10-02 14:35:15 +00:00
  • d082e44d94 Merge pull request #5141 from vector-im/luke/groups-remove-room Luke Barnard 2017-10-03 11:45:07 +01:00
  • 03581adf85 Merge pull request #1438 from matrix-org/luke/groups-remove-room Luke Barnard 2017-10-03 11:45:03 +01:00
  • 6b834bc72e Add confirmation dialog for removing room from group Luke Barnard 2017-10-03 11:16:22 +01:00
  • 195395e7ee Adjust CSS for groupRoomTile and add QuestionDialog right padding Luke Barnard 2017-10-03 11:14:43 +01:00
  • 0116c4b486 Log the error when failing to removie room from group Luke Barnard 2017-10-03 10:14:08 +01:00
  • 3e34a460a4 Add error dialog for when removing room fails Luke Barnard 2017-10-03 10:06:18 +01:00
  • a96169e80e Fix merge conflict Stefan Parviainen 2017-10-02 17:57:22 +02:00
  • 4361953d6d Translated using Weblate (Dutch) Silke 2017-09-30 09:37:11 +00:00
  • 8d189cc322 Merge pull request #1443 from matrix-org/dbkr/fix_3pid_invites Luke Barnard 2017-10-02 15:18:00 +01:00
  • b202601d65 Fix showing 3pid invites in member list David Baker 2017-10-02 15:10:32 +01:00
  • a8767e823a Added translation using Weblate (Galician) Xose M 2017-10-02 10:24:25 +00:00
  • fa4a22cd2e Translated using Weblate (Dutch) Silke 2017-09-30 09:36:03 +00:00
  • 0e2a1c90d5 Don't suggest grey as a color scheme for a room Travis Ralston 2017-09-29 16:08:50 -06:00
  • 20798dd2fa Expose power level setting for widgets Travis Ralston 2017-09-29 15:22:37 -06:00
  • 8ee9d39ffa Expose option for m.room.topic power level Travis Ralston 2017-09-29 15:12:05 -06:00
  • 8ab3d94c1c Always show common events in the PL section of room settings Travis Ralston 2017-09-29 15:11:48 -06:00
  • 614cf950b6 Supply user-friendly labels for common events Travis Ralston 2017-09-29 14:45:00 -06:00
  • 2e1b2178a1 Remove assumptions on how languages work in the power levels section Travis Ralston 2017-09-29 14:35:49 -06:00
  • 415693bd83 Support editing power levels of events. Travis Ralston 2017-09-29 14:02:31 -06:00
  • 2d153a72c1 Split up CSS; use .catch instead of .then Travis Ralston 2017-09-29 13:33:14 -06:00
  • a01387f7a6 Use an AccessibleButton for unpinning from the pane. Travis Ralston 2017-09-29 13:32:25 -06:00
  • 0f2fd9f698 Move the PinnedEventsPanel to the react-sdk Travis Ralston 2017-09-29 13:14:56 -06:00
  • 078ee54edf Move the PinnedEventsPanel to the react-sdk Travis Ralston 2017-09-29 13:15:21 -06:00
  • 2d5acfc0bc Filter pinned events before rendering Travis Ralston 2017-09-29 11:30:52 -06:00
  • b0190f6a65 i18n for remaining strings Travis Ralston 2017-09-29 11:22:06 -06:00
  • 0a3bc1c667 Don't try to show redacted messages Travis Ralston 2017-09-29 11:21:44 -06:00
  • aff02885de Don't fail if an event doesn't belong to a room. Travis Ralston 2017-09-29 11:21:21 -06:00
  • 965a25ba84 Fix bug where rooms missing m.room.pinned_events could not pin messages Travis Ralston 2017-09-29 11:08:22 -06:00
  • f7389b70aa Hide the pin option in the context menu if the user can't pin messages Travis Ralston 2017-09-29 11:01:17 -06:00
  • 955ca6cd2b Implement button to remove a room from a group Luke Barnard 2017-09-29 17:59:24 +01:00
  • 014464d82b CSS for "remove" button on GroupRoomTile Luke Barnard 2017-09-29 17:58:42 +01:00
  • efdb4b02c6 i18n for 'Jump to message' button Travis Ralston 2017-09-29 10:55:52 -06:00
  • 59a253af37 Don't show the unpin button if the user can't unpin the message. Travis Ralston 2017-09-29 10:53:44 -06:00
  • 9b11f576fe Add action bar to pinned event tiles; support unpinning from the panel Travis Ralston 2017-09-29 10:41:23 -06:00
  • fa5a23e0df Permalink pins to their original events Travis Ralston 2017-09-28 16:59:22 -06:00
  • 5daa16ab53 Add panel for pinned messages. Travis Ralston 2017-09-28 15:48:32 -06:00
  • 774c3dbd38 Pin/unpin message option in a message's context menu Travis Ralston 2017-09-28 09:42:33 -06:00
  • 9f7823f2df Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-09-29 16:23:06 +00:00
  • f35289a664 Merge pull request #5140 from vector-im/luke/groups-room-icons Luke Barnard 2017-09-29 17:23:02 +01:00
  • d3b8d8bf9d Create basic icon for the GroupRoomList tab and adding rooms to groups Luke Barnard 2017-09-29 17:03:58 +01:00
  • f71e07670d Send toggle handler for the cancel button in the pinned events pane Travis Ralston 2017-09-28 17:00:26 -06:00
  • 874d383a8f Add dock for pinned messages at the top of the room Travis Ralston 2017-09-28 15:32:51 -06:00
  • 3a58e1c066 Show pinned message changes in the timeline Travis Ralston 2017-09-28 11:03:13 -06:00
  • 7194f30dc0 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-09-29 10:00:34 +00:00
  • f6c28dce4a Translated using Weblate (Hungarian) Kevin Németh 2017-09-29 05:12:45 +00:00
  • 5544270bc4 Merge pull request #5131 from vector-im/luke/groups-button Luke Barnard 2017-09-29 11:00:29 +01:00
  • 0a53630806 Merge pull request #1435 from matrix-org/luke/groups-button Luke Barnard 2017-09-29 11:00:22 +01:00
  • c8b2158156 Lint Luke Barnard 2017-09-29 10:42:23 +01:00
  • 47919bc291 Honour the Groups feature flag Luke Barnard 2017-09-29 10:39:49 +01:00
  • 18e0d8da86 Rename Flair feature to Groups Luke Barnard 2017-09-29 10:27:40 +01:00
  • 412affefb9 Translated using Weblate (Hungarian) Szimszon 2017-09-20 06:40:44 +00:00
  • 739ddb8410 Merge branch 'develop' into luke/groups-button Luke Barnard 2017-09-28 12:11:26 +01:00
  • 6a988a0d08 Merge pull request #1436 from matrix-org/luke/lint-jsx-curly-spacing Luke Barnard 2017-09-28 12:09:46 +01:00
  • 07b6040c39 Update travis script to use lintwithexclusions Luke Barnard 2017-09-28 11:33:36 +01:00
  • f3d155b62c Merge pull request #1437 from matrix-org/lukebarnard1-patch-fix-inviting Luke Barnard 2017-09-28 11:27:07 +01:00
  • e2b7ff3675 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-09-28 10:26:58 +00:00