Commit Graph

3542 Commits

Author SHA1 Message Date
David Baker
2982174028 No need for repeated OKs anymore 2017-05-25 18:21:40 +01:00
Luke Barnard
b25e6eb2a9 Merge pull request #4026 from vector-im/luke/new-guest-access-rejig-nagbar
Rejig the PaswordNagBar
2017-05-25 17:57:16 +01:00
David Baker
c15a66d1d4 Fix up notification settings strings 2017-05-25 17:21:41 +01:00
David Baker
003238c1e7 Update for new API in react-sdk
We now get multiple languages from the browser as there may be
a whole preference list
2017-05-25 16:47:12 +01:00
Luke Barnard
1db3ba676d Rejig the PaswordNagBar
- Change the nag bar to read "To return to your account in future you need to set a password"
 - Underline "Set a password"
 - Make the whole thing clickable
2017-05-25 15:33:40 +01:00
Luke Barnard
790fc7ca4a Remove "new" from set password dialog 2017-05-25 15:26:44 +01:00
Luke Barnard
6c1b6f0476 Merge pull request #4024 from vector-im/luke/new-guest-access-fix-team-server-no-config
Allow team server config to be missing
2017-05-25 15:07:59 +01:00
Luke Barnard
3779b74dae Remove GuestWarningBar.scss from _components.scss 2017-05-25 14:51:24 +01:00
Luke Barnard
41e7706bc6 Allow team server config to be missing
, default to welcome page if either the teamToken or teamServerURL is undefined.
2017-05-25 14:35:59 +01:00
David Baker
2fde2d58b6 Merge pull request #4020 from vector-im/luke/remove-guest-warning-bar
Remove GuestWarningBar
2017-05-25 14:30:14 +01:00
David Baker
85aa390c8f Merge pull request #4023 from vector-im/luke/new-guest-access-left-panel
Make left panel better for new users (mk III)
2017-05-25 14:17:34 +01:00
Luke Barnard
9d28c8f577 Move ref to outer div 2017-05-25 13:49:41 +01:00
David Baker
5ccab395d7 Merge pull request #4021 from vector-im/t3chguy/electron_context_menus
add moar context menus [Electron]
2017-05-25 13:49:23 +01:00
David Baker
dd1c9a4477 Merge pull request #4022 from vector-im/t3chguy/patch-2
Add `Chat` to Linux app categories
2017-05-25 13:35:50 +01:00
Michael Telatynski
9cd04509bf Add Chat to Linux app categories
most dists inc Arch have Chat and IRCClient,
though the latter isn't exactly correct so missing it
2017-05-25 13:22:01 +01:00
Michael Telatynski
727e267853 we don't really need a webContents like that, so pass if needed
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-25 12:47:36 +01:00
Michael Telatynski
c4c78c9b3e split webContents context handling into own file, as main was growing
add handlers for editable fields, with Cut Copy Paste Undo Redo etc
add Copy Image feature to all images, working on not only the download
buttons now

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-25 12:42:53 +01:00
David Baker
284aeeb43e Call out icons on hover
Conflicts:
	src/components/structures/BottomLeftMenu.js

cherry-picking commit 39229c5.
2017-05-25 12:19:26 +01:00
David Baker
7636212bed Remove refs to counterpart
and remove extCounterpart which is unnecessary now we just use a
single counterpart instance
2017-05-25 12:08:47 +01:00
David Baker
bf716add99 Dedicated classes for the buttons 2017-05-25 12:08:14 +01:00
David Baker
fce1164b58 Align buttons better with the text 2017-05-25 12:08:06 +01:00
David Baker
9b1ffe6fda Remove slightly misleading commented code 2017-05-25 12:07:59 +01:00
David Baker
a5ea19b900 Remove commented code 2017-05-25 12:07:54 +01:00
Luke Barnard
e3342e36c0 Fix RoomSubList (RoomSubListHeader was removed) 2017-05-25 12:07:39 +01:00
David Baker
67ecd94b4a Make bottom left menu buttons use RoleButton too
Conflicts:
	src/components/structures/BottomLeftMenu.js

