Commit graph

3430 commits

Author SHA1 Message Date
Ray Schamp
1e52879148 Don't lint CSS
It's doesn't help much. And nobody's editor supports it. And nobody likes it and it's annoying.
2018-12-12 14:37:36 -05:00
picklesrus
a3afa5e482
Merge pull request #2447 from picklesrus/educators
Educators Page Changes
2018-12-12 12:18:34 -05:00
Benjamin Wheeler
a9f9d7ee49
Merge pull request #2428 from benjiwheeler/fix-favorite-love
make love and favorite icons respond to click immediately, cleanly
2018-12-12 11:25:31 -05:00
Benjamin Wheeler
964459fb17
Merge pull request #2437 from benjiwheeler/placeholder-text-go-away
Placeholder text go away
2018-12-12 11:24:43 -05:00
picklesrus
5b6bbbdb8a rename some messages and fix some wording 2018-12-12 10:21:12 -05:00
picklesrus
89f382a3c0 compress the svgs with svgo 2018-12-12 09:19:27 -05:00
picklesrus
1d305adc79 Fix some messages. 2018-12-12 09:07:49 -05:00
Andrew Sliwinski
4587736684
Merge pull request #2438 from apple502j/patch-6
Unquote userId
2018-12-12 08:26:21 -05:00
picklesrus
e6420b601a fix lint and remove unused stuff 2018-12-11 17:30:35 -05:00
picklesrus
09afde4396 add more links 2018-12-11 17:23:04 -05:00
Paul Kaplan
a99e8574f5
Merge pull request #2433 from paulkaplan/cloud-data-modal
Show username and cloud var alerts on projects that use them.
2018-12-11 16:58:11 -05:00
picklesrus
0a39123a3b more links 2018-12-11 16:53:43 -05:00
picklesrus
4716cb3b32 fix all the things 2018-12-11 16:36:17 -05:00
picklesrus
f3fb63b2e4 fix some stuff 2018-12-11 16:13:34 -05:00
picklesrus
8a8a564996 Beginnings of new educator page 2018-12-11 15:02:43 -05:00
Ben Wheeler
478259a5d2 placeholder text goes away when instructions, credits clicked 2018-12-11 12:29:31 -05:00
Paul Kaplan
78506f82c7 Hide project info alerts when switching to editor 2018-12-11 11:18:53 -05:00
Paul Kaplan
ace110c59b Show username and cloud var alerts on projects that use them.
Only implemented for scratch3 projects
2018-12-11 11:15:00 -05:00
chrisgarrity
bc49f04ed6
Merge pull request #2387 from Kenny2github/delete-cards
Redirect /info/cards route to /ideas 
/cc @ericrosenbaum
2018-12-11 10:25:48 -05:00
chrisgarrity
594ce06b5b
Merge pull request #2427 from chrisgarrity/issue/sb2-mod-info
Add moderator info for sb2 projects
2018-12-11 10:13:45 -05:00
Paul Kaplan
e8a7ea0a0c
Merge pull request #2440 from apple502j/translate-placeholder2
Translate placeholder
2018-12-11 10:11:21 -05:00
apple502j
c134a95de3 Translate placeholder 2018-12-11 20:41:49 +09:00
apple502j
fa29c2f2a5
Unquote userId 2018-12-11 18:29:02 +09:00
Ben Wheeler
d5ec7e17df add clientFaved and clientLoved, fix number selection 2018-12-10 11:59:32 -05:00
Paul Kaplan
26e821214a
Merge pull request #2431 from paulkaplan/fix-multi-love
Only try to update fave counts if there are no requests in progress.
2018-12-10 10:56:34 -05:00
Paul Kaplan
901dfeb6ca
Merge pull request #2425 from rschamp/admin-panel-occlusion
Don't occlude page content with the admin panel
2018-12-10 10:35:59 -05:00
Paul Kaplan
7c5d909a68 Only try to update fave counts if there are no requests in progress. 2018-12-10 10:31:58 -05:00
Paul Kaplan
3bda6a4a4e
Merge pull request #2430 from paulkaplan/fix-shared-date-display
Use falsey check for shareDate instead of checking for null.
2018-12-10 10:07:31 -05:00
Paul Kaplan
98b5930b91 Use falsey check for shareDate instead of checking for null.
It is set to empty string elsewhere when the value does not exist, not null
2018-12-10 09:15:24 -05:00
chrisgarrity
84cfcdee85 Add moderator info for sb2 projects 2018-12-10 08:47:01 -05:00
Benjamin Wheeler
9d5788cc77
Merge pull request #2417 from benjiwheeler/view-count
pass onGreenFlag to GUI; when called, call API to register project view
2018-12-07 16:52:44 -05:00
Paul Kaplan
d20b16d79c
Merge pull request #2424 from paulkaplan/admin-toggle-comments
Allow admins to toggle comments
2018-12-07 16:47:01 -05:00
Paul Kaplan
3934c92c7a
Merge pull request #2423 from paulkaplan/add-to-studio-fix
Show addToStudio for all logged in users on shared projects
2018-12-07 16:46:42 -05:00
Paul Kaplan
551cc0cc13 Remove userOwnsProject because it is unused 2018-12-07 16:09:34 -05:00
Paul Kaplan
74490f0922
Merge pull request #2422 from paulkaplan/no-share-censored
Remove share button on censored project banner.
2018-12-07 14:03:38 -05:00
Ray Schamp
1979675ebf Don't occlude page content with the admin panel
/ht @paulkaplan for the idea to move it below the nav bar.
2018-12-07 13:15:38 -05:00
Paul Kaplan
5d409bcdcf Allow admins to toggle comments 2018-12-07 12:57:50 -05:00
Paul Kaplan
4522983e20 Show addToStudio for all logged in users on shared projects 2018-12-07 12:51:00 -05:00
Paul Kaplan
2a464c8c21 Remove share button on censored project banner.
Functionality needs reconsidering.
2018-12-07 12:32:54 -05:00
Ben Wheeler
8dd239ebe5 use authorUsername, not users own username, in hitting logProjectView endpoint; use cookie and tokens in request 2018-12-07 11:00:43 -05:00
Ray Schamp
a2e46ea6ec
Merge pull request #2420 from rschamp/fix-props
Fix lint issues
2018-12-06 23:42:19 -05:00
Ray Schamp
402799e55f Fix lint issues
My linter doesn't catch prop order for some reason. So fix linting so the build works.
2018-12-06 23:15:54 -05:00
Ben Wheeler
5c3300dd68 pass onGreenFlag to GUI; when called, call API to register project view 2018-12-06 23:06:27 -05:00
Ray Schamp
c65ad06e91
Merge pull request #2419 from rschamp/admin-panel-only-admins
Fix admin panel visibility and style
2018-12-06 22:50:22 -05:00
Ray Schamp
0957173c88 Fix CSS
I dunno what I was seeing that made me think the width should be 237, but it was incorrect.
2018-12-06 22:48:03 -05:00
Ray Schamp
bc59a63e5e Only show the admin panel to admins 2018-12-06 17:07:28 -05:00
Benjamin Wheeler
5235cb2ecc
Merge pull request #2408 from benjiwheeler/remix-cues
Remix button progress spinner & banner message showing that user has remixed
2018-12-06 16:01:49 -05:00
Ben Wheeler
d235d872e1 show remixed banner to all, not just new scratchers 2018-12-06 16:01:28 -05:00
Ben Wheeler
07568b0f65 remove editor from url when not appropriate 2018-12-06 16:01:28 -05:00
Ben Wheeler
1adca1800a Banner message showing that user has remixed 2018-12-06 16:01:28 -05:00