Benjamin Wheeler
|
1af1eec9c0
|
Merge pull request #2973 from benjiwheeler/align-remix-credit
fix alignment of remix credit avatar, text
|
2019-05-22 10:21:18 -04:00 |
|
Ben Wheeler
|
69eca8ed49
|
defined player-header and redefined player-height to make project notes correct height
|
2019-05-21 23:37:10 -04:00 |
|
Bryce Taylor
|
59ff5968eb
|
Merge pull request #2982 from LLK/my-stuff-integration-update
Make Add to studio test in test-my-stuff integration test look in shared projects
|
2019-05-21 11:57:07 -04:00 |
|
Ben Wheeler
|
1cb4bb5f7e
|
adjust instructions column padding-top
|
2019-05-21 00:22:37 -04:00 |
|
picklesrus
|
30ea515901
|
Merge pull request #2981 from LLK/release/05-16-2019
[Develop]Release/05 16 2019
|
2019-05-16 16:12:57 -04:00 |
|
chrisgarrity
|
623adb716b
|
Merge pull request #2984 from chrisgarrity/rapanui-fixes
Rapanui fixes
|
2019-05-16 13:49:17 -04:00 |
|
Chris Garrity
|
da231ccf6a
|
update gui
get fixes for rapa nui:
* music extension instrument block
* hide (long) labels on paint editor buttons
|
2019-05-16 13:41:01 -04:00 |
|
BryceLTaylor
|
8d4f387093
|
Make Add to studio test in test-my-stuff integration test look in shared projects
|
2019-05-16 11:45:29 -04:00 |
|
Paul Kaplan
|
02419f9d18
|
Merge pull request #2979 from LLK/develop
Update release branch to bring in last weeks unreleased changes
|
2019-05-16 08:56:29 -04:00 |
|
Paul Kaplan
|
109549fd8f
|
Merge pull request #2957 from LLK/release/05-08-2019
[DEVELOP] Release 05/08/2019
|
2019-05-16 08:54:35 -04:00 |
|
picklesrus
|
00a552b15b
|
Merge pull request #2977 from chrisgarrity/fix-custom-locale
Add rapa nui to www custom locales
|
2019-05-15 18:18:15 -04:00 |
|
Chris Garrity
|
c73389fad3
|
Add rapa nui to www custom locales
|
2019-05-15 18:14:19 -04:00 |
|
Ben Wheeler
|
9afe46622b
|
added comments about form height
|
2019-05-15 18:08:25 -04:00 |
|
Ben Wheeler
|
974203d325
|
fix alignment of remix credit avatar, text
|
2019-05-15 18:00:31 -04:00 |
|
picklesrus
|
15e93cc4cc
|
Merge pull request #2976 from LLK/develop
Release 05-16-2019
|
2019-05-15 17:02:31 -04:00 |
|
picklesrus
|
df7633bfdc
|
Merge pull request #2975 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190515193432
chore(package): update scratch-gui to version 0.1.0-prerelease.201905…
|
2019-05-15 17:00:22 -04:00 |
|
greenkeeper[bot]
|
3fa1b3cf79
|
chore(package): update scratch-gui to version 0.1.0-prerelease.20190515193432
Closes #2972
|
2019-05-15 19:46:56 +00:00 |
|
Benjamin Wheeler
|
d12551945d
|
Merge pull request #2971 from benjiwheeler/story-link-correct
change /story redirect from tutorial=story to tutorial=tell-a-story
|
2019-05-15 10:56:27 -04:00 |
|
Benjamin Wheeler
|
4ec21913dc
|
Merge pull request #2965 from benjiwheeler/admin-markedbyfilter
for admins, handle markedbyfilter comments differently, color them ye…
|
2019-05-14 20:10:54 -04:00 |
|
Ben Wheeler
|
d8026a487e
|
change /story redirect from tutorial=story to tutorial=tell-a-story
|
2019-05-14 13:57:36 -04:00 |
|
Benjamin Wheeler
|
b2d5bbcb93
|
Merge pull request #2969 from benjiwheeler/make-translations
fix "make translations" command
|
2019-05-13 17:08:23 -04:00 |
|
Benjamin Wheeler
|
563501778f
|
Merge pull request #2952 from benjiwheeler/nairobi-revise
revised conference page to postpone kenya, change sur title, eu desc
|
2019-05-13 16:28:54 -04:00 |
|
Ben Wheeler
|
ec6f4c1715
|
for admins, handle markedbyfilter comments differently, color them yellow
|
2019-05-13 13:09:27 -04:00 |
|
Benjamin Wheeler
|
94a6c27770
|
Merge pull request #2964 from benjiwheeler/add-copy-link-fix-to-release
only show copy link button if project is shared
|
2019-05-13 11:59:34 -04:00 |
|
Ben Wheeler
|
69bc0348e7
|
Revert "Fix translations script”; moved to separate PR
This reverts commit 3a651fa9fd.
|
2019-05-13 11:55:45 -04:00 |
|
Ben Wheeler
|
033a0f5dcd
|
don't overwrite english defaults from local l10n.json source files with transifex download
|
2019-05-13 11:24:38 -04:00 |
|
Chris Garrity
|
3a651fa9fd
|
Fix translations script
Don’t overwrite the english defaults from the local `l10n.json` source files with ‘en’ downloaded from transifex.
|
2019-05-10 08:01:59 -04:00 |
|
Ben Wheeler
|
7562b16d8a
|
only show copy link button if project is shared
|
2019-05-09 13:46:56 -04:00 |
|
Paul Kaplan
|
f3c3228cf6
|
Merge pull request #2955 from LLK/develop
Merge develop into RC
|
2019-05-08 14:58:30 -04:00 |
|
Paul Kaplan
|
e67ce6c6cb
|
Merge pull request #2954 from LLK/paulkaplan-patch-5
Bump scratch-gui dep
|
2019-05-08 14:57:29 -04:00 |
|
Paul Kaplan
|
4836157e64
|
Bump scratch-gui dep
|
2019-05-08 14:57:13 -04:00 |
|
Benjamin Wheeler
|
d97f5b9d7a
|
Merge pull request #2924 from benjiwheeler/embed-modal
Embed/social sharing modal
|
2019-05-08 14:53:19 -04:00 |
|
Ben Wheeler
|
4ef73525c4
|
Revised modal title to Copy Link, use orig icon
|
2019-05-08 14:36:00 -04:00 |
|
Paul Kaplan
|
0a136d6240
|
Merge pull request #2953 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190508123954
chore(package): update scratch-gui to version 0.1.0-prerelease.201905…
|
2019-05-08 14:29:14 -04:00 |
|
Ben Wheeler
|
2b2132742d
|
revised conference page to postpone kenya, change sur title, eu desc
|
2019-05-08 10:45:39 -04:00 |
|
greenkeeper[bot]
|
f3be5600bd
|
chore(package): update scratch-gui to version 0.1.0-prerelease.20190508123954
Closes #2949
|
2019-05-08 12:52:43 +00:00 |
|
Ben Wheeler
|
73944a34e4
|
removed unused css for embed modal
|
2019-05-07 10:54:21 -04:00 |
|
Ben Wheeler
|
4ae4d4232a
|
removed social images and links
|
2019-05-07 10:54:01 -04:00 |
|
Ben Wheeler
|
6a3110e24e
|
moved and renamed linkUrl to keep url generation in one place
|
2019-05-06 18:49:57 -04:00 |
|
Ben Wheeler
|
d5e2ed69ad
|
refined colors
|
2019-05-06 16:22:41 -04:00 |
|
picklesrus
|
edcc7956e9
|
Merge pull request #2947 from LLK/master
Merge Master back into develop after 5/2 Release
|
2019-05-03 10:21:08 -04:00 |
|
Ben Wheeler
|
08f8e1c546
|
simplified embed modal to remove social links
|
2019-05-02 17:18:13 -04:00 |
|
picklesrus
|
d3547d94bf
|
Merge pull request #2944 from LLK/revert-2943-revert-2940-release/05-02-2019
Revert "Revert "[MASTER] Release/05 02 2019""
|
2019-05-02 17:13:51 -04:00 |
|
picklesrus
|
3c4606ca79
|
Revert "Revert "[MASTER] Release/05 02 2019""
|
2019-05-02 16:57:46 -04:00 |
|
chrisgarrity
|
f3cf28563e
|
Merge pull request #2943 from LLK/revert-2940-release/05-02-2019
Revert "[MASTER] Release/05 02 2019"
|
2019-05-02 14:28:40 -04:00 |
|
chrisgarrity
|
9050a5a5d2
|
Revert "[MASTER] Release/05 02 2019"
|
2019-05-02 14:28:15 -04:00 |
|
chrisgarrity
|
78f8b5184b
|
Merge pull request #2941 from LLK/release/05-02-2019
[DEVELOP] Release/05 02 2019
|
2019-05-02 13:46:12 -04:00 |
|
chrisgarrity
|
4f688a4c18
|
Merge pull request #2940 from LLK/release/05-02-2019
[MASTER] Release/05 02 2019
|
2019-05-02 13:33:39 -04:00 |
|
chrisgarrity
|
d22635d3cf
|
Merge pull request #2939 from LLK/develop
Prepare release branch
|
2019-05-01 17:45:44 -04:00 |
|
chrisgarrity
|
7bf7834814
|
Merge pull request #2938 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190501211108
chore(package): update scratch-gui to version 0.1.0-prerelease.201905…
|
2019-05-01 17:40:29 -04:00 |
|