Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-22 16:18:14 +08:00
Code Issues Packages Projects Releases Wiki Activity
62,697 Commits 202 Branches 553 Tags 442 MiB
e7cd322559
Commit Graph

5076 Commits

Author SHA1 Message Date
Aviral Dasgupta
bd9f5d3e06 Various fixes and improvements to emojification. 
- Use locally hosted emoji
- Emojify SenderProfile and m.emote
- Fix emoji spacing
 2016-08-09 21:44:09 +05:30
Matthew Hodgson
d0158f5812 fix merge conflict 2016-08-04 23:45:28 +01:00
Matthew Hodgson
90e5ab2ca3 merge in develop 2016-08-04 13:39:47 +01:00
Richard van der Hoff
24cc4f52bf Downgrade emojione to 2.2.3 
... because @aviraldg says > 2.2.3 is broken :/
 2016-08-03 21:36:52 +01:00
Richard van der Hoff
f4e40696bc Bump emojione to 2.2.3 
Because @aviraldg says it's better.
 2016-08-03 21:17:54 +01:00
Richard van der Hoff
51b74251f9 Exclude olm from the webpack 
Olm takes *ages* to webpack, and it doesn't compress well. So, serve it as a
separate asset to the browser.
 2016-08-02 12:44:23 +01:00
David Baker
cf3cd69f37 Merge pull request #366 from matrix-org/rav/remove_relayoutonupdate 
Remove relayoutOnUpdate prop on gemini-scrollbar
 2016-07-27 15:21:46 +01:00
David Baker
3308842121 Fix up reskindex.js path 
Since npm does not put our *own* 'binaries' on the path, we need to use the full path to it
 2016-07-27 13:28:23 +01:00
Richard van der Hoff
4b33164ab6 Remove relayoutOnUpdate prop on gemini-scrollbar 
The latest gemini-scrollbar makes relayoutOnUpdate redundant, so update to it
and remove the properties.
 2016-07-27 11:41:27 +01:00
Richard van der Hoff
c8df9148b3 Remove relayoutOnUpdate prop on gemini-scrollbar 
The latest gemini-scrollbar makes relayoutOnUpdate redundant, so update to it
and remove the properties.
 2016-07-27 11:35:48 +01:00
Richard van der Hoff
53fe372a0c Bump to react 15.2.1 
This should also stop npm complaining about invalid peerDependencies.
 2016-07-22 10:47:09 +01:00
Richard van der Hoff
4cb04d1e40 Bump to latest react-gemini-scrollbar 
I've updated our forks of the gemini-scrollbar project to latest upstream.
 2016-07-22 10:46:38 +01:00
Richard van der Hoff
e3cdeed32b Bump to react 15.2.1 
This should also stop npm complaining about invalid peerDependencies.
 2016-07-22 10:43:50 +01:00
Richard van der Hoff
ad7f8d0a58 Bump to latest react-gemini-scrollbar 
I've updated our forks of the gemini-scrollbar project to latest upstream.
 2016-07-22 10:12:37 +01:00
Richard van der Hoff
3e53879adc Bump to olm 1.0.0 
Fixes https://github.com/vector-im/vector-web/issues/1719
 2016-07-11 14:53:51 +01:00
David Baker
6d403e792b Add --stage 1 to babel cmdline 
So we can use trailing function commas. The trailing comma proposal is actually at stage 3 now and there's a babel 6 plugin for it, which  we should use when we switch back to babel 6.
 2016-07-08 15:29:59 +01:00
Aviral Dasgupta
cccc58b47f feat: implement autocomplete replacement 2016-07-03 22:15:13 +05:30
Aviral Dasgupta
cd928fe6f5 Merge remote-tracking branch 'upstream/develop' into feature-autocomplete 2016-07-03 00:00:02 +05:30
David Baker
21cc4cba9a Correct npm run lint command line 2016-07-01 19:30:53 +01:00
Aviral Dasgupta
1c002866e8 feat: add and configure eslint 2016-07-01 23:08:51 +05:30
David Baker
5cda2a6802 Disable colour output in jenkins script 
As it really confuses jenkins
 2016-06-23 14:38:08 +01:00
Richard van der Hoff
4c6fa740f3 package.json: add olm as optionalDependency 
Add olm as an optionalDependency to vector, so that the webpack config can find
it and include it in the bundle.
 2016-06-20 15:10:19 +01:00
