Commit graph

3829 commits

Author SHA1 Message Date
Ray Schamp
04e7aa1c8f
Merge pull request #2718 from paulkaplan/hotfix/project-info-updates
[develop] Fix project info updates being reflected after "See Inside"
2019-01-25 13:46:16 -05:00
Paul Kaplan
8e57bb5493 Pass updates up from project updater to top-level redux store 2019-01-25 13:35:39 -05:00
Ray Schamp
86ec698bf0
Merge pull request #2717 from LLK/hotfix/show-update-errors-hoc
Update z-index so validation bubbles go below the nav bar
2019-01-25 13:26:12 -05:00
Ray Schamp
db99c12d89
Merge pull request #2714 from LLK/hotfix/show-update-errors-hoc
[Master] Wrap project inputs to show server validation
2019-01-25 11:49:02 -05:00
Ray Schamp
29d5a80b5e
Update z-index so validation bubbles go below the nav bar 2019-01-25 11:20:32 -05:00
Ray Schamp
594c7453e6
Merge pull request #2716 from LLK/hotfix/show-update-errors-hoc
Fix initial value for notes and credits aka description
2019-01-25 10:27:47 -05:00
Ray
d8d46b102b Fix initial value for notes and credits aka description
Resolves "mirror world" issue
2019-01-25 10:11:22 -05:00
Paul Kaplan
2c6af0c0a3
Merge pull request #2711 from paulkaplan/show-update-errors-hoc
[Develop] Wrap project update inputs to show server validation
2019-01-25 09:40:29 -05:00
Paul Kaplan
d6c48a5730 Wrap project update inputs to show server validation 2019-01-24 16:53:21 -05:00
Paul Kaplan
8980fa289f
Merge pull request #2709 from LLK/develop
Deploy late January 2019 work to production
2019-01-24 15:37:25 -05:00
picklesrus
8aeba47261
Merge pull request #2707 from LLK/picklesrus-patch-1
Bump Gui
2019-01-23 18:50:01 -05:00
picklesrus
0019532c38
Bump Gui 2019-01-23 18:25:21 -05:00
Eric Rosenbaum
71cb92c214
Merge pull request #2704 from ericrosenbaum/bugfix/update-extension-chips
Update extension chips
2019-01-23 17:30:38 -05:00
Paul Kaplan
4f44aa08cc
Merge pull request #2705 from LLK/paulkaplan-patch-4
Bump GUI
2019-01-23 16:50:11 -05:00
Paul Kaplan
45a6779a32
Bump GUI 2019-01-23 16:44:25 -05:00
Eric Rosenbaum
825b885638 Update extension chip icons 2019-01-23 15:51:35 -05:00
Eric Rosenbaum
44ec3de0f1 Change extension chip wording to “Video Sensing” 2019-01-23 15:51:00 -05:00
Benjamin Wheeler
b72118e29d
Merge pull request #2702 from benjiwheeler/autocensored-message
added default censored messages
2019-01-23 15:24:58 -05:00
Benjamin Wheeler
5f3f7f0977
Merge pull request #2703 from LLK/revert-2693-revert-2682-studio-use-permissions
Revert "Revert "Add to studio modal should only show studios user can actually change""
2019-01-23 14:17:27 -05:00
Ben Wheeler
aeedf456c0 corrected messageHTML to message 2019-01-23 13:29:37 -05:00
Ben Wheeler
696bfa117e refactored censored message into component, removed autocensor message 2019-01-23 10:30:26 -05:00
Ben Wheeler
971b3dc2d1 added autocensor-specific banner message 2019-01-23 09:18:40 -05:00
Eric Rosenbaum
67bd48c841
Merge pull request #2701 from ericrosenbaum/feature/lego-branding
LEGO branding updates
2019-01-22 17:38:21 -05:00
Benjamin Wheeler
4d3e46e40b
Revert "Revert "Add to studio modal should only show studios user can actually change"" 2019-01-22 17:07:52 -05:00
Ben Wheeler
ddf6793362 reformat banner css to be less red, better line-height, max width on text 2019-01-22 16:35:59 -05:00
Ben Wheeler
d70bbe20c9 added default censored messages 2019-01-22 15:15:36 -05:00
Eric Rosenbaum
dea983c995 Update WeDo legacy link text 2019-01-22 11:32:42 -05:00
Eric Rosenbaum
5603e2dc2b Fix WeDo extension chip wording 2019-01-22 11:23:48 -05:00
Eric Rosenbaum
3231d4cbd7 Fix WeDo page title 2019-01-22 11:18:59 -05:00
Eric Rosenbaum
11c449226e Update LEGO wording 2019-01-22 11:02:10 -05:00
Eric Rosenbaum
ecad945ead
Merge pull request #2621 from apple502j/sound-credit
Sound credits
2019-01-22 10:54:27 -05:00
Eric Rosenbaum
41b74bab56 Remove paragraph break 2019-01-22 10:41:56 -05:00
Paul Kaplan
e6e825bb6e
Merge pull request #2696 from LLK/develop
Deploy sound reordering fix
2019-01-18 16:03:44 -05:00
Paul Kaplan
49b2ce0883
Merge pull request #2695 from LLK/paulkaplan-patch-4
Bump GUI to fix sound reordering bug
2019-01-18 15:33:55 -05:00
Paul Kaplan
b547432451
Bump GUI to fix sound reordering bug 2019-01-18 15:33:23 -05:00
Benjamin Wheeler
77733e2a87
Merge pull request #2691 from apple502j/little-bridge
Don't link if destination is null
2019-01-18 14:55:46 -05:00
Paul Kaplan
b86f3a0dfb
Merge pull request #2694 from LLK/develop
Deploy language, layering updates
2019-01-17 16:10:15 -05:00
Paul Kaplan
23be323a00
Bump GUI 2019-01-17 15:48:45 -05:00
Paul Kaplan
666f815843
Merge branch 'master' into develop 2019-01-17 13:40:59 -05:00
Benjamin Wheeler
2e1fcfb143
Merge pull request #2693 from LLK/revert-2682-studio-use-permissions
Revert "Add to studio modal should only show studios user can actually change"
2019-01-17 11:42:23 -05:00
Benjamin Wheeler
5ddb7660f6
Revert "Add to studio modal should only show studios user can actually change" 2019-01-17 11:22:00 -05:00
Paul Kaplan
62ea77116c
Merge pull request #2692 from LLK/paulkaplan-patch-3
Bump GUI with new languages from blocks
2019-01-17 10:16:12 -05:00
Paul Kaplan
8df6a9033f
Bump GUI with new languages from blocks 2019-01-17 09:48:16 -05:00
apple502j
608c08377a Don't link if destination is null 2019-01-17 21:23:15 +09:00
Karishma Chadha
71a67db73b
Merge pull request #2689 from LLK/paulkaplan-patch-3
Bump GUI
2019-01-16 17:29:10 -05:00
Karishma Chadha
2453278466
Update package.json
Co-Authored-By: paulkaplan <pkaplan@media.mit.edu>
2019-01-16 17:14:09 -05:00
Paul Kaplan
2d56e16f51
Bump GUI 2019-01-16 17:03:47 -05:00
Benjamin Wheeler
441d695f97
Merge pull request #2682 from benjiwheeler/studio-use-permissions
Add to studio modal should only show studios user can actually change
2019-01-16 16:59:33 -05:00
Ben Wheeler
e9b736270f make showStudio utility function purely functional 2019-01-16 16:42:02 -05:00
Bryce Taylor
a454f71032
Merge pull request #2688 from BryceLTaylor/Update-Footer-Link-Tests
Remove Scratch Wiki test from integration tests
2019-01-16 15:10:13 -05:00