OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
10,016 Commits
211 Branches
549 Tags
667 MiB
Commit Graph

10016 Commits (4439a04689605f7244505915e3494a86954cf28c)

Author SHA1 Message Date
Luke Barnard eabcbb349c
Merge pull request #1888 from matrix-org/luke/instant-sticker-picker 
Instant Sticker Picker
 2018-05-11 18:12:57 +01:00
Luke Barnard 06898394eb Send visibility only when changed, and messaging is available 2018-05-11 18:06:58 +01:00
Luke Barnard 1f2f3474ed Delinting 2018-05-11 17:28:12 +01:00
Luke Barnard 8b049b2182 When stickerpicker made visible, send visibility over postMessage 2018-05-11 16:51:03 +01:00
Luke Barnard 4b6378a80d Add API to send visibiliy actions to widgets 2018-05-11 16:22:54 +01:00
Luke Barnard 746eeee33c Make AppTile in Stickerpicker persistent using PersistedElement 2018-05-11 15:07:51 +01:00
Luke Barnard 6500797d2a Use correct CSS selector in message composer 
to stop any last div from having its right-padding removed
 2018-05-11 14:49:50 +01:00
Luke Barnard 2dc51c516c Use new ContextualMenu component in Stickerpicker 2018-05-11 14:47:57 +01:00
Xose M f6a2e8d52c Translated using Weblate (Galician) 
Currently translated at 100.0% (1174 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2018-05-11 10:43:25 +00:00
Weblate 3f427a2603 Merge remote-tracking branch 'origin/develop' into develop 2018-05-10 17:12:49 +00:00
Sotiris Papatheodorou 1f23809c99 Translated using Weblate (Greek) 
Currently translated at 66.5% (781 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/el/
 2018-05-10 17:12:48 +00:00
Richard Lewis 2cde2a2a0a
Merge pull request #1887 from matrix-org/rxl881/widgetMessaging 
Update widget 'widgetData' key to 'data' to match spec.
 2018-05-10 18:12:42 +01:00
Richard Lewis 5cb892bf3c Allow use of either 'data' or 'widgetData' fields for the time being. 2018-05-10 18:06:00 +01:00
Luke Barnard 2c2eda1f00 Export ContextualMenu component, with added `hasBackground` property 
, which is only enabled when `createMenu` is used.
 2018-05-10 17:51:49 +01:00
Richard Lewis cbf52e00d2 Update widget 'widgetData' key to 'data' to match spec. 2018-05-10 16:43:10 +01:00
Luke Barnard 9046769132 Factor out ContextualMenu component 2018-05-10 16:02:25 +01:00
Weblate a615616ed4 Merge remote-tracking branch 'origin/develop' into develop 2018-05-10 08:18:31 +00:00
Richard Lewis e5c0b21a28
Merge pull request #1886 from matrix-org/rxl881/widgetFixes 
Fix 'state_key' field name.
 2018-05-10 09:18:26 +01:00
Luke Barnard 6a0bff6685 v0.12.4-rc.2 2018-05-09 17:34:54 +01:00
Luke Barnard 54fdb234d5 Prepare changelog for v0.12.4-rc.2 2018-05-09 17:34:53 +01:00
Luke Barnard 770e2d400e Improve appearance of short-lived app loading spinner 
by hiding it for 500ms - thereby only showing it if the loading is
taking a long time.
 2018-05-09 17:28:41 +01:00
Luke Barnard 0a326dc6a0 Take feature_sticker_messagse out of labs 2018-05-09 17:28:29 +01:00
Luke Barnard 97b9316ec7 Fix issue incorrect positioning with widget loading indicator 
by making sure to apply the correct CSS class to the parent
 2018-05-09 17:28:18 +01:00
Weblate bd2cf3bca8 Merge remote-tracking branch 'origin/develop' into develop 2018-05-09 16:12:19 +00:00
Luke Barnard d304e0a0e7
Merge pull request #1885 from matrix-org/luke/feature-app-tile-spinner-delay2 
Improve appearance of short-lived app loading spinner
 2018-05-09 17:12:14 +01:00
Richard Lewis 44ea11d386 Fix 'state_key' field name. 2018-05-09 16:55:49 +01:00
Luke Barnard 0c1846630c Improve appearance of short-lived app loading spinner 
by hiding it for 500ms - thereby only showing it if the loading is
taking a long time.
 2018-05-09 16:54:01 +01:00
Weblate fe121d0952 Merge remote-tracking branch 'origin/develop' into develop 2018-05-09 15:52:26 +00:00
Luke Barnard 7d0406b430
Merge pull request #1883 from matrix-org/luke/cement-sticker-messages 
Take feature_sticker_messagse out of labs
 2018-05-09 16:52:20 +01:00
Weblate 60d85d3a44 Merge remote-tracking branch 'origin/develop' into develop 2018-05-09 15:52:16 +00:00
Luke Barnard bcf003757c
Merge pull request #1884 from matrix-org/luke/fix-glitchy-widget-spinner 
Fix issue incorrect positioning with widget loading indicator
 2018-05-09 16:52:11 +01:00
Luke Barnard 59cbaf67bb Fix issue incorrect positioning with widget loading indicator 
by making sure to apply the correct CSS class to the parent
 2018-05-09 15:48:53 +01:00
Weblate 147459d338 Merge remote-tracking branch 'origin/develop' into develop 2018-05-09 14:20:44 +00:00
Kenneth Larsson cf77c9ea05 Translated using Weblate (Swedish) 
Currently translated at 58.0% (682 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
 2018-05-09 14:20:43 +00:00
Richard Lewis c81e1ec535
Merge pull request #1879 from matrix-org/rxl881/widgetPermissions 
Users should always be able to edit their user/non-room  widgets
 2018-05-09 15:20:39 +01:00
Luke Barnard e10e659457 Take feature_sticker_messagse out of labs 2018-05-09 14:59:35 +01:00
Luke Barnard ddf98705f2 v0.12.4-rc.1 2018-05-09 13:44:42 +01:00
Luke Barnard 7d0f6532ec Prepare changelog for v0.12.4-rc.1 2018-05-09 13:44:41 +01:00
Weblate 9fc3324f55 Merge remote-tracking branch 'origin/develop' into develop 2018-05-09 12:32:23 +00:00
Kenneth Larsson 76f1978721 Translated using Weblate (Swedish) 
Currently translated at 57.4% (674 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
 2018-05-09 12:32:23 +00:00
Luke Barnard 76a8b61772 Merge branch 'master' into develop 2018-05-09 13:31:42 +01:00
Richard Lewis 9ef0813da4 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/widgetPermissions 2018-05-09 12:03:47 +01:00
Luke Barnard 17598d09b7
Merge pull request #1881 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate.
 2018-05-09 11:59:52 +01:00
Richard Lewis b930088b27 Bump travis-ci rebuild 2018-05-09 11:53:56 +01:00
Michael Telatynski ee0e6c5913
Remove margins when in a ReplyThread to stop them taking so much space 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-05-09 11:53:37 +01:00
Weblate 91b93921a9 Merge remote-tracking branch 'origin/develop' into develop 2018-05-09 10:50:48 +00:00
Kenneth Larsson 6fdd952510 Translated using Weblate (Swedish) 
Currently translated at 55.4% (651 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
 2018-05-09 10:50:47 +00:00
Andrey edc70c9f11 Translated using Weblate (Russian) 
Currently translated at 99.7% (1171 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-05-09 10:50:47 +00:00
Sven Thomsen 8bddbea236 Translated using Weblate (German) 
Currently translated at 100.0% (1174 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2018-05-09 10:50:47 +00:00
David Baker a7f9f7ae3a
Merge pull request #1880 from matrix-org/luke/pin-lolex-at-2.3.2 
Pin lolex at 2.3.2 to avoid bug causing tests to fail
 2018-05-09 11:50:43 +01:00