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

Commit Graph

  • 313956dd99 make left panel adapt to width Bruno Windels 2018-09-24 16:06:57 +01:00
  • 72a535ddac Translated using Weblate (Bulgarian) Slavi Pantaleev 2018-09-24 12:53:16 +00:00
  • 73ba837c26 fix style changes after merging in develop Bruno Windels 2018-09-21 13:27:00 +02:00
  • 23569705b4 Merge branch 'develop' into matthew/dharma Bruno Windels 2018-09-21 12:55:40 +02:00
  • 91ec96c8d3 Merge branch 'develop' into bwindels/redesign Bruno Windels 2018-09-21 12:44:44 +02:00
  • 4aad156b92 Merge pull request #29 from matrix-org/bwindels/fixroomaliasrequirements David Baker 2018-09-21 10:52:42 +01:00
  • a637ad85ad set a room alias for a public room, as required now Bruno Windels 2018-09-21 11:25:26 +02:00
  • 0fd360d35d Translated using Weblate (Chinese (Traditional)) Jeff Huang 2018-09-21 00:55:34 +00:00
  • 879f11b88b Translated using Weblate (Italian) Silvano 2018-09-20 23:12:10 +00:00
  • 83f939d5be Translated using Weblate (French) Kévin C 2018-09-20 20:54:49 +00:00
  • f2d1bf46e2 Translated using Weblate (Basque) Osoitz 2018-09-20 15:10:29 +00:00
  • a1a0dd5691 Translated using Weblate (German) Krombel 2018-09-20 14:33:42 +00:00
  • 95cfedb906 Translated using Weblate (Hungarian) Szimszon 2018-09-20 11:09:09 +00:00
  • e08af42647 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-09-20 10:42:11 +00:00
  • 1157320cba s/canonical address/main address/g for consistency Matthew Hodgson 2018-09-20 11:41:59 +01:00
  • 63dd155ad0 Translated using Weblate (French) Kévin C 2018-09-20 10:26:12 +00:00
  • 19da696058 Translated using Weblate (Hungarian) Szimszon 2018-09-20 10:25:24 +00:00
  • e15c581f6a Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-09-20 09:34:18 +00:00
  • 4d34f5f966 Translated using Weblate (Esperanto) Victor Grousset 2018-09-19 12:40:56 +00:00
  • a8d224736c Merge pull request #2171 from matrix-org/matthew/canonical_aliases Matthew Hodgson 2018-09-20 10:34:12 +01:00
  • 805c856324 Translated using Weblate (Bulgarian) Slavi Pantaleev 2018-09-20 08:13:58 +00:00
  • 0f806d5b99 Merge branch 'develop' into matthew/canonical_aliases Matthew Hodgson 2018-09-20 01:45:08 +01:00
  • e9806bb147 autocomplete domains on aliases Matthew Hodgson 2018-09-20 01:38:25 +01:00
  • 1aa85c69e4 fix vector-im/riot-web#7293 Matthew Hodgson 2018-09-20 01:23:29 +01:00
  • c6fa8ea24c show canonical aliases in timeline, and set/remove implicit ones Matthew Hodgson 2018-09-20 01:07:01 +01:00
  • abe6d72125 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-09-19 11:35:23 +00:00
  • b431292f6e Merge pull request #2168 from matrix-org/bwindels/fixstalerr Bruno Windels 2018-09-19 13:35:17 +02:00
  • 920e0d397c Merge branch 'develop' into bwindels/fixstalerr Bruno Windels 2018-09-19 12:15:41 +02:00
  • 93d34e7b3d fix lint Bruno Windels 2018-09-19 12:00:29 +02:00
  • 909e4052bc Translated using Weblate (Italian) random 2018-09-19 09:21:01 +00:00
  • 4d3afd1dc1 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-09-19 09:05:12 +00:00
  • 1020580653 Translated using Weblate (Esperanto) Victor Grousset 2018-09-18 11:50:10 +00:00
  • 42c148f330 Merge pull request #2170 from matrix-org/bwindels/disablelle2etests Bruno Windels 2018-09-19 11:05:05 +02:00
  • 64608af0b2 Merge pull request #26 from matrix-org/bwindels/disablelltests Bruno Windels 2018-09-19 11:04:55 +02:00
  • 8d9850b7e7 pass --travis flag to e2e tests to disable tests known not to work on travis CI because of dinosaur ubuntu version Bruno Windels 2018-09-19 10:57:47 +02:00
  • 13b20bb192 pass parameters through instead of hardcoding --travis Bruno Windels 2018-09-19 10:56:39 +02:00
  • e5b151ea26 Translated using Weblate (French) Kévin C 2018-09-18 21:47:49 +00:00
  • c2c735d521 Translated using Weblate (Hungarian) Szimszon 2018-09-18 18:48:14 +00:00
  • e951a22d31 fix tests Bruno Windels 2018-09-18 17:09:14 +02:00
  • fec1447e8f Merge pull request #28 from matrix-org/revert-25-bwindels/fixadminapiusage Bruno Windels 2018-09-18 16:52:05 +02:00
  • 70eb480553 Revert "use patched synapse so admin rest api works with python 2.7.6" Bruno Windels 2018-09-18 16:51:50 +02:00
  • 6e9721523d Merge pull request #27 from matrix-org/revert-24-bwindels/increaseservernoticetimeout Bruno Windels 2018-09-18 16:51:34 +02:00
  • d47f782c21 Revert "increase timeout for server notices room" Bruno Windels 2018-09-18 16:51:22 +02:00
  • cf397efed5 disable LL tests on travis CI Bruno Windels 2018-09-18 16:50:33 +02:00
  • 5ba45a71e8 Remove SuggestKeyRestoreHandler David Baker 2018-09-18 15:32:33 +01:00
  • 1c85536414 Merge pull request #25 from matrix-org/bwindels/fixadminapiusage Bruno Windels 2018-09-18 16:11:44 +02:00
  • a84162ede8 use patched synapse so admin rest api works with python 2.7.6 Bruno Windels 2018-09-18 16:11:07 +02:00
  • 2cef0f7f72 lint David Baker 2018-09-18 15:04:51 +01:00
  • 042bbca473 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-09-18 10:14:50 +00:00
  • d39889e2cf Merge pull request #2167 from matrix-org/t3chguy/m.room.aliases Matthew Hodgson 2018-09-18 11:14:44 +01:00
  • d1d886508b Merge pull request #24 from matrix-org/bwindels/increaseservernoticetimeout Bruno Windels 2018-09-18 11:13:30 +02:00
  • 0d86b82e3a increase timeout for server notices room Bruno Windels 2018-09-18 11:13:02 +02:00
  • 3de9f6efae Merge pull request #23 from matrix-org/bwindels/restlogs Bruno Windels 2018-09-18 10:17:31 +02:00
  • 42c1b95b7c spit out logs for creating REST users to figure out what is going on with the CI server Bruno Windels 2018-09-18 10:17:03 +02:00
  • c6da122e41 Fix npm link in the build script Travis Ralston 2018-09-17 17:57:27 -06:00
  • 67e9606d55 Reduce the number of terminals required to build riot-web to 1 Travis Ralston 2018-09-17 17:46:13 -06:00
  • c78ccd7856 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-09-17 23:16:36 +00:00
  • 23c91f22ef Translated using Weblate (Lithuanian) Moo 2018-09-17 21:45:09 +00:00
  • 719f7c6d01 Translated using Weblate (Esperanto) Victor Grousset 2018-09-17 11:59:18 +00:00
  • ece041d059 fix NPE on name (related to LL?) Matthew Hodgson 2018-09-18 00:16:25 +01:00
  • fc81dbbfad remove i18n used by RoomAliasesEvent Matthew Hodgson 2018-09-17 22:40:00 +01:00
  • 8c4f4765df remove initial parameter and show available members on invite instead Bruno Windels 2018-09-17 20:03:01 +02:00
  • 0727e0f8d3 mounted can be set straight in componentWillMount Bruno Windels 2018-09-17 20:02:15 +02:00
  • e8b4770940 fix lint Bruno Windels 2018-09-17 20:01:55 +02:00
  • 841aa4b800 check LL with client as this takes server support into account Bruno Windels 2018-09-17 19:28:06 +02:00
  • 0ce7bb8995 pass membersLoaded state to TimelinePanel to force it to re-render Bruno Windels 2018-09-17 19:27:25 +02:00
  • 0e1a814d23 remove RoomAliasesEvent in favour of simpler textual event Matthew Hodgson 2018-09-17 18:27:17 +01:00
  • 473f2dd72b pass room to _loadMembersIfJoined, it's called when newState not applied Bruno Windels 2018-09-17 19:24:34 +02:00
  • e0a789f77e remove untrue comment, as we only load the members when joining Bruno Windels 2018-09-17 19:21:22 +02:00
  • e1b9aa9626 better naming and document method Bruno Windels 2018-09-17 19:20:26 +02:00
  • dc7212ec2b switch back to simple TextForEvent Matthew Hodgson 2018-09-17 18:20:12 +01:00
  • d276b17c2a remove dead code Bruno Windels 2018-09-17 19:19:07 +02:00
  • c3914d3493 show empty list as initial state instead of spinner Bruno Windels 2018-09-17 19:18:55 +02:00
  • 2ed414494f use Room.myMembership event instead of RoomMember.membership for me Bruno Windels 2018-09-17 19:14:52 +02:00
  • 12d10cccef Show if sig is from this device David Baker 2018-09-17 17:14:03 +01:00
  • f507aac3d5 Show if recovery key is valid David Baker 2018-09-17 17:05:29 +01:00
  • 9a65e6817a Support restoring key backup David Baker 2018-09-17 16:00:23 +01:00
  • f26c50cdaa Merge pull request #22 from matrix-org/bwindels/lltests3 Bruno Windels 2018-09-17 12:14:13 +02:00
  • f8478f0644 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-09-17 09:22:04 +00:00
  • 06a74707de Translated using Weblate (Indonesian) Andri 2018-09-16 11:44:05 +00:00
  • 0ae37f2796 Translated using Weblate (German) xyzi 2018-09-14 16:43:06 +00:00
  • 647ab09b43 Translated using Weblate (Esperanto) Victor Grousset 2018-09-16 14:17:33 +00:00
  • 3f7e7f8da5 Translated using Weblate (English (United States)) Tim Stahel 2018-09-14 20:21:47 +00:00
  • 8a1c85f7a0 Translated using Weblate (Catalan) Simó Albert i Beltran 2018-09-15 12:04:45 +00:00
  • 33f648a6f6 Translated using Weblate (Basque) Osoitz 2018-09-16 05:49:32 +00:00
  • 6e12399fe9 Translated using Weblate (Arabic) ali almi 2018-09-14 15:39:39 +00:00
  • f65126119f Merge pull request #2165 from matrix-org/bwindels/fixllpeeking David Baker 2018-09-17 10:21:57 +01:00
  • 003083d9fc fix plurals Matthew Hodgson 2018-09-16 20:19:02 +01:00
  • a4b7348703 fix merge on i18n again Matthew Hodgson 2018-09-16 19:11:11 +01:00
  • 599697ca2f fix merge on i18n Matthew Hodgson 2018-09-16 19:08:31 +01:00
  • 3b868064c7 merge in develop Matthew Hodgson 2018-09-16 19:06:52 +01:00
  • 86cbe34181 rerender after members are loaded so pills and RR get rerendered Bruno Windels 2018-09-14 18:35:16 +02:00
  • 2e6d27717c LIIIIIIIIIIIIIIIINT! David Baker 2018-09-14 17:33:25 +01:00
  • d94553bafc UI for whether the key backup is enabled or not David Baker 2018-09-14 17:08:02 +01:00
  • 7fcedbc65d Translated using Weblate (Italian) random 2018-09-14 15:00:24 +00:00
  • 0f4d8e2f30 Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups David Baker 2018-09-14 15:43:18 +01:00
  • 8121fbe428 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-09-14 14:43:00 +00:00
  • 8ed411cd43 Translated using Weblate (Spanish) Milena Brum 2018-09-13 15:59:15 +00:00
  • 62c763da60 Translated using Weblate (Esperanto) Victor Grousset 2018-09-14 11:52:01 +00:00
  • 77d5daf9e3 Merge pull request #2166 from matrix-org/dbkr/allow_non_literal_translations David Baker 2018-09-14 15:42:54 +01:00