mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 21:31:45 +03:00
Code Issues Projects Releases Packages Wiki Activity
11618 commits 219 branches 562 tags 474 MiB
Commit graph

2388 commits

Author SHA1 Message Date
Michael Telatynski
301b8b8c56
Merge pull request #1954 from matrix-org/t3chguy/hide_empty_sublist 
hide empty roomsublists when filtering via search/tagpanel
 2018-06-25 11:30:03 +01:00
Michael Telatynski
fabdf22aad
delint RoomSubList and generate eslintignore file 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-25 09:54:33 +01:00
Michael Telatynski
a174555452
hide RoomSubList if has 0 tiles and either searchFilter or emptyContent 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-25 09:42:42 +01:00
Michael Telatynski
15e75ca7b3
generate local errors for blank fields during login 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-23 17:12:00 +01:00
Michael Telatynski
eb80022991
focus composer after interacting with e2ee statusbar/udd 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-23 16:40:27 +01:00
Michael Telatynski
b23f84e1f5
add XXX comment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-22 19:23:39 +01:00
Michael Telatynski
b7396c8ef0
trigger urlPreviews state update on {,room}AccountData changes of settings 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-22 19:17:55 +01:00
Michael Telatynski
acbc84a69c
switch to another settings key for e2e url previews to protect on change 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-22 18:44:54 +01:00
Michael Telatynski
ed1f801254
add comment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-22 18:36:07 +01:00
Michael Telatynski
a45dc837b4
add copyright 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-22 18:36:01 +01:00
Michael Telatynski
891070d001
update UrlPreview settings to be more privacy-aware in e2ee rooms 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-22 18:35:54 +01:00
Michael Telatynski
5b027c6410
Merge pull request #2003 from matrix-org/t3chguy/lang_select_register_view 
factor out conditional LanguageSelector as functional component
 2018-06-22 16:01:51 +01:00
Michael Telatynski
548a06cad2
use JSX and import via sdk rather than directly 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-22 14:47:57 +01:00
Michael Telatynski
88ecaced82
Merge pull request #1992 from matrix-org/t3chguy/focus_rte_after_when_uploadingFile 
Upload File confirmation modal steals focus, send it back to composer
 2018-06-22 10:56:17 +01:00
Luke Barnard
f15b877a55
Merge pull request #1977 from matrix-org/t3chguy/ctrl-k_tab 
allow using tab to navigate room list in a smarter way
 2018-06-22 10:35:28 +01:00
Michael Telatynski
f32da97a3a
delint and run generate-eslint-error-ignore-file 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-21 14:04:08 +01:00
Michael Telatynski
58be44ad9e
factor out conditional LanguageSelector as functional component 
and reuse in Login, ForgotPassword and Registration views

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-21 13:51:39 +01:00
Michael Telatynski
a0207fb7fd
Merge pull request #1982 from matrix-org/t3chguy/nvl/fix_set_password-email_flow 
fix set password & email flow possible to get stuck and onBlur murdering your email
 2018-06-21 11:42:53 +01:00
Michael Telatynski
4508da5666
only override contextmenu if closeMenu is provided 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-20 18:03:15 +01:00
Michael Telatynski
7cd8a5a2b2
allow chaining right click contextmenus 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-20 18:01:37 +01:00
Michael Telatynski
6200c147a6
Upload File confirmation modal steals focus, send it back to composer 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-19 08:41:24 +01:00
Michael Telatynski
015d433235
fix a way to get stuck in set password/email flow 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-18 18:14:48 +01:00
Michael Telatynski
6301c04590
Merge branch 'develop' into t3chguy/ctrl-k_tab 2018-06-18 18:01:41 +01:00
David Baker
0d05250914
Merge pull request #1983 from matrix-org/t3chguy/fix_filepanel_showing_roomavatar 
only show m.room.message in FilePanel
 2018-06-18 13:48:39 +01:00
David Baker
a32ffa83ef
Merge pull request #1979 from matrix-org/t3chguy/max_continuation_interval 
split continuation if there is a gap in conversation
 2018-06-18 11:22:51 +01:00
