Matthew Hodgson
1e1a43c78f
support iframes for RTS urls
2017-05-30 21:52:43 +01:00
Matthew Hodgson
64a67583e0
Merge pull request #4038 from vector-im/tom-welcome-page
...
Tom welcome page
2017-05-30 21:36:21 +01:00
Matthew Hodgson
d264426ece
Merge branch 'develop' into new-guest-access
2017-05-30 21:06:45 +01:00
Matthew Hodgson
4493994dd5
Merge pull request #4092 from turt2live/travis/12hrtime-hotfix
...
Show 12hr time on hover too
2017-05-30 20:15:00 +01:00
Matthew Hodgson
386fcb96fd
Merge pull request #4087 from vector-im/kegan/translation-ape
...
Translate src/notifications
2017-05-30 20:14:10 +01:00
turt2live
676bd6196f
Show 12hr time on hover too
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-05-30 13:07:49 -06:00
Matthew Hodgson
f4c7aaf138
Merge pull request #4084 from vector-im/kegan/translation-monkey
...
Translate src/components/structures
2017-05-30 18:13:36 +01:00
Kegan Dougal
2a122a25fa
Translate notification strings
2017-05-30 17:39:41 +01:00
Kegan Dougal
7e21e00c99
Translate src/components/structures
2017-05-30 16:27:48 +01:00
Matthew Hodgson
60a56d0617
Merge pull request #4056 from vector-im/t3chguy/piwik
...
Piwik Analytics
2017-05-30 15:59:08 +01:00
Michael Telatynski
6a57742343
managed to eat the eventStatus check, can't redact a local-echo etc
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-30 14:19:33 +01:00
Matthew Hodgson
37b51b8a2a
translate login button
2017-05-30 12:25:27 +01:00
Matthew Hodgson
1f4f86b5f8
rework tom's welcome page to fit in slightly better with riot's UI/UX
...
* moves login button to top-left
* switches from iframe to a request() to load the welcome page to inherit CSS (probably breaks RTS :/)
* namespace CSS
* change the layout a bit.
2017-05-30 03:58:45 +01:00
Michael Telatynski
17c4e7a748
check PL on change as well as on comp load, that way it'll show remove button if PL increases later.
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 23:49:56 +01:00
Michael Telatynski
d3f9304598
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/show_redact_if_can
2017-05-29 23:17:44 +01:00
Michael Telatynski
dda73cecf9
make eslint happy about MatrixToolbar
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 19:12:04 +01:00
Matthew Hodgson
1af86405bd
Merge branch 'new-guest-access' into tom-welcome-page
2017-05-29 18:38:57 +01:00
Matthew Hodgson
8ef7dda7bd
fixing missing OK button on TextInputDialog
2017-05-29 16:43:28 +01:00
Matthew Hodgson
a92d96347b
Merge branch 'develop' into new-guest-access
2017-05-28 22:50:53 +01:00
Matthew Hodgson
da7c6ca856
Merge branch 'develop' into travis/redact-to-remove
2017-05-28 22:41:38 +01:00
Michael Telatynski
6969baa5a6
change event wording
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-28 13:08:09 +01:00
Matthew Hodgson
2f71dc9fe5
Merge branch 'develop' into forward_message
2017-05-28 02:37:10 +01:00
Michael Telatynski
21b88ecfd5
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/piwik
2017-05-27 20:59:26 +01:00
Michael Telatynski
61a67c52c5
initial piwik stuff
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-27 20:39:52 +01:00
Matthew Hodgson
4293273e55
fix a bunch of i18n fails picked up by check-i18n.pl
2017-05-27 19:26:19 +01:00
Luke Barnard
aa604612a7
Add "Login" button to RHS when user is a guest
2017-05-26 18:42:07 +01:00
David Baker
5e0457c32d
Merge pull request #4035 from vector-im/dbkr/translations
...
Translations!
2017-05-26 18:39:07 +01:00
Thomas Lant
8f083a5fdd
Welcome page + too much bootstrap stuff for now
2017-05-26 17:23:34 +00:00
David Baker
ee2a49ad41
Punctuation in translation strings
2017-05-26 13:46:01 +01:00
David Baker
92579cf463
Array literal
2017-05-26 13:36:58 +01:00
David Baker
d688eade43
Remove commented use strict
...
It's even less use in a comment
2017-05-26 13:34:18 +01:00
David Baker
810fb42458
Fix indenting
2017-05-26 13:25:46 +01:00
Luke Barnard
aa357ff6de
Always show HomeButton
2017-05-26 10:33:48 +01:00
David Baker
2982174028
No need for repeated OKs anymore
2017-05-25 18:21:40 +01:00
David Baker
c15a66d1d4
Fix up notification settings strings
2017-05-25 17:21:41 +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
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
Luke Barnard
9d28c8f577
Move ref to outer div
2017-05-25 13:49:41 +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
bf716add99
Dedicated classes for the buttons
2017-05-25 12:08:14 +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
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
