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

3870 Commits

Author SHA1 Message Date
Richard van der Hoff 8fe05fdff3 Correct path to components.css 
Fix failure to find components.css which was introduced in e1919c5
(https://github.com/vector-im/vector-web/pull/2513)
 2016-10-26 15:02:34 +01:00
David Baker e002575eae Merge pull request #2513 from vector-im/rav/no_bundle_components_css 
Don't include two copies of the CSS in the tarball
 2016-10-26 14:52:29 +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
Richard van der Hoff e564d34ca8 Merge pull request #2512 from vector-im/dbkr/firefox_roomdir_align 
Correct text alignment on room directory search
 2016-10-26 10:49:59 +01:00
David Baker 61d7db6eb6 Correct text alignment on room directory search 
Seemed to only be broken on firefox
 2016-10-26 10:35:46 +01:00
Richard van der Hoff 5768f73bbd Merge pull request #2510 from vector-im/dbkr/ref-is-not-rel 
Correct spelling of 'rel'
 2016-10-25 14:51:30 +01:00
David Baker df94dd7487 Update ChangelogDialog.js 2016-10-25 14:41:02 +01:00
Richard van der Hoff 4221781d9b Merge pull request #2507 from vector-im/rav/readme 
readme tweaks
 2016-10-25 11:29:51 +01:00
Richard van der Hoff e0556789d2 readme tweaks 
Note that Chrome requires https for voip (fixes #2506)

Remove lies about where issues are filed.
 2016-10-25 11:20:23 +01:00
David Baker 9310d92605 document integrations config in README 2016-10-21 14:59:13 +01:00
Richard van der Hoff 8a2f57d234 Merge pull request #2491 from vector-im/rav/riot 
s/vector/riot/ in the readme
 2016-10-20 17:06:14 +01:00
Richard van der Hoff d72323bfc5 typo 2016-10-20 17:05:44 +01:00
Richard van der Hoff dfd0356609 s/vector/riot/ in the readme 
Also remove the outdated "E2E" section

Fixes https://github.com/vector-im/vector-web/issues/2457
 2016-10-20 16:54:30 +01:00
David Baker 20a7aa03ed Merge pull request #2480 from vector-im/dbkr/babelrc2 
Switch to babel 6, again
 2016-10-17 17:22:49 +01:00
David Baker e02e0219a7 Add plugin that makes babel 6 not break everything 2016-10-17 16:28:14 +01:00
David Baker d04201d069 Replace stage & es2017 with specific plugins 
Also sort out regenerator runtime as it turns out importing
babel-polyfill in your code is insufficient if using webpack
because it's imported too late, so use both that and
regenerator-runtime. Sigh.
 2016-10-17 16:28:14 +01:00
David Baker 82de2ca4ec Remove transform-runtime 
We use instance methods (or at least, draft.js does) so we need
babel-polyfill instead.
 2016-10-17 16:28:14 +01:00
David Baker 18450058d7 Remove presets from karma.conf 
seemt o be picked up from .babelrc
 2016-10-17 16:28:14 +01:00
David Baker f20b2593bc move babelcheck.js to scripts/ 2016-10-17 16:28:14 +01:00
David Baker 4d51a5de7e shebang 2016-10-17 16:28:14 +01:00
David Baker 8e0b61ca35 Reminder to restore links + stage2, not stage 0 2016-10-17 16:28:13 +01:00
David Baker 61a543a694 Add babelcheck.js 
As per 4bea0c0818
 2016-10-17 16:28:13 +01:00
David Baker 5608e97719 Remove babel-polyfill 
Should be no need for it if we're using transform-runtime (and
we definitely don't need it twice...)
 2016-10-17 16:28:13 +01:00
Aviral Dasgupta d6f27add66 Upgrade to babel6 and enable some presets. 2016-10-17 16:28:13 +01:00
David Baker 740ab7e479 Merge pull request #2472 from vector-im/revert-2461-aviraldg-babelrc 
Revert "Switch to babel 6"
 2016-10-14 18:51:02 +01:00
David Baker ea09a25563 Revert "Switch to babel 6" 2016-10-14 18:50:22 +01:00
David Baker 5a08c62f1b Use the default integrations URLs in the sample 
localhost is not a sensible default
 2016-10-14 18:21:26 +01:00
David Baker be1d7781c5 Merge pull request #2461 from vector-im/aviraldg-babelrc 
Switch to babel 6
 2016-10-14 18:19:43 +01:00
David Baker 40ac80a3e9 Replace stage & es2017 with specific plugins 
Also sort out regenerator runtime as it turns out importing
babel-polyfill in your code is insufficient if using webpack
because it's imported too late, so use both that and
regenerator-runtime. Sigh.
 2016-10-14 18:03:22 +01:00
David Baker 5f747e1a90 Remove transform-runtime 
We use instance methods (or at least, draft.js does) so we need
babel-polyfill instead.
 2016-10-13 10:57:10 +01:00
David Baker 0c3537ac1a Remove presets from karma.conf 
seemt o be picked up from .babelrc
 2016-10-13 09:51:10 +01:00
David Baker e6caf9ece4 move babelcheck.js to scripts/ 2016-10-13 09:50:40 +01:00
David Baker 34c60c69d8 shebang 2016-10-13 09:41:09 +01:00
David Baker 5ff915476a Reminder to restore links + stage2, not stage 0 2016-10-12 18:08:52 +01:00
David Baker e5d2ebc57c Add babelcheck.js 
As per 4bea0c0818
 2016-10-12 17:46:11 +01:00
David Baker 64815b1b0b Remove babel-polyfill 
Should be no need for it if we're using transform-runtime (and
we definitely don't need it twice...)
 2016-10-12 17:23:01 +01:00
David Baker 59120d3019 Merge branch 'babelrc' of https://github.com/aviraldg/vector-web into aviraldg-babelrc 2016-10-12 17:17:10 +01:00
David Baker 9245ab01f1 js-sdk & react-sdk develop 2016-10-12 11:52:18 +01:00
David Baker 59fe9279d1 0.8.3 2016-10-12 11:49:58 +01:00
David Baker 046c9ef920 Prepare changelog for v0.8.3 2016-10-12 11:49:57 +01:00
David Baker bca22f26c5 js-sdk & react-sdk release versions 2016-10-12 11:49:21 +01:00
Richard van der Hoff 2b68b88b14 Merge pull request #2453 from vector-im/rav/center_images_in_dialog_buttons 
Centre images in dialog buttons
 2016-10-11 19:09:46 +01:00
Richard van der Hoff 97cedfc712 Centre images in dialog buttons 
Some dialogs put a spinner in the button... need to line them up.
 2016-10-11 17:50:49 +01:00
Matthew Hodgson 86cb3e9376 Merge pull request #2448 from aviraldg/fix-quote 
Only show quote option if RTE is enabled
 2016-10-11 14:39:42 +01:00
Aviral Dasgupta 42993a78ed Only show quote option if RTE is enabled 2016-10-11 19:07:15 +05:30
Richard van der Hoff 2a5ca9d3df Merge pull request #2443 from vector-im/dbkr/matrix_network_join_button 
Fix join button for 'matrix' networks
 2016-10-10 11:40:32 +01:00
David Baker 323bd79d0e Fix join button for 'matrix' networks 
Fixes https://github.com/vector-im/vector-web/issues/2435
 2016-10-10 11:21:20 +01:00
Matthew Hodgson 60adbffacf try to fix the create room label 2016-10-10 02:38:38 +01:00
Richard van der Hoff f827a2963e Merge pull request #2422 from vector-im/dbkr/fix_no_freenode_rooms 
Don't stop paginating if no rooms match
 2016-10-06 10:39:45 +01:00