OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
12,782 Commits
186 Branches
525 Tags
448 MiB
Commit Graph

1034 Commits (469d11ffcb846cb97d828c692b941ff9880397ca)

Author SHA1 Message Date
David Baker 9c3e4a1202
Merge branch 'develop' into patch-1 2018-01-08 14:31:21 +00:00
Michael Telatynski 290bf54d4f pluralise properly 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-05 23:55:32 +00:00
Michael Telatynski c68c54618f delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-05 23:19:43 +00:00
Michael Telatynski 3788fde711 Add a tooltip to members button and badge with actual count 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-05 23:16:21 +00:00
Michael Telatynski 8a7477f50c
Highlight ViewSource and Devtools ViewSource 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-12-20 20:40:41 +00:00
Matthew Hodgson bfb60265cb
Merge pull request #5610 from vector-im/t3chguy/devtools-1 
add dark theme styling to devtools input box
 2017-12-18 21:44:43 +00:00
Michael Telatynski 2961e1949f
delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-12-16 19:07:32 +00:00
Michael Telatynski 304d281ed2
change reply to be its own thing 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-12-16 19:01:56 +00:00
Michael Telatynski 54a9ccdee7
throw new quoting behind flags 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-12-12 23:36:10 +00:00
Michael Telatynski 10c6f24a83
CSS and Context Menu tweaks for Rich Quoting/Replies 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-12-10 12:52:00 +00:00
Luke Barnard 608a359e0a Move DND wrapper to top level component 2017-12-06 14:54:35 +00:00
Luke Barnard b0d115a64a Implement renumeration of ordered tags upon collision 
I was being bitten by this enough for me to want to fix it. This implementation really ought to be improved such that it doesnt tend towards being broken the more it is used.
 2017-12-01 18:20:38 +00:00
Luke Barnard e80c4fadea Linting 2017-12-01 18:18:48 +00:00
Luke Barnard 1ccffb7e58 Update imports for accessing KeyCode 2017-12-01 10:56:25 +00:00
Michael Telatynski 43578d2366
make FilteredList controlled, such that it can externally persist filter 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-11-28 22:16:53 +00:00
Luke Barnard bbdafeff77 getGroupStore no longer needs a matrix client 2017-11-28 13:17:30 +00:00
Stefan Parviainen 0bd68ce068 Add some aria-labels to RightPanel 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-11-21 09:18:59 +01:00
lukebarnard 7cb59bddb0 Use badge count format for member count in RightPanel 
(to avoid cosmetic disasters with >9999 members in a room, e.g. HQ)
 2017-11-20 13:12:55 +00:00
Luke Barnard cb235a29fa
Merge pull request #5613 from pafcu/simplify-translation 
Refactor translations
 2017-11-16 11:54:52 +00:00
Stefan Parviainen 4949f2f763 Fix typo and update strings 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-11-15 20:43:45 +01:00
Michael Telatynski b00cf8c939
add dark theme styling to devtools input box 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-11-15 17:13:39 +00:00
Travis Ralston a583c2b658 Merge branch 'develop' into travis/granular 2017-11-14 19:16:35 -07:00
Matthew Hodgson 3e72d8d969
Merge pull request #5286 from turt2live/travis/presence 
CSS/components for custom presence controls
 2017-11-14 23:53:26 +00:00
Stefan Parviainen ca4b71b6e2 Update to use newer _t() 2017-11-14 21:54:00 +01:00
Travis Ralston 977599a660 Use the SettingsStore to get the theme 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-13 13:14:29 -07:00
Travis Ralston 7570ce580f Merge branch 'develop' into travis/granular 2017-11-13 12:25:56 -07:00
Matthew Hodgson 5abee4fddc replace some of the status.im theme with general config options 2017-11-11 23:47:03 +00:00
Matthew Hodgson 47d9e7f2a1 Merge remote-tracking branch 'origin/develop' into matthew/status 2017-11-10 15:29:37 -08:00
Luke Barnard 277a6dee10 Make groups a fully-fleged baked-in feature 2017-11-10 15:38:50 +00:00
Matthew Hodgson d4128af224 Merge remote-tracking branch 'origin/develop' into matthew/status 2017-11-08 04:29:44 -08:00
Luke Barnard e1d16acddb Implement general-purpose tooltip "(?)"-style 2017-11-07 14:09:04 +00:00
Luke Barnard cd26f63315 Do not init a group store when no groupId specified 
(in RightPanel), otherwise the store will happily send requests to the server for the `undefined` group.
 2017-11-06 10:16:03 +00:00