Matthew Hodgson
94aec10512 Merge branch 'develop' into dbkr/scalar 2016-06-19 22:40:48 +01:00
Aviral Dasgupta
b9d7743e5a Emoji provider, DDG working, style improvements 2016-06-17 04:58:09 +05:30
Aviral Dasgupta
769b3f0c2a Merge branch 'develop' into feature-autocomplete 2016-06-17 00:37:39 +05:30
Aviral Dasgupta
4bc8ec3e6d room, user, ddg autocomplete providers (wip) 2016-06-12 17:02:46 +05:30
Aviral Dasgupta
0df201c483 Merge branch 'develop' into feature-autocomplete 2016-06-12 14:10:23 +05:30
Aviral Dasgupta
e4217c3fb7 rte improvements, markdown mode 2016-06-11 15:52:08 +05:30
Aviral Dasgupta
bf8e56e04c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into feature-rte 2016-06-10 04:43:44 +05:30
Aviral Dasgupta
b2459b2dc6 Merge branch 'develop' of github.com:vector-im/vector-web into feature-rte 2016-06-10 04:43:06 +05:30
Richard van der Hoff
7999a70cab Switch to dev versions of react-sdk and js-sdk 2016-06-08 21:36:45 +01:00
Richard van der Hoff
cab24bb14c Switch matrix-js-sdk back to develop 2016-06-08 21:34:30 +01:00
David Baker
aca0e060a4 Also change velocity-vector commit & requires 
Because it needs a versiob where the package name is actually updated and the requires need to use the right package name
 2016-06-07 20:47:37 +01:00
David Baker
8679ce80c8 Update vector velocity fork package name 2016-06-07 20:28:38 +01:00
David Baker
d5a522fdfe Second attempt at fixing the Velocity memory leak 
1) Correct fix for Velociraptor (we need to find the DOM node and pass that in)
2) Do the same leak fix for the read marker
3) Update the dependency to our fork which is fixed to make the call we do to release memory actually work.
4) Remove the velocity-ui-pack dependency which is unnecessary because velocity-ui is included in the velocity package
 2016-06-07 18:22:01 +01:00
David Baker
c6cf5febd5 Merge pull request #1516 from vith/static-config-json 
serve config.json statically instead of bundling it
 2016-06-06 19:15:35 +01:00
David Baker
fdcebe1e56 Merge remote-tracking branch 'origin/develop' into dbkr/scalar 2016-06-06 17:19:38 +01:00
Matthew Hodgson
c672919d1e 0.7.3 2016-06-03 12:20:05 +01:00
Matthew Hodgson
e68a2b5e1d pin to react sdk 0.6.3 for release 2016-06-03 12:19:04 +01:00
Matthew Hodgson
507f5e2ca1 0.6.3 2016-06-03 12:17:46 +01:00
Matthew Hodgson
ddc4ac187c dep on react-sdk develop 2016-06-02 23:32:47 +01:00
Matthew Hodgson
ded66bbdfc 0.7.2 2016-06-02 19:05:50 +01:00
Matthew Hodgson
4ec77eeca7 correctly bump dep on js-sdk and react-sdk 2016-06-02 19:04:22 +01:00
Matthew Hodgson
b06ab78a81 0.6.2 2016-06-02 18:55:34 +01:00
Matthew Hodgson
168f74d6cf correctly bump dep on js-sdk 0.5.4 2016-06-02 18:53:50 +01:00
Matthew Hodgson
635fd927cd 0.7.1 2016-06-02 18:41:20 +01:00
Matthew Hodgson
204437e40c 0.6.1 2016-06-02 18:32:50 +01:00
Richard van der Hoff
e0bf23fa7c 0.7.0 2016-06-02 13:42:25 +01:00
Richard van der Hoff
f6ec858ac9 Bump js-sdk and react-sdk for new releases 
js-sdk 0.5.3
react-sdk 0.6.0
 2016-06-02 13:40:15 +01:00
Richard van der Hoff
268cedee0f 0.6.0 2016-06-02 13:38:19 +01:00
Richard van der Hoff
d812c77fc1 Bump to js-sdk 0.5.3 2016-06-02 13:36:45 +01:00
Aviral Dasgupta
b979a16199 initial version of autocomplete 2016-06-01 16:54:21 +05:30
Aviral Dasgupta
7e563b89c7 initial version of rich text editor 2016-05-27 10:17:01 +05:30
Aviral Dasgupta
001011df27 Initial version of rich text editor 2016-05-27 10:15:55 +05:30
Jason Papakostas
6a6118e136 serve config.json statically instead of bundling it 
issue #1344
 2016-05-24 19:08:09 -05:00
