Richard van der Hoff
53e5894759
Merge branch 'develop' into rav/webpack_olm
2016-10-26 15:13:57 +01:00
Richard van der Hoff
e1919c5ea3
Don't include two copies of the CSS in the tarball
...
Aggregate our CSS into build/components.css instead of vector/components.css, so
that it isn't included in the tarball.
2016-10-26 14:43:42 +01:00
Richard van der Hoff
fcf683c8a7
Use webpack to copy olm.js
...
Rather than copying olm.js ourselves in package.json, get webpack to do it for
us by declaring it as a second entry point.
2016-10-26 14:29:21 +01:00
Aviral Dasgupta
d6f27add66
Upgrade to babel6 and enable some presets.
2016-10-17 16:28:13 +01:00
David Baker
ea09a25563
Revert "Switch to babel 6"
2016-10-14 18:50:22 +01:00
Aviral Dasgupta
9174b32ef1
Upgrade to babel6 and enable some presets.
2016-10-02 17:28:24 +05:30
David Baker
43e3662e60
Merge pull request #1935 from aviraldg/fix-emoji
...
Various fixes and improvements to emojification.
2016-08-11 10:22:46 +01:00
Richard van der Hoff
b06c9f037e
gitignore copied olm.js
2016-08-10 00:09:26 +01:00
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
wmwragg
d2391f999e
Adding back in .DS_Store, but to ignore in any directory
2016-07-14 10:42:39 +01:00
wmwragg
e1779ca8bc
Deleteing .DS_Store files before adding to gitignore
2016-07-14 10:41:41 +01:00
wmwragg
65371c9a39
Adding ignoring of mac .DS_Store files to all directories
2016-07-14 10:32:30 +01:00
David Baker
b7f1a3db57
gitignore config.json now it isn't versioned
2016-06-09 18:51:25 +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
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
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
ce9a91e155
bundle.css shouldn't be necessary apart from the vector/bundle.* above
2015-10-30 11:33:33 +00:00
Matthew Hodgson
7f65ba506b
WIP of new CSS
2015-10-23 02:39:56 +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
bfa4cda2c6
build is no longer used
2015-09-23 10:14:38 +01:00
David Baker
22e18471db
gitignore bundle.js too
2015-06-11 18:26:25 +01:00
David Baker
a3126477bd
gitignore css bundle
2015-06-11 18:25:00 +01:00
David Baker
c6a30ff0c2
gitignore node_modules
2015-06-10 10:10:34 +01:00