Travis Ralston 63607f29e7 Use SettingsStore for notification settings 
Signed-off-by: Travis Ralstron <travpc@gmail.com>
 2017-11-04 22:27:34 -07:00
Matthew Hodgson 816042d3a8 Merge branch 'develop' into matthew/status 2017-11-04 23:51:20 +00:00
Matthew Hodgson adedf23cfb remove unnamespaced CSS fail 2017-11-04 22:19:06 +00:00
Travis Ralston 69939e2fe3 Merge branch 'develop' into travis/granular 2017-11-03 21:56:46 -06:00
Matthew Hodgson c0b343c89f
Merge pull request #5471 from vector-im/t3chguy/devtools-1 
T3chguy/devtools 1
 2017-11-03 23:10:00 +00:00
Matthew Hodgson c90834114b
Merge pull request #5498 from vector-im/luke/css-use-margin-in-room-dir-perms 
Use margin to separate "perms" in the room directory
 2017-11-03 22:44:41 +00:00
Matthew Hodgson 923295973b Merge branch 'develop' into matthew/status 2017-11-03 15:11:23 +00:00
Luke Barnard c60ff5d283 Fix group invites such that they look similar to room invites 
- Remove CSS for GroupInviteTile - the component should be using RoomTile CSS
 - Added extra tiles to roomCount of RoomSubList header

Part of fixing https://github.com/vector-im/riot-web/issues/5226
 2017-11-03 12:17:49 +00:00
Luke Barnard ee71c72685 Use margin to separate "perms" in the room directory 
instead of a space.
 2017-11-02 15:13:55 +00:00
Luke Barnard c01ea56676 Add toggle to alter visibility of room-group association 2017-11-02 13:40:07 +00:00
Luke Barnard 2163a54617 Implement simple GroupRoomInfo 
See matrix-org/matrix-react-sdk#1563
 2017-11-01 17:32:01 +00:00
Matthew Hodgson 8ef3811f28 Merge branch 'develop' into matthew/status 2017-11-01 15:25:50 +00:00
Michael Telatynski c39044f397
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/fix_typecheck_warn 2017-10-30 15:27:20 +00:00
Michael Telatynski 71c8dca91a
Fix instanceof check, was checking against the Package rather than class 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-30 15:12:03 +00:00
Michael Telatynski 6da2f88dc5
Devtools styling tweaks 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-30 13:32:31 +00:00
Michael Telatynski ea9b630082
Refactor and add Account Data stuffs 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-30 12:44:50 +00:00
Travis Ralston f6177cd7b5 Use granular settings instead of synced settings 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-29 01:51:02 -06:00
David Baker b9e2b59504 Merge remote-tracking branch 'origin/develop' into matthew/status 2017-10-27 19:01:34 +01:00
Luke Barnard 7bae7fe9e5 Use correct group store state when rendering "Invite to this community" 
This required slight rework of how RightPanel uses the group store, and now it knows an unfortunate amount about the group store. Food for thought on stores in general, I think.
 2017-10-27 14:33:28 +01:00
Matthew Hodgson 3df1808fd0 Merge pull request #5453 from VickyKoblinski/es6-notifications 
Leverages ES6 in Notifications
 2017-10-27 09:15:22 +01:00
Vicky Koblinski d188fdb9fe Changes requires to imports for consistancy, removes 'use strict' 2017-10-26 21:23:16 -04:00
Vicky Koblinski 7588814ec5 Leverages ES6 and fixes typo 2017-10-26 20:37:15 -04:00
Matthew Hodgson 225c7ee621 Merge branch 'develop' into matthew/status 2017-10-26 01:46:06 +01:00
Travis Ralston 45ca890f68 Merge remote-tracking branch 'vector-im/develop' into travis/presence 2017-10-25 11:27:22 -06:00
Luke Barnard f6a920a018 Merge pull request #5387 from vector-im/t3chguy/devtools-filter-case-sens 
Devtools: make filtering case-insensitive
 2017-10-25 16:51:57 +01:00
