Michael Telatynski
9493f4a872
fallback from undefined for interpolation
...
because _t called with undefined interpolation name: errorDetail
even though when its undef its not used to sprinf-js would have been fine...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-12 10:42:44 +01:00
Michael Telatynski
deb7ed660c
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/updating_stuff
2017-06-11 23:13:49 +01:00
Michael Telatynski
a520f0bfed
move all logic, make bar more generic
...
pass through actual errors
and tidy
needs testing
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-11 19:19:17 +01:00
Michael Telatynski
6592526109
change /!\ to Warning for accessibility (plus weird escaping?)
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-11 13:45:37 +01:00
Matthew Hodgson
919ca5d67c
fix missing string and broken var
2017-06-08 22:48:12 +01:00
Matthew Hodgson
d8f7262eac
Merge branch 'develop' into t3chguy/random_fix_1
2017-06-08 15:58:49 +01:00
Matthew Hodgson
da69d03b1d
i18n powered by [matrix] sanely
2017-06-08 13:50:53 +01:00
Matthew Hodgson
cabbd16dd3
fix colour & hyperlink for home page header
2017-06-08 12:06:52 +01:00
Luke Barnard
a158549a4c
Merge pull request #4039 from vector-im/new-guest-access
...
New guest access
2017-06-07 13:40:00 +01:00
David Baker
090a7c5761
Remove '/' from homepage URL
...
As we are not always at the root of the web server.
2017-06-07 11:20:41 +01:00
Luke Barnard
784e52f249
Align message timestamp centrally about the avatar mid-point
...
Tested visually against any unintended changes to the alignment of e2e icons, with timestamps on 12h and 24h mode.
2017-06-07 10:19:58 +01:00
David Baker
e30fcdba4c
Merge branch 'develop' into new-guest-access
2017-06-06 11:39:47 +01:00
Luke Barnard
feaff9d99d
Fix tests for new-guest-access
...
This time the test wasn't being flaky, but it does inspect a lot of the internal of RoomView, which has had some modifications recently. I've updated the test to reflect this and it passes locally.
Also, fix a bug in HomePage with an undeclared "error" which should be "err".
Let's see what Travis thinks of this!
2017-06-05 20:16:44 +01:00
Luke Barnard
0919b7ce3a
i18n for SetPasswordDialog
2017-06-05 16:13:44 +01:00
Michael Telatynski
5981887705
fix UpdateCheckBar image alt
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-03 16:04:01 +01:00
Michael Telatynski
a4c1aee5ea
correct file header
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-03 16:00:49 +01:00
Michael Telatynski
f5ba6fa952
i18n things
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
(cherry picked from commit d878c72)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-03 15:59:33 +01:00
Michael Telatynski
3ebd90565c
add clearer concept of timeout vs error
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
(cherry picked from commit 104c804)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-03 15:59:27 +01:00
Michael Telatynski
b95ad701af
match ENUM style to others in project
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
(cherry picked from commit a871815)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-03 15:59:18 +01:00
Michael Telatynski
efc68c078e
basic manual update stuff + update check bar
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-03 15:59:12 +01:00
Michael Telatynski
884322f82c
remove unused imports
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-02 21:57:42 +01:00
turt2live
640fa108fc
Support 12hr time on DateSeparator
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-06-01 09:52:42 -06:00
Matthew Hodgson
a8f0ed60cf
Merge branch 'new-guest-access' into matthew/i18n-welcome
2017-06-01 11:16:50 +01:00
Matthew Hodgson
623f995934
fix untested stuff with iframe homepages
2017-06-01 11:13:04 +01:00
Matthew Hodgson
a21c77f4dd
make it work
2017-06-01 00:07:47 +01:00
Kegan Dougal
a7659a57a8
Add remaining translations
2017-05-31 16:56:50 +01:00
Kegan Dougal
a3ebeb5c69
Sanitize translated HTML
2017-05-31 16:38:51 +01:00
Kegan Dougal
1dce9cda9e
Translate src/components/views/globals
...
directory and elements already done
2017-05-31 16:02:59 +01:00
Kegan Dougal
162f3872e5
Translate src/components/context_menus|dialogs
2017-05-31 15:40:49 +01:00
Matthew Hodgson
17e80d7757
i18n welcome
2017-05-31 11:02:59 +01:00
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
