OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
4,504 Commits
229 Branches
566 Tags
473 MiB
Commit Graph

3669 Commits (d72db5df87dd41b214acf8d5df75a8f09a831de4)

Author SHA1 Message Date
Matthew Hodgson ed79a3adef Merge pull request #935 from matrix-org/luke/new-guest-access-no-barf-on-username-check-err 
Show "Something went wrong!" when errcode undefined
 2017-05-26 17:47:52 +01:00
Matthew Hodgson 44f479c38b Merge pull request #930 from matrix-org/luke/new-guest-access-reset-stores-on-logged-out 
Reset store state when logging out
 2017-05-26 17:45:32 +01:00
David Baker c22978d033 Merge remote-tracking branch 'origin/develop' into dbkr/translations 2017-05-26 17:30:02 +01:00
Luke Barnard ac44151e2a Put the reset method in the right scope... 2017-05-26 17:27:31 +01:00
Luke Barnard 9311b9012a Use the same `.reset` as RoomViewStore 2017-05-26 17:23:02 +01:00
Matthew Hodgson 3d688a6ada Merge pull request #933 from matrix-org/luke/new-guest-access-set-display-name-to-useridlocalpart 
Set the displayname to the mxid once PWLU
 2017-05-26 17:17:23 +01:00
David Baker 84cef00f1f Mismatched oneUser / severalUsers 2017-05-26 17:16:23 +01:00
Matthew Hodgson 1c7785535f Merge pull request #929 from matrix-org/luke/new-guest-access-fix-view-next-room 
Fix view_next_room, view_previous_room and view_indexed_room
 2017-05-26 17:09:35 +01:00
Matthew Hodgson fbc3f83625 Merge pull request #928 from matrix-org/luke/new-guest-access-inidicate-joining-early 
Use RVS to indicate "joining" when setting a mxid
 2017-05-26 17:08:34 +01:00
Matthew Hodgson fde553a809 Merge pull request #903 from Kieran-Gould/kierangould/12hourtimestamp 
Kierangould/12hourtimestamp
 2017-05-26 16:52:09 +01:00
Luke Barnard 9f902c1190 Merge pull request #932 from matrix-org/luke/new-guest-access-no-notif-bar-if-is-guest 
Don't show notif nag bar if guest
 2017-05-26 16:42:12 +01:00
David Baker 0f8e560247 Add function to display i18n keys in UI 
Avoids having to load translations in riot-web tests
 2017-05-26 15:29:11 +01:00