Luke Barnard a627784c41 Merge pull request #5432 from vector-im/luke/fix-group-members-info-icon-highlight 
Highlight group members icon in group member info
 2017-10-25 15:41:09 +01:00
Luke Barnard cd0888ce5a Highlight group members icon in group member info 2017-10-25 15:27:50 +01:00
Luke Barnard 0561c5bd4f Swap ui_opacity for panel_disabled 
Simplify the API for disabling panels in the UI. `mx_fadable_faded` is applied instead of setting opacity.
 2017-10-25 10:29:57 +01:00
Luke Barnard bd15a88c89 Use CSS to stop greyed Right/LeftPanel UI from being interactable 2017-10-24 17:10:29 +01:00
Luke Barnard 6a0ecfba7f Merge branch 'develop' into luke/fix-privileged-group-ui-1 2017-10-24 11:09:05 +01:00
Luke Barnard f1a700ef99 Only show UI for adding rooms/users to groups to privileged users 2017-10-24 10:38:40 +01:00
Luke Barnard cc1fb8ac94 Only show "Invite to this community" when viewing group members 2017-10-24 10:22:13 +01:00
Michael Telatynski b16d4280b7
delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-23 11:42:06 +01:00
Michael Telatynski eb45b00b32
fix bad tab completion 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-23 11:40:25 +01:00
Michael Telatynski 84d1f838f0
make filtering case-insensitive 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-23 11:39:21 +01:00
Matthew Hodgson 190811ac1c WIP 2017-10-23 00:57:02 +01:00
David Baker 667556f3ce Custom server text was i18ned by key 
And therefore got replaced by the key by the i18n script
 2017-10-20 13:48:00 +01:00
Luke Barnard e5df06b2ab Groups->Communities 2017-10-19 15:07:22 +01:00
Luke Barnard 102651332a Merge pull request #5295 from vector-im/luke/groups-room-directory-esque 
CSS for Modifying GroupView UI matrix-org/matrix-react-sdk#1475
 2017-10-16 13:52:38 +02:00
Luke Barnard 2cefa58d5d CSS for Modifying GroupView UI matrix-org/matrix-react-sdk#1475 2017-10-16 11:44:38 +01:00
Travis Ralston ef5fc7347a Don't update presence status if the user is clicks twice 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-15 20:20:43 -06:00
Travis Ralston deb50b2d43 Add presence context menu and styling 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-14 23:15:26 -06:00
Matthew Hodgson f143315618 Merge pull request #5142 from turt2live/travis/pinned_messages 
Message/event pinning
 2017-10-15 01:02:49 +01:00
Travis Ralston 6926c96f36 Hide pinning messages behind a labs settings 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-14 16:41:44 -06:00
Matthew Hodgson 6f819606c1 Merge pull request #4054 from ollieh/issues/3771 
Sorting of networks within a protocol based on name
 2017-10-14 23:21:51 +01:00
Travis Ralston 3e066d3aef Merge branch 'develop' into travis/pinned_messages 2017-10-14 16:11:17 -06:00
Matthew Hodgson 2667ed2561 Merge pull request #4988 from vector-im/t3chguy/hide_notification_body 
allow hiding of notification body for privacy reasons
 2017-10-14 23:07:31 +01:00
Travis Ralston 1adb63ac74 Don't use MXIDs on the lightbox if possible 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-13 20:18:55 -06:00
Michael Telatynski 6df69138a2
switch to new logos, and use import rather than VAR 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-11 16:46:05 +01:00
Luke Barnard 70bbf2df7a Fix bug that made sub list placeholders not show for ILAG etc. 2017-10-04 15:58:40 +01:00
Luke Barnard ec414147d1 Merge pull request #5110 from pafcu/mark-and-remove-translations 
Mark and remove some translations
 2017-10-04 10:24:36 +01:00
