Commit graph

3854 commits

Author SHA1 Message Date
chrisgarrity
29fb4b69d1 restore 5000 character limit for description fields
Also make sure that validation error message is visible when 5000 character limit is exceeded.
2019-01-07 11:09:44 -05:00
chrisgarrity
1d223825df Disallow comments on an unshared project 2019-01-07 10:42:53 -05:00
Benjamin Wheeler
ad0da48eeb
Merge pull request #2596 from benjiwheeler/hotfix/view-all-remixes
[Master] Show link to view all remixes on project page
2019-01-04 11:47:47 -05:00
Benjamin Wheeler
976524b64d
Merge pull request #2600 from benjiwheeler/hotfix/view-all-remixes
[Develop] Show link to view all remixes on project page
2019-01-04 10:50:42 -05:00
Ben Wheeler
7f2fbd4a3b added View all link at top of studios list 2019-01-04 10:30:43 -05:00
Ben Wheeler
b452f73a32 revised remix list header css to handle longer strings better 2019-01-04 10:22:48 -05:00
Ray Schamp
4c22c18737
Merge pull request #2597 from paulkaplan/fix-hashtag-search
[Master] Fix hashtag search
2019-01-04 09:25:01 -05:00
Ray Schamp
ecdac98322
Merge pull request #2599 from paulkaplan/fix-hashtag-search
[Develop] Fix hashtag search
2019-01-04 09:13:30 -05:00
Andrew Sliwinski
8ac46c3855
Merge pull request #2598 from apple502j/patch-5
Capitalize URL
2019-01-04 09:10:56 -05:00
apple502j
220b027c46
capitalize URL 2019-01-04 10:28:06 +09:00
Paul Kaplan
6f83dd09a8 Fix hashtag search to link to query without the # 2019-01-03 20:24:39 -05:00
Ben Wheeler
0ad5c977aa show link to view all remixes on project page 2019-01-03 18:50:19 -05:00
Ray Schamp
62585d9a06
Merge pull request #2595 from LLK/develop
Release to master 1/3/2018
2019-01-03 17:08:00 -05:00
Ray Schamp
389349f78c
Merge pull request #2594 from LLK/bump-gui
Bump scratch-gui
2019-01-03 16:54:47 -05:00
Ray Schamp
0f5b32c467
Bump scratch-gui
Brings in font loading fixes
2019-01-03 16:54:19 -05:00
Paul Kaplan
98eaba7758
Merge pull request #2582 from paulkaplan/bump-gui
Update to latest GUI to partially fix bluriness
2019-01-03 14:55:27 -05:00
Paul Kaplan
e9fd0e5539
Update package.json 2019-01-03 14:55:12 -05:00
Benjamin Wheeler
35b55d7af0
Merge pull request #2574 from kyleplo/patch-3
Fix font in add to studio modal
2019-01-03 13:16:47 -05:00
Benjamin Wheeler
e1d3160c39
Merge pull request #2583 from benjiwheeler/collapse-project-notes
collapse empty project instructions or notes and credits
2019-01-03 13:12:46 -05:00
Ben Wheeler
9625bc554d added comments explaining need to show project instructions, notes when both are empty 2019-01-03 13:12:08 -05:00
Ben Wheeler
627737fdd4 collapse empty project instructions or notes and credits 2019-01-03 12:45:07 -05:00
Paul Kaplan
e10f4953b4 Update to latest gui 2019-01-03 12:34:03 -05:00
Ray Schamp
55a30f7ea2
Merge pull request #2578 from LLK/master
Merge master to develop
2019-01-03 11:44:22 -05:00
Ray Schamp
b9bfb007e0
Merge pull request #2577 from LLK/develop
Merge #2569 and #2567 to master
2019-01-03 11:43:19 -05:00
Ray Schamp
72e386cd3f
Merge pull request #2570 from paulkaplan/master-remove-project-count
[Master] remove project count api request
2019-01-03 11:24:27 -05:00
Paul Kaplan
23adf352ed Remove the project count request since it is no longer being used 2019-01-31 16:52:18 -05:00
Ray Schamp
8711542efa
Merge pull request #2568 from paulkaplan/master-only-track-green-flag-once
[Master] Only track green flag once
2019-01-03 11:24:11 -05:00
kyleplo
7cfad7b075
switch to more common options 2019-01-03 09:23:06 -05:00
kyleplo
c7f3ac00e9
Fix font in add to studio modal 2019-01-03 08:30:46 -05:00
Ray Schamp
3931f867a6
Merge pull request #2569 from paulkaplan/remove-project-count-request
Remove the project count request since it is no longer being used
2019-01-02 17:08:23 -05:00
Paul Kaplan
f7818049da Remove the project count request since it is no longer being used 2019-01-31 16:48:56 -05:00
Ray Schamp
999fe63db9
Merge pull request #2567 from paulkaplan/only-track-green-flag-once
Only track green flag once per session
2019-01-02 17:06:48 -05:00
Paul Kaplan
07ad54bb6c Only track green flag once 2019-01-02 16:22:42 -05:00
Paul Kaplan
a2fbdf9943 Only track green flag once 2019-01-02 16:19:26 -05:00
Ray Schamp
45d1badd56
Merge pull request #2549 from LLK/release/3.0
[Develop] Release Scratch 3.0!
2019-01-02 15:37:43 -05:00
Ray Schamp
3bd9ce0fcd
Merge pull request #2563 from LLK/rschamp-patch-1
Bump scratch-gui
2019-01-02 13:17:43 -05:00
Ray Schamp
55aee1f7ab
Merge pull request #2562 from LLK/rschamp-patch-1
Bump scratch-gui
2019-01-02 13:17:16 -05:00
Ray Schamp
58b7a0cb78
Bump scratch-gui 2019-01-02 13:16:54 -05:00
Paul Kaplan
02c868a79d
Merge pull request #2561 from paulkaplan/fix-query-string-routes
[MASTER] Fix the regexp that allows for query params on faq and download
2019-01-02 11:49:17 -05:00
Paul Kaplan
2d79cd0191 Fix the regexp that allows for query params on faq and download 2019-01-02 11:47:39 -05:00
picklesrus
6a297b3b5c
Merge pull request #2560 from paulkaplan/fix-query-string-routes
Fix the regexp that allows for query params on faq and download
2019-01-02 11:42:27 -05:00
Paul Kaplan
3eb8ad9092 Fix the regexp that allows for query params on faq and download 2019-01-02 11:39:30 -05:00
Ray Schamp
cc91b96167
Merge pull request #2548 from LLK/release/3.0
[Master] Release Scratch 3.0!
2019-01-02 07:30:19 -05:00
picklesrus
dcdf068f75
Merge pull request #2559 from picklesrus/update-links
update download links
2019-01-02 07:19:23 -05:00
picklesrus
aae2609bbc update download links 2019-01-02 07:16:52 -05:00
Colby Gutierrez-Kraybill
176bfe3e12
Merge pull request #2551 from colbygk/hotfix/fix_downloads_3faq_routes
[RELEASE] fix downloads 3faq routes
2019-01-02 06:56:59 -05:00
Colby Gutierrez-Kraybill
e1780b2454
Merge pull request #2552 from colbygk/hotfix/fix_downloads_3faq_routes
[Develop] fix downloads 3faq routes
2019-01-02 06:56:09 -05:00
Ray Schamp
53a0112e60
Merge pull request #2556 from thisandagain/hotfix/nocap
[Release] Remove "CappedNumber" from view count on project page.
2019-01-01 21:22:37 -05:00
Ray Schamp
c2d64a8b85
Merge pull request #2555 from thisandagain/hotfix/nocap
[Develop] Remove "CappedNumber" from view count on project page.
2019-01-01 18:43:52 -05:00
Andrew Sliwinski
4a4b8815e5 Remove "CappedNumber" from view count on project page. 2018-12-30 10:06:02 -05:00