Commit graph

8177 commits

Author SHA1 Message Date
Weblate
bd8eaf6868 Merge remote-tracking branch 'origin/develop' into develop 2017-12-07 10:00:55 +00:00
David Baker
8e7c4c2018
Merge pull request #1648 from matrix-org/rxl881/encWarning
Add messaging endpoint for room encryption status.
2017-12-07 10:00:51 +00:00
Richard Lewis
df438924a7 Remove logging. 2017-12-07 09:57:53 +00:00
Weblate
34774fed8f Merge remote-tracking branch 'origin/develop' into develop 2017-12-07 09:41:44 +00:00
Luke Barnard
4603d593de
Merge pull request #1588 from pvagner/develop
Add some missing translatable strings
2017-12-07 09:41:39 +00:00
Weblate
c3d6ff1e3b Merge remote-tracking branch 'origin/develop' into develop 2017-12-06 22:54:43 +00:00
Krombel
2c95055aaa Translated using Weblate (German)
Currently translated at 99.8% (940 of 941 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-12-06 22:54:42 +00:00
Richard Lewis
ed675fe791 Allow bypass of widget loading screen on hide / show. 2017-12-06 22:54:32 +00:00
jfkimmes
178cf2d301 Translated using Weblate (German)
Currently translated at 99.8% (940 of 941 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-12-06 22:04:10 +00:00
Krombel
b22ec73b5d Translated using Weblate (German)
Currently translated at 99.6% (938 of 941 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-12-06 22:03:39 +00:00
jfkimmes
80de90edb7 Translated using Weblate (German)
Currently translated at 99.6% (938 of 941 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-12-06 22:03:13 +00:00
Krombel
58f7647e8a Translated using Weblate (German)
Currently translated at 99.4% (936 of 941 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-12-06 22:02:53 +00:00
jfkimmes
0941789b7f Translated using Weblate (German)
Currently translated at 99.4% (936 of 941 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-12-06 22:02:47 +00:00
David Baker
d6688d8f12 Add jsdoc 2017-12-06 19:11:50 +00:00
David Baker
2a01985076 better proptypes 2017-12-06 19:07:12 +00:00
David Baker
0deed4bb88 null guard 2017-12-06 19:05:25 +00:00
David Baker
1a3671d241 remove stray param 2017-12-06 19:04:29 +00:00
David Baker
5bca5a7a8e More underscore 2017-12-06 19:02:26 +00:00
David Baker
aa99b898ce Add that it might not work now either
also a comma
2017-12-06 18:57:48 +00:00
Luke Barnard
65d88334a9 Fix linting
React DnD specifies functions with upper-case first letters
2017-12-06 16:48:18 +00:00
Weblate
fe01539e17 Merge remote-tracking branch 'origin/develop' into develop 2017-12-06 16:44:52 +00:00
vricci
3e1888b6d8 Translated using Weblate (Italian)
Currently translated at 8.6% (81 of 941 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2017-12-06 16:44:51 +00:00
Richard Lewis
e20db416f2 Add field to bypass riot widget loading screen. 2017-12-06 16:44:41 +00:00
David Baker
4462694438 lint 2017-12-06 16:06:33 +00:00
David Baker
65c210cdde Warn when migrating e2e data to indexeddb 2017-12-06 15:28:20 +00:00
Luke Barnard
7e1f1cdbd9 Move DragDropContext to wrap LoggedInView
Becuase the tests rely on being able to inspect the state of MatrixChat
2017-12-06 15:01:16 +00:00
Luke Barnard
8f88995b3d Add analytics to TagOrderStore 2017-12-06 14:22:11 +00:00
Luke Barnard
a9cc8eba33 Remove redundant TagOrderStore.orderedTags setting 2017-12-06 14:20:16 +00:00
Luke Barnard
35a108eecc Simplify render of TagPanel - remove sorting 2017-12-06 14:17:26 +00:00
Luke Barnard
4af7def20e Use AccountData im.vector.web.tag_ordering
Also, make defaults sensible
2017-12-06 14:13:08 +00:00
Luke Barnard
7aa5dcef69 Move DragDropContext to wrap entire app 2017-12-06 13:10:58 +00:00
Luke Barnard
a8a650c24a Move TagTile to separate file, and make it dragable 2017-12-06 11:25:46 +00:00
Luke Barnard
82a95f0793 Simplify order_tag in TagOrderStore
such that:
 - it takes a targetTag to be replaced instead the previous tag to insert after
 - it optionally displaces the targetTag before or after the inserted tag
2017-12-06 11:22:06 +00:00
Peter Vágner
802abe7091 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop 2017-12-06 11:07:01 +01:00
Richard Lewis
3206527d73 Remove logging. 2017-12-05 21:59:44 +00:00
Richard Lewis
d62520482a fix typo. 2017-12-05 21:57:28 +00:00
Richard Lewis
fc3287c49f Fix error message. 2017-12-05 21:56:35 +00:00
Richard Lewis
7f86ed35a3 Only show custom title if different from app name. 2017-12-05 21:49:11 +00:00
Richard Lewis
1415a83a61 Merge branch 'rxl881/titleBar' of https://github.com/matrix-org/matrix-react-sdk into rxl881/customTitle 2017-12-05 21:42:47 +00:00
Richard Lewis
d5d5397959 Set custom widget title. 2017-12-05 21:41:44 +00:00
Richard Lewis
9fd8deb16d Add maximize / minimize apps drawer icons. 2017-12-05 18:18:51 +00:00
Luke Barnard
8178496457 Implement Store for ordering tags in the tag panel 2017-12-05 14:45:44 +00:00
Weblate
bdf1fee64d Merge remote-tracking branch 'origin/develop' into develop 2017-12-05 12:03:02 +00:00
Richard Lewis
9eb334a1d4
Merge pull request #1640 from matrix-org/rxl881/widgetTitle
Add widget -> riot postMessage API
2017-12-05 12:02:57 +00:00
Weblate
c9aad51a96 Merge remote-tracking branch 'origin/develop' into develop 2017-12-05 11:59:30 +00:00
jfkimmes
35c7f6e13d Translated using Weblate (German)
Currently translated at 99.1% (933 of 941 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-12-05 11:59:30 +00:00
David Baker
130c056ed9
Merge pull request #1646 from matrix-org/dbkr/nullchecks4u
Add some null checks
2017-12-05 11:59:24 +00:00
Richard Lewis
597a71fa9d Add messaging endpoint for room encryption status. 2017-12-05 11:59:02 +00:00
David Baker
87c808a088 semicolon 2017-12-05 11:53:49 +00:00
David Baker
fec2e31b41 oops, actual null check 2017-12-05 11:38:25 +00:00