Travis Ralston 2d153a72c1 Split up CSS; use .catch instead of .then 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 13:33:14 -06:00
Travis Ralston 078ee54edf Move the PinnedEventsPanel to the react-sdk 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 13:15:21 -06:00
Travis Ralston 2d5acfc0bc Filter pinned events before rendering 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 11:30:52 -06:00
Travis Ralston b0190f6a65 i18n for remaining strings 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 11:22:06 -06:00
Travis Ralston 0a3bc1c667 Don't try to show redacted messages 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 11:21:44 -06:00
Travis Ralston aff02885de Don't fail if an event doesn't belong to a room. 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 11:21:21 -06:00
Travis Ralston 965a25ba84 Fix bug where rooms missing m.room.pinned_events could not pin messages 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 11:08:22 -06:00
Travis Ralston f7389b70aa Hide the pin option in the context menu if the user can't pin messages 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 11:01:17 -06:00
Travis Ralston efdb4b02c6 i18n for 'Jump to message' button 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 10:55:52 -06:00
Travis Ralston 59a253af37 Don't show the unpin button if the user can't unpin the message. 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 10:53:44 -06:00
Travis Ralston 9b11f576fe Add action bar to pinned event tiles; support unpinning from the panel 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 10:42:58 -06:00
Travis Ralston fa5a23e0df Permalink pins to their original events 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 10:42:58 -06:00
Travis Ralston 5daa16ab53 Add panel for pinned messages. 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 10:42:58 -06:00
Travis Ralston 774c3dbd38 Pin/unpin message option in a message's context menu 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 10:42:58 -06:00
Luke Barnard d3b8d8bf9d Create basic icon for the GroupRoomList tab and adding rooms to groups 2017-09-29 17:03:58 +01:00
Luke Barnard 5544270bc4 Merge pull request #5131 from vector-im/luke/groups-button 
Add button to get to MyGroups
 2017-09-29 11:00:29 +01:00
Luke Barnard 47919bc291 Honour the Groups feature flag 2017-09-29 10:39:49 +01:00
Luke Barnard f9a92ad15a Lint 2017-09-28 10:02:16 +01:00
Luke Barnard ce13837216 Remove `key` prop pass-thru on HeaderButton 
This is redundant and throws a warning
 2017-09-28 09:46:10 +01:00
Luke Barnard 9c86a655ca Add button to get to MyGroups 2017-09-27 17:46:53 +01:00
Luke Barnard 888e3abc75 Implement "Add room to group" feature 
This step needs to be taken before adding a room to a group summary
 2017-09-26 14:35:38 +01:00
Luke Barnard bfdb92ff6b Nit: Re-order property 2017-09-25 16:13:54 +01:00
Luke Barnard 77f30aacf9 Re-add clickPhase for FilePanel header button 2017-09-25 16:13:13 +01:00
Luke Barnard fd7e81193e Less coupling between HeaderButton and RightPanel 
Use isHighlighted as a prop instead of computing based on phases and currentPhase
 2017-09-25 16:06:46 +01:00
Luke Barnard 28e9fdc873 rebase in progress; onto 7137ba71 2017-09-25 14:42:44 +01:00
Luke Barnard 7137ba7188 Refactor right panel header buttons 
To reduce repetition of code, simplify the process of adding header buttons and remove the need for many handler functions.
 2017-09-25 14:13:02 +01:00
Stefan Parviainen 3cff8c1230 Mark some strings as translatable 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-09-23 13:46:51 +02:00
Luke Barnard 96b9570465 Update comment 2017-09-21 17:31:06 +01:00
Matthew Hodgson fbe1c82dfa Merge pull request #5074 from vector-im/t3chguy/devtools-1 
T3chguy/devtools 1
 2017-09-19 22:14:52 +01:00
Luke Barnard fbcccd8be0 Merge pull request #4830 from vector-im/dbkr/group_userlist 
Group Membership UI
 2017-09-19 13:26:02 +01:00
Michael Telatynski dccee6d419
add ability to filter room state types/results 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-09-18 12:03:11 +01:00
Michael Telatynski af450df513
add ability to jump from RSE to Send Custom State Event prefilled 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-09-18 11:27:31 +01:00
Michael Telatynski 821ab6c13e
switch to controlled inputs and require eventType !== '' 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-09-18 11:06:46 +01:00
Matthew Hodgson 828e9d5eb4 Merge pull request #4735 from vector-im/t3chguy/devtools 
T3chguy/devtools
 2017-09-17 23:15:28 +01:00
