Commit Graph

11085 Commits (a3c4fac375774cf9836a950886d8d4ff4f350336)

Author SHA1 Message Date
James Salter a3c4fac375 Use custom nginx conf 2021-09-28 12:15:34 +01:00
Michael Telatynski 1aa2efd2ce
Merge pull request #18490 from vector-im/t3chguy/fix/18088 2021-09-16 10:16:23 +01:00
Michael Telatynski 44a67ee383
Merge pull request #19037 from vector-im/t3chguy/fix/18481 2021-09-16 08:58:57 +01:00
Travis Ralston 72e4197db8
Merge pull request #19038 from vector-im/travis/be-better
Encourage false positives of the error dialog to result in tickets
2021-09-15 11:44:54 -06:00
David Baker 446c4f991f
Merge pull request #19056 from vector-im/dbkr/yarnupgrade_20210914
yarn upgrade
2021-09-15 17:53:13 +01:00
David Baker 73a05d35bd Merge remote-tracking branch 'origin/develop' into dbkr/yarnupgrade_20210914 2021-09-15 17:15:25 +01:00
David Baker f4a11b8509 yarn upgrade
and pin types as per https://github.com/matrix-org/matrix-react-sdk/pull/6813
2021-09-15 17:12:16 +01:00
Kat Gerasimova 4f0c3bf4ff
Merge pull request #18896 from kittykat/issue-automation
Issue labelling and process home updates
2021-09-15 10:18:28 +01:00
Travis Ralston 574e848bf3 Merge branch 'master' into develop 2021-09-14 14:50:07 -06:00
Travis Ralston 75b1d813f1 Encourage false positives of the error dialog to result in tickets 2021-09-14 12:33:14 -06:00
RiotRobot c7aab2530b Merge branch 'release-v1.8.5' 2021-09-14 16:18:17 +01:00
RiotRobot 7a72547133 v1.8.5 2021-09-14 16:07:08 +01:00
RiotRobot dd17148ce6 Prepare changelog for v1.8.5 2021-09-14 16:07:08 +01:00
RiotRobot a40d7474f4 Upgrade matrix-react-sdk to 3.30.0 2021-09-14 16:05:19 +01:00
RiotRobot 10a8d06546 Upgrade matrix-js-sdk to 12.5.0 2021-09-14 16:04:22 +01:00
Michael Telatynski 5a561b674f Fix space keyboard shortcuts conflicting with native zoom shortcuts 2021-09-14 16:02:15 +01:00
RiotRobot ae624658c9 Merge branch 'master' into develop 2021-09-13 13:09:41 +01:00
RiotRobot e4997981ec v1.8.4 2021-09-13 13:04:21 +01:00
RiotRobot 9d0a96cf9a Upgrade matrix-react-sdk to 3.29.1 2021-09-13 13:03:26 +01:00
RiotRobot 8c78084531 Upgrade matrix-js-sdk to 12.4.1 2021-09-13 13:02:54 +01:00
RiotRobot feefa2ece2 changelog 2021-09-13 12:55:02 +01:00
Michael Telatynski da1423d660 Merge branch 'develop' of github.com:vector-im/element-web into t3chguy/fix/18088 2021-09-10 09:53:07 +01:00
RiotRobot 6747155dea v1.8.3-rc.2 2021-09-09 18:33:38 +01:00
RiotRobot 1e41f7ad19 Prepare changelog for v1.8.3-rc.2 2021-09-09 18:33:38 +01:00
RiotRobot c0ffd980a1 Upgrade matrix-react-sdk to 3.30.0-rc.2 2021-09-09 18:32:11 +01:00
James Salter 2dfa6fd58e
Merge pull request #18960 from vector-im/config-posthog-develop
Enable posthog on develop
2021-09-09 13:44:30 +01:00
James Salter fa0d500d4a Configure posthog on develop 2021-09-09 11:21:54 +01:00
James Salter dec8795f7a
Merge pull request #18948 from vector-im/config-sentry-develop
Configure sentry on develop
2021-09-08 16:36:38 +01:00
James Salter 0a13413c48 Configure sentry on develop 2021-09-08 15:57:37 +01:00
Michael Telatynski 1d5d7751f7 Merge branch 'develop' of github.com:vector-im/element-web into t3chguy/fix/18088 2021-09-08 15:29:11 +01:00
David Baker 8fa4079565
Merge pull request #18940 from vector-im/dbkr/allchange_103
Update changelog generator
2021-09-07 19:23:38 +01:00
RiotRobot dc3d0abfef v1.8.3-rc.1 2021-09-07 19:18:07 +01:00
RiotRobot 4ab524673d Prepare changelog for v1.8.3-rc.1 2021-09-07 19:18:06 +01:00
David Baker a947cdfa96 Update changelog generator 2021-09-07 19:14:25 +01:00
David Baker 4da180324a Update changelog generator 2021-09-07 19:12:20 +01:00
RiotRobot a2cde39495 Upgrade matrix-react-sdk to 3.30.0-rc.1 2021-09-07 19:06:11 +01:00
RiotRobot d627faf3f8 Upgrade matrix-js-sdk to 12.5.0-rc.1 2021-09-07 19:05:21 +01:00
David Baker ed3ba39ffe
Merge pull request #18937 from RiotTranslateBot/weblate-element-web-element-web
Translations update from Weblate
2021-09-07 09:50:52 +01:00
Weblate fad1237dd0 Merge branch 'origin/develop' into Weblate. 2021-09-06 10:15:32 +00:00
Michael Telatynski c551063832
Merge pull request #18920 from vector-im/t3chguy/gha-spaces-label 2021-09-06 11:15:28 +01:00
Michael Telatynski 0cb9fef9da apply to more spaces related labels 2021-09-06 10:36:23 +01:00
Michael Telatynski 6874e782f2 Move A-Spaces issues to Delight project board GHA 2021-09-06 09:39:53 +01:00
Ekaterina Gerasimova 607c840917 Update README to point to element-meta wiki
Shared processes have moved to element-meta so update README to point
there.
2021-09-03 17:30:01 +01:00
Ekaterina Gerasimova 4d5607894c Issue labelling: update Occurrence label
Lets use slightly more sensible labels for Occurrence: Frequent,
Occasional and Uncommon.
2021-09-03 17:29:19 +01:00
Weblate b8fb8b0460 Merge branch 'origin/develop' into Weblate. 2021-09-03 14:55:22 +00:00
Kat Gerasimova 9b7070b8e6
Merge pull request #18877 from kittykat/issue-templates
Issue templates: merge expected and actual results
2021-09-03 15:55:18 +01:00
Weblate eb8d3be1c3 Merge branch 'origin/develop' into Weblate. 2021-09-03 14:14:52 +00:00
Dariusz Niemczyk 315609e375
Merge pull request #18893 from vector-im/palid/fix/yarn-lock
Lock matrix-widget-api to 0.1.0-beta.16
2021-09-03 16:14:49 +02:00
Dariusz Niemczyk 6fcb021874
Lock matrix-widget-api to 0.1.0-beta.16 2021-09-03 16:07:37 +02:00
Weblate cd213eb43a Merge branch 'origin/develop' into Weblate. 2021-09-03 13:26:55 +00:00