790fc7ca4a
Remove "new" from set password dialog
2017-05-25 15:26:44 +01:00
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
3779b74dae
Remove GuestWarningBar.scss from _components.scss
2017-05-25 14:51:24 +01:00
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
2fde2d58b6
Merge pull request #4020 from vector-im/luke/remove-guest-warning-bar
...
Remove GuestWarningBar
2017-05-25 14:30:14 +01:00
9d28c8f577
Move ref to outer div
2017-05-25 13:49:41 +01:00
284aeeb43e
Call out icons on hover
...
Conflicts:
src/components/structures/BottomLeftMenu.js
cherry-picking commit 39229c5.
2017-05-25 12:19:26 +01:00
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
bf716add99
Dedicated classes for the buttons
2017-05-25 12:08:14 +01:00
fce1164b58
Align buttons better with the text
2017-05-25 12:08:06 +01:00
9b1ffe6fda
Remove slightly misleading commented code
2017-05-25 12:07:59 +01:00
a5ea19b900
Remove commented code
2017-05-25 12:07:54 +01:00
e3342e36c0
Fix RoomSubList (RoomSubListHeader was removed)
2017-05-25 12:07:39 +01:00
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
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
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
ee85eb961a
Bulk change counterpart imports
...
to use react-sdk wrapper function, rather than using counterpart
directly.
2017-05-25 11:39:56 +01:00
365a46777c
Remove GuestWarningBar
2017-05-25 11:02:26 +01:00
e253f86c63
Improve teamToken prop doc on homePage
2017-05-25 10:23:26 +01:00
52a8039eb3
add more generic class for links/highlights within UserSettings
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-05-25 01:30:11 +01:00
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
a98792b05e
auto-launch support, ux =checkbox in UserSettings[Electron]
...
settings are sorta generic, probably reusable for proxy settings
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-05-24 15:52:08 +01:00
aaf948017a
Make language dropdown a more sensible width
2017-05-24 14:37:12 +01:00
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
c63e429c76
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/electron_call_sleep
2017-05-24 10:56:36 +01:00
ff1567ed2a
Remove spurious import
2017-05-23 17:09:09 +01:00
af6cc7bf9c
I don't really see why this is necessary
2017-05-23 17:06:49 +01:00
caca5cc00b
Remove c+ped UserSettingsStore functions
...
as they don't seem to be necessary
2017-05-23 17:06:02 +01:00
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
a6b11968a4
s/tabs/spaces/
2017-05-23 16:15:52 +01:00
6b6fa59f3e
Squash merge https://github.com/vector-im/riot-web/pull/3636
2017-05-23 14:12:53 +01:00
f57d8e4cb9
make ESLint a touch happier
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-05-22 18:31:30 +01:00
755c66b9f1
pass dispatcher through to electron, on a whitelist basis
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-05-22 18:30:45 +01:00
998739a7dc
Edit icon and styling
2017-05-22 18:00:40 +01:00
299dc7fe84
Merge branch 'develop' into new-guest-access
2017-05-22 16:17:36 +01:00
9fc57786f1
Add warm-fuzzy for successful password entry
2017-05-22 16:11:52 +01:00
5d712d27d3
autoFocus new password input in SetPasswordDialog
2017-05-22 14:45:40 +01:00
cae62c8383
MessageTimestamp now has 12 hour prop
2017-05-19 22:36:02 +01:00
1ebe819aa2
Revert _EventTile.scss padding.
2017-05-19 22:29:20 +01:00
9e37fa46b1
Add 12 hour support
2017-05-19 22:29:20 +01:00
8afc9f9a09
Add widget iframes and styling
2017-05-19 17:17:48 +01:00
dc990f47be
Fix app breakage with a 'version' file
...
Re-add accidenally removed variable initialiser
2017-05-19 17:02:48 +01:00
a9b5282ba3
Merge pull request #3909 from vector-im/t3chguy/favicon_improvements
...
Electron Tray Improvements
2017-05-19 16:22:11 +01:00
76bf869d87
Add type="text/css" to SVG logos
...
Without this, SVG renderers may not pick up the CSS in the SVGs at all, as is the case with librsvg.
2017-05-19 11:19:30 +01:00
09f987559b
rename action, now forwarding any event is possible, limited by where
...
button is shown, i.e easy to modify
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-05-19 01:30:36 +01:00
eaeac1230f
Merge branch 'develop' of github.com:vector-im/riot-web into forward_message
2017-05-19 01:15:31 +01:00
7777be89ee
only for finalised events
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-05-18 23:53:37 +01:00
b886215fdd
Merge pull request #3958 from vector-im/rav/roomdirectory_unmounting
...
Fix some setState-after-unmount in roomdirectory
2017-05-18 19:06:18 +01:00
d0adfb6469
CSS for left_aligned Dropdowns, and adjustments for Country dd in Login
2017-05-18 14:03:27 +01:00
1460eae280
Change background colour of login country dd to white
2017-05-18 13:43:21 +01:00
Luke Barnard