sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity
3,976 Commits 4 Branches 19 Tags
30e183a7f1e0c5378d837f3ab45dfc8abbe6ade0
Commit Graph
1213 Commits
Author SHA1 Message Date
Luke Barnard 30e183a7f1 Only send RR if we should 2017-05-10 14:48:01 +01:00
Luke Barnard 7f766d89c3 Rename variables, more comments 2017-05-10 14:42:06 +01:00
Luke Barnard ca79d9bb6e Separate predicates for RM/RR 
Instead of modifying the condition for updating the RR, separate the RM and RR conditions and use an OR to decide when to set both.

Make some logs only log when DEBUG.
 2017-05-09 17:36:19 +01:00
Luke Barnard ac25fd6d87 Remove log 2017-05-09 10:16:37 +01:00
Luke Barnard 488fa3745b Fix RM not updating if RR event unpaginated 
If the RR event has been unpaginated, the logic in `sendReadReceipt` will now fallback on the event ID of the RM which in theory is always =< RR event ID stream-wise.
 2017-05-09 10:03:40 +01:00
Matthew HodgsonandGitHub 5900c879ce Merge pull request #851 from t3chguy/warn_on_unload 
Warn on unload
 2017-05-07 18:17:18 +01:00
David Baker e00605571b Fix the spinner to actually appear 
We started with clientSyncState being null, which it remained
until the SYNCING event was emitted. We need to set
clientSyncState's initial value correctly.
 2017-05-05 10:48:54 +01:00
Luke BarnardandGitHub 8e3851b380 Merge pull request #860 from t3chguy/patch-4 
Guests can't send RR so no point trying
 2017-05-04 17:53:59 +01:00
Michael TelatynskiandGitHub f76b9b4489 remove link to issue 
not very useful
 2017-05-04 17:25:23 +01:00
Luke BarnardandGitHub 7918ff2fc2 Merge pull request #857 from t3chguy/t3chguy/settings_versions_improvements 
T3chguy/settings versions improvements
 2017-05-04 16:56:45 +01:00
Michael TelatynskiandGitHub da4c2f8b31 Guests can't send RR 
so they shouldn't try
lets not hit the HS quite as much
 2017-05-04 16:42:41 +01:00
Michael Telatynski 3c6e301f7f Improve regex to ignore trailing -dirty and for rc tags 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-04 16:22:39 +01:00
Michael Telatynski 2edfc3e598 remove commented out code as per review 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-04 15:51:31 +01:00
Michael Telatynski cb478f1194 no idea why those got in there... 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-04 15:50:52 +01:00
Luke BarnardandGitHub 694fc26a55 Merge pull request #855 from matrix-org/luke/fix-jump-to-rm-in-mels 
Fix jumping to an unread event when in MELS
 2017-05-04 13:03:30 +01:00
Luke Barnard 6d9a1f047d Typo 2017-05-04 13:03:04 +01:00
Luke Barnard bfa3123f9b Combine data-scroll-token and -contained-scroll-tokens 
- Instead of using one attribute, use one that might just contain one token
 - Use the first token when tracking a child
 - Mandate that no commas can be in individual tokens
 2017-05-04 10:00:13 +01:00
Michael Telatynski 9d92f93fcb consolidate call onPageUnload handler into RoomView 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-03 16:39:19 +01:00
Michael Telatynski 356d29939c also warn when quitting mid-call 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-03 16:25:27 +01:00
Michael Telatynski 74b2c86f93 tidy up UserSettings 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-02 21:17:12 +01:00
Michael Telatynski 76e98d4267 improve version hyperlinking 
removed redundant v prefix (key already says version)
links to most applicable version/tag
tag-commit -> commit
commit1-commit2-commit3 -> commit1
(v)x.y.z -> tag<x.y.z>
commit -> commit

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-02 21:12:58 +01:00
Luke Barnard af137f8867 Validate phone number on login 
To prevent confusion when accidently inputting mxid or email. Fixes https://github.com/vector-im/riot-web/issues/3637
 2017-05-02 18:30:46 +01:00
Luke Barnard 4febc63aee Add comment to _scrollToToken 2017-05-02 17:41:09 +01:00
Luke Barnard fe83a99ab7 Update ScrollPanel docs 2017-05-02 17:36:59 +01:00
Luke Barnard 3f25928380 Fix jumping to an unread event when in MELS 
This adds the `data-contained-scroll-tokens` API to elements in `ScrollPanel` which allows arbitrary containers of elements with scroll tokens to declare their contained scroll tokens. When jumping to a scroll token inside a container, the `ScrollPanel` will act as if it is scrolling to the container itself, not the child.

MELS has been modified such that it exposes the scroll tokens of all events that exist within it.This means "Jump to unread message" will work if the unread event is within a MELS (which is any member event, because even individual member events surrounded by other events are put inside a MELS).
 2017-05-02 16:34:39 +01:00