David Baker
0bb4f9dd5c add browser request as a dep 
since we need to do requests directly for scalar integ
 2016-05-16 15:35:39 +01:00
David Baker
4f64f70a12 Use react-sdk develop as email notifs needs it 2016-05-10 17:35:35 +02:00
Richard van der Hoff
4cddda67d9 0.6.1 2016-04-22 11:35:51 +01:00
Richard van der Hoff
ee88fe55c1 Bump to react-sdk 0.5.2 2016-04-22 11:30:33 +01:00
Richard van der Hoff
412512570b 0.5.2 2016-04-22 11:21:32 +01:00
Richard van der Hoff
e5e9a3819e Load babel-polyfill in tests 
Object.values() isn't available natively, so use polyfill for it.
 2016-04-21 08:10:46 +01:00
Richard van der Hoff
b8018942fc Bump react-gemini-scrollbar 
(to pick up a non-broken version)
 2016-04-20 13:46:59 +01:00
Richard van der Hoff
37365728cb Bump react-gemini-scrollbar 
(to pick up a non-broken version)
 2016-04-20 13:46:21 +01:00
Richard van der Hoff
02f58ef9e3 Don't relayout scrollpanels every time something changes 
Gemini's habit of reflowing everything everytime anything changes at all makes
for an unresponsive app. Turn it off everywhere we use gemini.
 2016-04-20 12:29:32 +01:00
Richard van der Hoff
d953ac4e6b Don't relayout scrollpanels every time something changes 
Gemini's habit of reflowing everything everytime anything changes at all makes
for an unresponsive app. Turn it off everywhere we use gemini.
 2016-04-20 12:25:19 +01:00
Richard van der Hoff
b5f029d10e Turn react consistency checks off in develop builds 
For now at least, turn off the consistency checks in build:dev, and hence in
/develop. This will allow us to more meaningfully compare performance between
/beta and /develop.
 2016-04-19 20:28:29 +01:00
Richard van der Hoff
caff20cbb3 Merge pull request #1431 from vector-im/rav/reactperf 
Include react-addons-perf for non-production builds
 2016-04-19 19:28:15 +01:00
Richard van der Hoff
e71ca328e7 Switch back to dev builds of the react-sdk and js-sdk 2016-04-19 18:32:35 +01:00
Richard van der Hoff
a0b460b084 Include react-addons-perf for non-production builds 
This makes it possible to gather a few performance stats
 2016-04-19 15:01:24 +01:00
Richard van der Hoff
abca28c80b 0.6.0 2016-04-19 13:39:40 +01:00
Richard van der Hoff
da7909f1ce Bump to release versions of js-sdk and react-sdk 
... in preparation for vector release.
 2016-04-19 13:36:25 +01:00
Richard van der Hoff
9bd68ba5a8 0.5.1 2016-04-19 13:35:06 +01:00
Richard van der Hoff
e114f04e47 Abort publish if build fails 
.. otherwise we end up publishing a broken build.
 2016-04-19 13:30:07 +01:00
Richard van der Hoff
24223ae2b6 0.5.0 2016-04-19 13:20:26 +01:00
Richard van der Hoff
bf6665c9f7 Bump to js-sdk 0.5.2 2016-04-19 13:16:39 +01:00
Richard van der Hoff
210cb31852 Upgrade to react 15.0 
(which also requires upgrades to react-gemini-scrollbar and react-dnd)
 2016-04-17 21:41:50 +01:00
Richard van der Hoff
3cde22169e Upgrade to react 15.0 
Needs a new react-gemini-scrollbar to match.
 2016-04-17 21:40:50 +01:00
Richard van der Hoff
5cdd234bf2 Do less mangling of jenkins builds 
This turns off uglification, and turns on the react sanity checks.
 2016-04-14 15:05:36 +01:00
Richard van der Hoff
cb3ae0e069 Disable autoWatch for npm test 
... we're only going to run the tests once, so there is no need to tell webpack
to watch the sources. This saves a spurious repack.
 2016-04-13 18:13:57 +01:00
