Commit graph

7993 commits

Author SHA1 Message Date
picklesrus
ef801112cd
Merge branch 'develop' into project-comments 2021-06-07 15:38:40 -04:00
picklesrus
1afbe4ad79 clean up 2021-06-07 15:31:20 -04:00
chrisgarrity
c3eaaa0578
Merge pull request #5530 from LLK/release/2021-06-02
[Develop] Release 2021-06-02
2021-06-07 13:36:17 -04:00
picklesrus
993dd36aa5 WIP of being able to turn off project comments. 2021-06-07 11:28:29 -04:00
dependabot-preview[bot]
696ba6008a
Merge pull request #5560 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210606094924 2021-06-07 11:07:20 +00:00
dependabot-preview[bot]
56c8e47fc5
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210604034855 to 0.1.0-prerelease.20210606094924.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210604034855...0.1.0-prerelease.20210606094924)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-07 10:38:54 +00:00
dependabot-preview[bot]
25bb65bd52
Merge pull request #5559 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210606031618 2021-06-06 03:48:56 +00:00
dependabot-preview[bot]
115a1e781f
Bump scratch-l10n from 3.11.20210605031634 to 3.11.20210606031618
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210605031634 to 3.11.20210606031618.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210605031634...3.11.20210606031618)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-06 03:22:14 +00:00
dependabot-preview[bot]
61ef3e5030
Merge pull request #5557 from LLK/dependabot/npm_and_yarn/formatjs/intl-pluralrules-4.0.27 2021-06-05 04:36:01 +00:00
dependabot-preview[bot]
7f0992a23a
Merge pull request #5556 from LLK/dependabot/npm_and_yarn/formatjs/intl-locale-2.4.32 2021-06-05 04:35:37 +00:00
dependabot-preview[bot]
788769343c
Bump @formatjs/intl-pluralrules from 4.0.26 to 4.0.27
Bumps [@formatjs/intl-pluralrules](https://github.com/formatjs/formatjs) from 4.0.26 to 4.0.27.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/@formatjs/intl-pluralrules@4.0.26...@formatjs/intl-pluralrules@4.0.27)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-05 04:15:14 +00:00
dependabot-preview[bot]
7ce71381fb
Bump @formatjs/intl-locale from 2.4.31 to 2.4.32
Bumps [@formatjs/intl-locale](https://github.com/formatjs/formatjs) from 2.4.31 to 2.4.32.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/@formatjs/intl-locale@2.4.31...@formatjs/intl-locale@2.4.32)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-05 04:15:01 +00:00
dependabot-preview[bot]
96fe4284bf
Merge pull request #5554 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210605031634 2021-06-05 03:39:42 +00:00
dependabot-preview[bot]
345460e3a5
Bump scratch-l10n from 3.11.20210604031644 to 3.11.20210605031634
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210604031644 to 3.11.20210605031634.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210604031644...3.11.20210605031634)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-05 03:22:20 +00:00
dependabot-preview[bot]
3fe2e0cba4
Merge pull request #5553 from LLK/dependabot/npm_and_yarn/formatjs/intl-locale-2.4.31 2021-06-05 01:30:31 +00:00
dependabot-preview[bot]
511727e131
Merge pull request #5551 from LLK/dependabot/npm_and_yarn/formatjs/intl-pluralrules-4.0.26 2021-06-05 01:27:56 +00:00
dependabot-preview[bot]
3645b922cc
Bump @formatjs/intl-locale from 2.4.30 to 2.4.31
Bumps [@formatjs/intl-locale](https://github.com/formatjs/formatjs) from 2.4.30 to 2.4.31.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/@formatjs/intl-locale@2.4.30...@formatjs/intl-locale@2.4.31)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-05 01:12:12 +00:00
dependabot-preview[bot]
dcd59c0d78
Bump @formatjs/intl-pluralrules from 4.0.25 to 4.0.26
Bumps [@formatjs/intl-pluralrules](https://github.com/formatjs/formatjs) from 4.0.25 to 4.0.26.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/@formatjs/intl-pluralrules@4.0.25...@formatjs/intl-pluralrules@4.0.26)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-05 01:12:01 +00:00
dependabot-preview[bot]
32dea2d2a8
Merge pull request #5549 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210604034855 2021-06-04 10:55:31 +00:00
dependabot-preview[bot]
a24c2cfd33
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210603035852 to 0.1.0-prerelease.20210604034855.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210603035852...0.1.0-prerelease.20210604034855)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-04 10:38:46 +00:00
dependabot-preview[bot]
61a351f6a9
Merge pull request #5548 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210604031644 2021-06-04 03:46:54 +00:00
dependabot-preview[bot]
292ac2161d
Bump scratch-l10n from 3.11.20210603031533 to 3.11.20210604031644
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210603031533 to 3.11.20210604031644.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210603031533...3.11.20210604031644)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-04 03:30:17 +00:00
dependabot-preview[bot]
4c565ca05a
Merge pull request #5546 from LLK/dependabot/npm_and_yarn/formatjs/intl-locale-2.4.30 2021-06-04 02:55:37 +00:00
dependabot-preview[bot]
a318c6c5bb
Merge pull request #5547 from LLK/dependabot/npm_and_yarn/formatjs/intl-pluralrules-4.0.25 2021-06-04 02:55:05 +00:00
dependabot-preview[bot]
b86bd1dff1
Bump @formatjs/intl-pluralrules from 4.0.24 to 4.0.25
Bumps [@formatjs/intl-pluralrules](https://github.com/formatjs/formatjs) from 4.0.24 to 4.0.25.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/@formatjs/intl-pluralrules@4.0.24...@formatjs/intl-pluralrules@4.0.25)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-04 02:38:55 +00:00
dependabot-preview[bot]
e35c1aae08
Bump @formatjs/intl-locale from 2.4.29 to 2.4.30
Bumps [@formatjs/intl-locale](https://github.com/formatjs/formatjs) from 2.4.29 to 2.4.30.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/@formatjs/intl-locale@2.4.29...@formatjs/intl-locale@2.4.30)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-04 02:38:53 +00:00
Karishma Chadha
7e1eb3a2f8
Merge pull request #5539 from kchadha/reply-thread-refresh-fix
Use reply_count to check whether reply limit is reached
2021-06-03 11:09:04 -04:00
Karishma Chadha
94f0df4a18
Merge pull request #5541 from kchadha/reply-status-ui
Fix reply status box alignment.
2021-06-03 11:07:52 -04:00
dependabot-preview[bot]
734666888e
Merge pull request #5544 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210603035852 2021-06-03 10:55:29 +00:00
dependabot-preview[bot]
49bd1de9a0
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210602035258 to 0.1.0-prerelease.20210603035852.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210602035258...0.1.0-prerelease.20210603035852)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-03 10:36:21 +00:00
dependabot-preview[bot]
fef6193804
Merge pull request #5542 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210603031533 2021-06-03 03:51:07 +00:00
dependabot-preview[bot]
ccd5a53965
Bump scratch-l10n from 3.11.20210602031702 to 3.11.20210603031533
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210602031702 to 3.11.20210603031533.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210602031702...3.11.20210603031533)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-03 03:35:22 +00:00
Karishma Chadha
9b323d99a0 Fix reply status box alignment. 2021-06-02 18:14:09 -04:00
Karishma Chadha
17ada7172d Add totalReplyCount prop to check whether thread has reached limit instead of checking only the 20 we load on the first try 2021-06-02 17:38:10 -04:00
Karishma Chadha
99344af688
Merge pull request #5538 from kchadha/comment-thread-string-fix
Fix l10n string ID where it previously got missed.
2021-06-02 16:18:32 -04:00
Karishma Chadha
c377af81f2 Fix l10n string ID where it previously got missed. 2021-06-02 15:45:07 -04:00
Karishma Chadha
dab89d0a02
Merge pull request #5536 from LLK/develop
Stage additional changes for release.
2021-06-02 14:09:45 -04:00
Karishma Chadha
e2db890814
Merge pull request #5495 from kchadha/comment-thread-limit
Comment thread limit
2021-06-02 14:08:03 -04:00
Eric Rosenbaum
ac2ee91d28
Merge pull request #5533 from LLK/develop
merge develop into release branch (add promote to manager modal)
2021-06-02 10:52:53 -04:00
Eric Rosenbaum
be047a5a7b
Merge pull request #5503 from ericrosenbaum/promote-modal
Add "Promote to manager" modal
2021-06-02 10:51:05 -04:00
Karishma Chadha
da231ed3af Change l10n string ID to match server error 2021-06-02 10:48:04 -04:00
chrisgarrity
d86d7b4f81
Merge pull request #5529 from LLK/develop
Update release branch with develop
2021-06-02 09:36:20 -04:00
dependabot-preview[bot]
2555b45bf1
Merge pull request #5528 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210602035258 2021-06-02 10:56:04 +00:00
dependabot-preview[bot]
5e71e3d3a2
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210531041354 to 0.1.0-prerelease.20210602035258.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210531041354...0.1.0-prerelease.20210602035258)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-02 10:37:50 +00:00
dependabot-preview[bot]
01904ae014
Merge pull request #5527 from LLK/dependabot/npm_and_yarn/formatjs/intl-pluralrules-4.0.24 2021-06-02 04:17:16 +00:00
dependabot-preview[bot]
517d20862a
Bump @formatjs/intl-pluralrules from 4.0.23 to 4.0.24
Bumps [@formatjs/intl-pluralrules](https://github.com/formatjs/formatjs) from 4.0.23 to 4.0.24.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/@formatjs/intl-pluralrules@4.0.23...@formatjs/intl-pluralrules@4.0.24)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-02 03:58:21 +00:00
dependabot-preview[bot]
7732f4d695
Merge pull request #5526 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210602031702 2021-06-02 03:41:24 +00:00
dependabot-preview[bot]
97aeef2315
Bump scratch-l10n from 3.11.20210601031633 to 3.11.20210602031702
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210601031633 to 3.11.20210602031702.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210601031633...3.11.20210602031702)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-02 03:24:57 +00:00
DD Liu
165be114dd
Merge pull request #5500 from fsih/commentsNotAllowed
Add comments not allowed box
2021-06-01 15:49:29 -04:00
dependabot-preview[bot]
92d2586ed2
Merge pull request #5522 from LLK/dependabot/npm_and_yarn/formatjs/intl-locale-2.4.29 2021-06-01 17:05:00 +00:00