David Baker 06fe240be2 Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist 2017-09-13 16:35:37 +01:00
David Baker f148844573 Merge pull request #4989 from vector-im/t3chguy/on_copy_tooltip 
generic contextual menu for tooltip/responses
 2017-09-13 14:27:28 +01:00
Michael Telatynski 2316f4230e
install and use prop-types over React.PropTypes 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-09-13 14:23:35 +01:00
David Baker 3ac154b7da Add comment to update shouldComponentUpdate 
if adding new props
 2017-09-11 18:30:43 +01:00
David Baker 47ddc6dedf Comment typo 2017-09-11 18:29:20 +01:00
David Baker 82f2e47667 Avoid re-rendering RoomList on room switch 
See https://github.com/matrix-org/matrix-react-sdk/pull/1375
 2017-09-11 17:06:40 +01:00
David Baker 76be54b2be Make isInvite default to false 
as things are assuming it's optional but it isn't which is causing
a ton of warnings.
 2017-09-07 13:35:13 +01:00
David Baker 38575a653d Revert "Implement sticky date separators" 2017-09-06 17:36:43 +01:00
Michael Telatynski 32ea675c92
fix (C) header 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-09-06 14:20:12 +01:00
Michael Telatynski 60c2338543
generic contextual menu for tooltip/responses 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-09-06 11:27:04 +01:00
Michael Telatynski fca86be077
allow hiding of notification body for privacy reasons 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-09-06 10:56:32 +01:00
David Baker b8d9276f29 Merge pull request #4939 from vector-im/luke/feature-sticky-date-separators 
Implement sticky date separators
 2017-09-05 14:16:21 +01:00
Michael Telatynski 3aa12246ea Merge branch 'develop' into t3chguy/devtools 2017-08-31 17:11:53 +01:00
Michael Telatynski b84f258f87
add bottom margin to navigation buttons of room state explorer 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-31 13:49:52 +01:00
Luke Barnard da9dcc8f50 Merge pull request #4858 from Nostradamos/fix-4804 
Fix overflowing login/register buttons on some languages issue #4804
 2017-08-31 09:51:06 +01:00
Michael Telatynski 68fc202086
remove pointless self vars and DRY render method of send custom events 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-31 09:45:46 +01:00
Michael Telatynski ce0861d5bd
undo `` as its hard to read 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-31 09:25:06 +01:00
David Baker a70e7751e9 Merge pull request #4943 from anoadragon453/develop 
Update vector-im to riot-im on Login
 2017-08-31 08:33:21 +01:00
Andrew (anoa) 8e5427d626
Update vector-im to riot-im on Login 
Signed-off-by: Andrew (anoa) <anoa@openmailbox.org>
 2017-08-30 12:06:19 -07:00
Luke Barnard 8874c4dd43 Merge pull request #4910 from vector-im/t3chguy/success_bug_report 
lets let people know that the bug report actually sent properly :)
 2017-08-30 16:16:24 +01:00
Luke Barnard 88228a5a3f Implement sticky date separators 
Codep https://github.com/matrix-org/matrix-react-sdk/pull/1353
 2017-08-30 14:06:50 +01:00
David Baker e5912b996d copyright 2017-08-30 09:23:20 +01:00
Michael Telatynski f560dc4c11
add useful comment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-29 14:58:30 +01:00
Michael Telatynski a2b57f502c
lets let people know that the bug report actually sent properly :) 
RFC on the wording of it.

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-28 00:07:48 +01:00
Michael Telatynski 1c387c1fd1
fix two room list regressions: 
+ missing roomsublist badge for invites
+ missing room badge for invites if i18n!=English

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-27 23:37:13 +01:00
Michael Telatynski d14f16f0e9
look at event property of the mxEv, this way we won't have all 
the additional internal keys :)

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-27 17:25:51 +01:00
Michael Telatynski a437f23e9d
add i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-26 18:48:24 +01:00
Michael Telatynski 78aa0a59de
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/devtools 2017-08-26 18:29:19 +01:00
David Baker a673cbcf1e s/member/groupMember/ 2017-08-25 13:00:43 +01:00
Nostradamos 1dfa8361c5 Fixed https://github.com/vector-im/riot-web/issues/4804 2017-08-23 22:12:02 +02:00
David Baker ee6e36cd90 Allow extra tiles to be put into room sub lists 
So we can put in tiles for group invites & other stuff
 2017-08-18 11:23:55 +01:00