Richard van der Hoff
bf31d6d5fa Karma test tweaks 
* Make sure we only get one js-sdk (and update runtime config to match)
* Don't verifyNoOutstandingRequests (since it is hard to be certain which we
  will get, and makes the tests too dependent on implementation-specifics).
* Disable color for npm test, to avoid confusing Jenkins
 2016-04-13 17:41:23 +01:00
Richard van der Hoff
322af6513d Run some tests under karma 
Including a regression test for
https://github.com/vector-im/vector-web/issues/1314
 2016-04-13 17:20:06 +01:00
Richard van der Hoff
69ce3c43cf Revert "Merge branch 'develop' into rav/karma" 
The karma tests don't pass yet, and aren't ready to land on develop.

This reverts commit 438453e61a, reversing
changes made to 50f94eb040.
 2016-04-13 17:17:45 +01:00
Richard van der Hoff
429d110212 Run some tests under karma 
Including a regression test for
https://github.com/vector-im/vector-web/issues/1314
 2016-04-13 10:15:04 +01:00
Richard van der Hoff
73f7528d0f Use babel 5 for karma tests 2016-03-31 16:59:38 +01:00
Richard van der Hoff
bf055688b7 Switch js-sdk and react-sdk back to develop 2016-03-31 16:35:38 +01:00
Richard van der Hoff
3129e84b6c Switch js-sdk back to develop 2016-03-31 16:34:38 +01:00
Richard van der Hoff
dc5c0928b2 Some basic tests for MessagePanel 
Check that it puts the read marker in the right place, and check that the
animation works.

... all of which has been surprisingly painful.
 2016-03-31 00:48:46 +01:00
Richard van der Hoff
00a92452e8 0.5.0 2016-03-30 13:31:09 +01:00
Richard van der Hoff
20f93e761b Bump to react-sdk 0.4.0 and js-sdk 0.5.1. 2016-03-30 13:27:55 +01:00
Richard van der Hoff
d2e69c819f 0.4.0 2016-03-30 13:25:25 +01:00
Richard van der Hoff
c5793b91cd Bump to js-sdk 0.5.1 2016-03-30 13:23:13 +01:00
Richard van der Hoff
abedb05268 Merge pull request #250 from matrix-org/rav/disable_composer_if_no_permission 
Disable the message composer if we don't have permission to post
 2016-03-29 15:15:58 +01:00
Richard van der Hoff
9ae3a96b6a Add missing devDependencies 2016-03-29 00:12:59 +01:00
Richard van der Hoff
31e283729e Need babel-loader for karma tests 2016-03-29 00:12:59 +01:00
Richard van der Hoff
6069812fcf Create Junit reports from karma 2016-03-29 00:12:59 +01:00
Richard van der Hoff
04561ea6e6 Use phantomjs when running a single test 2016-03-29 00:12:59 +01:00
Richard van der Hoff
f60dd93660 Initial implementation of some karma/mocha tests 
It does something, but things I don't like:

* it churns for 15 seconds webpacking everything. Do we really need to get
  webpack involved here?

* I don't think there's any way to control which tests get run and which don't.

Other things I'd want to fix up include:

* Make it run on jsdom or phantomjs instead of Chrome
* figure out how to configure babel without a .babelrc
 2016-03-29 00:12:58 +01:00
Richard van der Hoff
2462ede539 Switch to dev versions of react-sdk and js-sdk 2016-03-24 17:39:49 +00:00
Richard van der Hoff
cbf5b0eca3 Disable the message composer if we don't have permission to post 
Rehashes dave's earlier PR which did the same thing
 2016-03-24 13:57:21 +00:00
Richard van der Hoff
4507117f89 0.4.1 2016-03-23 14:58:30 +00:00
Richard van der Hoff
5138dc9fd8 Bump to react-sdk 0.3.1 
Disables ScrollPanel debug.
 2016-03-23 14:56:22 +00:00
Richard van der Hoff
dcfc283279 0.3.1 2016-03-23 14:55:44 +00:00
Richard van der Hoff
c12a77bc15 0.4.0 2016-03-23 14:40:16 +00:00
Richard van der Hoff
752f8363a7 Bump to release versions of react-sdk and js-sdk 2016-03-23 14:14:07 +00:00
Richard van der Hoff
31a3f342af 0.3.0 2016-03-23 14:00:40 +00:00
Richard van der Hoff
fb3a471d77 Revert "Switch js-sdk back to develop" 
This reverts commit bf6e13dbcd.

