Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-15 12:45:11 +08:00
Code Issues Packages Projects Releases Wiki Activity
62,578 Commits 207 Branches 552 Tags 516 MiB
bebf44d9ee
Commit Graph

98 Commits

Author SHA1 Message Date
Michael Telatynski
a09f890619 Merge package.json, match version in electron/package.json 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-05 17:03:28 +01:00
Michael Telatynski
7676fd960e Merge branch 'develop' into forward_message 2017-04-30 12:35:52 +01:00
Matthew Hodgson
4dd6ee681d fix /config.json in .gitignore 2017-04-25 00:14:24 +01:00
Michael Telatynski
2eb715002f Merge branch 'develop' of https://github.com/vector-im/riot-web into forward_message 
Conflicts:
	.gitignore
 2017-04-24 18:38:52 +01:00
Michael Telatynski
f200e349c9 Add .idea to .gitignore file so I don't accidentally upload my IDE config 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-21 13:50:22 +01:00
Michael Telatynski
77ce58b59d add .idea to .gitignore so I don't accidentally push my IDE config 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-21 13:46:49 +01:00
Michael Telatynski
3fb54029d7 Fix packaged functionality 
Improve dependency management for Electron main process deps

Dependencies in /electron/package.json will be installed through a script in /package.json and will be bundled via electron-builder

Does not affect standard webapp whatsoever

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-13 13:39:15 +01:00
daniel tygel
ab1b377a1d add config.json to .gitignore 2017-04-10 14:11:26 -03:00
David Baker
229693dd71 gitignore .npmrc 
(We now require a .npmrc in the riot-web dir to use the right
account when releasing)
 2016-12-08 11:41:31 +00:00
David Baker
3d813e68e9 gitignore electron/pub 2016-12-05 14:20:26 +00:00
David Baker
c8a6be1454 Update gitignore 2016-11-08 16:14:57 +00:00
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
caa3cb7d89 Electron support 
From https://github.com/vector-im/vector-web/pull/2511 but with
just the actual electron changes
 2016-11-02 18:49:28 +00:00
David Baker
622ab27254 gitignore dist 2016-11-01 15:35:41 +00:00
Richard van der Hoff
6396c60645 Put a cachebuster in the names of CSS and JS files 
This means that clients can do better caching of assets, as it will mean we are
no longer reliant on etags to ensure that clients get a fresh version.

We inhibit the cachebuster for `npm start`, so that we don't get millions of
copies of the bundles on dev boxes.
 2016-10-26 15:20:59 +01:00
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
Aviral Dasgupta
1c002866e8 feat: add and configure eslint 2016-07-01 23:08:51 +05:30
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
Richard van der Hoff
6069812fcf Create Junit reports from karma 2016-03-29 00:12:59 +01: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
Richard van der Hoff
46a2d4079d jenkins.sh for react-sdk 2016-02-25 14:18: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
manuroe
e72323c405 Removed unexpected commit on .gitignore 2016-01-22 08:57:06 +01:00
manuroe
a627ee7ef6 Fixed ternary operation 2016-01-22 08:54:40 +01: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
6cc88e4ef3 Remove stuff that's going into the base skin 2015-09-09 16:57:55 +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