93a3c896a4
un-i18n Modal Analytics
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-27 17:45:02 +01:00
4fa85723ab
Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist
2017-07-25 17:16:05 +01:00
3ff628254d
CSS for group userlist
2017-07-25 15:56:40 +01:00
bc2f639aae
Fix a couple of minor errors in the room list
...
bluebird promises don't support .fail, so some operations didn't work quite
right. We should use .catch instead.
2017-07-24 17:19:46 +01:00
76181f4771
Merge remote-tracking branch 'origin/develop' into rav/bluebird
2017-07-13 12:04:54 +01:00
b29b4a959b
q(...) -> Promise.resolve
...
```
find src test -name '*.js' | xargs perl -i -pe 's/\b[qQ]\(/Promise.resolve(/'
```
2017-07-13 00:50:01 +01:00
10decf95f6
replace imports of `q` with bluebird
...
update `package.json`
```
find src test -name '*.js' |
xargs perl -i -pe 'if (/require\(.[qQ].\)/) { $_ = "import Promise from '\''bluebird'\'';\n"; }'
find src test -name '*.js' |
xargs perl -i -pe 'if (/import [qQ] /) { $_ = "import Promise from '\''bluebird'\'';\n"; }'
```
2017-07-13 00:48:31 +01:00
188a58e5c7
RateLimitedFunc -> rate_limited_func
2017-07-12 18:18:13 +01:00
3e1a909b1d
Just use the onKeyDown of the <input>
2017-07-12 17:46:27 +01:00
41cd238e02
Update to reflect previous implementation
...
Which was a74bbb424c
2017-07-12 17:10:43 +01:00
4fe4e10abb
Implement the focus_room_filter action
...
This is for ctrl+k room filtering and switching
2017-07-12 13:49:57 +01:00
bc60fa81af
more HomePage tweaks
...
* Don't log errors with no context
* i18nify the "Couldn't load home page" message
2017-07-11 14:29:47 +01:00
d755903fdb
typo
2017-07-11 14:10:18 +01:00
8ac26dd19f
Give HomePage an unmounted guard
...
Also add missing return in error-handling path
2017-07-11 14:08:16 +01:00
60703bdcfc
Log errors thrown by getThirdpartyProtocols
...
- so that it appears in rageshakes and test logs.
2017-07-05 10:54:10 +01:00
1c82b7b0c3
add register button
2017-06-19 00:54:07 +01:00
91295c68ad
Don't show the tooltips when filtering rooms
...
Fixes https://github.com/vector-im/riot-web/issues/4281
2017-06-12 17:54:58 +01:00
bbb9dd9228
Fix broken riot.im link on homepage
...
For want of a quote the something something
Also add noopeners
2017-06-12 17:33:02 +01:00
d8f7262eac
Merge branch 'develop' into t3chguy/random_fix_1
2017-06-08 15:58:49 +01:00
da69d03b1d
i18n powered by [matrix] sanely
2017-06-08 13:50:53 +01:00
cabbd16dd3
fix colour & hyperlink for home page header
2017-06-08 12:06:52 +01:00
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
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
884322f82c
remove unused imports
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-02 21:57:42 +01:00
a8f0ed60cf
Merge branch 'new-guest-access' into matthew/i18n-welcome
2017-06-01 11:16:50 +01:00
623f995934
fix untested stuff with iframe homepages
2017-06-01 11:13:04 +01:00
a21c77f4dd
make it work
2017-06-01 00:07:47 +01:00
17e80d7757
i18n welcome
2017-05-31 11:02:59 +01:00
1e1a43c78f
support iframes for RTS urls
2017-05-30 21:52:43 +01:00
64a67583e0
Merge pull request #4038 from vector-im/tom-welcome-page
...
Tom welcome page
2017-05-30 21:36:21 +01:00
d264426ece
Merge branch 'develop' into new-guest-access
2017-05-30 21:06:45 +01:00
f4c7aaf138
Merge pull request #4084 from vector-im/kegan/translation-monkey
...
Translate src/components/structures
2017-05-30 18:13:36 +01:00
7e21e00c99
Translate src/components/structures
2017-05-30 16:27:48 +01:00
37b51b8a2a
translate login button
2017-05-30 12:25:27 +01:00
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
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
6969baa5a6
change event wording
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-28 13:08:09 +01:00
61a67c52c5
initial piwik stuff
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-27 20:39:52 +01:00
aa604612a7
Add "Login" button to RHS when user is a guest
2017-05-26 18:42:07 +01:00
8f083a5fdd
Welcome page + too much bootstrap stuff for now
2017-05-26 17:23:34 +00:00
810fb42458
Fix indenting
2017-05-26 13:25:46 +01:00
aa357ff6de
Always show HomeButton
2017-05-26 10:33:48 +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
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
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
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
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
79d32868a6
Replace NeedToRegister with SetMxId dialog
2017-05-16 11:39:30 +01:00
e6133820a2
Merge pull request #3804 from vector-im/dbkr/left_panel_for_newbies_2
...
Make left panel better for new users (mk II)
2017-05-08 10:37:59 +01:00
0deed1b511
Merge pull request #3790 from t3chguy/patch-2
...
Fix scope of callback
2017-05-05 18:25:29 +01:00
c27f39714a
Dedicated classes for the buttons
2017-05-05 14:26:13 +01:00
23a141c5ad
Remove slightly misleading commented code
2017-05-04 17:46:44 +01:00
da960e776d
Remove commented code
2017-05-04 17:45:11 +01:00
2bf0074953
Make bottom left menu buttons use RoleButton too
2017-05-04 15:38:53 +01:00
ff709ed8b1
Fix import
2017-05-04 14:53:13 +01:00
095da68aac
Add buttons to room sub list headers
2017-05-04 13:58:17 +01:00
9997cc9891
import Modal
...
class seems to be referring to Modal but does not import it
2017-05-02 22:27:30 +01:00
d5009962cd
Fix scope of callback
...
This may have led to the room list not refreshing on error of deleting alias
2017-05-02 22:19:32 +01:00
96c867b34b
Make left panel more friendly to new users
...
https://github.com/vector-im/riot-web/issues/3609
2017-04-28 11:23:13 +01:00
4eb0ca63a9
Revert commits acciderntally put on develop
2017-04-28 11:22:05 +01:00
431b8aaefa
Make left panel more friendly to new users
...
https://github.com/vector-im/riot-web/issues/3609
2017-04-28 11:10:41 +01:00
afb4b79d81
Improve Room Directory Look & Feel
...
By adding an icon next to the title.
Requires https://github.com/matrix-org/matrix-react-sdk/pull/848
2017-04-27 18:04:41 +01:00
40eceaf9bc
show err.message in errors if present
2017-04-23 02:22:31 +01:00
ab5ec04507
oops
2017-04-23 01:01:38 +01:00
b1ff0b9e65
hook up keyb shortcuts for roomdir
2017-04-23 01:00:25 +01:00
be52787473
better solution to incomingcallbox weirdness
2017-04-22 17:37:16 +01:00
b3431bb750
fix incoming call box
2017-04-22 17:28:09 +01:00
52a119244b
Cancel quick-search on Escape, clearing it and returning focus to composer.
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-21 01:21:25 +01:00
ddd12edc06
clear the searchbox after quick-search
2017-04-20 14:21:36 +01:00
c1d30664de
pass through selectedRoom
2017-04-20 01:13:13 +01:00
1803a0df9e
select any existing filter text on ctrl-k
2017-04-20 00:04:08 +01:00
e780fe4067
we don't need RoomTile specific focus in the end
2017-04-18 22:54:20 +01:00
acbc3e9f9b
move RoomSubList.refreshHeader to apply to the whole RoomSubList again
2017-04-18 19:27:57 +01:00
a8daa53a5b
always let tab/shift-tab select sublist headers
2017-04-18 17:49:50 +01:00
053beae035
move focus-via-up/down cursors to LeftPanel
2017-04-18 17:36:23 +01:00
f8aa2c3487
fix bugs in RoomSubListHeader splitout
2017-04-18 02:43:06 +01:00
5ff49f4000
split out header from RoomSubList and let it update separately
...
By moving the header into its own RoomSubListHeader, we can refresh it explicitly
by poking it by the new constantTimeDispatcher without re-rendering the whole stack
of room tiles
*UNTESTED*
2017-04-17 20:53:52 +01:00
c6ee221ae4
typos
2017-04-16 15:58:00 +01:00
8351ec9738
thread RoomTile focus events through RoomSubList up to RoomList
2017-04-15 13:23:11 +01:00
27de972bfb
oops
2017-04-15 12:02:50 +01:00
e5e259e1f8
put a ! on invite sublists
2017-04-15 12:02:16 +01:00
a74bbb424c
cmd-k shortcut to the searchbox
2017-04-15 11:37:09 +01:00
91892ec18b
Do not assume getTs will return comparable integer
...
Fixes https://github.com/vector-im/riot-web/issues/3529 . In the worst case, tsOfNewestEvent will return MAX_SAFE_INTEGER, instead of undefined, as may be the case of some events that were redacted and persisted in indexDB before changes were made to how events are redacted locally. (The important change is that events are now not stripped of their `origin_server_ts`).
2017-03-29 14:30:08 +01:00
d696196d72
fix https://github.com/vector-im/riot-web/issues/3348
2017-03-27 12:39:58 +01:00
f8298b2482
Fix the people section
...
This does two things:
- Fixes an incorrect import that was causing Direct Chat toggle to not be editable https://github.com/vector-im/riot-web/issues/3355
- Use props.list in RoomSubList when calculating whether to show IncomingCallDialog. Fixes https://github.com/vector-im/riot-web/issues/2956
2017-03-16 11:36:57 +00:00
d639eb1049
beautify all error msgs
2017-03-12 23:26:26 +00:00
611bb3a857
beautiful error on roomdirectory fail
2017-03-12 20:04:02 +00:00
3d67234372
`view_room` dispatch from `onClick` RoomTile
...
So that RoomTile does less, and if other things should happen onClick, they happen in the same place as the `view_room` for clarity.
2017-03-06 17:55:12 +00:00
78aaf6b47e
Use the teamToken threaded through from react sdk
...
The bottom left menu now uses the same teamToken that the rest of the components use. This will require changes to react-sdk: https://github.com/matrix-org/matrix-react-sdk/pull/684
2017-02-10 09:56:15 +00:00
5b239adfb8
Fix bug with home icon not appearing when logged in as team member
2017-02-07 14:58:25 +00:00
fa552ad5af
Merge branch 'develop' into luke/rts-welcome-pages
2017-02-07 12:41:52 +01:00
35bc384c51
Set team token in state on mount
2017-02-07 11:39:31 +00:00
d490bd8638
Use home.html rather than welcome.html
2017-02-07 11:35:17 +00:00
8d4f81ff67
Remove redundant inline style
2017-02-07 11:34:49 +00:00
648204b6f9
Use import
2017-02-07 11:34:34 +00:00
3f49f020cf
Copyright
2017-02-07 11:19:01 +00:00
7ceaabb166
RightPanel: remove superfluous divs
2017-02-03 12:00:33 +00:00
67e14ff363
Merge branch 'develop' into rav/hotkey-ux
2017-02-03 11:43:32 +00:00
4c3a723aa8
make TopRightMenu more intuitive
...
should fix https://github.com/vector-im/riot-web/issues/2827
2017-02-02 18:42:03 +00:00
a2622a556c
Remove SdkConfig dep
2017-02-02 14:01:12 +00:00
6a9e5deb7b
Remove commented code
2017-02-02 14:00:21 +00:00
f2e62ff439
Use RTS URL passed through
2017-02-02 11:58:20 +00:00
4a34bee2dc
Use localStorage `mx_team_token` to decide welcome page
2017-02-02 11:12:43 +00:00
40609d7da3
then->done
2017-02-01 11:39:23 +00:00
1f3ab4425a
Merge branch 'develop' into matthew/homepages
...
Conflicts:
src/component-index.js
src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomPreviewBar.scss
2017-02-01 11:34:24 +00:00
5edb5f6487
Turned divs to button-likes to comply with MDN's recommendations
2017-01-14 02:11:58 +02:00
bb28903c8e
fix warning page
2016-12-24 01:36:00 +00:00
42357dee0b
Typo
2016-12-16 16:36:24 +00:00
2e73cd6c4d
PR feedback
2016-12-16 16:24:24 +00:00
994bc9279f
Remove the client side filtering from the room dir
...
This removes the ability for the client to filter remote room
directories by network, since the /thirdparty/protocols API does
not yet work for remote servers. They would only get the main list
now though anyway, so there is no point in us continuing to support
it.
2016-12-16 14:17:13 +00:00
98cad8779c
Add instance_id to initial state
2016-12-15 10:42:11 +00:00
f5bd8abfda
Support room dir 3rd party network filtering
...
As per https://github.com/matrix-org/synapse/pull/1676
The existing local config system still exists and is used for
remote home server directories (since /thirdparty/protocols
doesn't support listing remote home servers, and also because
people are using it).
2016-12-14 15:41:15 +00:00
81d70a921d
Add a 'View decrypted source' button
2016-11-16 23:10:51 +00:00
3f640139d2
quick and dirty support for custom welcome pages, with an example for geektime techfest
2016-11-13 14:10:33 +00:00
323bd79d0e
Fix join button for 'matrix' networks
...
Fixes https://github.com/vector-im/vector-web/issues/2435
2016-10-10 11:21:20 +01:00
5e293c0f45
Don't stop paginating if no rooms match
...
Always show the scrollpanel otherwise we stop paginating if there
are no matching rooms in the first request (as per comment).
Fixes no freenode rooms being shown.
2016-10-05 18:06:43 +01:00
ea38968be9
Merge pull request #2379 from vector-im/dbkr/join_3p_location
...
Add native joining of 3p networks to room dir
2016-10-05 14:00:21 +01:00
c0a4574069
For single instance, allow domain present & match
2016-10-04 15:30:46 +01:00
de9bf4bb47
Actually use variable
2016-10-04 15:18:07 +01:00
304e5b997a
PR Freedback
2016-10-04 11:04:01 +01:00
000ca35727
Don't pop up errors when this API fails for guests
2016-10-03 16:30:57 +01:00
776fe2ad70
Different way of getting fields for 3p location
...
Try to match protocol insance from 'domain' field and use its
fields for all but the last field. Assume the last takes the user
input.
2016-10-03 13:42:55 +01:00
b71b1b5535
Use more variables
2016-09-30 09:39:30 +01:00
2a37a0cb19
Room directory: indicate when there are no results
...
Fixes https://github.com/vector-im/vector-web/issues/2250
2016-09-29 15:45:45 +01:00
761600f325
Add native joining of 3p networks to room dir
...
Use the 3rd party location lookup API to accept third-party locations
in their native form and look up the corresponding portal room for
that location.
Also give the network dropdown some placeholder text.
Fixes https://github.com/vector-im/vector-web/issues/2374
2016-09-29 15:30:54 +01:00
65f14c7d21
Stop random rooms appearing when switching network
...
in the public room directory
2016-09-28 14:18:40 +01:00
5ca391f914
Replace double truth test with something sane
...
Also typo
2016-09-28 11:04:13 +01:00
6ff1c30a4b
Fix spurious fill requests when switching networks
...
Ignore responses for old servers too, don't trigger a backfill request
when we re-render before refresh. Also a few more comments.
2016-09-28 10:08:03 +01:00
85ea45a64a
Room dir: New filtering & 3rd party networks
...
Changes filtering on 3rd party networks to divide into portal / non portal rooms and not show portal rooms by default. Adds a special '_matrix' network for all rooms that aren't portal rooms.
Also adds ability to query 3rd party directory servers.
2016-09-27 19:39:20 +01:00
bf58c340bc
Oops, missed the ref
2016-09-26 15:30:42 +01:00
dc0b15bdfa
Remove unused variable / function
2016-09-26 14:17:36 +01:00
51a5542446
Make tests pass
2016-09-23 18:20:31 +01:00
Michael Telatynski