Apparently we don't need this change anyway
 2016-03-23 13:54:20 +00:00
Richard van der Hoff
948b862c31 Bump gemini-scrollbar to latest version 
RoomDirectory uses react-gemini-scrollbar directly, so make sure we are using a
consistent version.
 2016-03-23 12:24:25 +00:00
Richard van der Hoff
bf6e13dbcd Switch js-sdk back to develop 
Matthew has landed some required fix in js-sdk
 2016-03-23 12:11:05 +00:00
Richard van der Hoff
1495a6ffa0 Bump react-sdk to latest develop 
Pick up the version which optimises out onResize handler where possible
 2016-03-23 12:09:09 +00:00
Richard van der Hoff
272bef1606 Bump react-gemini-scrollbar version 2016-03-23 00:03:55 +00:00
Richard van der Hoff
a82c0580d2 Bump to matrix-js-sdk 0.5.0 2016-03-22 19:17:22 +00:00
Richard van der Hoff
a5e0aa763b Bump gemini-scrollbar version 
To fix scrollbar fail thanks to npm's lack of dependency-version conflict
resolution.
 2016-03-18 16:34:20 +00:00
Richard van der Hoff
cb1cf0661e Bump to latest react-gemini-scrollbar build 
Hopefully this will https://github.com/vector-im/vector-web/issues/1186 and
some other bugs.
 2016-03-18 16:06:12 +00:00
Richard van der Hoff
0598092f9d Bump to latest react-gemini-scrollbar 
... which will hopefully fix the mystery of the disappearing member list.
 2016-03-14 19:02:22 +00:00
Richard van der Hoff
d4d2ef326e Bump to dev branch of js-sdk 2016-03-14 15:54:56 +00:00
Richard van der Hoff
6a0cd9e047 Bump to dev branch of js-sdk 2016-03-14 15:54:33 +00:00
Richard van der Hoff
2a62fdb652 Switch back to dev version of react-sdk 2016-03-14 14:08:47 +00:00
Richard van der Hoff
88b3f2ed8c Use our fork of react-gemini-scrollbar to fix resize issues 
Rather than telling react-gemini-scrollbar to update every time something that
changes its size happens, try out our fork of it which uses some hackery to
listen for resizes.
 2016-03-14 12:46:13 +00:00
Richard van der Hoff
8fa059fc4b Prep 0.3.0 2016-03-11 13:00:31 +00:00
Richard van der Hoff
fc062072b0 Bump to 0.2.0 2016-03-11 12:52:21 +00:00
Richard van der Hoff
eeab97114f Prepare v0.2.0 2016-03-11 12:48:26 +00:00
Richard van der Hoff
02510003dd prep v0.1.1 2016-03-11 12:24:44 +00:00
Richard van der Hoff
030b8fe113 Merge remote-tracking branch 'origin/0_1_0_fixes' into develop 2016-02-25 17:32:22 +00:00
Richard van der Hoff
c1bb527539 s/version.txt/git-revision.txt/ 2016-02-25 16:50:27 +00:00
Richard van der Hoff
dceb4a9297 Add a 'version.txt' file to the tarball 
This will enable the vector build to know what it got
 2016-02-25 15:24:10 +00:00
David Baker
874123bbfa Move package script out and make it tar into a versioned top level directory. It may as well be a shell script since it's unix specific anyway, and maintaining it inside package.json is now impractical. 2016-02-24 18:41:30 +00:00
David Baker
b088651211 Use the --tags option so it works with non-annoated tags (seriously, git?) 2016-02-24 15:05:13 +00:00
David Baker
ebd5399626 Bump to version 0.2.0 2016-02-24 14:24:15 +00:00
David Baker
5d63d2269e Use newly released versions of js-sdk & react-sdk 2016-02-24 14:21:53 +00:00
David Baker
4b13d71bb4 Bump to 0.1.0 2016-02-24 14:14:53 +00:00
David Baker
cd92f0ea62 Use new release of js-sdk 2016-02-24 14:06:03 +00:00
Matthew Hodgson
484736bf57 oops, add sanitize-html 2016-02-21 00:05:44 +00:00
David Baker
95a3354b90 Merge pull request #914 from vector-im/dbkr/package_use_tar 
Use tar for packaging because zip can't traverse directory symlinks
 2016-02-11 15:09:49 +00:00