David Baker e3e848d09e Fix missing full stop on translation key 2017-05-26 13:19:46 +01:00
Luke Barnard 5e136863b0 Block user settings with view_set_mxid 2017-05-26 13:18:44 +01:00
Luke Barnard 28094a9a66 Show "Something went wrong!" when errcode undefined 2017-05-26 13:13:57 +01:00
David Baker e44f3cc709 Fix tests 
* Serve translation files from the karma server
 * Port UserSettingsStore to ES6 exports because the test runner
   gets confused by ES6 importing a commonjs module
 * Remove extra spaces in translations strings for MELS
 * Fix 'his/her' back to be 'their'
 * Change test to expect singular 'invitation' for a single person
   (there may be multiple invitations, but IMO this should be
   'rejected n invitations' and we can play with the wording later,
   I don't think the singular is any worse than the plural).
 * set language in the MELS tests (and wait for it to complete)
 * Don't bother setting lang in other tests for now
 2017-05-26 11:58:45 +01:00
Luke Barnard ad3373789f Warn about LifecycleStore not explicitly being used 2017-05-26 11:50:32 +01:00
Luke Barnard 2400efa92b Correct LifecycleStore docs 2017-05-26 11:48:38 +01:00
Luke Barnard c0f43a14fd Improve comment 2017-05-26 11:47:55 +01:00
Luke Barnard 2dcc03960a Set the displayname to the mxid once PWLU 2017-05-26 11:46:33 +01:00
Luke Barnard b5b157a0fb Don't show notif nag bar if guest 2017-05-26 10:34:36 +01:00
David Baker 2d6bf5fa91 Remove messages with HTML formatting 
The translations strings are not HTML and it gets escaped.
 2017-05-25 20:04:28 +01:00
David Baker ab92cc2254 Question marks do not internationalise 2017-05-25 19:55:54 +01:00
David Baker e7fbf889fa Make current language more accurate 
Make it reflect reality if it's been taken from the browser langs
by just getting what was saet in counterpart rather than the saved
setting.

Also fix style.
 2017-05-25 19:53:27 +01:00
David Baker be4944a4b6 Hopefully get translations with '.'s sorted 
attempt 2
 2017-05-25 19:43:34 +01:00
David Baker dac6a3360b Oops, don't change these reason strings. 2017-05-25 19:25:06 +01:00
David Baker 43d8ccf128 Hopefully sort out strings with appended '.'s 2017-05-25 19:21:18 +01:00
David Baker c3c2916449 Use array literals 2017-05-25 18:26:42 +01:00
David Baker 6c41be3c14 Missed OKs 2017-05-25 18:23:15 +01:00
David Baker 443ab1add7 Put back default strings on dialogs 
But make them work by calling _t in render rather than
getDefaultProps().

Also sort out some 'Warning!' strings
 2017-05-25 18:20:48 +01:00
David Baker 9112fc231a More translation string fixups 2017-05-25 17:35:18 +01:00
David Baker 6d67655f66 Add german for Change password 2017-05-25 17:22:04 +01:00
David Baker 85756c78b4 Change to object literal 2017-05-25 17:17:37 +01:00
Luke Barnard 263a51938d Reset store state when logging out 
This prevents leaking of state that we do not want to share with the next user
 2017-05-25 17:16:16 +01:00
Luke Barnard 0849b0e205 Fix view_next_room, view_previous_room and view_indexed_room 
These must now make a dispatch to RoomViewStore instead of calling `viewRoom` directly on MatrixChat. This will call both `viewRoom` of MatrixChat _and_ the logic in RVS so there is some redundancy here. It'd be best to move as much as possible of viewRoom out to the RVS itself.

But for now, this fixes a bug that occures when leaving (the viewed room would not change).
 2017-05-25 17:10:49 +01:00
Luke Barnard 91edc06441 Use RVS to indicate "joining" when setting a mxid 
This prevents RoomView from doing any peeking whilst the join/registration is in progress, causing weirdness with TimelinePanel getPendingEventList (which throws an error if called when peeking).
 2017-05-25 17:04:42 +01:00
David Baker feef7d49e9 More tabs 2017-05-25 16:55:24 +01:00
David Baker 3a379d09de Update translations 
Actually translate the language dropdown label & add the string.
Remove some unused ones.
 2017-05-25 16:52:15 +01:00
David Baker 39dbc4c6e1 Lots of changes to languageHandler 
* Replace callbacks with promises
 * Move plain functions to top level
 * De-duplicate bits that fetched languages.json
 * Take full language preference list from the browser if we
   can get it, rather than just the first.
 2017-05-25 16:45:32 +01:00
Luke Barnard 11799b4c71 Show "Password" instead of "New Password" when the existing password has been cached 2017-05-25 15:27:54 +01:00
Luke Barnard 0707b7440a Merge branch 'new-guest-access' of github.com:matrix-org/matrix-react-sdk into new-guest-access 2017-05-25 15:20:22 +01:00
Luke Barnard ce17df0883 Unbreak the roomlist 2017-05-25 15:20:02 +01:00
Luke Barnard 1214b01330 Merge pull request #926 from matrix-org/luke/new-guest-access-set-mxid-warm-fuzzy-revert 
Remove warm-fuzzy after setting mxid
 2017-05-25 15:16:52 +01:00
Luke Barnard 2265b59287 Remove warm-fuzzy after setting mxid 2017-05-25 14:54:28 +01:00
Luke Barnard 51c8ee6db2 Allow teamServerConfig to be missing 2017-05-25 14:38:12 +01:00
David Baker c54a24c49a Merge pull request #923 from matrix-org/luke/remove-guest-warning-bar 
Remove GuestWarningBar
 2017-05-25 14:30:10 +01:00
Luke Barnard 7900bf1c7d Don't show "Drop to ..." if total rooms = 0 2017-05-25 13:55:37 +01:00
Luke Barnard 3185d3ed41 Re-add bouncing/callout animation to action buttons 2017-05-25 13:54:59 +01:00
David Baker db45e99536 Remove defaulting here 
We already do it in the place this function gets called
 2017-05-25 12:09:48 +01:00
David Baker 548f319816 Remove redundant role elements 2017-05-25 12:09:08 +01:00
David Baker 5e855e6fee Size is a string, import react 
React gets put in by the JSX transpile
 2017-05-25 12:09:01 +01:00
David Baker 9337158a47 Separate classes for the different buttons 
Also rename RoleButton to ActionButton because it's not being
given a Role any more.

Conflicts:
	src/component-index.js

cherry-picking commit 4a5821e.
 2017-05-25 12:08:42 +01:00
David Baker 913723b76b Remove extCounterpart now we only use one instance 2017-05-25 12:08:14 +01:00
David Baker dc2274df54 Hide empty tips if collapsed 2017-05-25 12:05:06 +01:00
David Baker 3d3d89202e Year 2017-05-25 12:04:36 +01:00
David Baker a996f52ea3 Make bottom left menu buttons use RoleButton too 2017-05-25 12:04:22 +01:00
David Baker 54af06e8e1 What year is it? Who's the president? 2017-05-25 12:04:14 +01:00
David Baker 9fa6e8b1e2 Add us to copyright 
As I've now added code to this file
 2017-05-25 12:02:05 +01:00
David Baker bff0577cb6 Add buttons to room sub list headers 
Conflicts:
	src/component-index.js
	src/components/views/rooms/RoomList.js

cherry-picking commit ce119a6.
 2017-05-25 11:49:45 +01:00
David Baker d6d9a89453 Other empty sections no longer need to be greyed 2017-05-25 11:47:21 +01:00
David Baker c7776915f7 Kill off more tabs 2017-05-25 11:45:36 +01:00
David Baker 5c359e63ab Bulk change counterpart imports 
to use languageHandler wrapper func
 2017-05-25 11:39:08 +01:00
David Baker 5531f27435 Make the left panel more friendly to new users 
https://github.com/vector-im/riot-web/issues/3609

Conflicts:
	src/components/views/rooms/RoomList.js

cherry-picking commit f5f35e3.
 2017-05-25 11:24:45 +01:00
David Baker ec146c7f45 Switch to stock counterpart 
We no longer need the custom counterpart. The things that were
changed in it and reasosn we no lomger need them are:

 1. set separator - this can be done with standard counterpart
 2. ES6 port: this was done to allow importing as _t, but is
    unnecessary with the _t wrapper function in react-sdk
    (although also seems to work fine with
    `import _t from 'counterpart';`)
 3. Fallback to key name: unnecessary with
    `setMissingEntryGenerator` in 0.18, but we've changed to just
    using a fallback locale anyway since No code missing en
    translations should ever make it to the devbelop branch.
 4. Logging on missing translations. Unnecessary with
    `onTranslationNotFound`, but now not used anyway because we
    let missing translations show up in the UI as
    'missing translation'

Bulk changes to imports coming in separate commit for easy reading.
 2017-05-25 11:24:17 +01:00
Luke Barnard c894c83fbe Remove GuestWarningBar 2017-05-25 11:02:48 +01:00
Luke Barnard f3fc459875 Merge pull request #922 from matrix-org/luke/new-guest-access-default-welcome 
Implement default welcome page and allow custom URL /w config
 2017-05-25 10:08:34 +01:00
Luke Barnard 8fc44a9b66 Add comment to explain sync_state dispatch 2017-05-25 09:31:14 +01:00
Luke Barnard fffe425730 Add non-null RoomView key 2017-05-24 18:04:04 +01:00
Luke Barnard dcf2fb68ae Remove console log 2017-05-24 18:02:17 +01:00
Luke Barnard 5f36f797da Implement default welcome page and allow custom URL /w config 
This changes the default behaviour of displaying the room directory to instead displaying the default homepage. If specified, the config "welcomePageUrl" can be used to override the default '/home.html'.
 2017-05-24 17:55:36 +01:00
Luke Barnard 298c5e4df3 Implement a store for RoomView 
This allows for a truely flux-y way of storing the currently viewed room, making some callbacks (like onRoomIdResolved) redundant and making sure that the currently viewed room (ID) is only stored in one place as opposed to the previous many places.

This was required for the `join_room` action which can be dispatched to join the currently viewed room.

Another change was to introduce `LifeCycleStore` which is a start at encorporating state related to the lifecycle of the app into a flux store. Currently it only contains an action which will be dispatched when the sync state has become PREPARED. This was necessary to do a deferred dispatch of `join_room` following the registration of a PWLU (PassWord-Less User).

The following actions are introduced:
 - RoomViewStore:
    - `view_room`: dispatch to change the currently viewed room ID
    - `join_room`: dispatch to join the currently viewed room
 - LifecycleStore:
    - `do_after_sync_prepared`: dispatch to store an action which will be dispatched when `sync_state` is dispatched with `state = 'PREPARED'`
 - MatrixChat:
    - `sync_state`: dispatched when the sync state changes. Ideally there'd be a SyncStateStore that emitted an `update` upon receiving this, but for now the `LifecycleStore` will listen for `sync_state` directly.
 2017-05-24 16:56:13 +01:00
David Baker b677a2002f Minimal UI fixes 
Add a label. Make css selector match style. Also fix import.
 2017-05-24 14:36:14 +01:00
David Baker aef068b00e Indenting 2017-05-24 14:28:30 +01:00
David Baker c2df23395d Fix up language dropdown 
* Read languages from the available ones rather than the config
 * Make the search work (add searchEnabled=true)
 * Move variables to the class since they were populated there
 2017-05-24 11:25:06 +01:00
Michael Telatynski edcfb77a6d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/electron_call_sleep 2017-05-24 10:56:41 +01:00
David Baker a95f3252b8 s/tabs/spaces/ 2017-05-24 10:48:10 +01:00
David Baker f412552c2c Fix imports/exports 2017-05-23 18:32:45 +01:00
David Baker cc0924f1c7 Fix imports 2017-05-23 18:16:02 +01:00
MTRNord 9bce417400 fix algorithm ReferenceError 2017-05-23 18:01:30 +01:00
David Baker d419c42a4f Squash merge https://github.com/matrix-org/matrix-react-sdk/pull/801 2017-05-23 15:16:31 +01:00
David Baker 46bb29a3af Merge pull request #910 from matrix-org/t3chguy/version_anchor_newtab 
Make the linked versions open a new tab, turt2live complained :P
 2017-05-23 13:51:40 +01:00
Michael Telatynski a10c2faac1 lets not open an attack vector :) 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-23 13:12:21 +01:00
Michael Telatynski b65ba6b080 Merge pull request #919 from matrix-org/rav/delint_slashcommands 
Fix lint errors in SlashCommands
 2017-05-23 12:10:34 +01:00