David Baker
a918d73c29
Merge pull request #1973 from matrix-org/t3chguy/fix_react_proptypes_warnings 
fix a bunch of instances of react console spam
 2018-06-18 10:47:20 +01:00
David Baker
210d920a92
Merge pull request #1949 from matrix-org/luke/track-uisis-piwik 
Track decryption success/failure rate with piwik
 2018-06-18 10:12:26 +01:00
Michael Telatynski
eb32dda260
given we also want to hide widget events, hide all except m.room.message 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-16 19:52:15 +01:00
Michael Telatynski
b87824ba92
hide m.room.avatar from FilePanel via sync filter 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-16 19:50:51 +01:00
Michael Telatynski
7d19841e68
delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-16 09:48:57 +01:00
Michael Telatynski
61e09395d0
split continuations if longer than N 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-16 09:45:06 +01:00
Michael Telatynski
423b8939e7
simplify handled logic by inverting it 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-16 08:52:14 +01:00
Michael Telatynski
ff33ef4b51
allow using tab to navigate room list smarter 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-16 08:50:53 +01:00
Michael Telatynski
1afdb0e3c0
add null-guard 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-16 08:44:57 +01:00
Michael Telatynski
8971211639
delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-16 08:42:40 +01:00
Michael Telatynski
efaccf7344
implement hitting enter after Ctrl-K should switch to the first result 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-16 08:42:28 +01:00
Michael Telatynski
43681026b8
s/onClick/onChange because react cries about it 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-15 19:01:12 +01:00
Michael Telatynski
a899871d52
specify unique key to make react happy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-15 18:55:37 +01:00
Michael Telatynski
a2219472f6
inline redundant bodyNodes, fixes react no unique key warning too 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-15 18:47:15 +01:00
Michael Telatynski
5fbadbc44f
comment out visibility:hidden div as it seems unfinished 
and refers to undefined method `this._onJoinGroupClick`

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-15 18:42:51 +01:00
Luke Barnard
b0a2772889 Use more consistent start/stop pattern 2018-06-15 17:58:43 +01:00
Luke Barnard
488cc416cf For now, shelve persistance across sessions 2018-06-15 17:08:11 +01:00
Luke Barnard
7489d7d531 Fix incorrect call to DFT 2018-06-15 16:50:52 +01:00
Luke Barnard
f08274585e Persist tracked event ID hash using localStorage 2018-06-15 15:30:54 +01:00
Luke Barnard
cfe52a2888 Instead of passing dft.eventDecrypted, call it instead 
So that `this` has the correct reference.
 2018-06-15 15:15:05 +01:00
Luke Barnard
62601d657d Implement DecryptionFailureTracker for less agressive tracking 
Instead of pinging Analytics once per failed decryption, add the failure
to a list of failures and after a grace period, add it to a FIFO for
tracking. On an interval, track a single failure from the FIFO.
 2018-06-15 13:42:18 +01:00
David Baker
349f95d5ab
Merge pull request #1957 from matrix-org/t3chguy/roomsublist_search_aliases 
apply roomlist searchFilter to aliases if it begins with a `#`
 2018-06-15 10:55:32 +01:00
David Baker
6904c2bafe
Merge pull request #1948 from matrix-org/export_Group 
Share Dialog
 2018-06-15 10:52:27 +01:00
David Baker
5523c1e50a
Merge pull request #1964 from matrix-org/t3chguy/tag_panel_a11y 
fix styling of clearButton when its not there
 2018-06-14 11:47:44 +01:00
Michael Telatynski
3b501137a5
change cursor:pointer iff clicking TagPanel background does something 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-14 11:42:21 +01:00
Michael Telatynski
c811c30c0d
fix styling of clearButton when its not there 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-14 11:36:04 +01:00
Michael Telatynski
384c974589
tidy up if statements and fix up comments 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-14 11:16:57 +01:00
Michael Telatynski
2454540bc0
Merge branch 'develop' into t3chguy/audio_output 2018-06-14 11:03:59 +01:00
David Baker
84a9c6a824
Merge pull request #1960 from matrix-org/t3chguy/tag_panel_a11y 
improve tag panel accessibility and remove a no-op dispatch
 2018-06-14 10:56:03 +01:00
