Commit Graph

476 Commits

Author SHA1 Message Date
Luke Barnard 3f49f020cf Copyright 2017-02-07 11:19:01 +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
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