OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
4,759 Commits
203 Branches
553 Tags
456 MiB
Commit Graph

283 Commits (22df03944c1ee712d4eb31fffb4b4432e9677d66)

Author SHA1 Message Date
Aviral Dasgupta 71251293e4 RTE formatbar (wip) 
Fixes vector-im/vector-web#2024
 2016-09-08 00:02:16 +05:30
Matthew Hodgson b5f9c2a5ac Merge branch 'master' into develop 2016-09-02 17:17:24 +01:00
Matthew Hodgson 14227b5718 0.6.5-r3 2016-09-02 17:17:01 +01:00
Matthew Hodgson fd664e893f Merge branch 'master' into develop 2016-09-02 17:14:24 +01:00
Matthew Hodgson c2ca261085 0.6.5-r2 2016-09-02 17:13:59 +01:00
Matthew Hodgson 1a4e236a50 Merge branch 'master' into develop 2016-09-01 22:18:32 +01:00
Matthew Hodgson b9d98f918e 0.6.5-r1 2016-09-01 22:18:11 +01:00
Matthew Hodgson 3b2faa4cf9 pin to dev 2016-08-30 13:54:35 +01:00
Matthew Hodgson 90cfb06ba3 0.6.5 2016-08-28 16:55:04 +01:00
Matthew Hodgson 3dd337b553 dep on 0.5.6 of matrix-js-sdk 2016-08-28 16:51:51 +01:00
Matthew Hodgson 6786539550 pin linkifyjs to precisely 2.0.0-beta4, as 2.0.0-beta9 breaks links as per https://github.com/vector-im/vector-web/issues/2010 2016-08-25 18:30:48 +01:00
David Baker 3c8a7e36aa 0.6.4-r1 2016-08-12 10:08:15 +01:00
David Baker ec9243d4b0 0.6.4 2016-08-11 17:29:10 +01:00
David Baker e4dd387376 JS SDK 0.5.5 released 2016-08-11 17:28:09 +01:00
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
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 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 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
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
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
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 fdcebe1e56 Merge remote-tracking branch 'origin/develop' into dbkr/scalar 2016-06-06 17:19:38 +01:00
Matthew Hodgson 507f5e2ca1 0.6.3 2016-06-03 12:17:46 +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 204437e40c 0.6.1 2016-06-02 18:32:50 +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 001011df27 Initial version of rich text editor 2016-05-27 10:15:55 +05:30
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
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 37365728cb Bump react-gemini-scrollbar 
(to pick up a non-broken version)
 2016-04-20 13:46:21 +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 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 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 73f7528d0f Use babel 5 for karma tests 2016-03-31 16:59: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 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 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 dcfc283279 0.3.1 2016-03-23 14:55:44 +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 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 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 6a0cd9e047 Bump to dev branch of js-sdk 2016-03-14 15:54:33 +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 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 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
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 5e2a4fa537 Merge branch 'develop' into skindex-nextgen 2015-12-01 15:48:05 +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
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 5ba1ef5203 Move velocity stuff / contextual menu from Vector to React. 2015-11-27 15:37:40 +00:00
Kegan Dougal b12fc67a63 Add markdown support (enabled by default) 2015-11-20 16:08:57 +00:00
David Baker caabe02fca Merge pull request #32 from matrix-org/read_receipts 
Read receipts
 2015-11-18 14:53:25 +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
David Baker 2f783a7ba9 Merge remote-tracking branch 'origin/develop' into read_receipts 2015-11-10 11:27:43 +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 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
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 55f656f150 0.0.2 2015-10-02 18:55:09 +01:00
David Baker 4472f63b5f We need js sdk 0.2.1 for getRoomIdForAlias 2015-09-25 17:49:35 +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 d938ba70d3 Port over room leaving 2015-09-17 12:10:01 +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
David Baker 5a87b9759f update to new js-sdk 2015-08-07 11:27:13 +01: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