Michael Telatynski daae3bd1ec warn on unload when uploading file(s) 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-29 06:27:06 +01:00
David BakerandGitHub b91f53652d Merge pull request #848 from matrix-org/luke/room-directory-improve 
Improve RoomDirectory Look & Feel
 2017-04-27 18:28:28 +01:00
Luke Barnard 791f7f7f6b Merge branch 'luke/room-directory-remove-rhs' into luke/room-directory-improve 2017-04-27 17:57:19 +01:00
Luke BarnardandGitHub 9d57e8b959 Merge pull request #845 from matrix-org/luke/rm-fix 
Only show jumpToReadMarker bar when RM !== RR
 2017-04-27 17:01:39 +01:00
Luke Barnard 6313193aa8 Null check readMarkerEventId, update comment 2017-04-27 16:52:40 +01:00
Luke Barnard 50831796bb Remove RHS when viewing RoomDirectory 2017-04-27 16:49:23 +01:00
Luke Barnard 2012513c0e Allow MELS to have its own RM 
This inserts a RM if any of the events in a MELS if the RM is tracking an event within it.

Fixes https://github.com/vector-im/riot-web/issues/3749
 2017-04-27 14:16:50 +01:00
Luke Barnard 8f7359fce1 Only show jumpToReadMarker bar when RM !== RR 
If RM !== RR, use the pos. of the RM to determine whether it is visible, as before.
 2017-04-27 14:03:54 +01:00
David Baker 4910a225d1 Fix spinner that shows until the first sync 
Listen for the sync event and update when it changes
 2017-04-26 17:26:53 +01:00
Luke BarnardandGitHub 9ac06d4c79 Merge pull request #839 from matrix-org/dbkr/spinner_until_sync 
Show spinner until first sync has completed
 2017-04-26 14:34:08 +01:00
David Baker df283dae47 Show spinner until first sync has completed 
Shows the 'forward paginating' spinner until the first sync has
completed.

Fixes https://github.com/vector-im/riot-web/issues/3318
 2017-04-26 14:05:09 +01:00
David Baker 04f44e9201 Style fixes for LoggedInView 
PRing this becaise I was going to change LoggedInView, so did
some code style updates, but then decided the do the change
elsewhere.
 2017-04-26 13:48:03 +01:00
David Baker fa9c2d1373 Fix specifying custom server for registration 
Broken by https://github.com/matrix-org/matrix-react-sdk/commit/9cd7914ea51dbfb60f8b84a80cb800282476d3e4
(ServerConfig interface changed but Registration not updated)
 2017-04-25 19:21:09 +01:00
Luke Barnard 96e7479d8b Show "jump to message" when message is not paginated 2017-04-25 17:19:36 +01:00
Matthew HodgsonandGitHub 29e48d1801 Merge pull request #826 from matrix-org/matthew/mels-profile-changes 
summarise profile changes in MELS
 2017-04-25 00:18:19 +01:00
Richard van der HoffandGitHub 96e733b487 Merge pull request #825 from matrix-org/matthew/missing-keyboard-modifiers 
limit our keyboard shortcut modifiers correctly
 2017-04-23 12:02:29 +01:00
Matthew Hodgson 24f2aed45f summarise profile changes in MELS 
fixes https://github.com/vector-im/riot-web/issues/3463
 2017-04-23 04:05:50 +01:00
Matthew Hodgson a2be764681 display err.message to user if available in error msgs 2017-04-23 01:48:27 +01:00
Matthew Hodgson 7854cac61d hook up keyb shortcuts for roomdir 2017-04-23 01:00:44 +01:00
Matthew Hodgson fa033e6116 limit our keyboard shortcut modifiers correctly 
fixes https://github.com/vector-im/riot-web/issues/3614
 2017-04-23 00:49:14 +01:00
Matthew Hodgson e18e965eb8 missing key attr 2017-04-22 16:26:39 +01:00
Michael Telatynski 33e841a786 move user settings outward and use built in read receipts disabling 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-22 15:40:29 +01:00
Matthew HodgsonandGitHub 6c177bc617 Merge pull request #806 from t3chguy/t3chguy/show_access_token 
Show Access Token under Advanced in Settings
 2017-04-22 02:51:54 +01:00
Matthew HodgsonandGitHub ad76dd0dd1 Merge pull request #810 from t3chguy/t3chguy/settings_versions_improvements 
Link tags/commit hashes in the UserSettings version section
 2017-04-22 02:38:30 +01:00
Matthew HodgsonandGitHub febd9c637e Merge pull request #813 from t3chguy/RoomSettings_close_focus_composer 
On return to RoomView from auxPanel, send focus back to Composer
 2017-04-22 02:08:48 +01:00