David Baker
82b498017d Bumb webpack micro version (although it would have installed the latest micro version anyway) to maybe get a webpack that doesn't throw stack depth errors. 2016-02-11 15:01:32 +00:00
David Baker
b929f80be8 Use tar for packaging because zip can't traverse directory symlinks, hence ditch windows support for packaging. 2016-02-11 14:59:22 +00:00
David Baker
05a30e7c68 Merge pull request #902 from vector-im/dbkr/add_package_script 
Add 'package' script to build a webapp bundle
 2016-02-11 14:18:06 +00:00
David Baker
3c75c43d37 Bail if build step fails 2016-02-11 13:59:40 +00:00
David Baker
369e357742 We expect the mkdir to fail when the dir exists, so use ; not && 2016-02-11 13:40:26 +00:00
David Baker
93f8fcbacc Add 'package' script to build a webapp bundle for straight unzipping on a production server. 2016-02-10 15:35:06 +00:00
Matthew Hodgson
155728b136 make babel actually do full ES6 emulation for Safari 8 2016-02-10 14:54:55 +00:00
Kegan Dougal
0752c3a6d5 Add start:prod - same as 'npm run start' but with NODE_ENV=production 2016-01-22 13:17:09 +00:00
David Baker
99a491bb0e Merge pull request #68 from matrix-org/notif_sync 
Set room highlight from unread_notification_count
 2016-01-21 10:31:42 +00:00
David Baker
02e41450b4 Do (more) client side validation of registration parameters. 2016-01-15 13:31:41 +00:00
David Baker
6ea3f21a8e Favicon badges 2015-12-21 12:55:13 +00:00
David Baker
939733b736 Merge branch 'develop' into require-css 2015-12-02 10:26:26 +00:00
Kegan Dougal
d837d02ac9 Still add highlight.js as an import as we symlink directly to the node_module for github.css :/ - Fixes ENOENT 2015-12-02 09:26:12 +00:00
David Baker
7ff5e42f3e Run the CSS through webpack so we can pull in CSS files from modules with require rather than symlinking into the node_module directory which is breaking people on different npm versions. 2015-12-01 18:05:43 +00:00
David Baker
5e2a4fa537 Merge branch 'develop' into skindex-nextgen 2015-12-01 15:48:05 +00:00
David Baker
021056cfd1 Move copyright header 2015-11-30 18:00:54 +00:00
David Baker
4f8895f160 Copyright header on component index 2015-11-30 18:00:19 +00:00
David Baker
730b33535a More WIP component indexing 2015-11-30 17:33:04 +00:00
David Baker
6f646260aa WIP of component indexing update 2015-11-30 17:31:32 +00:00
Kegan Dougal
80a235adf9 Move and merge MemberList 2015-11-30 15:13:28 +00:00
Kegan Dougal
9950e45b7d Add required imports 2015-11-27 15:39:52 +00:00
Kegan Dougal
af30ef1f72 Remove unusued imports 2015-11-27 15:39:29 +00:00
Kegan Dougal
5ba1ef5203 Move velocity stuff / contextual menu from Vector to React. 2015-11-27 15:37:40 +00:00
Kegan Dougal
05c9b44b81 Move velocity stuff to react sdk 2015-11-27 15:34:26 +00:00
Matthew Hodgson
da97185fcd highlight <code/> blocks via highlight.js 2015-11-21 12:14:56 +00:00
Matthew Hodgson
76c6d6d4d6 add target=_blank onto all HTML links, and apply GFM.css for CSS for markdown 2015-11-20 20:12:23 +00:00
Kegan Dougal
b12fc67a63 Add markdown support (enabled by default) 2015-11-20 16:08:57 +00:00
Richard van der Hoff
3a003341ad Merge pull request #387 from vector-im/rav/suppress_unread_on_memberchange 
Don't mark rooms as unread on m.room.member changes
 2015-11-19 13:22:37 +00:00
David Baker
025b9e2fc8 depend on react sdk dev 2015-11-18 14:54:32 +00:00
David Baker
caabe02fca Merge pull request #32 from matrix-org/read_receipts 
Read receipts
 2015-11-18 14:53:25 +00:00
