David Baker
6b6fa59f3e
Squash merge https://github.com/vector-im/riot-web/pull/3636
2017-05-23 14:12:53 +01:00
Luke Barnard
299dc7fe84
Merge branch 'develop' into new-guest-access
2017-05-22 16:17:36 +01:00
Luke Barnard
9fc57786f1
Add warm-fuzzy for successful password entry
2017-05-22 16:11:52 +01:00
Luke Barnard
5d712d27d3
autoFocus new password input in SetPasswordDialog
2017-05-22 14:45:40 +01:00
Kieran Gould
cae62c8383
MessageTimestamp now has 12 hour prop
2017-05-19 22:36:02 +01:00
Maxwell Kepler
9e37fa46b1
Add 12 hour support
2017-05-19 22:29:20 +01:00
Michael Telatynski
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
Michael Telatynski
eaeac1230f
Merge branch 'develop' of github.com:vector-im/riot-web into forward_message
2017-05-19 01:15:31 +01:00
Michael Telatynski
7777be89ee
only for finalised events
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-18 23:53:37 +01:00
Richard van der Hoff
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
David Baker
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
David Baker
9fc9de3af5
Revert "Merge pull request #3654 from vector-im/matthew/quick-search"
...
This reverts commit 8f20fcfa6b
, reversing
changes made to 751f715e77
.
2017-05-16 17:21:49 +01:00
David Baker
844ea390c8
Revert "clear the searchbox after quick-search"
...
This reverts commit ddd12edc06
.
2017-05-16 17:13:55 +01:00
David Baker
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
David Baker
9399b7ddf0
Revert "fix incoming call box"
...
This reverts commit b3431bb750
.
2017-05-16 16:35:17 +01:00
David Baker
03476705b1
Revert "better solution to incomingcallbox weirdness"
...
This reverts commit be52787473
.
2017-05-16 16:35:06 +01:00
David Baker
3cead032c2
Revert "Merge pull request #3804 from vector-im/dbkr/left_panel_for_newbies_2"
...
This reverts commit e6133820a2
, reversing
changes made to d1db602b3a
.
2017-05-16 16:27:58 +01:00
Luke Barnard
219bfffea2
Only dispatch password_changed when password has changed
2017-05-16 14:24:09 +01:00
Michael Telatynski
58ada2c27d
move mxEvent.status check to js-sdk
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-16 14:14:06 +01:00
Michael Telatynski
db78534b45
remove no longer required parseIntWithDefault
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-16 14:10:00 +01:00
Michael Telatynski
d55f4f9e6a
use new RoomState method from matrix-org/matrix-js-sdk/pull/435
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-16 14:08:00 +01:00
Luke Barnard
11d88aa6a2
import dispatcher
2017-05-16 13:56:12 +01:00
Luke Barnard
36ec39ffc0
Merge branch 'new-guest-access' into luke/new-guest-access-set-pwd-dialog
2017-05-16 13:49:18 +01:00
Luke Barnard
48856c31f8
Dispatch password_changed when SetPasswordDialog finished
2017-05-16 13:48:56 +01:00
Michael Telatynski
aff1e14efc
first go at show redact only if we can redact
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-16 13:15:14 +01:00
Luke Barnard
e367fb5a98
disabledConfirmation -> confirm
2017-05-16 12:45:30 +01:00
Luke Barnard
79d32868a6
Replace NeedToRegister with SetMxId dialog
2017-05-16 11:39:30 +01:00
Luke Barnard
5814a3fdc8
Fix copyright
2017-05-16 10:11:44 +01:00
Luke Barnard
0e787a09c3
Implement dialog to set password
...
Until https://github.com/matrix-org/matrix-react-sdk/pull/881 , ChangePassword will not know about the cached password (so it won't hide "Current Password" yet).
There's also a bit of work left - informing the SessionStore that the password has changed (marked with a TODO)
2017-05-16 09:44:52 +01:00
Matthew Hodgson
25a727b8d8
use full date formats on timestamps - fixes https://github.com/vector-im/riot-web/issues/3874
2017-05-15 00:26:02 +01:00
Luke Barnard
2eccdf56b9
Merge branch 'develop' into new-guest-access
2017-05-11 09:50:13 +01:00
David Baker
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
Luke Barnard
5766a6e93d
Give warning icon better alt
2017-05-08 10:02:05 +01:00
David Baker
0deed1b511
Merge pull request #3790 from t3chguy/patch-2
...
Fix scope of callback
2017-05-05 18:25:29 +01:00
Luke Barnard
f14c2a0a71
Implement PasswordNagBar
...
This will tell the user that they need to set a password to return to their account.
2017-05-05 16:30:18 +01:00
David Baker
c27f39714a
Dedicated classes for the buttons
2017-05-05 14:26:13 +01:00
David Baker
23a141c5ad
Remove slightly misleading commented code
2017-05-04 17:46:44 +01:00
David Baker
da960e776d
Remove commented code
2017-05-04 17:45:11 +01:00
David Baker
2bf0074953
Make bottom left menu buttons use RoleButton too
2017-05-04 15:38:53 +01:00
David Baker
ff709ed8b1
Fix import
2017-05-04 14:53:13 +01:00
David Baker
cbb32968f1
Merge remote-tracking branch 'origin/develop' into dbkr/left_panel_for_newbies_2
2017-05-04 14:04:33 +01:00
David Baker
095da68aac
Add buttons to room sub list headers
2017-05-04 13:58:17 +01:00
Michael Telatynski
9997cc9891
import Modal
...
class seems to be referring to Modal but does not import it
2017-05-02 22:27:30 +01:00
Michael Telatynski
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
Michael Telatynski
7676fd960e
Merge branch 'develop' into forward_message
2017-04-30 12:35:52 +01:00
Matthew Hodgson
67efb8bde2
Add date tooltip to timestamps
2017-04-29 00:00:37 +01:00
David Baker
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
David Baker
4eb0ca63a9
Revert commits acciderntally put on develop
2017-04-28 11:22:05 +01:00
David Baker
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
Luke Barnard
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
David Baker
7b3719bc3c
Remove unused `placeholder` prop on RoomDropTarget
2017-04-26 16:27:25 +01:00
Michael Telatynski
0a1ebc2487
Don't show for anything that doesn't have a msgtype and body
...
otherwise the server will just reject it anyway
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-24 22:43:02 +01:00
turt2live
9124c1475a
Change redact -> remove to improve clarity
...
Addresses #2814
Non-technical users may not understand what 'redact' means and can more easily understand what 'Remove' does. See discussion on vector-im/riot-web#2814 for more information.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-04-24 12:48:32 -06:00
Michael Telatynski
2eb715002f
Merge branch 'develop' of https://github.com/vector-im/riot-web into forward_message
...
Conflicts:
.gitignore
2017-04-24 18:38:52 +01:00
Michael Telatynski
92b52a61e7
don't show forward option for things we cannot decrypt
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-24 18:33:25 +01:00
Matthew Hodgson
40eceaf9bc
show err.message in errors if present
2017-04-23 02:22:31 +01:00
Matthew Hodgson
ab5ec04507
oops
2017-04-23 01:01:38 +01:00
Matthew Hodgson
b1ff0b9e65
hook up keyb shortcuts for roomdir
2017-04-23 01:00:25 +01:00
Matthew Hodgson
be52787473
better solution to incomingcallbox weirdness
2017-04-22 17:37:16 +01:00
Matthew Hodgson
b3431bb750
fix incoming call box
2017-04-22 17:28:09 +01:00
Matthew Hodgson
523b315985
Merge pull request #3640 from t3chguy/t3chguy/lightbox_download_button
...
fix ImageView Download functionality
2017-04-22 02:59:17 +01:00
Luke Barnard
2afe9e6928
Merge pull request #3692 from vector-im/luke/login-ui
...
Cosmetics to go with matrix-org/matrix-react-sdk#811
2017-04-21 17:40:53 +01:00
Luke Barnard
1e139ef183
Cosmetics to go with matrix-org/matrix-react-sdk#811
2017-04-21 17:04:11 +01:00
Michael Telatynski
20abb2c2df
Add Forward Message button to m.room.message events
...
Conform this file to eslint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-21 13:46:23 +01:00
Michael Telatynski
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
Matthew Hodgson
ddd12edc06
clear the searchbox after quick-search
2017-04-20 14:21:36 +01:00
Matthew Hodgson
8f20fcfa6b
Merge pull request #3654 from vector-im/matthew/quick-search
...
Optimise RoomList and implement quick-search functionality on it.
2017-04-20 11:26:08 +01:00
Matthew Hodgson
c1d30664de
pass through selectedRoom
2017-04-20 01:13:13 +01:00
Matthew Hodgson
1803a0df9e
select any existing filter text on ctrl-k
2017-04-20 00:04:08 +01:00
Matthew Hodgson
e780fe4067
we don't need RoomTile specific focus in the end
2017-04-18 22:54:20 +01:00
Matthew Hodgson
acbc3e9f9b
move RoomSubList.refreshHeader to apply to the whole RoomSubList again
2017-04-18 19:27:57 +01:00
Matthew Hodgson
a8daa53a5b
always let tab/shift-tab select sublist headers
2017-04-18 17:49:50 +01:00
Matthew Hodgson
053beae035
move focus-via-up/down cursors to LeftPanel
2017-04-18 17:36:23 +01:00
Richard van der Hoff
25907301a3
More unmounted guards in BugReportDialog
2017-04-18 16:51:35 +01:00
Richard van der Hoff
d8bf57edc5
Add progress reporting to rageshake submission
2017-04-18 16:51:35 +01:00
Richard van der Hoff
269f9a5ccc
Load submit-rageshake asynchronously
...
... because it's 250K :/
2017-04-18 16:51:35 +01:00
Matthew Hodgson
f8aa2c3487
fix bugs in RoomSubListHeader splitout
2017-04-18 02:43:06 +01:00
Matthew Hodgson
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
Michael Telatynski
cc7a585126
make ImageView Download work, based on props.name
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-17 15:07:21 +01:00
Matthew Hodgson
c6ee221ae4
typos
2017-04-16 15:58:00 +01:00
Matthew Hodgson
8351ec9738
thread RoomTile focus events through RoomSubList up to RoomList
2017-04-15 13:23:11 +01:00
Matthew Hodgson
27de972bfb
oops
2017-04-15 12:02:50 +01:00
Matthew Hodgson
e5e259e1f8
put a ! on invite sublists
2017-04-15 12:02:16 +01:00
Matthew Hodgson
a74bbb424c
cmd-k shortcut to the searchbox
2017-04-15 11:37:09 +01:00
Richard van der Hoff
3f291aae5b
Use an opts arg for submit-rageshake
2017-04-12 11:26:53 +01:00
Richard van der Hoff
6423f7ce03
rageshake: factor out submission to a separate file
...
This will mean we can load it asyncronously in future, if we want.
2017-04-11 18:59:22 +01:00
Richard van der Hoff
cbfa4dd1ab
Get rageshake endpoint from SdkConfig instead of storing in rageshake
...
- in preparation for factoring out the sending of the rageshake
2017-04-11 18:46:48 +01:00
Luke Barnard
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
David Baker
2480831e2f
Merge pull request #3530 from vector-im/dbkr/email_notifs_only_to_email_addresses
...
Don't show phone number as target for email notifs
2017-03-28 16:40:13 +01:00
David Baker
c72a49d229
More equalses
2017-03-28 16:34:35 +01:00
David Baker
83b7f94609
Don't show phone number as target for email notifs
...
Fixes https://github.com/vector-im/riot-web/issues/3518
2017-03-28 16:24:54 +01:00
Luke Barnard
8b50ed8006
Merge pull request #3458 from vector-im/luke/fix-people-section2
...
Fix people section again
2017-03-27 15:52:15 +02:00
Matthew Hodgson
d696196d72
fix https://github.com/vector-im/riot-web/issues/3348
2017-03-27 12:39:58 +01:00
Luke Barnard
abc5b2d5f4
UI delay in UI
2017-03-27 09:44:33 +01:00
Keyvan Fatehi
a9ed2e20cb
Confirm redactions with a dialog
...
Closes #277
Closes #1805
Signed-off-by: Keyvan Fatehi <keyvanfatehi@gmail.com>
2017-03-18 18:58:24 -07:00
Luke Barnard
be02ac3bc6
Fix people section again
...
- Alter CSS due to removed mx_RoomDropTarget_avatar. The avatar was removed because it didn't particularly add anything and we needed space for "Drop here to tag as direct chat", which is quite long.
- Use guessAndSetDMRoom as a convenience method for guessing the DM member and setting the state.
- Do evil hacks to make DNDRoomTile do dragging of RoomTiles to and from the People section. Dragging a DM to and from Rooms/Favourites/Low Priority now works as one would expect. This is still not ideal however because edge cases exist where you have more than one tag set and then you drag a DM from "Favourites" to "Rooms" and the tile ends up in "People". This would require setting multiple tags, and breaks the 1-1 mapping between tags and sections even further. Ultimately the UI needs a rework.
2017-03-17 12:14:44 +00:00
Luke Barnard
49be954d31
Better CSS for redactions
...
See https://github.com/vector-im/riot-web/issues/3390
Also: The "Redact" option in the MessageContextMenu no longer appears for redacted events.
2017-03-16 17:03:16 +00:00
Luke Barnard
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
Luke Barnard
32b9ee7f6f
Copyright
2017-03-14 14:07:10 +00:00
Luke Barnard
e4c155a881
Merge branch 'develop' into luke/merge-RoomTile-context-menus
...
Conflicts:
src/components/views/context_menus/RoomTagContextMenu.js
2017-03-14 14:01:47 +00:00
Matthew Hodgson
d639eb1049
beautify all error msgs
2017-03-12 23:26:26 +00:00
Matthew Hodgson
611bb3a857
beautiful error on roomdirectory fail
2017-03-12 20:04:02 +00:00
Luke Barnard
3dc45886f7
Merge the two RoomTile context menus into one
2017-03-09 17:05:51 +00:00
Luke Barnard
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
turt2live
9b42fbe42f
Expose notification option for username/MXID
...
For those unfortunate people that get pinged constantly.
2017-02-27 15:32:58 -07:00
David Baker
03dd25624f
Allow forgetting rooms you're banned from
...
From the room tag context menu.
Also fix the room tag context menu, which was missing sdk and
modal imports. Switch over the import while we're at it.
2017-02-17 15:52:07 +00:00
Luke Barnard
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
Luke Barnard
5b239adfb8
Fix bug with home icon not appearing when logged in as team member
2017-02-07 14:58:25 +00:00
Luke Barnard
fa552ad5af
Merge branch 'develop' into luke/rts-welcome-pages
2017-02-07 12:41:52 +01:00
Luke Barnard
35bc384c51
Set team token in state on mount
2017-02-07 11:39:31 +00:00
Luke Barnard
d490bd8638
Use home.html rather than welcome.html
2017-02-07 11:35:17 +00:00
Luke Barnard
8d4f81ff67
Remove redundant inline style
2017-02-07 11:34:49 +00:00
Luke Barnard
648204b6f9
Use import
2017-02-07 11:34:34 +00:00
Luke Barnard
3f49f020cf
Copyright
2017-02-07 11:19:01 +00:00
Richard van der Hoff
7ceaabb166
RightPanel: remove superfluous divs
2017-02-03 12:00:33 +00:00
Richard van der Hoff
67e14ff363
Merge branch 'develop' into rav/hotkey-ux
2017-02-03 11:43:32 +00:00
Richard van der Hoff
a64e1cb936
Merge pull request #3118 from vector-im/dbkr/network_dropdown_mxc
...
Allow mxc: URLs for icons in the NetworkDropdown
2017-02-02 19:53:46 +00:00
David Baker
3903954bf2
Allow mxc: URLs for icons in the NetworkDropdown
...
For https://github.com/vector-im/riot-web/issues/3086
2017-02-02 19:35:36 +00:00
Matthew Hodgson
4c3a723aa8
make TopRightMenu more intuitive
...
should fix https://github.com/vector-im/riot-web/issues/2827
2017-02-02 18:42:03 +00:00
Luke Barnard
a2622a556c
Remove SdkConfig dep
2017-02-02 14:01:12 +00:00
Luke Barnard
6a9e5deb7b
Remove commented code
2017-02-02 14:00:21 +00:00
Luke Barnard
f2e62ff439
Use RTS URL passed through
2017-02-02 11:58:20 +00:00
Luke Barnard
4a34bee2dc
Use localStorage `mx_team_token` to decide welcome page
2017-02-02 11:12:43 +00:00
Luke Barnard
40609d7da3
then->done
2017-02-01 11:39:23 +00:00
Luke Barnard
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
Luke Barnard
87db89b67a
Replace inline styles for logos with css
...
Also, give .mx_Login_logo a height so that if the image has not loaded yet, it will not change height (thanks @dbkr)
2017-01-27 16:30:44 +00:00
Luke Barnard
02d6a10f67
Allow a custom login logo to be displayed on login
...
This is to allow team logos to be shown when a user registers with a team email.
2017-01-27 16:08:14 +00:00
Kegan Dougal
b16fa4171a
Close the dialog box after sending bugs
2017-01-26 13:42:37 +00:00
Kegan Dougal
0a9f02abcc
Glue the dialog to rageshake: honour sendLogs flag.
2017-01-25 16:51:26 +00:00
Matthew Hodgson
ef519231d6
fix mute button colors
2017-01-20 21:16:58 +00:00
Jani Mustonen
5edb5f6487
Turned divs to button-likes to comply with MDN's recommendations
2017-01-14 02:11:58 +02:00
Matthew Hodgson
bb28903c8e
fix warning page
2016-12-24 01:36:00 +00:00
David Baker
42357dee0b
Typo
2016-12-16 16:36:24 +00:00
David Baker
2e73cd6c4d
PR feedback
2016-12-16 16:24:24 +00:00
David Baker
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
David Baker
fb08910db3
Read the icon from the right place
...
Also don't define image widths in the HTML as it's done in the CSS.
2016-12-16 10:14:38 +00:00
David Baker
52cf1f6a4b
Missed a wire_onclick
2016-12-15 16:36:14 +00:00
David Baker
5f7cdb8d42
s/wire_onclick/handleClicks/
...
and actually pass handleClicks false as appropriate
2016-12-15 14:29:16 +00:00
David Baker
901c0e7e41
Remove unused event params
2016-12-15 14:24:55 +00:00
David Baker
98cad8779c
Add instance_id to initial state
2016-12-15 10:42:11 +00:00
David Baker
fc597ba86e
Underscore for private method
2016-12-15 10:41:22 +00:00
David Baker
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
Richard van der Hoff
7577d2eb05
s/var/const/
2016-11-17 10:51:09 +00:00
Richard van der Hoff
81d70a921d
Add a 'View decrypted source' button
2016-11-16 23:10:51 +00:00
David Baker
70d383fb1b
Fix changelog dialog to read new version format
...
Remove the 'vector' from the start of the version (otherwise the
tarballs are called vector-vector-[...].tar.gz). The jenkins
script already creates these files, so update accordingly.
2016-11-13 23:06:57 +00:00
Matthew Hodgson
3f640139d2
quick and dirty support for custom welcome pages, with an example for geektime techfest
2016-11-13 14:10:33 +00:00
Will Hunt
15c730a22a
Add rel="noopener" to context menu links.
2016-11-08 17:08:50 +00:00
Will Hunt
cf33ed58c1
Add menu option for `external_url` if present
2016-11-08 16:57:56 +00:00
David Baker
108af83ae8
Just bind the right function to the button
...
rather than deciding in onChangelogClicked
2016-11-03 11:43:50 +00:00
David Baker
e8494c3dc7
Split NewVersionBar release notes / changelog
...
and change the class to use React createClass syntax while I'm at
it, rather than a completely different third style we use nowhere
else in the project.
2016-11-02 19:20:11 +00:00