Commit Graph

18 Commits

Author SHA1 Message Date
David Baker b9e2b59504 Merge remote-tracking branch 'origin/develop' into matthew/status 2017-10-27 19:01:34 +01:00
Matthew Hodgson 225c7ee621 Merge branch 'develop' into matthew/status 2017-10-26 01:46:06 +01:00
Matthew Hodgson f86b616769 status homepage 2017-10-26 01:38:07 +01:00
lub b5629ac3e6 fix comma error of features example
Signed-off-by: Simon Körner <github@lubiland.de>
2017-10-24 11:43:15 +02:00
Matthew Hodgson 508a850dec add features example to config.sample.json 2017-10-23 14:54:38 +01:00
Matthew Hodgson 6fa2d35630 support concept of default theme 2017-10-20 18:41:39 +01:00
Michael Telatynski 27a1038e8d
Merge branch 'master' of github.com:vector-im/riot-web into set_default_federate_by_settings 2017-08-02 11:48:20 +01:00
Matthew Hodgson d264426ece Merge branch 'develop' into new-guest-access 2017-05-30 21:06:45 +01:00
Michael Telatynski 8a59acb5c3 explicit protocol in configs, otherwise breaks in Electron
when it tries file://

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 19:32:44 +01:00
Matthew Hodgson a92d96347b Merge branch 'develop' into new-guest-access 2017-05-28 22:50:53 +01:00
Michael Telatynski 2e75640cdd sample piwik config
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-28 11:27:33 +01:00
Luke Barnard f60be2d658 Add welcomeUserId to sample config 2017-05-12 16:12:17 +01:00
Richard van der Hoff f9ae456a64 Fix bug report endpoint in config.sample.json.
Not sure why this was like this - has vector.im/bugs *ever* worked?
2017-05-09 12:27:41 +01:00
Pablo Saavedra 53796f55be Added default_federate property 2017-05-08 12:25:45 +02:00
Kegan Dougal 3996d23b19 Inject bug report endpoint URL from config.json 2017-01-19 16:49:25 +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 0df242e0e9 Add Freenode & Mozilla domains
So the join button works for them
2016-11-24 16:20:58 +00:00
David Baker 1e2cd9c2d1 Build all of the vector dir in the build process
So the whole vector/ directory can now be removed during the build
process and we don't ship random files that end up in the vector
directory.
2016-11-08 14:30:12 +00:00