gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
6,463 Commits 964 Branches 0 Tags 74 MiB
Commit Graph

6463 Commits

Author SHA1 Message Date
Matthew Hodgson 9a861f46d0 make electron send email validation URLs with a nextlink of riot.im rather than file:/// 2016-12-24 03:18:12 +00:00
Matthew Hodgson bb28903c8e fix warning page 2016-12-24 01:36:00 +00:00
Matthew Hodgson e8eadc5d20 Merge pull request #2793 from joelostblom/patch-1 
Update desktop build instructions fixes #2792
 2016-12-22 20:42:01 +00:00
joelostblom e741a4f294 Update desktop build instructions fixes #2792 
This is based on what I had to do to get the desktop app running, as per the advice in https://github.com/vector-im/riot-web/issues/2792. I am not familiar with `npm`, so please change this pull request if there is a more appropriate way of achieving the same result.
 2016-12-22 14:53:03 -05:00
Richard van der Hoff 1678a25fd6 Merge branch 'master' into develop 2016-12-22 18:33:37 +00:00
Richard van der Hoff ff70b0a2c8 v0.9.4 2016-12-22 18:24:04 +00:00
Richard van der Hoff 3803c64226 prep 0.9.4 changelog 2016-12-22 18:15:00 +00:00
Richard van der Hoff 35a541c824 Bump to olm 2.1.0 2016-12-22 17:23:27 +00:00
Richard van der Hoff ab8420f5a9 Bump to olm 2.1.0 2016-12-22 16:30:14 +00:00
David Baker fa46757830 Merge pull request #2784 from vector-im/dbkr/delete_threepid 
CSS for the delete threepid button
 2016-12-22 15:31:38 +00:00
David Baker ed35a90cfb Back to develop js & react sdk 2016-12-22 14:36:05 +00:00
David Baker d8bce0f202 v0.9.3 2016-12-22 14:18:23 +00:00
David Baker e6f600bb47 Prepare changelog for v0.9.3 2016-12-22 14:18:22 +00:00
David Baker 519af6a5d0 Bump to matrix-react-sdk 0.8.3 2016-12-22 14:14:44 +00:00
Richard van der Hoff c6c4aff8ae Redeploy script: put each build in a separate directory (#2790) 
* Redeploy script: put each build in a separate directory

Hopefully this will fix the problem whereby we can overwrite the live
deployment.
 2016-12-22 12:02:54 +00:00
Matthew Hodgson 6d4abac016 Merge pull request #2755 from Mikaela/readme-nativefier 
README.md: fix GFMD for nativefier
 2016-12-22 02:37:17 +00:00
David Baker d34cb80b68 CSS for the delete threepid button 2016-12-21 18:50:35 +00:00
Matthew Hodgson 57641f7228 typo 2016-12-20 00:05:49 +00:00
Mikaela Suomalainen 9ae86f2585
README.md: fix GFMD for nativefier 
GitHub Flavoured MarkDown parsed this as
`sudo npm install nativefier -g nativefier https://riot.im/app/` which
is incorrect.
 2016-12-17 21:17:58 +02:00
David Baker 1e7e9d6101 v0.9.2 2016-12-16 17:44:22 +00:00
David Baker 8bbc16ed4b Prepare changelog for v0.9.2 2016-12-16 17:44:22 +00:00
David Baker 4745b3efeb released js-sdk & react-sdk 2016-12-16 17:40:37 +00:00
David Baker 09f79b94dd Merge pull request #2750 from vector-im/dbkr/roomdir_remove_client_filter 
Remove the client side filtering from the room dir
 2016-12-16 16:44:05 +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 161978ab05 Fix tests 2016-12-16 15:20:52 +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
Richard van der Hoff e607f49ae6 Merge pull request #2745 from vector-im/rav/set_olm_heap_size 
Configure olm memory size
 2016-12-15 17:19:04 +00:00
David Baker 52cf1f6a4b Missed a wire_onclick 2016-12-15 16:36:14 +00:00
Richard van der Hoff 61f9966fe0 Merge pull request #2747 from vector-im/dbkr/third_party_filter 
Support room dir 3rd party network filtering
 2016-12-15 16:21:28 +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 8be72e6c27 Configure olm memory size 
16M is somewhat excessive: configure olm to use a bit less.

Requires changes to the olm library to do anything useful, but will be harmless
without them.

Partial fix to vector-im/riot-web#2726.
 2016-12-14 11:59:37 +00:00
David Baker 2740013625 RELEASES is for update, not install 2016-12-13 10:24:32 +00:00
David Baker 119e03b64f Get the update base URL right 
and update the text in the README.
 2016-12-12 17:24:22 +00:00
David Baker c6dbeee245 ico needs to be at least 256x256 2016-12-09 22:33:20 +00:00
David Baker feb3a13a71 Get version after we've checked out... 2016-12-09 20:23:19 +00:00
David Baker c80d1c15d2 dev js-sdk & react-sdk 2016-12-09 20:12:37 +00:00
David Baker b9ba795cb0 v0.9.1 2016-12-09 20:05:41 +00:00
David Baker 598b841bf7 Prepare changelog for v0.9.1 2016-12-09 20:05:41 +00:00
David Baker 93b3857a9b Merge branch 'develop' into release-v0.9.1 2016-12-09 20:03:10 +00:00
David Baker 5414b5d189 Released js-sdk & react-sdk 2016-12-09 19:58:33 +00:00
David Baker b4e362d700 Bump to electron 1.4.11 2016-12-09 19:14:59 +00:00
David Baker eabb91da1e Merge pull request #2732 from vector-im/dbkr/desktop_readme 
Update README to say how to build the desktop app
 2016-12-09 19:06:14 +00:00
David Baker fe574b008b Credit aviral & other options for native riot 2016-12-09 19:05:25 +00:00
David Baker b8fe8a4363 Merge branch 'develop' of github.com:vector-im/riot-web into develop 2016-12-09 18:30:38 +00:00