Commit graph

2988 commits

Author SHA1 Message Date
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
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
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
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
3a379d09de Update translations
Actually translate the language dropdown label & add the string.
Remove some unused ones.
2017-05-25 16:52:15 +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
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
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
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
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
Michael Telatynski
8158ec6d54 touchups
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-25 01:25:17 +01:00
Michael Telatynski
09d0ab7df5 attempt to make media selector work everywhere (TM)
loadDevices not only in electron

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-25 01:01:40 +01:00
Michael Telatynski
a4b2bacc7e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into webrtc_settings 2017-05-25 00:26:38 +01:00
Luke Barnard
fffe425730 Add non-null RoomView key 2017-05-24 18:04:04 +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
Michael Telatynski
b9ac1222ed remove listener on unmount
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-24 15:55:37 +01:00
Michael Telatynski
1186207658 Initial Electron Settings - for Auto Launch
(opens path for Proxy Settings)

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-24 15:51:11 +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
David Baker
a95f3252b8 s/tabs/spaces/ 2017-05-24 10:48:10 +01:00