Michael Telatynski
d4578783ef
apply pr review feedback 
fix copyright headers
fix user settings link accessibility
fix typo and add noopener

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-13 18:46:02 +01:00
Michael Telatynski
75abb415d4
improve tag panel accessibility and remove a no-op dispatch 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-13 16:17:26 +01:00
Luke Barnard
3cadbd3974 Include decryption error in decryption failure metrics 2018-06-13 11:21:26 +01:00
Luke Barnard
5a275fcfef
Merge pull request #1953 from matrix-org/t3chguy/skip_set_displayname 
don't set the displayname on registration as Synapse now does it
 2018-06-13 10:03:35 +01:00
Michael Telatynski
41be46a712
apply roomlist searchFilter to aliases if it begins with a # 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-13 09:51:35 +01:00
Luke Barnard
230de44071 Adjust comment 2018-06-13 09:38:57 +01:00
Luke Barnard
64b86108d0 Only track decryption failures 2018-06-13 09:38:23 +01:00
Michael Telatynski
175f1aa15c
don't set the displayname on registration as Synapse now does it 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-12 16:43:54 +01:00
Luke Barnard
b18a8c483e
Merge pull request #1952 from matrix-org/luke/context-menus-downwards-keep-vertically-on-screen 
Keep context menus that extend downwards vertically on screen
 2018-06-12 16:27:57 +01:00
Luke Barnard
ffcba9498e Keep context menus that extend downwards vertically on screen 
This fixes https://github.com/vector-im/riot-web/issues/3429 in the case
of RoomList context menus *and* EventTile context menus.

This was mostly stolen from #1903 and it would be good to factor things
out at a later date such that #1903 is replaced with similar logic
within ContextualMenu.
 2018-06-12 16:14:24 +01:00
David Baker
e858cf3bcb Merge branch 'master' into develop 2018-06-12 14:26:29 +01:00
David Baker
13d52065f5 Merge branch 'release-v0.12.7' 2018-06-12 14:23:48 +01:00
Luke Barnard
0934006817 Track decryption success/failure rate with piwik 
Emit a piwik event when a decryption occurs in the category "E2E" with
the action "Decryption result" and the name either "failure" or
"success".

NB: This will cause Riot to a lot of networking when decrypting many
events. One HTTP request per decrypted event should be expected.
 2018-06-12 14:13:09 +01:00
Michael Telatynski
7f1ce52dd3
link to ShareDialog from GroupView, RoomView, UserSettings & MemberInfo 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-12 11:22:01 +01:00
Michael Telatynski
64bcf6fd7e
allow ContextualMenu to run without background, for tooltips & fix copy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-12 11:22:01 +01:00
David Baker
50e08c7560
Merge pull request #1947 from matrix-org/t3chguy/invite_checkIfAlone 
re-run checkIfAlone if a member change occurred in the active room
 2018-06-08 17:36:42 +01:00
Michael Telatynski
0b9b03c9ee
re-run checkIfAlone if a member change occurred in the active room 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-07 22:01:27 +01:00
Travis Ralston
83f0459a7f
Merge branch 'develop' into travis/persist-pinned-open 2018-06-06 09:17:08 -06:00
David Baker
bea99e07b3
Merge pull request #1940 from matrix-org/luke/exit_settings 
Fix click on faded left/right/middle panel -> close settings
 2018-06-05 10:36:58 +01:00
Luke Barnard
6a317569d7 Add null-guard to support browsers that don't support performance 
Like Tor.

Fixes https://github.com/vector-im/riot-web/issues/6781
 2018-06-04 09:38:21 +01:00
Luke Barnard
d30bc2dc6b
Merge pull request #1937 from turt2live/travis/no-guest 
Replace "Login as guest" with "Try the app first" on login page
 2018-06-01 11:58:26 +01:00
