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

Commit Graph

  • b21e8dec58 Add 'nightly' to brand too David Baker 2020-03-06 23:57:47 +00:00
  • c828f50e88 Merge pull request #42 from vector-im/dbkr/actally_enable_the_thing_we_did_all_this_for David Baker 2020-03-06 23:38:16 +00:00
  • c4f342b7b1 Enable seshat in labs on nightly David Baker 2020-03-06 23:26:38 +00:00
  • 584fb4e905 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-06 21:35:07 +00:00
  • 0be4a15bb2 Translated using Weblate (Lithuanian) MamasLT 2020-03-06 17:26:47 +00:00
  • b138f1921f Translated using Weblate (Hungarian) Szimszon 2020-03-06 17:05:55 +00:00
  • 7a640522fe Translated using Weblate (Basque) Osoitz 2020-03-06 17:33:11 +00:00
  • 1530c91772 Merge pull request #4182 from matrix-org/travis/edit-redactions Travis Ralston 2020-03-06 14:34:57 -07:00
  • e4d323d2f2 Disable edits on redacted events Travis Ralston 2020-03-06 14:23:20 -07:00
  • 77ab892430 Merge pull request #41 from vector-im/dbkr/config_of_the_night David Baker 2020-03-06 17:34:27 +00:00
  • 2fe6040c23 Merge pull request #40 from vector-im/dbkr/winsign David Baker 2020-03-06 17:23:53 +00:00
  • e34736954c More sensible dir tree David Baker 2020-03-06 17:20:48 +00:00
  • c8b815d27f Merge branch 'origin/develop' into Weblate. Weblate 2020-03-06 16:47:24 +00:00
  • a8a499ce7d Translated using Weblate (Albanian) Besnik Bleta 2020-03-06 16:30:07 +00:00
  • 4fd1d8a5e7 Merge pull request #4180 from matrix-org/bwindels/toastwithoutxsign Bruno Windels 2020-03-06 16:47:17 +00:00
  • b312e73510 Merge branch 'bwindels/toastwithoutxsign' into bwindels/bringbacklegacyverififnoxsignkeys Bruno Windels 2020-03-06 17:44:23 +01:00
  • 0304096e46 lint David Baker 2020-03-06 16:42:24 +00:00
  • 450afde85e Add config for Riot Nightly David Baker 2020-03-06 16:37:17 +00:00
  • 1f9bd55f3b revert to legacy user verification (over to_device) without xsign keys Bruno Windels 2020-03-06 17:37:01 +01:00
  • dd59fd586a Merge remote-tracking branch 'origin/master' into dbkr/winsign David Baker 2020-03-06 16:31:25 +00:00
  • b0617f10e8 stick to IncomingSasDialog as VerificationRequestDialog doesn't show sender yet, makes e2e tests fail Bruno Windels 2020-03-06 17:22:56 +01:00
  • f8ef5bb6a5 check .started first as it can be both .started and pending Bruno Windels 2020-03-06 17:20:08 +01:00
  • ecbfbe73a0 Add really useful stackoverflow link David Baker 2020-03-06 16:18:55 +00:00
  • e2a6cc3196 Remove certificateSubjectName which didn't work David Baker 2020-03-06 16:14:51 +00:00
  • aad1e8388e Nope, that didn't work. Try the cert file, David Baker 2020-03-06 15:57:25 +00:00
  • 83746b5709 let's try this format David Baker 2020-03-06 15:52:54 +00:00
  • 781eff95ac hardcode cert sha1 to test David Baker 2020-03-06 15:51:39 +00:00
  • a7de575316 use crypto.verification.request even when xsign is disabled Bruno Windels 2020-03-06 16:50:39 +01:00
  • d403b86690 Removing logging David Baker 2020-03-06 15:34:36 +00:00
  • e435f46993 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-06 15:28:37 +00:00
  • 778251680d Translated using Weblate (French) Kévin C 2020-03-06 09:14:03 +00:00
  • 38ee5c09e4 Translated using Weblate (Dutch) Nathan Follens 2020-03-06 00:26:17 +00:00
  • 02d76bdef5 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-03-06 01:28:21 +00:00
  • 69389823f7 ManageEventIndexDialog: Reword and move the crawler state around a bit. Damir Jelić 2020-03-06 16:07:10 +01:00
  • bffee2d4c3 Add csp option which is apparently required David Baker 2020-03-06 15:01:50 +00:00
  • 1585e370d3 It's options.options in the original so keep it that way David Baker 2020-03-06 14:55:14 +00:00
  • 7f25e23878 Also try actually returning the value David Baker 2020-03-06 14:50:53 +00:00
  • 763b176b2e variable name David Baker 2020-03-06 14:49:55 +00:00
  • 5c85de4934 Fix synatx hopefully David Baker 2020-03-06 14:47:09 +00:00
  • 364899b27d ManageEventIndexDialog: Show how many rooms are done instead being processed. Damir Jelić 2020-03-06 15:43:17 +01:00
  • bff3f3e632 Revert "ManageEventIndexDialog: Reword the status for the currently indexing rooms." Damir Jelić 2020-03-06 15:34:19 +01:00
  • 8fe54e5dca ManageEventIndexDialog: Reword the status for the currently indexing rooms. Damir Jelić 2020-02-18 10:59:42 +01:00
  • f961513212 args, not options David Baker 2020-03-06 14:38:13 +00:00
  • 6e8f8dcdce Define the args variable David Baker 2020-03-06 14:35:09 +00:00
  • cee7410388 also just one level of options David Baker 2020-03-06 14:32:02 +00:00
  • 8cbef5b5e5 name the function the same thing David Baker 2020-03-06 14:29:11 +00:00
  • da606bcd6d Too many dots David Baker 2020-03-06 14:22:06 +00:00
  • eeef56c22d Merge branch 'origin/develop' into Weblate. Weblate 2020-03-06 00:24:59 +00:00
  • e900fe04e8 Translated using Weblate (Hungarian) Szimszon 2020-03-05 18:37:44 +00:00
  • a275d296fe Translated using Weblate (Albanian) Besnik Bleta 2020-03-05 18:59:37 +00:00
  • 191abb5b0d Merge pull request #3892 from krkc/move-read-receipts-to-bottom Travis Ralston 2020-03-05 17:24:51 -07:00
  • 1975a8e082 Merge branch 'develop' into move-read-receipts-to-bottom Travis Ralston 2020-03-05 17:13:24 -07:00
  • 82d4441184 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-05 18:04:39 +00:00
  • 74fcb103b1 Link to the right contributing guidelines Travis Ralston 2020-03-05 11:04:33 -07:00
  • 3fbdf567be Merge branch 'origin/develop' into Weblate. Weblate 2020-03-05 18:01:18 +00:00
  • fcc28c4d4d Merge pull request #4159 from mstriemer/mark-as-read-button Travis Ralston 2020-03-05 11:01:12 -07:00
  • a524f76a08 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-05 17:38:06 +00:00
  • 3527fae275 Merge pull request #4178 from n0emis/crosssigning-presence Travis Ralston 2020-03-05 10:38:01 -07:00
  • d54abc0c86 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-05 17:09:50 +00:00
  • 597343018d Translated using Weblate (Albanian) Besnik Bleta 2020-03-05 15:32:14 +00:00
  • 64b757e302 Merge pull request #4179 from matrix-org/bwindels/localechoforlegacyverif Bruno Windels 2020-03-05 17:09:44 +00:00
  • c20028782c Merge branch 'origin/develop' into Weblate. Weblate 2020-03-05 17:05:23 +00:00
  • e2de059a78 Translated using Weblate (Hungarian) Szimszon 2020-03-04 20:47:17 +00:00
  • a16faa2610 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-03-05 03:12:14 +00:00
  • 71f2f0e7c9 Merge pull request #12612 from Pestdoktor/docker-cleanup Travis Ralston 2020-03-05 10:05:15 -07:00
  • e9657cea70 Merge branch 'develop' into travis/poc/theme-command Travis Ralston 2020-03-05 09:49:32 -07:00
  • 7d051d6a1d await request promise inside encryption panel to show spinner Bruno Windels 2020-03-05 17:44:35 +01:00
  • 96b8a6160e Merge branch 'origin/develop' into Weblate. Weblate 2020-03-05 14:47:09 +00:00
  • 3c2f4a5c42 Merge pull request #4129 from matrix-org/benp/add-security-disclosure-link J. Ryan Stinnett 2020-03-05 14:47:02 +00:00
  • d28d330b33 run yarn i18n Ben Parsons 2020-03-05 14:33:40 +00:00
  • ce84967225 update Security Disclosure Policy link text Ben Parsons 2020-03-05 14:18:12 +00:00
  • a6882cece1 increase margin between Settings sections Ben Parsons 2020-03-05 14:10:44 +00:00
  • 03d36f30ec Fix lint errors Tulir Asokan 2020-03-05 13:44:54 +02:00
  • a8c5574bc8 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering Tulir Asokan 2020-03-05 13:19:15 +02:00
  • ec33fb4509 Merge branch 'master' into t3chguy/depr8 Michael Telatynski 2020-03-05 11:12:39 +00:00
  • 825d90e27b move the setter from the deprecated method also Michael Telatynski 2020-03-05 11:12:01 +00:00
  • 26177a19d5 access cross-signing callbacks via method Zoe 2020-03-05 10:45:37 +00:00
  • 2ae881237e Merge branch 'origin/develop' into Weblate. Weblate 2020-03-05 09:24:15 +00:00
  • cc26dc157b Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-03-05 03:11:47 +00:00
  • 5df35ea432 Merge pull request #4174 from matrix-org/bwindels/showverifyifuserhasxsignkeys Bruno Windels 2020-03-05 09:24:09 +00:00
  • a5cd0a7d5f indent by 4 spaces Bruno Windels 2020-03-05 11:09:45 +01:00
  • 76de422803 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-04 22:35:39 +00:00
  • 9836a7a655 Merge pull request #4176 from matrix-org/travis/linkify-rooms Travis Ralston 2020-03-04 15:35:34 -07:00
  • bc9ea1de39 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-04 22:35:33 +00:00
  • d3439c8101 Merge pull request #4177 from matrix-org/travis/no-rooms-dm Travis Ralston 2020-03-04 15:35:27 -07:00
  • f5bd5a345e docker: download required branch only Jonas Fentker 2020-03-04 23:11:40 +01:00
  • cf1d9cc8b5 make the linter happy Simeon Keske 2020-03-04 22:46:07 +01:00
  • 98f0a2ab67 show the room presence indicator, even when cross-singing is enabled Simeon Keske 2020-03-04 22:30:24 +01:00
  • 4a976acb84 Add a null check to getUniqueRoomsWithIndividuals Travis Ralston 2020-03-04 14:18:56 -07:00
  • c6af591c6e Ensure linkified topics in the room directory also work Travis Ralston 2020-03-04 14:14:03 -07:00
  • d820356990 Convert alias links in room header topics to local permalinks Travis Ralston 2020-03-04 13:56:58 -07:00
  • ab20600f9d Merge branch 'origin/develop' into Weblate. Weblate 2020-03-04 19:59:14 +00:00
  • 7aba168c34 Merge pull request #4170 from matrix-org/travis/sso-register-dev Travis Ralston 2020-03-04 12:59:08 -07:00
  • 2204785026 Simplify SSO step checking Travis Ralston 2020-03-04 12:26:08 -07:00
  • 7ea9f5e3cd Merge branch 'origin/develop' into Weblate. Weblate 2020-03-04 19:24:37 +00:00
  • 68258d8e89 Merge pull request #4160 from matrix-org/travis/filter-blank Travis Ralston 2020-03-04 12:24:31 -07:00
  • ee42f35f09 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-04 19:24:04 +00:00
  • 830c6e7cc8 Translated using Weblate (Albanian) Besnik Bleta 2020-03-04 17:13:43 +00:00
  • 7f66198afb Merge pull request #4175 from matrix-org/travis/room-list-updates Travis Ralston 2020-03-04 12:23:58 -07:00
  • 8e3fea9d0f Use an algorithmic comparator for room list ops Travis Ralston 2020-03-04 12:09:05 -07:00