12 commits

Author	SHA1	Message	Date
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
David Baker	5a08c62f1b	Use the default integrations URLs in the sample ... localhost is not a sensible default	2016-10-14 18:21:26 +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	6b4dbfbd62	Change default brand to Riot ... & update sample config	2016-10-04 10:23:38 +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	455ee4f91b	Argh, tabs	2016-09-28 11:04:54 +01:00
David Baker	b2dd3ecf3a	Add the _matrix network to the sample config	2016-09-28 10:44:29 +01:00
David Baker	f852e8a01d	Update sample config	2016-09-28 10:13:35 +01:00
David Baker	8f6d98886c	Use real matrix.org network in sample config	2016-09-16 11:44:33 +01:00
David Baker	190cd884b5	Add roomDirectory to sample config	2016-09-15 18:42:00 +01:00
David Baker	d0d7f2d2d2	Add 'enable labs' setting to sample config	2016-08-05 16:14:03 +01:00
David Baker	f6aa9a7ea4	Make the config optional ... Accept 404 errors from getting the config and start MatrixChat with no config, make other errors display a simple error message to prevent a completely blank page if the config does fail to load.	2016-06-08 18:46:21 +01:00

Renamed from config.json (Browse further)