David Baker 1a7a670c96 Show the group invite dialog 
What to TODO said!
 2017-08-16 14:59:00 +01:00
David Baker 57eb2feeb6 Make right panel collpasing work in GroupView 2017-08-15 13:18:16 +01:00
David Baker be611f53e1 Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist 2017-08-15 10:49:20 +01:00
David Baker d610788866 Merge pull request #4777 from vector-im/luke/fix-quick-search-nav 
move focus-via-up/down cursors to LeftPanel
 2017-08-11 10:52:36 +01:00
David Baker 3eeabe8d91 Merge pull request #4775 from vector-im/luke/fix-user-url-no-middle-panel 
Remove userId property on RightPanel
 2017-08-11 10:49:25 +01:00
Michael Telatynski 84f4fbe142
DRY up code and change flow to be less destructive 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-10 23:56:57 +01:00
Michael Telatynski 3fd1a366bf
add back button to all pages and widen textarea 2017-08-10 23:13:40 +01:00
Matthew Hodgson 5bfb5d4c3c move focus-via-up/down cursors to LeftPanel 
Conflicts:
	src/components/structures/LeftPanel.js
 2017-08-10 18:18:15 +01:00
Luke Barnard 44c6f3fafc Add todo to make RP listen to RVS 2017-08-10 16:59:12 +01:00
Michael Telatynski 2d4484e0f2
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/devtools 2017-08-10 16:06:14 +01:00
Luke Barnard 535e33509b Merge pull request #4688 from vector-im/t3chguy/i18n_analytics 
un-i18n Modal Analytics
 2017-08-10 15:36:04 +01:00
Michael Telatynski 4c6836bc3f
don't track error messages .2 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-10 15:13:30 +01:00
Michael Telatynski 9c5ceb6775
don't track error messages 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-10 13:56:01 +01:00
Luke Barnard 7269e7b84a Remove userId property on RightPanel 
because we shouldn't have a dispatch AND have a property that do vaguely similar things. Ideally, the dispatch would send a userId and RP would do async work to get the member/avatar/displayname.
 2017-08-10 13:16:31 +01:00
Luke Barnard 57f82c3c9e Quote using innerText 
codep matrix-org/matrix-react-sdk#1289
 2017-08-10 10:18:37 +01:00
David Baker 7c4b6739fc Add group member right panel 2017-08-09 15:36:51 +01:00
Michael Telatynski 1b004f170d
make eslint happy 2017-08-03 01:10:32 +01:00
Michael Telatynski 9ab30b7b17
fix line-length and copyright header 2017-08-03 01:05:43 +01:00
Michael Telatynski 131d1c74c9
add room state explorer to devtools 2017-08-03 00:59:40 +01:00
Michael Telatynski 6bfdd69279
add devtools dialog 2017-07-31 12:08:41 +01:00
Michael Telatynski 5b6dbfb701
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/i18n_analytics 2017-07-28 21:02:48 +01:00
Michael Telatynski 93a3c896a4
un-i18n Modal Analytics 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-27 17:45:02 +01:00
David Baker 4fa85723ab Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist 2017-07-25 17:16:05 +01:00
David Baker 3ff628254d CSS for group userlist 2017-07-25 15:56:40 +01:00
Richard van der Hoff bc2f639aae Fix a couple of minor errors in the room list 
bluebird promises don't support .fail, so some operations didn't work quite
right. We should use .catch instead.
 2017-07-24 17:19:46 +01:00
Luke Barnard 53ae42ed68 Use `catch` instead of `fail` to handle room tag error 
Because bluebird doesn't support fail
 2017-07-19 14:11:22 +01:00
Richard van der Hoff 76181f4771 Merge remote-tracking branch 'origin/develop' into rav/bluebird 2017-07-13 12:04:54 +01:00
Richard van der Hoff 7238c4dfac Fix overlooked `q` 2017-07-13 11:33:25 +01:00
Richard van der Hoff 1d2d086a58 Replace q.allSettled() 
Bluebird doesn't have an `allSettled` method, so instead catch the exceptions and
use `all`.
 2017-07-13 00:50:01 +01:00
