Commit Graph

  • ab2a72a193 Bump version temporarily David Baker 2017-08-22 18:55:33 +01:00
  • 6bdad8b5f6 Released js-sdk & react-sdk David Baker 2017-08-22 18:55:09 +01:00
  • 85b609608e v0.10.1-rc.1 David Baker 2017-08-22 18:53:11 +01:00
  • f4fb502fc3 Prepare changelog for v0.10.1-rc.1 David Baker 2017-08-22 18:53:11 +01:00
  • 8312cf6ab2 Temporarily bump version David Baker 2017-08-22 18:50:33 +01:00
  • 3939d948bf js-sdk v0.10.1-rc.1 David Baker 2017-08-22 18:43:33 +01:00
  • 0b29b7f9fd Merge pull request #4832 from RiotTranslateBot/weblate-riot-web-riot-web David Baker 2017-08-22 18:17:45 +01:00
  • c203f417bc Merge pull request #1329 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk David Baker 2017-08-22 18:17:40 +01:00
  • ecaaee3b24 Translated using Weblate (Ukrainian) strix aluco 2017-08-21 22:35:44 +00:00
  • 56219dd649 Translated using Weblate (Spanish) lazz0 2017-08-19 23:55:27 +00:00
  • ce4abc6bcc Translated using Weblate (Russian) Andrey 2017-08-22 16:53:08 +00:00
  • ca0061f7a1 Translated using Weblate (German) Krombel 2017-08-18 15:56:22 +00:00
  • e427df4133 Translated using Weblate (French) kaiyou 2017-08-19 11:18:37 +00:00
  • 1b84fc1d2e Translated using Weblate (Bengali (India)) Sohom Bhattacharjee 2017-08-21 00:33:41 +00:00
  • 60d9ef5c67 Translated using Weblate (Bengali (India)) Sohom Bhattacharjee 2017-08-21 00:33:41 +00:00
  • 0df68cb8e6 Translated using Weblate (Tamil) Balaji Ravichandran 2017-08-21 16:06:30 +00:00
  • 729d3f7608 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-08-22 16:47:01 +00:00
  • eeadf63b6f Translated using Weblate (Ukrainian) strix aluco 2017-08-21 22:35:44 +00:00
  • 9f762db59f Translated using Weblate (Spanish) lazz0 2017-08-19 23:55:27 +00:00
  • 3c34c141c2 Translated using Weblate (French) kaiyou 2017-08-19 11:18:37 +00:00
  • 630c405728 Translated using Weblate (Czech) Jan Kudrik 2017-08-17 18:59:37 +00:00
  • 9f5f4ee8d1 v0.12.0-rc.2 v0.12.0-rc.2 David Baker 2017-08-22 14:18:53 +01:00
  • f79f8e1d3e Prepare changelog for v0.12.0-rc.2 David Baker 2017-08-22 14:18:53 +01:00
  • 7412828f05 v0.12.0-rc.2 David Baker 2017-08-22 14:17:34 +01:00
  • beb694f68c react-sdk rc.2 David Baker 2017-08-22 14:13:04 +01:00
  • bbe00b2f54 Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist David Baker 2017-08-22 11:08:58 +01:00
  • 502a0480a0 Merge pull request #1327 from matrix-org/matthew/multiple-widgets Richard Lewis 2017-08-22 10:53:51 +01:00
  • f551cfef81 Retest please David Baker 2017-08-22 10:53:24 +01:00
  • b50ce2daa0 Empty commit: retest please David Baker 2017-08-22 10:35:03 +01:00
  • e72bdffd62 Remove unused import David Baker 2017-08-22 10:22:51 +01:00
  • 5f816666e1 Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist David Baker 2017-08-22 10:08:02 +01:00
  • a69cc9169f lint fix. Richard Lewis 2017-08-22 10:04:57 +01:00
  • 74ab7c9bb3 Fix encoding Richard Lewis 2017-08-22 09:59:27 +01:00
  • 5648a7488a Translated using Weblate (Hungarian) Szimszon 2017-08-21 19:54:01 +00:00
  • 013f2ce66a More CSS for group membership lifecycle David Baker 2017-08-21 19:34:31 +01:00
  • ac64e9b705 Lint David Baker 2017-08-21 19:34:07 +01:00
  • b898d15580 Specify default number of members to load David Baker 2017-08-21 19:30:28 +01:00
  • e77ea352e4 Support full group membership cycle David Baker 2017-08-21 19:18:32 +01:00
  • a0fe3d1cb0 Merge pull request #1326 from matrix-org/rav/userpicker_proptypes David Baker 2017-08-21 16:43:15 +01:00
  • 764d5891ad Fix proptypes on UserPickerDialog Richard van der Hoff 2017-08-21 16:30:49 +01:00
  • b7569a9831 Revert auxPanel changes (this should already have been fixed in a separate PR). Richard Lewis 2017-08-21 15:29:11 +01:00
  • bfb6f8f273 Merge pull request #1325 from matrix-org/rob/appdrawer-bind Robert Swain 2017-08-21 15:59:47 +02:00
  • 385205471b AppsDrawer: Remove unnecessary bind Robert Swain 2017-08-21 15:34:13 +02:00
  • f38df8b61b Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-08-21 13:03:47 +00:00
  • 77dbac81ed Translated using Weblate (Tamil) Balaji Ravichandran 2017-08-21 09:04:13 +00:00
  • 0d1d30ab32 Translated using Weblate (Spanish) lazz0 2017-08-19 18:45:55 +00:00
  • c28ad8e8ef Translated using Weblate (French) kaiyou 2017-08-19 11:01:54 +00:00
  • 2306d6ffd6 Translated using Weblate (Bengali (India)) Sohom Bhattacharjee 2017-08-21 00:33:41 +00:00
  • b54dabddd5 Merge pull request #4826 from vector-im/rxl881/drawerStyling Richard Lewis 2017-08-21 14:03:40 +01:00
  • c0f0425907 Merge pull request #1322 from matrix-org/rxl881/styling Richard Lewis 2017-08-21 14:03:27 +01:00
  • e8e3117099 Merge pull request #1323 from matrix-org/rxl881/beta Richard Lewis 2017-08-21 14:03:15 +01:00
  • 97485366bc Merge pull request #1324 from matrix-org/rxl881/strings Richard Lewis 2017-08-21 12:16:08 +01:00
  • 866f6f1dd3 Add missing translation. Richard Lewis 2017-08-21 12:11:21 +01:00
  • 6c8391e3ea Remove beta tag. Richard Lewis 2017-08-21 11:39:06 +01:00
  • e0bc1133d7 Position add app widget. Richard Lewis 2017-08-21 11:30:05 +01:00
  • e93a1fac3d Position add app widget link Richard Lewis 2017-08-21 11:29:42 +01:00
  • 94877b0ac4 App drawer bottom margin. Minimised app drawer margin. Make app body content full width. Richard Lewis 2017-08-21 11:10:21 +01:00
  • fde6314e0f Merge pull request #1319 from matrix-org/rob/apps-not-e2ee Robert Swain 2017-08-21 11:45:47 +02:00
  • 38720e6216 Add internationlisation. Richard Lewis 2017-08-21 10:05:16 +01:00
  • 2eac869e27 Merge branch 'develop' into rob/apps-not-e2ee Robert Swain 2017-08-21 10:30:38 +02:00
  • 70824960ee AppPermission: Make strings translatable Robert Swain 2017-08-21 10:23:55 +02:00
  • c6a48cbda6 Translated using Weblate (French) Jean 2017-08-19 11:03:05 +00:00
  • 345903514a Translated using Weblate (French) kaiyou 2017-08-19 11:02:32 +00:00
  • 388d8141ae Merge pull request #1321 from matrix-org/rxl881/warnings Richard Lewis 2017-08-18 18:43:21 +01:00
  • d7f5295949 untested WIP for supporting multiple widgets properly Matthew Hodgson 2017-08-18 18:40:00 +01:00
  • 1862057695 Only render appTile body (including warnings) if drawer shown. Richard Lewis 2017-08-18 18:33:56 +01:00
  • e32c499298 Merge pull request #1320 from matrix-org/rxl881/timeline Richard Lewis 2017-08-18 18:11:47 +01:00
  • 7395f96b77 Rearrange timeline update wording for better internationalisation. Fix widget name values. Richard Lewis 2017-08-18 18:02:50 +01:00
  • b678c2cf0f Don't bind Pill function, React does this for us Luke Barnard 2017-08-18 17:15:27 +01:00
  • 45e7f1c401 Translated using Weblate (German) Krombel 2017-08-18 15:56:02 +00:00
  • 2e00968bcd AppPermission: Note that apps are not E2E encrypted in E2E rooms Robert Swain 2017-08-18 17:44:33 +02:00
  • 4a1106de2f Translated using Weblate (German) Bamstam 2017-08-18 14:47:01 +00:00
  • 273abd9327 Merge pull request #1318 from matrix-org/luke/fix-widget-event-name Luke Barnard 2017-08-18 16:09:20 +01:00
  • 942656d947 Merge pull request #1286 from matrix-org/rxl881/appFixes Richard Lewis 2017-08-18 16:09:08 +01:00
  • 1c36e47403 Fix add widget link Richard Lewis 2017-08-18 15:59:12 +01:00
  • 7a277bff3a Add a space between widget name and "widget" in widget event tiles Luke Barnard 2017-08-18 15:45:02 +01:00
  • b7d46d91ed Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes Richard Lewis 2017-08-18 15:35:01 +01:00
  • bf07333915 Merge pull request #1316 from matrix-org/luke/fix-app-name-case Luke Barnard 2017-08-18 15:08:40 +01:00
  • 3c7eec711b Merge pull request #1315 from matrix-org/luke/fix-apps-auto-integs Luke Barnard 2017-08-18 15:07:35 +01:00
  • 5e0a7212d9 Don't apply case logic to app names Luke Barnard 2017-08-18 14:57:28 +01:00
  • 36fffa1696 Stop integ manager opening on every room switch Luke Barnard 2017-08-18 14:48:58 +01:00
  • 857a8c9519 Remove empty defaultProps. Richard Lewis 2017-08-18 13:28:47 +01:00
  • 3a7aa926c3 Merge pull request #1313 from matrix-org/luke/feature-app-tile-ux Luke Barnard 2017-08-18 13:08:57 +01:00
  • caff761df7 Merge pull request #1308 from matrix-org/t3chguy/mels_fix Luke Barnard 2017-08-18 13:08:35 +01:00
  • 84f5e5aad2 REmove unused onCancelClick Richard Lewis 2017-08-18 12:21:48 +01:00
  • 1a1a80b633 Merge branch 'develop' into luke/feature-app-tile-ux Luke Barnard 2017-08-18 12:12:00 +01:00
  • cab3123bd8 Merge pull request #1312 from matrix-org/luke/feature-widget-timeline-events Luke Barnard 2017-08-18 12:10:22 +01:00
  • 0c99abc89b Merge pull request #1314 from matrix-org/rxl881/securityWarning Matthew Hodgson 2017-08-18 12:08:23 +01:00
  • 1bba1f0fa6 Add comment Luke Barnard 2017-08-18 12:04:34 +01:00
  • 6c37a9a3af Simplify getting of content, prev content for widget event Luke Barnard 2017-08-18 12:03:29 +01:00
  • 615d96a065 catch hidden event being RM Michael Telatynski 2017-08-18 11:53:52 +01:00
  • 96900e76a0 Move error logging to where it is first caught. Richard Lewis 2017-08-18 11:51:32 +01:00
  • 4b5cdac032 Don't show widget security warning to the person who added it to the room. Richard Lewis 2017-08-18 11:41:27 +01:00
  • 07b6e215a1 CSS for group invite tiles David Baker 2017-08-18 11:24:52 +01:00
  • ee6e36cd90 Allow extra tiles to be put into room sub lists David Baker 2017-08-18 11:23:55 +01:00
  • 55998028b4 Show group invites in 'invites' section David Baker 2017-08-18 11:22:50 +01:00
  • 0adc043884 Merge branch 'luke/feature-app-tile-ux' of github.com:matrix-org/matrix-react-sdk into luke/feature-app-tile-ux Luke Barnard 2017-08-18 11:01:02 +01:00
  • 57505c3a61 Add behaviour to toggle app draw on app tile header click Luke Barnard 2017-08-16 18:19:12 +01:00
  • 9382689675 Merge branch 'develop' into luke/feature-widget-timeline-events Luke Barnard 2017-08-18 10:47:25 +01:00
  • 20a0ec35af Use short form to get event URL Luke Barnard 2017-08-18 10:45:43 +01:00