Richard van der Hoff
c42d4f901b Don't mark rooms as unread on m.room.member changes 
A quick and hacky fix to issue #169.
 2015-11-18 11:01:47 +00:00
David Baker
816f20e068 comma 2015-11-16 16:36:01 +00:00
David Baker
bb59e9276b Merge remote-tracking branch 'origin/develop' into read_receipts 2015-11-16 16:33:39 +00:00
David Baker
bc2c744bed more bits of read receipt animation implemented 2015-11-13 11:42:51 +00:00
Matthew Hodgson
02ad2b5152 remove react-loader (not that the controller should be rendering spinners in the first place :( 2015-11-10 18:25:10 +00:00
Matthew Hodgson
68c1ddd5d2 replace react-loader with Spinner everywhere 2015-11-10 18:12:26 +00:00
David Baker
2f783a7ba9 Merge remote-tracking branch 'origin/develop' into read_receipts 2015-11-10 11:27:43 +00:00
David Baker
450036a6ed Merge remote-tracking branch 'origin/develop' into read_receipts 2015-11-10 11:26:42 +00:00
Matthew Hodgson
cb887c699e use gemini-scrollbar to provide fake scrollbars for the room list 2015-11-10 01:40:08 +00:00
Matthew Hodgson
87bb7c9b7b upgrade to react 0.14 2015-11-09 23:13:46 +00:00
Matthew Hodgson
efd88b9a83 upgrade to react 0.14 2015-11-09 23:13:43 +00:00
David Baker
d8edbd2e3c Requires js-sdk develop 2015-11-05 14:45:48 +00:00
David Baker
0aa90d918c bump js-sdk dep to develop 2015-11-05 14:45:16 +00:00
Matthew Hodgson
7fe7af6026 refactor out the sections of the RoomList into RoomSubLists. Start wiring up tags 2015-11-04 00:19:37 +00:00
Matthew Hodgson
e25d31a9fe Merge pull request #296 from vector-im/matthew/redesign 
Matthew/redesign
 2015-10-30 18:30:13 +00:00
David Baker
ffb9ce89c7 Merge branch 'develop' into matthew/redesign 2015-10-30 11:50:34 +00:00
Matthew Hodgson
fdfa0cbd0e display search results correct; support HTML markup 2015-10-30 04:10:37 +00:00
Kegan Dougal
cc313f350c Merge branch 'develop' into kegan/blocking 2015-10-29 16:03:26 +00:00
David Baker
5c77395faa v0.1.2 2015-10-28 18:32:13 +00:00
David Baker
e48e636c44 Bump js-sdk & react-sdk deps 2015-10-28 18:27:09 +00:00
David Baker
966f44baa1 bump js-sdk -> 0.3.0 on the right branch 2015-10-28 18:06:10 +00:00
David Baker
c46f40c816 bump js-sdk -> 0.3.0 2015-10-28 18:02:50 +00:00
Kegan Dougal
59d8cbe742 Use Modernizr to check for browser compatibility 
Add a CompatibilityPage which is shown for incompatible clients. If they
continue on regardless, proceed as if it never happened.
 2015-10-28 17:39:50 +00:00
David Baker
d12ca92ea7 Avoid double updating: setting the state will cause a re-render so forcing an update is redundant. Also bump js sdk dep to newest to match vector. 2015-10-13 11:12:06 +01:00
David Baker
1dd707775a Use new js-sdk modified time to avoid unnecessary member tile updates. Also avoid double-updating since we were setting state and then forcing an update which is redundant. 2015-10-13 11:10:43 +01:00
David Baker
53c8b9bcf7 no single quotes because windows 2015-10-05 10:20:02 +01:00
David Baker
55f656f150 0.0.2 2015-10-02 18:55:09 +01:00
David Baker
2247d951d6 Add config file for default hs/is urls 2015-10-02 11:48:52 +01:00
David Baker
94a6f856d1 Use the new interface for providing conf call functionality. Doesn't shoe it in the right room yet. 2015-09-30 16:52:45 +01:00
David Baker
4472f63b5f We need js sdk 0.2.1 for getRoomIdForAlias 2015-09-25 17:49:35 +01:00
David Baker
3ecf19df49 Disable caching on the local http server as commented 2015-09-25 17:38:51 +01:00
David Baker
56530d80d7 Add link to guthub issue about webpack's loader path silliness 2015-09-25 13:53:58 +01:00
David Baker
d172aaf41f Add -loader packages as deps 
Even though we don't use webpack directly, webpack needs the loaders
to be in the dependency package's node_modules directory, so this
lets packages that depend on us use webpack.
 2015-09-25 13:39:21 +01:00
David Baker
796f424a3f Didn't need these in the end 2015-09-25 11:51:35 +01:00
David Baker
f020f4397c Switch to webpack 
Webapck actually supports loading input source maps and generally seems a lot
more solid then browserify (even if their website has an annoying animated
logo).
 2015-09-25 11:43:28 +01:00
David Baker
c21dd853f9 Update package.json for renamed skin 2015-09-23 09:48:18 +01:00
David Baker
7e72ee891a More fixing up of vector skin 2015-09-22 18:49:04 +01:00
David Baker
09b81f46b0 Remove controllers that all come from react-sdk 2015-09-22 17:20:22 +01:00
David Baker
d938ba70d3 Port over room leaving 2015-09-17 12:10:01 +01:00
David Baker
901574b56e Update package.json 2015-09-16 14:13:16 +01:00
David Baker
aba4c1e9af We don't use catw here anymore 2015-09-15 14:46:41 +01:00
David Baker
f3b9f8c799 WIP reworking of skinning and app integration process 2015-09-11 15:42:11 +01:00
David Baker
9b73d6ed6d react-tools is dead. Long live Babel. 2015-09-10 15:28:30 +01:00
David Baker
6cc88e4ef3 Remove stuff that's going into the base skin 2015-09-09 16:57:55 +01:00
David Baker
e1a6ede17b Ignore all module caches and make the built js the default include root 2015-09-08 18:45:00 +01:00
Matthew Hodgson
5bab440a1f temporarily pin flux to 2.0, as 2.1 switches to ES6 and Babel which breaks our Dispatcher.js which fails to correctly extend the new Flux dispatcher, presumably due to using our noddy extend.js rather than an ES6-compatible one 2015-08-29 20:28:07 +01:00
David Baker
5a87b9759f update to new js-sdk 2015-08-07 11:27:13 +01:00
Kegan Dougal
772f987489 Unbreak npm start when running on Windows 2015-07-22 08:25:40 +01:00
David Baker
c8f3f5841c Depend on develop js-sdk for now 2015-07-21 22:51:54 -07:00
Matthew Hodgson
c33899e93a bump to the same react version as the custom app 2015-07-12 14:26:51 +01:00
David Baker
63d7ff3ed6 Build the logic too into the same hierarchy as it is unbuilt so it can be used either processed or unprocessed. Does involve having a dir called 'src' in the built products directory, and abusing jsx as a cross-platform version of cp (there is no jsx in the src dir). 2015-07-10 18:09:30 +01:00
David Baker
a00510c1ca Linkify URLs 2015-07-09 15:41:19 +01:00
David Baker
53e9d030b7 See uploaded files 2015-07-08 16:25:27 +01:00
David Baker
36ecbfc87f Upload files and images 2015-07-08 14:34:53 +01:00
David Baker
dff74f44de Tweak the example build process. Move example -> examples/trivial to we can have more than one. Update README appropriately. 2015-07-03 15:56:04 +01:00
Matthew Hodgson
aaa38d95ba s/themes/skins/g as we are always describing the whole UI layout here, whereas themes can sometimes just be small cosmetic tweaks (light-on-dark, dark-on-light etc) 2015-06-23 18:28:20 +01:00
David Baker
6fc1c54e66 Bump js-sdk version 2015-06-23 15:48:15 +01:00
David Baker
a022a4b9a6 Reshuffle to put "HTML" (JSX) and CSS together as a theme with logic elsewhere. 2015-06-23 14:40:50 +01:00
David Baker
5c56b201fc sensible version of js-sdk 2015-06-18 11:56:12 +01:00
David Baker
125fa78bc6 Something starting to resemble a Matrix Client 2015-06-12 17:34:17 +01:00
David Baker
877873e730 Build (and watch-build) jsx->js and modular css -> (uglified) css bundle 2015-06-10 15:54:36 +01:00
David Baker
2ea9ed8d79 Add repository fields to package.json and add a README to the example 2015-06-09 18:52:26 +01:00
David Baker
c42733ec95 Basic structure of a react SDK and start of an implementation. 2015-06-09 17:40:42 +01:00