1af86405bd
Merge branch 'new-guest-access' into tom-welcome-page
2017-05-29 18:38:57 +01:00
a92d96347b
Merge branch 'develop' into new-guest-access
2017-05-28 22:50:53 +01:00
2f71dc9fe5
Merge branch 'develop' into forward_message
2017-05-28 02:37:10 +01:00
4293273e55
fix a bunch of i18n fails picked up by check-i18n.pl
2017-05-27 19:26:19 +01:00
aa604612a7
Add "Login" button to RHS when user is a guest
2017-05-26 18:42:07 +01:00
5e0457c32d
Merge pull request #4035 from vector-im/dbkr/translations
...
Translations!
2017-05-26 18:39:07 +01:00
8f083a5fdd
Welcome page + too much bootstrap stuff for now
2017-05-26 17:23:34 +00:00
ee2a49ad41
Punctuation in translation strings
2017-05-26 13:46:01 +01:00
92579cf463
Array literal
2017-05-26 13:36:58 +01:00
d688eade43
Remove commented use strict
...
It's even less use in a comment
2017-05-26 13:34:18 +01:00
810fb42458
Fix indenting
2017-05-26 13:25:46 +01:00
aa357ff6de
Always show HomeButton
2017-05-26 10:33:48 +01:00
2982174028
No need for repeated OKs anymore
2017-05-25 18:21:40 +01:00
c15a66d1d4
Fix up notification settings strings
2017-05-25 17:21:41 +01:00
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
790fc7ca4a
Remove "new" from set password dialog
2017-05-25 15:26:44 +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
bf716add99
Dedicated classes for the buttons
2017-05-25 12:08:14 +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
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
6b6fa59f3e
Squash merge https://github.com/vector-im/riot-web/pull/3636
2017-05-23 14:12:53 +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
9e37fa46b1
Add 12 hour support
2017-05-19 22:29:20 +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
86055bc476
Fix some setState-after-unmount in roomdirectory
...
Give the RoomDirectory and unmounted guard, and use it to avoid some setState
warnings. Also, cancel the filterTimeout (no point in leaving it around).
There are still plenty of other opportunities to setState after unmount, but
the filterTimeout was causing noise in the test.
2017-05-18 13:41:54 +01:00
7ea0ecd125
Merge branch 'new_release_process_stable' into develop
...
This reverts PRs on riot-web marked as notready, turning the develop
branch into a more stable version.
2017-05-17 10:43:02 +01:00
9fc9de3af5
Revert "Merge pull request #3654 from vector-im/matthew/quick-search"
...
This reverts commit 8f20fcfa6b751f715e77
2017-05-16 17:21:49 +01:00
844ea390c8
Revert "clear the searchbox after quick-search"
...
This reverts commit ddd12edc06
2017-05-16 17:13:55 +01:00
fdf326c9f0
Revert "Cancel quick-search on Escape, clearing it and returning focus to composer."
...
This reverts commit 52a119244b
2017-05-16 17:13:39 +01:00
9399b7ddf0
Revert "fix incoming call box"
...
This reverts commit b3431bb750
2017-05-16 16:35:17 +01:00
03476705b1
Revert "better solution to incomingcallbox weirdness"
...
This reverts commit be52787473
2017-05-16 16:35:06 +01:00
3cead032c2
Revert "Merge pull request #3804 from vector-im/dbkr/left_panel_for_newbies_2"
...
This reverts commit e6133820a2d1db602b3a
2017-05-16 16:27:58 +01:00
219bfffea2
Only dispatch password_changed when password has changed
2017-05-16 14:24:09 +01:00
11d88aa6a2
import dispatcher
2017-05-16 13:56:12 +01:00
Matthew Hodgson