Commit Graph

  • 0a326dc6a0 Take feature_sticker_messagse out of labs Luke Barnard 2018-05-09 14:59:35 +01:00
  • 97b9316ec7 Fix issue incorrect positioning with widget loading indicator Luke Barnard 2018-05-09 15:48:53 +01:00
  • bd2cf3bca8 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-05-09 16:12:19 +00:00
  • d304e0a0e7 Merge pull request #1885 from matrix-org/luke/feature-app-tile-spinner-delay2 Luke Barnard 2018-05-09 17:12:14 +01:00
  • 44ea11d386 Fix 'state_key' field name. Richard Lewis 2018-05-09 16:55:49 +01:00
  • 0c1846630c Improve appearance of short-lived app loading spinner Luke Barnard 2018-05-09 16:41:45 +01:00
  • fe121d0952 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-05-09 15:52:26 +00:00
  • 7d0406b430 Merge pull request #1883 from matrix-org/luke/cement-sticker-messages Luke Barnard 2018-05-09 16:52:20 +01:00
  • 60d85d3a44 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-05-09 15:52:16 +00:00
  • bcf003757c Merge pull request #1884 from matrix-org/luke/fix-glitchy-widget-spinner Luke Barnard 2018-05-09 16:52:11 +01:00
  • 59cbaf67bb Fix issue incorrect positioning with widget loading indicator Luke Barnard 2018-05-09 15:48:53 +01:00
  • 2ea7ad6d7b v0.15.0-rc.1 v0.15.0-rc.1 Luke Barnard 2018-05-09 15:31:25 +01:00
  • 3a30feaa52 Prepare changelog for v0.15.0-rc.1 Luke Barnard 2018-05-09 15:31:25 +01:00
  • 98c9dd23d5 v0.15.0-rc.1 Luke Barnard 2018-05-09 15:27:48 +01:00
  • 147459d338 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-05-09 14:20:44 +00:00
  • cf77c9ea05 Translated using Weblate (Swedish) Kenneth Larsson 2018-05-09 13:21:40 +00:00
  • c81e1ec535 Merge pull request #1879 from matrix-org/rxl881/widgetPermissions Richard Lewis 2018-05-09 15:20:39 +01:00
  • e10e659457 Take feature_sticker_messagse out of labs Luke Barnard 2018-05-09 14:59:35 +01:00
  • fb0bbf31c4 v0.14.3-rc.1 v0.14.3-rc.1 Luke Barnard 2018-05-09 13:52:27 +01:00
  • e87c44c38b Prepare changelog for v0.14.3-rc.1 Luke Barnard 2018-05-09 13:52:27 +01:00
  • 371ea7c078 v0.14.3-rc.1 Luke Barnard 2018-05-09 13:50:45 +01:00
  • 0e00677851 Bump react-sdk dep to 12.4-rc.1 Luke Barnard 2018-05-09 13:48:06 +01:00
  • ddf98705f2 v0.12.4-rc.1 Luke Barnard 2018-05-09 13:44:42 +01:00
  • 7d0f6532ec Prepare changelog for v0.12.4-rc.1 Luke Barnard 2018-05-09 13:44:41 +01:00
  • 9fc3324f55 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-05-09 12:32:23 +00:00
  • 76f1978721 Translated using Weblate (Swedish) Kenneth Larsson 2018-05-09 12:32:02 +00:00
  • 7f50fb3023 Merge branch 'master' into develop Luke Barnard 2018-05-09 13:32:06 +01:00
  • 76a8b61772 Merge branch 'master' into develop Luke Barnard 2018-05-09 13:31:42 +01:00
  • 9ef0813da4 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/widgetPermissions Richard Lewis 2018-05-09 12:03:47 +01:00
  • 17598d09b7 Merge pull request #1881 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk Luke Barnard 2018-05-09 11:59:52 +01:00
  • 9dc61307fa Merge pull request #6688 from RiotTranslateBot/weblate-riot-web-riot-web Luke Barnard 2018-05-09 11:59:47 +01:00
  • b930088b27 Bump travis-ci rebuild Richard Lewis 2018-05-09 11:53:56 +01:00
  • ee0e6c5913 Remove margins when in a ReplyThread to stop them taking so much space Michael Telatynski 2018-05-09 11:53:37 +01:00
  • 83d9ca080a Translated using Weblate (Italian) Simone Salsi 2018-05-02 20:34:00 +00:00
  • 91b93921a9 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-05-09 10:50:48 +00:00
  • 6fdd952510 Translated using Weblate (Swedish) Kenneth Larsson 2018-05-09 09:58:37 +00:00
  • edc70c9f11 Translated using Weblate (Russian) Andrey 2018-05-09 08:39:12 +00:00
  • 8bddbea236 Translated using Weblate (German) Sven Thomsen 2018-05-08 20:59:27 +00:00
  • a7f9f7ae3a Merge pull request #1880 from matrix-org/luke/pin-lolex-at-2.3.2 David Baker 2018-05-09 11:50:43 +01:00
  • 3d20bd00a2 Pin lolex at 2.3.2 to avoid bug causing tests to fail Luke Barnard 2018-05-09 11:43:02 +01:00
  • cbb8432873 unbreak switching from draft to slate Matthew Hodgson 2018-05-09 01:03:40 +01:00
  • 8e1ba6d139 Always allow users to edit their user widgets. Richard Lewis 2018-05-08 22:44:49 +01:00
  • b5320444a9 Fix current user and creator user ID properties. Richard Lewis 2018-05-08 22:05:53 +01:00
  • 8d2b5de4ff Translated using Weblate (German) Krombel 2018-05-08 15:45:05 +00:00
  • 03c6d424bd Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-05-08 13:16:06 +00:00
  • 61343e8a70 Translated using Weblate (Slovak) Peter Vágner 2018-05-08 10:40:50 +00:00
  • 337af1643f Merge pull request #1878 from matrix-org/t3chguy/m.relates_to Luke Barnard 2018-05-08 14:15:59 +01:00
  • def6329b6a Translated using Weblate (Slovak) Peter Vágner 2018-05-08 10:29:53 +00:00
  • e5021f368b Translated using Weblate (Basque) Osoitz 2018-05-08 09:26:35 +00:00
  • cd45f400a8 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-05-08 08:50:18 +00:00
  • f76191b0a2 Translated using Weblate (Ukrainian) strix aluco 2018-05-07 17:13:56 +00:00
  • 961dc11a70 Translated using Weblate (Hungarian) Szimszon 2018-05-07 12:21:26 +00:00
  • 03c7b7ef65 Translated using Weblate (Chinese (Simplified)) RainSlide 2018-05-08 03:51:50 +00:00
  • afb9e1f5f4 blind fix to the overlapping sticker bug Matthew Hodgson 2018-05-08 09:49:53 +01:00
  • 984961a3ed blind fix to the overlapping sticker bug Matthew Hodgson 2018-05-08 09:49:53 +01:00
  • 8b2eb2c400 make history work again Matthew Hodgson 2018-05-08 01:54:06 +01:00
  • ff42ef4a58 make it work for MD mode (modulo history) Matthew Hodgson 2018-05-06 22:08:36 +01:00
  • f0b7fd58b9 delint Michael Telatynski 2018-05-06 19:28:18 +01:00
  • f68036a4fb Replies: un-break click-to-mention on SenderProfile for reply&preview Michael Telatynski 2018-05-06 19:18:41 +01:00
  • 190f6d9483 make slate actually work as a textarea Matthew Hodgson 2018-05-06 15:27:27 +01:00
  • a2233a48c2 stub out yet more Matthew Hodgson 2018-05-06 01:18:26 +01:00
  • 8fbc87b6cf Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-05-05 23:22:23 +00:00
  • 8a1bd8da69 tell eslint to ignore viewAvatarOnClick being unused Matthew Hodgson 2018-05-06 00:22:14 +01:00
  • 05eba3fa32 stub out more until it loads... Matthew Hodgson 2018-05-06 00:18:11 +01:00
  • f4ed820b6f fix stubbing Matthew Hodgson 2018-05-05 23:38:14 +01:00
  • 67b29bb02f Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-05-05 22:25:58 +00:00
  • 500f58a963 fix deeply irritating react warning about viewAvatarOnClick on BaseAvatar Matthew Hodgson 2018-05-05 23:25:50 +01:00
  • e62e43def6 comment out more draft stuff Matthew Hodgson 2018-05-05 23:25:04 +01:00
  • 02947063d3 Merge branch 'develop' into matthew/slate Matthew Hodgson 2018-05-05 22:45:44 +01:00
  • d421c031fc Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-05-05 21:28:18 +00:00
  • af5be5c36c appease the fascist linter Matthew Hodgson 2018-05-05 22:28:09 +01:00
  • ccd99f4a49 increase max-warnings temporarily Matthew Hodgson 2018-05-05 22:27:54 +01:00
  • a2c75e776a Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-05-05 21:08:48 +00:00
  • 14bcfdd5c6 fix NPE Matthew Hodgson 2018-05-05 22:08:37 +01:00
  • a8a5d9e053 Translated using Weblate (Ukrainian) Walter 2017-11-17 20:15:46 +00:00
  • d6a226e6bd Put webpack-dev-server in development mode David Baker 2018-05-04 18:37:29 +01:00
  • 5bab9a7e34 Translated using Weblate (Portuguese (Brazil)) daniel tygel 2018-02-26 20:43:19 +00:00
  • 287a0de1df Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-05-04 12:58:03 +00:00
  • 224e905cae Translated using Weblate (Swedish) Kenneth Larsson 2018-05-03 23:28:34 +00:00
  • d4f4ebae14 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2018-05-03 23:55:48 +00:00
  • 5691b78591 Translated using Weblate (Chinese (Simplified)) RainSlide 2018-05-04 04:14:04 +00:00
  • aa370b3b67 Merge pull request #1877 from matrix-org/luke/test-room-list Luke Barnard 2018-05-04 13:57:57 +01:00
  • 91a68822ed Translated using Weblate (Chinese (Traditional)) Jeff Huang 2018-05-03 23:54:47 +00:00
  • 81c2bf6814 Translated using Weblate (Swedish) Kenneth Larsson 2018-03-15 09:55:24 +00:00
  • 3cc21d5701 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-05-03 17:46:25 +00:00
  • b08abd3d8b Merge pull request #1874 from matrix-org/luke/fix-analytics-crash Luke Barnard 2018-05-03 18:46:20 +01:00
  • 3ba51ba695 Null check before accessing _paq Luke Barnard 2018-05-03 18:25:00 +01:00
  • 5854b82074 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-05-03 17:14:22 +00:00
  • fecbac0b34 Merge pull request #1875 from matrix-org/t3chguy/m.relates_to Luke Barnard 2018-05-03 18:14:17 +01:00
  • c06a04af97 Fix unrelated linting issue Luke Barnard 2018-05-03 18:11:32 +01:00
  • e15b39092d Add tests for testing room tile updates when tags (groups in LLP) are selected Luke Barnard 2018-05-03 18:04:01 +01:00
  • 80d251b622 Add tests for optimistic updates of moving room tiles Luke Barnard 2018-05-03 15:41:35 +01:00
  • 8fcb530e6f Install lolex for clock mocking in tests Luke Barnard 2018-05-03 15:25:14 +01:00
  • 3e55a45601 Mock getGroups on MatrixClient for RoomList _makeGroupInviteTiles Luke Barnard 2018-05-03 15:24:41 +01:00
  • 97d344483e fix thinko when changing from ClientPeg to context in static method (DUH Michael Telatynski 2018-05-03 14:32:13 +01:00
  • 22f2d6f292 Fix crash when browser doesn't report page change measurement Luke Barnard 2018-05-03 14:08:10 +01:00
  • 4059ee5c55 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-05-03 12:22:45 +00:00
  • 7d0af02373 Merge pull request #1873 from matrix-org/t3chguy/m.relates_to Luke Barnard 2018-05-03 13:22:41 +01:00
  • 4892694e77 use more explicit reply fallback closing tag construct to fix 6657 Michael Telatynski 2018-05-03 11:24:10 +01:00
  • 71a12b6bbb fix getDefaultProps mixup Michael Telatynski 2018-05-03 11:23:41 +01:00