Backmerge the 6/1 DTP squash commit into test #15586
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
DTP (Test > Production: d3c9e2f)
* Add a gamelab page * New UI tips: beginning of some dismissable tips on /home Tips show on the page, can be dismissed, and modify the user object on the server. * New UI tips: more work on initial tips * New UI tips: save whether user has dismissed initial tips * New UI tips: support for triggering tip with non-React element click * New UI tips: add a little X to the tip * New UI tips: one dismissable tip for en-teachers on /courses * Create script to fix birthday, aligning day and month to created_at. * New UI tips: fix property name * Add comments * New UI tips: update file locations * Add Pardot#delete_pardot_prospects. * Fix copy/pasta in CustomMarshalingInterpreter initialization Not sure why I didn't think of this method before, but it's much more resilient to upstream interpreter changes. * Swap out teacher hero for slightly taller image (#15471) * move google analytics include sooner * levelbuilder content changes (-Ram) * fix styling for /projects/public with all flags while signed out * enable progress redesign * New UI header: courses tip in place, hide on mobile, fixes * Scoop pegasus strings (brendan) * New UI tips: adjust colouring * Course explorer: fix missing image * New UI tips: add API test * enable the publicGallery experiment flag * New header: fix vertical location of freeplay icons * New header: fix the placement of the My Projects button * New UI tips: tiny updates * New UI: Flip to the new UI Deliver the same experience as previously hidden behind the "new_header" page mode cookie. Doesn't rename various files and CSS classes yet. Also doesn't gut various files and CSS classes that are no longer used. * Update image_optim_rails in Gemfile.lock (#15480) commit hash changed due to upstream commit rebase. * New UI: missed a couple places * fix background hero on retina (#15489) Fix bug introduced by attribute change in #15405. * Hamburger help links (#15477) * Remove 'Help and Support' from user dropdown links * Put help and support in the hamburger menu for everyone * Put Teacher Community link in the hamburger for teachers * Documentation and Tutorial links only when on a level * Rearrange links per Tanya's request * Thicker borders for SetUpMessages (#15488) * Teacher homepage announcement about navigation redesign (#15490) * Updated apps strings * fix selector for redesign * Course Cards are clickable, fix JS prop errors, webpack change to make images appear (#15487) * New UI tips: fix test * Purple course cards (#15493) * update selector for dropdown bubbles [ci skip] * New UI: fix header issue when no script_level * Updated apps strings * New UI: fix bad merge * Fix 'back to top' link in public gallery * updates selectors to get eyes tests to run [ci skip] * Add accept terms reminder to teacher homepage (#15492) * Add accept terms reminder to teacher homepage * Render partial for the terms interstitial modal * define $ in TeacherHomepage component so there aren't any storybook errors * isTeacher = true for RecentCoursesCollapsible on TeacherHomepage * Change my-professional-learning redirect for non-pd teachers to code.org/educate/professional-learning * Make buttons have a bigger font * New UI: update login landing page for UI tests * Fix regex to support multi-length rails digests. * New UI: dashboard header no longer uses cookie, fix tips The dashboard header now uses current_user instead of the user_type cookie, which improves things so that the first time an already signed-in user sees the new UI they see the correct header/hamburger options. Prior to this change, the user would see the options for a signed-out user until their next request, which would have the new user_type cookie for the first time. Also fixes the /home tip for the hamburger to point directly at it. * Add descriptive comments for image asset (re)naming code * New header: dashboard header falls back to cookie if no current_user * remove reference to Code Studio from /student page * Teachers without courses on /course should not see set up msg (#15507) * scoop I18n strings removing 'Code Studio' -tanya * Replace bee banner with girl banner on /home and /courses (#15504) * Don't show bee for signed out users on /courses * Girl banner for everyone on /home and /courses * Delete unused bee banner * New UI: attempt to make circle unit & UI tests pass * New UI: fix bad merge * Levelbuilder scoop * New UI: Fix more unit tests * Add a hover state * New UI: fix some UI tests by checking for student destination URL * Projects loading and no projects case * string scoop for standards page -tanya * X should close dialog * New UI: fix signing in UI test * Fix spacing on course explorer * New UI: fix race interstitial UI test to use /courses for students * New UI: restore empty line * remove old videos and update professional learning page * Sentence case links * add a link to project gallery at the bottom of the student courses page * Change make my own gamelab link * Add workshop links for facilitators to teacher homepage (#15512) * Content updates to Teacher Resources and Course Explorer (#15538) * Updated apps strings * Code review feedback * Redesign hamburger dropdown (#15530) * Redesign hamburger dropdown * Rearrange link order in hamburger dropdown * code review * scoop report bug and tutorials strings that had an extra space -tanya * Add project gallery button * Localize * Alphabetize * Updated apps strings * Show user links in hamburger menu on mobile for students * Show link to project gallery when signed out on mobile * Link to project gallery when signed out goes to projects/public * New UI: Fix teacher dashboard test on Yosemite Safari To keep this useful UI test intact, we added a no_home_redirect URL parameter to prevent /teacher-dashboard from redirecting. This allowed existing UI tests to continue using that page as a starting point for testing the remainder of the teacher-dashboard. For some reason, on Safari 8.0 on Yosemite, after click on a link, the URL parameter lived on. This updates the test to cope with this situation. * Move Project Gallery link for signed out users to bottom of dropdown * Fix artist text * Project Gallery for signed out is not in its own section * stop changing the url when switching between Public Gallery and My Projects * Updated apps strings * New header: show header but hide all contents but logo on dashboard * New UI: update text of first teacher UI tip * Scoop staging strings (brendan)
|
Thanks, Ram. This seems to fix the conflict, GitHub now allows merging test into production. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.