David Baker 6d30bc7182 Merge pull request #911 from matrix-org/t3chguy/autofocus_directorysearchbox 
autoFocus input box
 2017-05-23 09:57:20 +01:00
Richard van der Hoff 5df4b9de16 Fix lint errors in SlashCommands 2017-05-23 09:44:11 +01:00
Richard van der Hoff 26c8540d03 Add in a "verify" slash command to confirm signing keys (#912) 
Allows users to send a text string via an alternative channel (like email
or SMS) which Riot can leverage to confirm that the signing keys match.

Effectively removes the tedium of checking keys until a better mechanism
is completed.

Signed-off-by: Kit Sczudlo <kit@kitscz.com>
 2017-05-23 09:24:18 +01:00
Michael Telatynski 024964aceb pass call state through, for things that don't have access to full API 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-22 18:33:14 +01:00
Luke Barnard b0a824c941 Remove double declaration of TextInputDialog 2017-05-22 16:28:23 +01:00
Luke Barnard 05aaa599cc Merge branch 'develop' into new-guest-access 
Conflicts:
	src/components/structures/MatrixChat.js
 2017-05-22 16:19:10 +01:00
Luke Barnard a1f10ff46d Add prop to toggle whether new password input is autoFocused 2017-05-22 14:46:49 +01:00
Richard van der Hoff fc08dc33c6 Group e2e keys into blocks of 4 characters 
Hopefully this will make them a bit easier to compare.
 2017-05-22 12:01:09 +01:00
Richard van der Hoff 574b820d11 Factor out DeviceVerifyDialog 2017-05-22 11:12:36 +01:00
Michael Telatynski 02a1c1868c autoFocus input box 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-20 00:08:53 +01:00
Kieran Gould 47e5e8d678 Moved isTwelveHour alllll the way up to TimelinePanel. 2017-05-19 23:04:37 +01:00
Kieran Gould 6b32975e0c Add 12 hour class to mx_EventTile 2017-05-19 22:36:13 +01:00
Kieran Gould f9152b205c Add parameter `showTwelveHours` to formatTime 2017-05-19 22:29:49 +01:00
Kieran Gould 5aa1bc4185 Rename twentyFourHour 
Pad time
 2017-05-19 22:29:49 +01:00
Maxwell Kepler 008cc95e9c Add 12 hour support 2017-05-19 22:29:49 +01:00
Michael Telatynski cc3673d2d2 Make the linked versions open a new tab, turt2live complained :P 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-19 17:39:21 +01:00
Richard van der Hoff e3dbf057fb Fix 'missing page_type' error 
LoggedInView will complain if it is instantiated without a page_type, so let's
keep showing the syncing spinner until we have one.
 2017-05-19 14:09:20 +01:00
Richard van der Hoff c61294f71c Delintify some of MatrixChat (#907) 
... it annoyed me too much.
 2017-05-19 13:53:11 +01:00
Luke Barnard 2bec44a517 Remove suffix and prefix from login input username 
This is an attempt reduce confusion when entering a custom home server: https://github.com/vector-im/riot-web/issues/3736
 2017-05-19 10:03:51 +01:00
Luke Barnard 96c3bf56f8 Implement warm-fuzzy success dialog for SetMxIdDialog 2017-05-19 09:43:56 +01:00
Michael Telatynski cc7edbf86d allow for sending arbitrary events, also override highlight with 
event currently being forwarded while forwardingEvent is set

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-19 01:29:11 +01:00
Michael Telatynski 475646a2a7 Change wording 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-19 00:34:35 +01:00
Michael Telatynski a2ab36f598 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into forward_message 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-19 00:33:36 +01:00
Michael Telatynski bf0fe63759 don't know why I'm even tracking mounted state. Never refd 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-19 00:20:51 +01:00
Michael Telatynski 0e7e4d8595 replace weird sidebar snapping with better ui_opacity 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-19 00:20:32 +01:00
David Baker 3e7a31ac75 Revert "fix scroll behaviour on macs with no gemini" 
This reverts commit 1347d9fa65.
 2017-05-18 19:03:51 +01:00
David Baker 726cd60127 Merge pull request #902 from matrix-org/dbkr/prevent_illegal_finddomnode 
Prevent an exception getting scroll node
 2017-05-18 17:56:29 +01:00
David Baker 8fe3fa9178 Remove debug logging 2017-05-18 17:35:22 +01:00
David Baker 01955146e9 Prevent an exception getting scroll node 
Don't try to findDOMNode before we're mounted as it makes react
angry.
 2017-05-18 17:33:32 +01:00
Luke Barnard 32818aff4f Simplify expression 2017-05-18 17:08:26 +01:00
Luke Barnard ee64f4a8dd Add country prefix to country dd options 2017-05-18 17:02:19 +01:00
Luke Barnard 384f50609d Allow searching by partial prefix (/w or /wo '+') 2017-05-18 17:01:40 +01:00
Luke Barnard a425909b76 Get rid of react key warning when no results 2017-05-18 17:01:01 +01:00
Luke Barnard f99fa3ac1a Fixed pressing space or clicking dd input closes dd 2017-05-18 16:58:57 +01:00
Luke Barnard 2350277d29 Add left_aligned class to CountryDropdown 
This indiciates that the dd chevron should be on the left
 2017-05-18 14:03:02 +01:00
Luke Barnard 2ebd9b6290 Merge pull request #899 from matrix-org/luke/improve-country-dd-3 
Swap to new flag files (which are stored as GB.png)
 2017-05-18 13:37:28 +01:00
Luke Barnard c991b52d2c Swap to new flag files (which are stored as GB.png) 
Requires https://github.com/vector-im/riot-web/pull/3953
 2017-05-18 11:45:23 +01:00
Luke Barnard e38437e6ce Invite the welcome user after registration if configured 
This will shift focus to the welcome user DM.

We probably don't want to do this for teams, but I shall leave that for another PR that fixes teams WRT to new-guest-access.
 2017-05-18 11:14:56 +01:00
Luke Barnard c44d7b6c44 Improve phone number country dropdown for registration and login 
This implements https://github.com/vector-im/riot-web/issues/3895
 2017-05-17 13:09:32 +01:00
David Baker 8ce6da1b16 Merge branch 'new_release_process_stable' into develop 
This reverts all PRs currently marked notready, changing develop into
a branch that should be more stable.
 2017-05-17 10:38:09 +01:00
Richard van der Hoff 696234694c Merge pull request #892 from matrix-org/rav/pastefiles 
Support for pasting files into normal composer
 2017-05-17 09:59:23 +01:00
Luke Barnard e1089574ae Write some tests for the RTS UI 
Add tests that make assertions about the UI during registration when registration is done with a user recognised as a team member (by the mock rtsClient).
 2017-05-17 09:46:17 +01:00
Richard van der Hoff 8695397abb Support for pasting files into normal composer 
We don't seem to be in any danger of getting a working RTE any time soon, so
implement file pasting in the normal composer too.
 2017-05-17 01:43:13 +01:00
David Baker 75eea89c08 Revert "Merge pull request #765 from t3chguy/t3chguy/escape-closes-user-settings" 
This reverts commit a29d8c2af2, reversing
changes made to 1d836c7d02.
 2017-05-16 16:12:57 +01:00
David Baker ebfafb3639 Revert "Merge pull request #807 from matrix-org/matthew/quick-search" 
This reverts commit 0ad1d8caf3, reversing
changes made to 1189368aab.
 2017-05-16 16:11:01 +01:00
David Baker 67c6a8b81d Revert "unbreak stack overflow which fires on tests due to mocked timers" 
This reverts commit e69ea68133.
 2017-05-16 16:02:13 +01:00
David Baker eddc2af92d Revert "HOW DID THIS EVER WORK?" 
This reverts commit 0d8d3c6710.
 2017-05-16 16:01:54 +01:00
David Baker 7a949b6a45 Revert "oops, actually refresh roomlist when its state changes!" 
This reverts commit 35a16edccc.
 2017-05-16 16:01:32 +01:00
David Baker b063c605a8 Revert "fix stupid typos in RoomList's shouldComponentUpdate" 
This reverts commit b0288ebd89.
 2017-05-16 16:01:14 +01:00
David Baker 714cd6a10f Revert "recalculate roomlist when your invites change" 
This reverts commit ec6a1c4c75.
 2017-05-16 16:00:34 +01:00
David Baker 1aabaec158 Revert "comment out spammy CTD logging" 
This reverts commit 19482d751d.
 2017-05-16 15:35:22 +01:00
David Baker ff9c40472a Revert "Merge pull request #822 from t3chguy/BaseDialog_restore_focus" 
This reverts commit 0ac836919d, reversing
changes made to 7e07ffd55f.
 2017-05-16 14:50:29 +01:00
David Baker 19dcd83aeb Revert "Merge pull request #841 from matrix-org/luke/fix-double-dialogs" 
This reverts commit 1913a32fbd, reversing
changes made to 0c16298c45.
 2017-05-16 14:50:19 +01:00
David Baker 387529d130 Revert "Merge pull request #859 from matrix-org/dbkr/left_panel_for_newbies_2" 
This reverts commit 3366d3bbae, reversing
changes made to ceb71a4ef6.
 2017-05-16 14:49:55 +01:00
David Baker d06bd3cf9d Revert "Fix Create Room button" 
This reverts commit 9cae667c06.
 2017-05-16 14:30:02 +01:00
David Baker f8d1a6d240 Revert "Fix 'start chat' button" 
This reverts commit c841eb641b.
 2017-05-16 14:26:46 +01:00
Luke Barnard ca907f42dc Fix redundant getComponent 2017-05-16 14:24:24 +01:00
Luke Barnard 2c5fb01f03 Fix bugs introduced by dodgy merge 2017-05-16 14:13:22 +01:00
David Baker 6bd7af2917 Revert "Merge pull request #867 from matrix-org/t3chguy/BaseDialog-patch1" 
This reverts commit 3549ff2543, reversing
changes made to 1db677141e.
 2017-05-16 14:00:09 +01:00
Luke Barnard 66985e6d08 Merge branch 'new-guest-access' into luke/new-guest-access-change-pwd 2017-05-16 13:59:54 +01:00
Luke Barnard 5a3c32044e disableConfirmation -> confirm 2017-05-16 12:45:14 +01:00
Luke Barnard c6350379dc Merge pull request #881 from matrix-org/luke/user-settings-remove-current-password 
Remove "Current Password" input if mx_pass exists
 2017-05-16 12:29:23 +01:00
Luke Barnard 633c6b39f6 Add comment to Lifecycle 2017-05-16 11:58:37 +01:00
Luke Barnard eb36e979c2 Reference store token, call .remove on it on unmount 2017-05-16 11:52:51 +01:00
Luke Barnard f7e6a996c5 Add proptype 2017-05-16 11:51:09 +01:00
Luke Barnard 93ecdc90a9 Make confirmation optional on ChangePassword 
Add option to disable password change confirmation (`disabledConfirmation`). Style fixes, use `<button>` element on ChangePassword submit button.
 2017-05-16 11:45:01 +01:00
Luke Barnard d7eec27c4b Merge pull request #889 from matrix-org/luke/new-guest-access-need-to-set-mx-id 
Replace NeedToRegisterDialog /w SetMxIdDialog
 2017-05-15 18:36:20 +01:00
Luke Barnard f199f3599e Replace NeedToRegisterDialog /w SetMxIdDialog 
This uses MatrixChat's `view_set_mxid`
 2017-05-15 17:31:26 +01:00
Luke Barnard 269fd51130 Remove SessionStore listener on unmount 2017-05-15 17:17:32 +01:00
Luke Barnard eb0041d21a Remove redundant state 2017-05-15 17:03:54 +01:00
Luke Barnard f73cf772fb Move sessionStore ref from MatrixChat to LoggedInView 
MatrixChat didn't actually use the sessionStore, so this is one less prop to pass.
 2017-05-15 14:56:05 +01:00
Luke Barnard da3cb0ee48 SessionStore extends flux.Store 2017-05-15 14:52:19 +01:00
Michael Telatynski 8715b5233c link to #/register 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-15 10:31:17 +01:00
Michael Telatynski 83cb1e6e29 tell guests they can't use filepanel until they register 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-15 10:15:35 +01:00
Matthew Hodgson 317e24852d explicitly label email & phone add sections; fixes https://github.com/vector-im/riot-web/issues/3531 2017-05-15 03:03:17 +01:00
Matthew Hodgson 486301cffb remove dodgy heuristics for hiding dates on RRs and use DateUtils instead. 
reverts 5d99d68a64
fixes https://github.com/vector-im/riot-web/issues/3523
 2017-05-15 02:55:07 +01:00
Matthew Hodgson 6879f7ee6f add presence to MemberInfo, fixes https://github.com/vector-im/riot-web/issues/3720 2017-05-15 02:43:23 +01:00
Matthew Hodgson 5c0c49e1f6 ignore voip answer/hangup in unread events - fixes https://github.com/vector-im/riot-web/issues/3827 2017-05-15 02:18:18 +01:00
Matthew Hodgson 82092dc2d8 onClick MELS avatars = expand MELS; fixes https://github.com/vector-im/riot-web/issues/3899 2017-05-15 02:15:00 +01:00
Matthew Hodgson 7d8c104cb8 Merge pull request #884 from matrix-org/t3chguy/tiny_usersettings_fixes 
I broke UserSettings for webpack-dev-server
 2017-05-15 01:57:45 +01:00
Matthew Hodgson 7f78e737eb Merge pull request #880 from matrix-org/t3chguy/fixRoomHeaderPreviewing 
various fixes to RoomHeader
 2017-05-15 01:52:42 +01:00
Matthew Hodgson 24d09d8f5b Merge pull request #885 from matrix-org/t3chguy/rte_emote_weirdness 
remove /me whether or not it has a space after it
 2017-05-15 01:50:53 +01:00
Matthew Hodgson 48864b0880 fix visibility of topbar close on dark theme, fixing https://github.com/vector-im/riot-web/issues/3783 2017-05-15 01:39:57 +01:00
Matthew Hodgson c5f2b69e48 add alt attributes to e2e icons on msgs; fixes https://github.com/vector-im/riot-web/issues/3786 2017-05-15 01:37:24 +01:00
Matthew Hodgson c0cead1546 workaround for https://github.com/vector-im/riot-web/issues/3633. 
unsure our vector url match could ever return undefined, but apparently it is...
 2017-05-15 01:32:37 +01:00
Matthew Hodgson f3274426db revert f999aa9 and support full date formats when desired 2017-05-15 00:25:20 +01:00
Matthew Hodgson 38cb123506 Merge pull request #883 from matrix-org/t3chguy/file_panel_fixes 
show error if we can't set a filter because no room
 2017-05-15 00:19:45 +01:00
Michael Telatynski d7c88a9813 only removed `/me `, remove anyway to fix vector-im/riot-web#3733 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-13 15:20:31 +01:00
Michael Telatynski 6ec799a028 I broke UserSettings for webpack-dev-server 
where version file doesn't exist, version starts as null
then gets set to undefined by the promise
this wasn't handled and now undefined is understood to be unknown
rather than null

also picked up on a small casing error
threePids vs threepids, most things using the latter apart from the init

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-13 15:04:20 +01:00
Michael Telatynski 29568feb95 show error if we can't set a filter 
this way it still works for a room we've been in before

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-12 22:38:57 +01:00
Michael Telatynski 60b13d76a5 conform to Luke's other comment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-12 21:20:56 +01:00
Michael Telatynski 822f2f10f2 conform to Luke's comment 
https://github.com/matrix-org/matrix-react-sdk/pull/880#discussion_r116257726

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-12 21:16:55 +01:00
Michael Telatynski 69d860e982 revert name overengineering, undefined onClick should be fine on div 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-12 21:06:36 +01:00
Luke Barnard 683f1b8a1a Invite the welcome user after registration if configured 
This will shift focus to the welcome user DM.

We probably don't want to do this for teams, but I shall leave that for another PR that fixes teams WRT to new-guest-access.
 2017-05-12 17:39:38 +01:00
Luke Barnard 2b4c87aca6 Remove useless comment 2017-05-12 16:02:38 +01:00
Luke Barnard 536724e7c5 ES6 SessionStore 2017-05-12 15:58:44 +01:00
Luke Barnard 6ffe7ef9b2 Use same singleton impl as MatrixClientPeg for SessionStore 2017-05-12 15:50:01 +01:00
Luke Barnard 5c8187dc8f Explicitly pass thru userHasGeneratedPassword 2017-05-12 15:47:37 +01:00
Luke Barnard 1176573f39 Implement SessionStore 
This wraps session-related state into a basic flux store. The localStorage item 'mx_pass' is the only thing managed by this store for now but it could easily be extended to track other items (like the teamToken which is passed around through props a lot)
 2017-05-12 12:02:45 +01:00
Luke Barnard 8725ef3863 Remove "Current Password" input if mx_pass exists 
If the user is PWLU, do not show "Current Password" field in ChangePassword and when setting a new password, use the cached password.
 2017-05-11 17:47:45 +01:00
Michael Telatynski 5e4467adce hide settings/search appropriately 
pass inRoom prop to RoomHeader (defaults to false)
remove default onSettingsClick, handle if it is passed EVERYWHERE

if onSettingsClick is passes, show that button
show search button only if we are in the room, seems to fail otherwise
this seems to handle all cases I could throw at it. Give it your best

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-11 17:35:06 +01:00
Michael Telatynski f55b27f432 looks like it is passed and accessed like a string 
so unless I'm going insane, it should be a string.

fixes
```
rageshake.js:61 Warning: Failed prop type: The prop `onClick` is marked as required in `AccessibleButton`, but its value is `undefined`.
    in AccessibleButton (created by RoomHeader)
    in RoomHeader (created by RoomView)
    in div (created by RoomView)
    in RoomView (created by LoggedInView)
    in main (created by LoggedInView)
    in div (created by LoggedInView)
    in div (created by LoggedInView)
    in LoggedInView (created by MatrixChat)
    in MatrixChat
```

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-11 17:32:23 +01:00
Luke Barnard cfa108a28c No need to dispatch, just call setMxId 2017-05-11 17:07:03 +01:00
Luke Barnard 6326a95b39 Prevent ROUs from creating new chats/new rooms 
Spawn a SetMxIdDialog instead and do nothing.
 2017-05-11 17:04:11 +01:00
Luke Barnard 2437eb7910 Merge pull request #874 from matrix-org/luke/fix-rm-not-updating 
Fix RM not updating if RR event unpaginated
 2017-05-11 15:54:49 +01:00
Luke Barnard 5151264f60 Merge branch 'develop' into new-guest-access 
Conflicts:
	src/component-index.js
 2017-05-11 13:22:30 +01:00
Luke Barnard 852e1eb720 Rename some variables 
`ReadUpTo` -> `RR`
`ReadReceipt` -> `RR`
`ReadMarker` -> `RM`
 2017-05-11 09:31:59 +01:00
Luke Barnard 3815ad6cd0 Sent -> Event 2017-05-11 09:20:34 +01:00
Michael Telatynski 50092a0f1f fixes vector-im/riot-web#3881 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-10 15:16:49 +01:00
Luke Barnard 856ef58d46 fix commen 2017-05-10 14:55:58 +01:00
Luke Barnard fe8ea4ffe7 Rename vars, linting 2017-05-10 14:51:47 +01:00
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 6257bfcd87 Add prop type for onDifferentServerClicked 2017-05-10 14:28:48 +01:00
Luke Barnard ad2ed12980 Redesign mxID chooser, add availability checking 
Requires https://github.com/matrix-org/matrix-js-sdk/pull/432 for availability checking.

Changes:
 - Redesign the dialog to look more like https://github.com/vector-im/riot-web/issues/3604#issuecomment-299226875
 - Attempt to fix wrong password being stored by generating one per SetMxIdDialog (there's no issue tracking this for now, I shall open one if it persists)
 - Backwards compatible with servers that don't support register/availability - a spinner will appear the first time a username is checked because server support can only be determined after a request.
 - Rate-limited by a 2s debounce
 - General style improvements
 2017-05-10 14:22:17 +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 3549ff2543 Merge pull request #867 from matrix-org/t3chguy/BaseDialog-patch1 
Fixes 2 issues with Dialog closing
 2017-05-09 11:36:35 +01:00
Michael Telatynski f02e659fb7 Consume key{up,down,pressed} events 
so they don't trigger other things bubbling up
until Modal is closed
 2017-05-09 11:27:06 +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
Luke Barnard 1db677141e Merge pull request #871 from matrix-org/luke/fix-auto-reskindex 
Automatic Reskindex
 2017-05-09 09:36:32 +01:00
David Baker e5b1e4ce6d Merge pull request #873 from matrix-org/dbkr/room_name_in_leave_confirm 
Put room name in 'leave room' confirmation dialog
 2017-05-08 17:02:53 +01:00
David Baker 85ed39b9d8 Put room name in 'leave room' confirmation dialog 
https://github.com/vector-im/riot-web/issues/3850
 2017-05-08 16:49:40 +01:00
David Baker c01e8e85ac Merge pull request #872 from matrix-org/dbkr/fix_left_panel 
Fix this/self fail in LeftPanel
 2017-05-08 16:40:17 +01:00
David Baker 805354bd2c Revert unintentional change 2017-05-08 16:39:11 +01:00
David Baker 9cae667c06 Fix Create Room button 
Opened the DM dialog rather than the new room dialog
 2017-05-08 16:03:52 +01:00
David Baker 534f9277d4 Fix this/self fail in LeftPanel 2017-05-08 15:37:40 +01:00
Luke Barnard d1f467ee91 Remove auto-generated component-index 
This will now be generated as part of the build process (`npm run build`) and whilst developing (`npm run start`).
 2017-05-08 14:53:00 +01:00
Luke Barnard 39323647d1 Don't show null URL previews 
These are URLs that were spidered by the server without error but yielded an empty response from the server. There's nothing to display, so return an empty div.
 2017-05-08 14:01:44 +01:00
David Baker cafbe14589 Fix keys for AddressSelector 
Was using a property which just did not exist.
 2017-05-08 11:59:06 +01:00
David Baker c841eb641b Fix 'start chat' button 2017-05-08 11:26:25 +01:00
David Baker 3366d3bbae Merge pull request #859 from matrix-org/dbkr/left_panel_for_newbies_2 
Make left panel better for new users (mk II)
 2017-05-08 10:37:55 +01:00
Michael Telatynski bd32df4ef6 comment wording 2017-05-07 20:58:30 +01:00
Michael Telatynski 360f1cd250 completely missed the ESC check 
I need sleep
 2017-05-07 20:57:54 +01:00
Michael Telatynski 78e7272344 Fixes 2 issues with Dialog closing 
+ Upload Confirmation dialog would just change focus on ESC and not close
+ Keywords Dialog in UserSettings would also close UserSettings because event bubbled up
 2017-05-07 20:43:42 +01:00
Matthew Hodgson ceb71a4ef6 Merge pull request #866 from t3chguy/warn_on_unload 
Explicitly save composer content onUnload
 2017-05-07 20:07:09 +01:00
Michael Telatynski a141350670 Explicitly save composer content onUnload 
small oversight, caught by Matthew

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-07 20:01:55 +01:00
Matthew Hodgson 5900c879ce Merge pull request #851 from t3chguy/warn_on_unload 
Warn on unload
 2017-05-07 18:17:18 +01:00
Michael Telatynski 2b2b43a7f3 Content in Composer is not lost on unload so it should be fine 
to scare the user thinking they have lost all of their content
even though when they come back they can cry with joy :D

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-07 18:16:10 +01:00
Matthew Hodgson 2b71123ddc suppress null member rejoins again 
reverts f5fe4b2433
should fix https://github.com/vector-im/riot-web/issues/3788
 2017-05-06 01:45:37 +01:00
David Baker 1a0ea29995 Remove redundant role elements 2017-05-05 17:51:14 +01:00
Luke Barnard 6f4eb9d8b1 Show password nag bar when user is PWLU 2017-05-05 16:31:33 +01:00
David Baker 4fc4ae1e99 Size is a string, import react 
React gets put in by the JSX transpile
 2017-05-05 14:56:26 +01:00
Richard van der Hoff 28e0a32d6c Merge pull request #862 from matrix-org/rav/log_device_id 
Log deviceid at login
 2017-05-05 14:52:49 +01:00
David Baker 4a5821e199 Separate classes for the different buttons 
Also rename RoleButton to ActionButton because it's not being
given a Role any more.
 2017-05-05 14:25: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
David Baker f86ca5bc97 Hide empty tips if collapsed 2017-05-04 18:08:04 +01:00
Richard van der Hoff bfceaa827b Log deviceid at login 
- to help understand rageshakes
 2017-05-04 18:04:47 +01:00
Richard van der Hoff 8d4663f437 Fix lint in Lifecycle.js 2017-05-04 18:03:35 +01:00
Luke Barnard 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 Telatynski f76b9b4489 remove link to issue 
not very useful
 2017-05-04 17:25:23 +01:00
Luke Barnard 7918ff2fc2 Merge pull request #857 from t3chguy/t3chguy/settings_versions_improvements 
T3chguy/settings versions improvements
 2017-05-04 16:56:45 +01:00
Michael Telatynski 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
David Baker 72df43d22b Year 2017-05-04 15:46:24 +01:00
David Baker 306ea58578 Merge remote-tracking branch 'origin/develop' into dbkr/left_panel_for_newbies_2 2017-05-04 15:45:05 +01:00
David Baker 6a1d0fbab5 Make bottom left menu buttons use RoleButton too 2017-05-04 15:38:09 +01:00
David Baker 0998adb366 What year is it? Who's the president? 2017-05-04 15:02:21 +01:00
Luke Barnard d5b49a11d7 Merge pull request #829 from matrix-org/luke/fix-people-section-disappearing 
Remove DM-guessing code
 2017-05-04 14:15:28 +01:00
David Baker e1c99430cb Merge remote-tracking branch 'origin/develop' into dbkr/left_panel_for_newbies_2 2017-05-04 14:04:22 +01:00
David Baker ce119a6364 Add buttons to room sub list headers 2017-05-04 13:55:52 +01:00
Luke Barnard 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