ef00a1624d
fix up RoomSettings somewhat and implement room colors
2016-01-08 03:22:38 +00:00
a3df50f4c3
Implement guest account upgrading
2016-01-07 17:23:32 +00:00
c64f36c81b
Merge branch 'develop' into kegan/guest-access
2016-01-07 13:21:06 +00:00
99abd58f1a
Merge remote-tracking branch 'origin/develop' into notif_sync
2016-01-07 10:41:16 +00:00
287da54fbc
Address PR comments
2016-01-07 10:38:44 +00:00
0772f50fab
update copyright for 2016
2016-01-07 04:06:52 +00:00
ae7b2d54bb
Merge branch 'develop' into kegan/guest-access
2016-01-05 11:39:36 +00:00
1af5018597
General code cleanup / tweaks / fixes
...
- Swap Phases enum to be using string literals
- Swap roomId prop on UserSettings for a more sane onUserSettingsClose and
make MatrixChat responsible for swapping the room.
- s/then/done/ when terminating Promise chains to avoid subtle errors.
- Rejig render() of UserSettings so we don't need to indent quite so much.
2015-12-23 11:47:56 +00:00
6ea3f21a8e
Favicon badges
2015-12-21 12:55:13 +00:00
e2ae2dd199
merge stuff from vector
2015-12-18 00:37:56 +00:00
6e324a0dd1
Whoops, didn't mean to add this
2015-12-17 15:12:09 +00:00
32bd9d155c
Pass a new prop 'startingQueryParams' to pluck out the email from the URL
...
This is preferable to doing the way other QPs are passed (secret, etc) because
the link in the email wants to look like "#/room/<room_id_or_alias>" for guest
read-access (only bouncing you to /login if that room is not readable by guests).
This is hard to do in the current arch because we don't preserve QPs on /room
paths, and we do conditional executions depending on if it is a room ID or
alias. Rather than threading through the email in each section and creating
a fragile mess, just pass the *starting* set of query parameters through to
MatrixChat which can then do the Right Thing when the time comes.
2015-12-17 14:56:55 +00:00
a670a7e4c4
Don't spam logging
2015-12-15 14:23:58 +00:00
68cdff1159
Fix 'Create room' and 'Settings' buttons
...
These buttons were broken by PR #49... wire them up correctly.
2015-12-14 11:07:59 +00:00
5ce917ba84
merge in develop
2015-12-13 14:47:53 +00:00
6ad6ed2a49
factor out room-leaving code into MatrixChat for now, and add a dedicated leave button in to the header bar for now
2015-12-13 13:49:28 +00:00
b7699c0544
Save scroll state when swapping to non-room pages too
2015-12-10 21:53:14 +00:00
d9782b35e1
Fix review comments
...
camelcasing and comments
2015-12-10 21:44:30 +00:00
00656fc1dc
Preserve scroll offset when switching rooms
...
When we change rooms, save the scroll offset, and restore the scroll when we
switch back.
Hopefully this fixes https://github.com/vector-im/vector-web/issues/80 .
2015-12-10 16:26:36 +00:00
b64e5d49cc
Add magic flag to say 'dump pending events to the end'
2015-12-07 15:33:58 +00:00
92cf14d5e9
Support registration as a guest
2015-12-04 15:28:35 +00:00
d0ec84fe59
Hook up auto-registration as a guest to MatrixChat.
2015-12-04 11:34:50 +00:00
636be0c003
Update getComponent paths
2015-12-01 15:45:11 +00:00
726c893663
Merge branch 'develop' into kegan/vector-components
2015-12-01 15:39:15 +00:00
d5819d54db
Fix typos
2015-12-01 15:36:40 +00:00
784c1b63dc
Move remaining vector molecules to components
2015-12-01 11:19:25 +00:00
1e694da460
Move MatrixChat and login components to react SDK.
...
Removed Modulator as it is no longer necessary in this form. ConferenceHandler
is injected in src/vector/index.js
2015-11-30 18:11:04 +00:00
Matthew Hodgson