Commit Graph

776 Commits (798558e5cc0e0ad25513ac49aa3306d516d17fc1)

Author SHA1 Message Date
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
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
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