Luke Barnard
404c071f2a Remove lie from docs 2018-05-29 13:19:56 +01:00
Luke Barnard
da9fe9917b Fix click on faded left/right/middle panel -> close settings 
- implement generic dispatch to close user/room/group settings
 - use dispatch to allow clicks on disabled left/right/middle panel to
   close settings

A much more maintainable approach would be to use dedicate routing
instead of doing different things depending on what page of the app is
currently being viewed. At the very least we could make the concept of a
settings page generic.
 2018-05-29 13:16:39 +01:00
Michael Telatynski
05357b9f8c
improve comment 2018-05-29 12:07:56 +01:00
Travis Ralston
e690bcb6ef Replace "Login as guest" with "Try the app first" on login page 
Fixes vector-im/riot-web#5875

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2018-05-26 20:54:19 -06:00
Travis Ralston
752605429c Persist pinned message open-ness between room switches 
Addresses part of https://github.com/vector-im/riot-web/issues/5405

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2018-05-26 19:58:12 -06:00
Michael Telatynski
6636fa32f6
Allow selecting audio output for WebRTC Audio/Video calls 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-05-26 17:22:23 +01:00
Michael Telatynski
5147246c17
kill stream when using gUM for permission to device labels to kill camera 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-05-26 15:41:25 +01:00
David Baker
168b956b3c homeserver 2018-05-24 17:01:00 +01:00
David Baker
9d2f223773 Message for leaving server notices room 2018-05-24 16:54:48 +01:00
Luke Barnard
658e88c30f Implement consent/terms and conditions dialog for /_matrix/consent flow 2018-05-22 18:03:56 +01:00
David Baker
ae10491f95 Space between sentences in 'leave room' warning 2018-05-22 09:28:41 +01:00
Luke Barnard
0bda607bb2 Only show cookie bar if analytics configured 2018-05-16 15:53:43 +01:00
Luke Barnard
d15051a635 Add policyLink configuration to piwik 
Also:
 - Make CookieBar ES6 class
 - Alter phrasing on CookieBar
 - Conditionaly display longer "...(See our ++cookie and privacy
   policies++)." if policy link is configured.
 2018-05-16 15:49:23 +01:00
Luke Barnard
d01e738839 Fix UserSettings for new analyticsOptIn 2018-05-16 15:20:38 +01:00
Luke Barnard
ac1cd384e7 Implement opt-in analytics with cookie bar 2018-05-16 15:20:38 +01:00
Travis Ralston
9e11720191 Add setting to enable widget screenshots (if widgets declare support) 
Fixes the remainder of https://github.com/vector-im/riot-web/issues/6708

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2018-05-12 14:30:59 -06:00
Luke Barnard
1f2f3474ed Delinting 2018-05-11 17:28:12 +01:00
Luke Barnard
2c2eda1f00 Export ContextualMenu component, with added hasBackground property 
, which is only enabled when `createMenu` is used.
 2018-05-10 17:51:49 +01:00
Luke Barnard
9046769132 Factor out ContextualMenu component 2018-05-10 16:02:25 +01:00
Luke Barnard
22f2d6f292 Fix crash when browser doesn't report page change measurement 2018-05-03 14:08:10 +01:00
Michael Telatynski
4c3f811050
switch RoomView:uploadFile to async to clean up then/catch handling 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-05-02 13:14:47 +01:00
Michael Telatynski
f2102e283c
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to 2018-05-02 13:08:38 +01:00
Michael Telatynski
db55f87699
avoid .done and .then anti-pattern 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-05-01 18:14:35 +01:00
Luke Barnard
6ec9e5f670
Merge pull request #1866 from matrix-org/luke/luke/group-store-refactor 
Refactor GroupStores into one global GroupStore
 2018-05-01 12:33:06 +01:00
Luke Barnard
25690336c3 Prevent user getting trapped in group settings when an error occurs 2018-05-01 11:52:02 +01:00
Luke Barnard
023daef4b7 Refactor GroupStores into one global GroupStore 
Take a step closer to a flux-like architecture for group data, for
the purposes of providing features that require it.

