David Baker
1405859d2c
Merge pull request #5944 from vector-im/revert-3046-patch-1
...
Revert "Add a after timestamp"
2018-01-08 15:18:03 +00:00
David Baker
24e16e5c18
Revert "Add a after timestamp"
2018-01-08 15:17:05 +00:00
David Baker
a21bbd15c5
Merge pull request #3046 from rubo77/patch-1
...
Add a after timestamp
2018-01-08 15:00:45 +00:00
David Baker
b6c002b587
Fix merge
2018-01-08 14:35:39 +00:00
David Baker
9c3e4a1202
Merge branch 'develop' into patch-1
2018-01-08 14:31:21 +00:00
Matthew Hodgson
bddab533a3
Merge pull request #5938 from osoitz/master
...
Corrected language name
2018-01-07 20:34:19 +00:00
osoitz
5106809394
Update copy-res.js
...
Corrected Basque name
2018-01-07 20:39:24 +01:00
David Baker
d6942a455d
Merge branch 'rubo77-hide-options-cp' into develop
2018-01-05 14:30:36 +00:00
David Baker
c8af65fff4
Merge branch 'hide-options-cp' of https://github.com/rubo77/vector-web into rubo77-hide-options-cp
2018-01-05 14:30:21 +00:00
David Baker
38e0b26153
Merge branch 'master' into develop
2018-01-03 16:15:46 +00:00
David Baker
5635614549
v0.13.4
2018-01-03 16:13:24 +00:00
David Baker
1bb861f6cf
Prepare changelog for v0.13.4
2018-01-03 16:13:24 +00:00
David Baker
2eb433157a
v0.13.4
2018-01-03 16:08:38 +00:00
Michael Telatynski
d71af40967
add missing config.json entry such that scalar-staging widgets work
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-03 16:06:58 +00:00
Luke Barnard
604d4e0a51
Merge pull request #5900 from Nostradamos/fix_4821
...
Fix for `If riot is narrow enough, such that 'Send a message (unecrypted)' wraps to a second line, the timeline doesn't fit the window.`
2018-01-03 15:48:38 +00:00
nostradamos
762f6aaf0f
Merge remote-tracking branch 'upstream/develop' into fix_4821
2018-01-02 12:58:30 +01:00
Nostradamos
3600d1c667
moved max-height/min-height/overflow attributes to higher level to also include DraftEditorPlaceholder. Could fix https://github.com/vector-im/riot-web/issues/4821
2018-01-02 12:14:54 +01:00
Richard Lewis
cf47b919d5
Merge pull request #5849 from vector-im/rxl881/snapshot
...
Screenshot UI
2017-12-19 17:04:46 +00:00
Richard Lewis
af99ac3293
Merge pull request #5855 from vector-im/t3chguy/nvl/fix_electron_config
...
add missing config.json entry such that scalar-staging widgets work
2017-12-19 13:23:15 +00:00
Michael Telatynski
843505f6a9
add missing config.json entry such that scalar-staging widgets work
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-19 12:03:48 +00:00
Matthew Hodgson
bfb60265cb
Merge pull request #5610 from vector-im/t3chguy/devtools-1
...
add dark theme styling to devtools input box
2017-12-18 21:44:43 +00:00
Michael Telatynski
fbd9ba32aa
Merge pull request #5851 from oivoodoo/add-oivoodoo-author
...
Fixes #1953 by adding oivoodoo as author
2017-12-18 19:50:26 +00:00
Alexandr Korsak
3164655a21
Fixes #1953
2017-12-18 22:41:46 +03:00
Matthew Hodgson
fbbca2e466
Merge pull request #5824 from pafcu/patch-1
...
Instructions on security issues
2017-12-18 12:35:00 +00:00
Richard Lewis
6b24aff6c5
Merge branch 'develop' of github.com:vector-im/riot-web into rxl881/snapshot
2017-12-15 13:01:51 +00:00
Luke Barnard
7cc8fed61b
Merge pull request #5790 from vector-im/luke/feature-ordered-tag-panel
...
Move DND wrapper to top level component
2017-12-14 10:36:26 +00:00
pafcu
25bfb52e7e
Instructions on security issues
...
It's not good to put potentially sensitive security issues in the public bug tracker, so advice to use security@matrix.org instead
2017-12-12 19:49:48 +01:00
Matthew Hodgson
89efbd0a71
Merge pull request #5786 from vector-im/rxl881/titleBar
...
Widget title bar max / min visual cues.
2017-12-08 19:18:52 +01:00
Luke Barnard
608a359e0a
Move DND wrapper to top level component
2017-12-06 14:54:35 +00:00
Richard Lewis
0ff5d61189
Don't capture pointer events.
2017-12-05 18:44:24 +00:00
Richard Lewis
c37c50e1e0
Add maximise and minimise icons
2017-12-05 18:07:49 +00:00
Richard Lewis
e0ae266bb2
Make cursor pointer on menubar mouseover.
2017-12-05 18:07:19 +00:00
Matthew Hodgson
9835e2e0b4
Merge pull request #5759 from vector-im/luke/renumerate-broken-ordered-sublists
...
Implement renumeration of ordered tags upon collision
2017-12-04 18:09:23 +00:00
Luke Barnard
95c746936a
Merge branch 'master' into develop
2017-12-04 12:36:42 +00:00
Luke Barnard
b73f0c7b90
v0.13.3
2017-12-04 12:31:50 +00:00
Luke Barnard
8ec48db86c
Prepare changelog for v0.13.3
2017-12-04 12:31:50 +00:00
Luke Barnard
5fba5b30e9
v0.13.3
2017-12-04 12:29:32 +00:00
Luke Barnard
c685546e9a
Bump js-sdk to 0.9.2, react-sdk to 0.11.3
2017-12-04 12:27:49 +00:00
Luke Barnard
1a0c0af447
Bump js-sdk to 0.9.2, react-sdk to 0.11.3
2017-12-04 12:25:54 +00:00
Richard Lewis
380625241e
Green camera icon
2017-12-03 11:25:52 +00:00
Luke Barnard
b0d115a64a
Implement renumeration of ordered tags upon collision
...
I was being bitten by this enough for me to want to fix it. This implementation really ought to be improved such that it doesnt tend towards being broken the more it is used.
2017-12-01 18:20:38 +00:00
Luke Barnard
e80c4fadea
Linting
2017-12-01 18:18:48 +00:00
Luke Barnard
cc4890f0b8
Fix TagPanel bg on status theme
2017-12-01 14:12:31 +00:00
Luke Barnard
0aaae9bca5
Merge pull request #5751 from vector-im/luke/refactor-keycode-to-keyboard
...
Update imports for accessing KeyCode
2017-12-01 12:04:10 +00:00
Luke Barnard
a24c42b3a8
Realign collpased BottomLeftMenu with create group button
2017-12-01 11:04:46 +00:00
Luke Barnard
1ccffb7e58
Update imports for accessing KeyCode
2017-12-01 10:56:25 +00:00
Luke Barnard
4e7a1e9653
Correctly position TagPanel createGroupButton
2017-11-30 11:07:27 +00:00
Matthew Hodgson
2a402985aa
Merge pull request #5685 from aidalgol/root-lang-attrib-fix
...
Set html lang attribute from language setting
2017-11-30 10:12:40 +00:00
Matthew Hodgson
f72b44650b
fix tertiary accent colors
2017-11-29 22:04:40 +00:00
Luke Barnard
72563e6114
overflow hidden for groupPublicity scrollbox
2017-11-29 18:50:22 +00:00
