Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-09-22 09:05:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,237 Commits 3 Branches 492 Tags 100 MiB
36ec39ffc0
Commit Graph

565 Commits

Author SHA1 Message Date
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
David Baker
64fdb290eb Move 'new version' support into Platform 2016-11-02 16:02:55 +00:00
David Baker
df94dd7487 Update ChangelogDialog.js 2016-10-25 14:41:02 +01:00
Aviral Dasgupta
42993a78ed Only show quote option if RTE is enabled 2016-10-11 19:07:15 +05:30
David Baker
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
David Baker
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
David Baker
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
David Baker
c0a4574069 For single instance, allow domain present & match 2016-10-04 15:30:46 +01:00
David Baker
de9bf4bb47 Actually use variable 2016-10-04 15:18:07 +01:00
David Baker
b80b08f04f Specify width on icons & comment 2016-10-04 11:14:36 +01:00
David Baker
304e5b997a PR Freedback 2016-10-04 11:04:01 +01:00
David Baker
6b4dbfbd62 Change default brand to Riot 
& update sample config
 2016-10-04 10:23:38 +01:00
David Baker
000ca35727 Don't pop up errors when this API fails for guests 2016-10-03 16:30:57 +01:00
David Baker
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
Richard van der Hoff
602727b7ad Merge pull request #2383 from vector-im/dbkr/sign_in_not_log_in 
Use 'Sign In' / 'Sign Out' universally
 2016-09-30 11:31:15 +01:00
David Baker
b71b1b5535 Use more variables 2016-09-30 09:39:30 +01:00
David Baker
f9a70a8b04 Use 'Sign In' / 'Sign Out' universally 
Rather than a mix of 'sign in/out' and 'log in/out'
 2016-09-29 17:40:19 +01:00
David Baker
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
David Baker
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
David Baker
65f14c7d21 Stop random rooms appearing when switching network 
in the public room directory
 2016-09-28 14:18:40 +01:00
David Baker
864ba52bc5 Relative img paths please 2016-09-28 12:03:35 +01:00
David Baker
fdb5020c0c Oops, fix undefined variable 2016-09-28 11:56:07 +01:00
David Baker
0db12fcd22 Move method & don't wastefullt create elements 
Put did update with the other react interface methods & don't
bother creating the 'current_value' if we throw it away later.
 2016-09-28 11:05:14 +01:00
David Baker
5ca391f914 Replace double truth test with something sane 
Also typo
 2016-09-28 11:04:13 +01:00
David Baker
a32abae5a3 Don't use _matrix as default if there isn't one 2016-09-28 10:58:01 +01:00
David Baker
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
David Baker
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
David Baker
bf58c340bc Oops, missed the ref 2016-09-26 15:30:42 +01:00
David Baker
dc0b15bdfa Remove unused variable / function 2016-09-26 14:17:36 +01:00
David Baker
51a5542446 Make tests pass 2016-09-23 18:20:31 +01:00
David Baker
8e1105b12a Oops, wrong function 2016-09-23 15:25:13 +01:00