Now the app has a single GroupStore that can be poked to fetch
updates for a particular group.
 2018-05-01 11:24:17 +01:00
Luke Barnard
22047d7e72
Merge pull request #1845 from kethinov/hide_encryption_icons 
Hide inline encryption icons except when hovering over a message
 2018-04-30 17:57:22 +01:00
David Baker
37cb8abf13 Fix UX issues with bug report dialog 
* Make it use BaseDialog / DialogButtons (also gives it has a top-right 'x' &
   escape to cancel works)
 * Stop misusing the 'danger' CSS class on the buttons. There is nothing dangerous
   about submitting logs.
 * Continued campaign against 'Click here' links.

Fixes https://github.com/vector-im/riot-web/issues/6622
 2018-04-30 13:39:46 +01:00
Michael Telatynski
bbf4d3e39f
add comment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-29 00:34:27 +01:00
David Baker
0c309c88ad Bluebird has no need for your .done() 2018-04-27 17:52:25 +01:00
David Baker
0323f8ed0c Wrap exception handling around all of loadSession 
The user might (probably does) have a session even if we haven't actually tried
to load it yet, so wrap the whole loadSession code in the error handler we were
using for restoring sessions so we gracefully handle exceptions that happen
before trying to restore sessions too.

Remove the catch in MatrixChat that sent you to the login screen.  This is
never the right way to handle an error condition: we should only display the
login screen if we successfully determined that the user has no session, or
they explicitly chose to blow their sessions away.
 2018-04-27 11:25:13 +01:00
Michael Telatynski
82d117974f
Remove unused import 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-27 11:16:29 +01:00
Luke Barnard
665e052596 Allow debugging of unhandled login errors 2018-04-26 15:09:17 +01:00
David Baker
80837a9199 s/contian/contain/g 
Fixes https://github.com/vector-im/riot-web/issues/6565
 2018-04-24 17:53:23 +01:00
Eric Newport
d42fa9d17a Hide inline encryption icons except when hovering over a message 
Closes https://github.com/vector-im/riot-web/issues/2882

This is a redo of https://github.com/matrix-org/matrix-react-sdk/pull/1707 (see associated discussion there and here: https://github.com/vector-im/riot-web/pull/5988)

I tried several times to resolve the conflicts correctly, but could not. Thus, fresh PR.
 2018-04-22 22:30:37 -04:00
Michael Telatynski
58cd585e86
start of BigMerge fixup 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-20 09:12:02 +01:00
Matthew Hodgson
92c98aa3e5 displayName should be tracked as static 2018-04-18 16:19:37 +01:00
Matthew Hodgson
f84573ec9f convert HomePage to ES6 and split out the vectory bit 2018-04-18 10:23:32 +01:00
Matthew Hodgson
40a67ca8fe point imports at the new locations 2018-04-13 00:43:44 +01:00
Michael Telatynski
c77807bd22
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/i18n/strings/en_EN.json
#	src/i18n/strings/eu.json
#	src/i18n/strings/fr.json
#	src/i18n/strings/lv.json
#	src/i18n/strings/ru.json
#	src/i18n/strings/zh_Hant.json
 2018-04-12 09:48:06 +01:00
Matthew Hodgson
8ab8f76254 move non-Riot-specific components over from riot-web 2018-04-11 23:58:04 +01:00
Luke Barnard
fca7325b20 Change comments 2018-04-10 15:56:57 +01:00
Luke Barnard
31e9979285 Add 500ms delay to show membershipBusy for longer 
to avoid a UI that flashes quickly
 2018-04-10 15:31:04 +01:00
David Baker
74c84addea
Merge pull request #1831 from matrix-org/luke/fix-group-join-or-leave-update 
Improve group join/leave feedback
 2018-04-10 13:40:50 +01:00