cherry-picking commit 2bf0074.
2017-05-25 12:06:49 +01:00
David Baker
d81f894a50 Add buttons to room sub list headers
Conflicts:
	src/components/structures/RoomSubList.js
	src/components/structures/RoomSubListHeader.js

cherry-picking commit 095da68.
2017-05-25 11:58:12 +01:00
David Baker
af305ea540 Make left panel more friendly to new users
https://github.com/vector-im/riot-web/issues/3609
2017-05-25 11:42:12 +01:00
David Baker
b95da4a40c No longer need counterpart
We now use stock counterpart, but indirectly via react-sdk so no
need to depend on it directly.
2017-05-25 11:40:31 +01:00
David Baker
ee85eb961a Bulk change counterpart imports
to use react-sdk wrapper function, rather than using counterpart
directly.
2017-05-25 11:39:56 +01:00
Luke Barnard
365a46777c Remove GuestWarningBar 2017-05-25 11:02:26 +01:00
Luke Barnard
36ec156d2e Merge pull request #4015 from vector-im/luke/new-guest-access-default-welcome
Implement default welcome page and allow custom URL /w config
2017-05-25 10:28:55 +01:00
Luke Barnard
e253f86c63 Improve teamToken prop doc on homePage 2017-05-25 10:23:26 +01:00
Luke Barnard
43bd88777c Remove potentially confusing sample config 2017-05-25 10:10:26 +01:00
Luke Barnard
efb6316ba0 Implement default welcome page and allow custom URL /w config
counterpart to https://github.com/matrix-org/matrix-react-sdk/pull/922
2017-05-24 17:58:03 +01:00
David Baker
aaf948017a Make language dropdown a more sensible width 2017-05-24 14:37:12 +01:00
David Baker
d4aa428321 Move translation status image to i18n section 2017-05-24 14:23:34 +01:00
David Baker
d5425b62a1 Don't inject languages into the config
If we're defaulting this it should really be by the component
itself or with the other defaukts in SdkConfig, but we've decided
to leave out support for reading languages from the config file as
it's only useful for a Riot admin to restrict the choice of
languages available to users which is of debateable use.
2017-05-24 11:27:06 +01:00
Michael Telatynski
c63e429c76 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/electron_call_sleep 2017-05-24 10:56:36 +01:00
David Baker
ff1567ed2a Remove spurious import 2017-05-23 17:09:09 +01:00
David Baker
af6cc7bf9c I don't really see why this is necessary 2017-05-23 17:06:49 +01:00
David Baker
caca5cc00b Remove c+ped UserSettingsStore functions
as they don't seem to be necessary
2017-05-23 17:06:02 +01:00
David Baker
241d95293e Code style fixes
Use async/await consistently rather than flipping between that and
callbacks, s/var/let/, indenting
2017-05-23 16:44:54 +01:00
David Baker
a6b11968a4 s/tabs/spaces/ 2017-05-23 16:15:52 +01:00
David Baker
3f3f230a77 Remove accidentally comitted yarn stuff 2017-05-23 14:20:51 +01:00
David Baker
6b6fa59f3e Squash merge https://github.com/vector-im/riot-web/pull/3636 2017-05-23 14:12:53 +01:00
Michael Telatynski
8994c2bad1 missed a concat :)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-22 19:28:01 +01:00
Michael Telatynski
e0fb2fd074 /me forgets we don't have babel
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-22 19:25:56 +01:00
Michael Telatynski
4bb054c955 electron stuff isn't actually using flow, so don't enable it
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-22 19:25:18 +01:00
Michael Telatynski
911c3bcf6e tidy electron files, they were starting to annoy me
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-22 19:21:52 +01:00
Michael Telatynski
4944bfdaa2 onAction support in Electron process, disable powersave when in call
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-22 18:32:39 +01:00