Richard van der Hoff d5b550f89a replace q method calls with bluebird ones 
```
find src test -name '*.js' |
    xargs perl -i -pe 's/q\.(all|defer|reject|delay|try|isFulfilled)\(/Promise.$1(/'
```
 2017-07-13 00:50:01 +01:00
Richard van der Hoff b29b4a959b q(...) -> Promise.resolve 
```
find src test -name '*.js' | xargs perl -i -pe 's/\b[qQ]\(/Promise.resolve(/'
```
 2017-07-13 00:50:01 +01:00
Richard van der Hoff 10decf95f6 replace imports of `q` with bluebird 
update `package.json`

```
find src test -name '*.js' |
    xargs perl -i -pe 'if (/require\(.[qQ].\)/) { $_ = "import Promise from '\''bluebird'\'';\n"; }'

find src test -name '*.js' |
    xargs perl -i -pe 'if (/import [qQ] /) { $_ = "import Promise from '\''bluebird'\'';\n"; }'
```
 2017-07-13 00:48:31 +01:00
Luke Barnard 188a58e5c7 RateLimitedFunc -> rate_limited_func 2017-07-12 18:18:13 +01:00
Luke Barnard 3e1a909b1d Just use the onKeyDown of the <input> 2017-07-12 17:46:27 +01:00
Luke Barnard 41cd238e02 Update to reflect previous implementation 
Which was a74bbb424c
 2017-07-12 17:10:43 +01:00
Luke Barnard 4fe4e10abb Implement the focus_room_filter action 
This is for ctrl+k room filtering and switching
 2017-07-12 13:49:57 +01:00
Richard van der Hoff bc60fa81af more HomePage tweaks 
* Don't log errors with no context
* i18nify the "Couldn't load home page" message
 2017-07-11 14:29:47 +01:00
Richard van der Hoff d755903fdb typo 2017-07-11 14:10:18 +01:00
Richard van der Hoff 8ac26dd19f Give HomePage an unmounted guard 
Also add missing return in error-handling path
 2017-07-11 14:08:16 +01:00
Luke Barnard c1b8879b6b Merge pull request #4500 from vector-im/luke/feature-enable-RTE 
Take RTE out of labs
 2017-07-10 13:56:02 +01:00
Richard van der Hoff 60703bdcfc Log errors thrown by getThirdpartyProtocols 
- so that it appears in rageshakes and test logs.
 2017-07-05 10:54:10 +01:00
Luke Barnard 77a52b02cb Take RTE out of labs 
Goes with https://github.com/matrix-org/matrix-react-sdk/pull/1176
 2017-07-04 16:26:19 +01:00
Michael Telatynski f36c1ca207 fix Quote not closing contextual menu 
also use `this.closeMenu();` over the explicit direct call as the wrapper exists and is a little clearer
 2017-06-27 14:51:18 +01:00
Michael Telatynski e33e0effa3 use `_t` on string literals and i18n 'warning' 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-22 15:05:13 +01:00
Michael Telatynski 0788826a71 Merge branches 'develop' and 't3chguy/updating_stuff' of github.com:vector-im/riot-web into t3chguy/updating_stuff 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	electron_app/src/tray.js
 2017-06-22 15:04:33 +01:00
Richard van der Hoff a9c8429d2e Merge pull request #4362 from turt2live/travis/missed-redact 
Change missed 'Redact' to 'Remove' in ImageView.
 2017-06-22 14:37:31 +01:00
Luke Barnard c4a3211cfc Use _tJsx for PasswordNagBar (because it has <u>) 2017-06-20 16:28:40 +01:00
Michael Telatynski fe1b0b5cd8 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/updating_stuff 2017-06-20 14:32:19 +01:00
Luke Barnard d5d29c1c92 Give _t to PasswordNagBar, add CSS for UserSettings password warning 
Codep https://github.com/matrix-org/matrix-react-sdk/pull/1123
 2017-06-20 11:23:34 +01:00
turt2live b9fc46fa41 Change missed 'Redact' to 'Remove' in ImageView. 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-06-19 16:24:03 -06:00
Matthew Hodgson 1c82b7b0c3 add register button 2017-06-19 00:54:07 +01:00
Matthew Hodgson 612cad5d9e fix broken vars 2017-06-19 00:01:11 +01:00