Luke Barnard
de1073aacb Factor out _closeSettings for cleanliness 2018-04-10 13:28:42 +01:00
Luke Barnard
24d4df87d1 Show membership spinner next to Leave/Join button when leaving/joining 2018-04-10 11:49:59 +01:00
Luke Barnard
0681df71b0 Hide settings after leaving a group 2018-04-10 11:49:35 +01:00
Luke Barnard
42141f7da7 Fetch group data when leaving or joining to update the view 2018-04-10 10:03:54 +01:00
Matthew Hodgson
0ff2837d7f rename createGroupButton to not be a total misnomer... 2018-04-09 23:02:59 +01:00
Luke Barnard
2da45277cd Update group join button to match new API 2018-04-09 16:57:27 +01:00
David Baker
03016b9fc8
Merge pull request #1828 from matrix-org/luke/fix-redact-avatar 
Make stickers/messages continuations of each other
 2018-04-06 17:58:26 +01:00
Luke Barnard
01dd494f50 Make stickers/messages continuations of each other 2018-04-06 17:47:44 +01:00
Luke Barnard
008572afe1 Revert "Handle non-m.room.message event types." 
This reverts commit f8d7ab10fa.
 2018-04-06 16:42:59 +01:00
Luke Barnard
1e586428ac Update to match is_openly_joinable API 2018-04-06 14:58:10 +01:00
Luke Barnard
adb78c2931 Fix broken ForgotPassword component 2018-04-06 10:27:03 +01:00
Luke Barnard
59abfa6337
Merge pull request #1817 from matrix-org/luke/feature-group-set-joinable 
Add radio button for setting group m.join_policy
 2018-04-05 17:03:04 +01:00
David Baker
03747b8287 Update to use new join_policy API 2018-04-05 16:56:35 +01:00
Richard Lewis
369cbdaaf6 Add missing PropType declarations. 2018-04-04 13:38:07 +01:00
Richard Lewis
702380c591 Add props to style (remaining) menu padding attributes. 2018-04-04 13:37:52 +01:00
Michael Telatynski
1d90835de0
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/components/structures/RoomView.js
 2018-04-04 11:08:34 +01:00
Richard Lewis
f8f8bc469e Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/snapshot 2018-04-03 11:34:14 +01:00
Michael Telatynski
80fbc757f5
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to 2018-03-31 17:46:31 +01:00
Richard Lewis
ff0834ad9d Add comment. 2018-03-29 21:31:09 +01:00
Luke Barnard
c9283ad988 Merge branch 'luke/feature-group-set-joinable' of github.com:matrix-org/matrix-react-sdk into luke/feature-group-set-joinable 2018-03-29 17:28:44 +01:00
Luke Barnard
2bc8d6d3a4 Use less confusing values on radio buttons 2018-03-29 17:25:06 +01:00
Luke Barnard
e9193ff0b6
Merge branch 'develop' into luke/feature-group-set-joinable 2018-03-29 17:01:19 +01:00
Luke Barnard
f42cdf6a4c Add radio button for setting group is_joinable 
which dictates whether the group can be joined without invitation.
 2018-03-29 16:57:07 +01:00
Richard Lewis
35fcb2c9ab Catch rather than 'done' error handler. 2018-03-29 16:56:02 +01:00
Richard Lewis
23a52bdb4c Indentation. 2018-03-29 16:46:22 +01:00
Luke Barnard
1226ad3330
Merge pull request #1815 from matrix-org/luke/feature-group-join 
Join this community button
 2018-03-29 15:44:46 +01:00
Luke Barnard
c4322892de Reword group setting delay 2018-03-29 14:33:54 +01:00
Luke Barnard
385211528d Implement "Join this community" button 
for groups that have truthy summary.profile.is_joinable.
 2018-03-29 12:39:09 +01:00
Luke Barnard
00167fbc06 Init page change state in willMount 2018-03-28 11:25:28 +01:00
Luke Barnard
8d994f2788 Merge branch 'develop' into luke/track-page-change-duration 2018-03-28 10:56:36 +01:00
Luke Barnard
c8312dd5ae Use a less fragile API to track page change performance 2018-03-28 10:25:28 +01:00