Dima/element-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Commit Graph

  • fcb705d79b Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-09-21 09:01:09 +00:00
  • 26ec25b2f7 Merge pull request #5090 from vector-im/dbkr/deploy_config_glob David Baker 2017-09-21 10:01:05 +01:00
  • 88551afef3 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-09-21 08:55:19 +00:00
  • 9b9073f0ed Merge pull request #5093 from vector-im/luke/groups-add-featured-rooms-and-users David Baker 2017-09-21 09:55:14 +01:00
  • b4ea938be3 This is the default David Baker 2017-09-20 18:17:06 +01:00
  • 6ec26932af This is the default anyway David Baker 2017-09-20 17:54:52 +01:00
  • a0c5bbb3eb Merge pull request #1403 from matrix-org/luke/track-action-buttons Luke Barnard 2017-09-20 17:53:11 +01:00
  • 21d233b5af oops, leftover debug David Baker 2017-09-20 17:48:47 +01:00
  • a8a9f5ec6b Translated using Weblate (German) Krombel 2017-09-20 16:20:03 +00:00
  • b9b4ac3166 Rename symlink to 'include' & add to redeploy David Baker 2017-09-20 17:22:47 +01:00
  • 515222c25f Track action button click event Luke Barnard 2017-09-20 17:16:49 +01:00
  • 0d4b3b41f9 CSS for GroupView: Add a User Luke Barnard 2017-09-20 17:07:32 +01:00
  • 6ff91789b2 Rename 'config' option to 'symlink' David Baker 2017-09-20 17:04:31 +01:00
  • 7ef55946da Fix console error log statement Luke Barnard 2017-09-20 17:04:05 +01:00
  • 5471431ee5 Disable "Add a Room" button for when we have a room picker Luke Barnard 2017-09-20 17:02:20 +01:00
  • adf0a79585 Implement avatar, displayname for featured users Luke Barnard 2017-09-20 16:54:12 +01:00
  • 1c1bf82c2a Add users to group summary using new API Luke Barnard 2017-09-20 16:32:02 +01:00
  • 44c38652ab Implement UserPickerDialog for adding users Luke Barnard 2017-09-20 15:29:31 +01:00
  • 9b988f1a19 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-09-20 14:24:22 +00:00
  • 8d9f06cc47 Merge branch 'master' into develop David Baker 2017-09-20 15:24:11 +01:00
  • 2ea9fc3f9a v0.12.4 v0.12.4 David Baker 2017-09-20 15:19:10 +01:00
  • d96759b8ad Prepare changelog for v0.12.4 David Baker 2017-09-20 15:19:10 +01:00
  • e814eb4555 v0.12.4 David Baker 2017-09-20 15:18:17 +01:00
  • d957f0cdd7 released js-sdk & react-sdk David Baker 2017-09-20 15:16:42 +01:00
  • 4dd83de6d1 Merge branch 'master' into develop David Baker 2017-09-20 15:14:10 +01:00
  • 6c5f4983da v0.10.4 David Baker 2017-09-20 15:13:20 +01:00
  • 4a9886b4da Prepare changelog for v0.10.4 David Baker 2017-09-20 15:13:19 +01:00
  • 22271ced0d released js-sdk David Baker 2017-09-20 15:09:14 +01:00
  • 1c6cecbd43 Add "Add a User/Room" buttons and always display default lists Luke Barnard 2017-09-20 14:41:29 +01:00
  • be938ac0f4 Accept globs for the config location David Baker 2017-09-20 14:38:41 +01:00
  • e4082d4f45 Support multiple configs on the command line David Baker 2017-09-20 14:25:33 +01:00
  • 7f4695bba2 Translated using Weblate (Polish) Akcja Demokracja Open-Source 2017-09-20 10:29:59 +00:00
  • 72bb08b99f Translated using Weblate (Hungarian) Szimszon 2017-09-20 06:40:12 +00:00
  • e8c3c2bc20 Translated using Weblate (Russian) Andrey 2017-09-20 05:39:28 +00:00
  • 8561e43cb5 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2017-09-20 00:01:18 +00:00
  • 16123ff5db Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-09-19 21:14:56 +00:00
  • 546397e676 Translated using Weblate (Dutch) Silke 2017-09-19 18:53:07 +00:00
  • fbe1c82dfa Merge pull request #5074 from vector-im/t3chguy/devtools-1 Matthew Hodgson 2017-09-19 22:14:52 +01:00
  • 37ccf3b93f Translated using Weblate (Hungarian) Szimszon 2017-09-19 18:53:08 +00:00
  • 94a30c0889 Translated using Weblate (Hungarian) Szimszon 2017-09-19 18:49:08 +00:00
  • 86d8a95e32 Translated using Weblate (Russian) Andrey 2017-09-19 16:45:10 +00:00
  • 0b7ebf8764 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-09-19 16:22:01 +00:00
  • 8fc69198b1 Merge pull request #5085 from vector-im/luke/fix-separate-sender-profile David Baker 2017-09-19 17:21:57 +01:00
  • 6ad4ba767b Merge pull request #1401 from matrix-org/luke/fix-separate-sender-profile David Baker 2017-09-19 17:21:52 +01:00
  • ecbd42c71c Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-09-19 16:21:52 +00:00
  • 0b0e74cd63 Translated using Weblate (Hungarian) Kevin Németh 2017-09-19 13:14:14 +00:00
  • 283829cb0c Merge pull request #5082 from vector-im/luke/fix-ugly-integ-button David Baker 2017-09-19 17:21:47 +01:00
  • 29be5878dd Translated using Weblate (Portuguese) Carlos 2017-09-19 15:47:04 +00:00
  • 173370dfc2 Merge pull request #1399 from matrix-org/luke/fix-ugly-integ-button David Baker 2017-09-19 17:21:42 +01:00
  • 979b580e1f Merge branch 'develop' into luke/fix-ugly-integ-button Luke Barnard 2017-09-19 17:04:06 +01:00
  • 0d6b09a5f6 Merge branch 'develop' into luke/fix-ugly-integ-button Luke Barnard 2017-09-19 17:03:06 +01:00
  • 7469ab5ed9 Alter opacity for flair Luke Barnard 2017-09-19 16:56:46 +01:00
  • e2ae6e6235 Separate sender profile into elements with classes Luke Barnard 2017-09-19 16:56:14 +01:00
  • b676d1818e Translated using Weblate (Portuguese) carlos-am 2017-09-19 15:26:15 +00:00
  • 668e096194 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop Luke Barnard 2017-09-19 16:36:51 +01:00
  • 7414d4d1f9 Fix issue with "props.aux" being inserted instead of e.g. "sent an image" Luke Barnard 2017-09-19 16:36:30 +01:00
  • b6a183aa5b Translated using Weblate (Portuguese) carlos-am 2017-09-19 15:31:11 +00:00
  • 077d4aafe2 Translated using Weblate (Portuguese) carlos-am 2017-09-19 15:04:12 +00:00
  • d221b20721 Translated using Weblate (Portuguese) carlos-am 2017-09-19 14:59:57 +00:00
  • d38e950f8b Merge pull request #1400 from matrix-org/dbkr/flair_bluebird David Baker 2017-09-19 16:00:02 +01:00
  • 80e0205b78 Fix promise error in flair David Baker 2017-09-19 15:53:54 +01:00
  • 4d127db358 Translated using Weblate (Portuguese) carlos-am 2017-09-19 14:01:37 +00:00
  • b4ed9d7c87 Merge pull request #1351 from matrix-org/luke/feature-flair Luke Barnard 2017-09-19 15:05:40 +01:00
  • 5295d7f058 Merge branch 'develop' into luke/feature-flair Luke Barnard 2017-09-19 14:55:54 +01:00
  • 6352e5cca6 Translated using Weblate (Portuguese) carlos-am 2017-09-19 13:54:03 +00:00
  • a1e3115046 Merge pull request #1328 from matrix-org/dbkr/group_userlist Luke Barnard 2017-09-19 14:54:08 +01:00
  • 49f85703da Translated using Weblate (German) Krombel 2017-09-18 11:45:55 +00:00
  • 3cf641d281 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2017-09-18 01:12:54 +00:00
  • e9fb5712bd Merge branch 'develop' into dbkr/group_userlist Luke Barnard 2017-09-19 13:26:55 +01:00
  • d409e96e2a Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-09-19 12:26:08 +00:00
  • fbcccd8be0 Merge pull request #4830 from vector-im/dbkr/group_userlist Luke Barnard 2017-09-19 13:26:02 +01:00
  • d25c3be627 CSS to fix ugly integrations button Luke Barnard 2017-09-19 11:59:51 +01:00
  • 61a0f1ef67 Fix ugly integration button, use hover to show error Luke Barnard 2017-09-19 11:57:23 +01:00
  • ca50d1f04a v0.12.4-rc.1 v0.12.4-rc.1 David Baker 2017-09-19 10:57:02 +01:00
  • ab66833c45 Prepare changelog for v0.12.4-rc.1 David Baker 2017-09-19 10:57:01 +01:00
  • 8a4710b270 v0.12.4-rc.1 David Baker 2017-09-19 10:55:28 +01:00
  • 57851cd508 js-sdk & react-sdk rc.1 David Baker 2017-09-19 10:54:35 +01:00
  • 620ca5f211 v0.10.4-rc.1 David Baker 2017-09-19 10:50:34 +01:00
  • fba66557b5 Prepare changelog for v0.10.4-rc.1 David Baker 2017-09-19 10:50:33 +01:00
  • d992d6937e js-sdk rc.1 David Baker 2017-09-19 10:47:18 +01:00
  • 38c0d62478 Fix typo for integs error button error Luke Barnard 2017-09-19 10:46:00 +01:00
  • 3e7e7987ba Translated using Weblate (Finnish) Stefan Parviainen 2017-09-19 07:31:51 +00:00
  • 658285ebbf Merge pull request #1396 from matrix-org/dbkr/3pid_invite_update_when_joined David Baker 2017-09-19 10:34:39 +01:00
  • e8ff3ca7ed Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-09-19 09:34:35 +00:00
  • ff8bc1ca68 Merge pull request #5053 from vector-im/dbkr/3pid_invite_update_when_joined David Baker 2017-09-19 10:34:31 +01:00
  • c32e736754 Comment why we don't expect joining flag to reset David Baker 2017-09-19 10:23:12 +01:00
  • 4d8eadad4f Clarify comment David Baker 2017-09-19 10:21:20 +01:00
  • ca13e35413 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-09-19 07:13:31 +00:00
  • 8ab0caaf0c Translated using Weblate (Czech) Jan Kudrik 2017-09-18 04:33:20 +00:00
  • 26c8d23c21 Merge pull request #5080 from vector-im/t3chguy/fix-powersave-typo Matthew Hodgson 2017-09-19 08:13:26 +01:00
  • d97224e69e fix really dumb blunder/typo preventing system from going to sleep. Michael Telatynski 2017-09-19 00:53:44 +01:00
  • 0c8a31d9e9 Translated using Weblate (Finnish) Stefan Parviainen 2017-09-18 18:27:44 +00:00
  • 925cb2dccf Do translation correctly Luke Barnard 2017-09-18 17:44:13 +01:00
  • 241d442284 Fail gracefully for non-supporting servers Luke Barnard 2017-09-18 15:12:38 +01:00
  • 6add06db44 Fix big with rejecting promises upon error Luke Barnard 2017-09-18 15:11:49 +01:00
  • 26941e994f Merge branch 'develop' into luke/feature-flair Luke Barnard 2017-09-18 14:46:50 +01:00
  • 3476cfca79 getPublicGroups->getPublicisedGroups Luke Barnard 2017-09-18 14:44:35 +01:00
  • 548e5f516c Put flair into labs Luke Barnard 2017-09-18 14:38:41 +01:00
  • 35cdea44bd Translated using Weblate (Swedish) Max Sandholm 2017-09-18 08:01:03 +00:00
  • ff503fce3b Translated using Weblate (Finnish) Stefan Parviainen 2017-09-18 09:53:17 +00:00