Skip to content

Test > Levelbuilder#9699

Merged
mehalshah merged 51 commits into
levelbuilderfrom
test
Jul 25, 2016
Merged

Test > Levelbuilder#9699
mehalshah merged 51 commits into
levelbuilderfrom
test

Conversation

@mehalshah

Copy link
Copy Markdown
Contributor

No description provided.

Hamms and others added 30 commits July 14, 2016 14:11
workshops from the same organizer.
Removed unique constraint from followers.[user_id, student_user_id].
Added unit tests for Section.add_student.
Caley Brock and others added 21 commits July 22, 2016 15:08
Conflicts:
	apps/src/templates/instructions/TopInstructionsCSF.jsx
Allow pd-workshop sections to accept members who are in other workshops from the same organizer.
GameLab: Add horizontal and vertical stretch for animations
…hints

Integrate Hints into new Top Instructions
By setting this new permission on a user, that user can see the full list of courses in the teacher dashboard, including hidden courses, without being an admin.
…to be whether the course contains an evaluation.

 Please enter the commit message for your changes. Lines starting
Add "Report Bug" link to all courses
New permission for non-admins to also see hidden courses.
…llment

[test ui] Instead of pd vs non pd, the real determining factor ought …
906f3ad Merge pull request #9559 from code-dot-org/topInstructions-integrate-hints (Elijah Hamovitz)
40e882e Merge pull request #9546 from code-dot-org/animation-sizes (Caley Brock)
b3a9bbb Merge pull request #9660 from code-dot-org/pd-workshop-join-section (Andrew Oberhardt)
ea5c048 Merge branch 'staging' into topInstructions-integrate-hints (Elijah Hamovitz)
de6955d missing semicolon fix (Caley Brock)
6bc0459 PR feedback: renamed unit test variables and added comment (Andrew Oberhardt)
85f27bb code review: fix typo (Caley Brock)
2653697 staging content changes (-Ram) (Continuous Integration)
f0fcf5c Remove not needed comment (Caley Brock)
8fb23f7 Merge pull request #9675 from code-dot-org/levelbuilder (Ram Kandasamy)
ad499a1 Modify p5play to initialize sprite height and width and not change them during update (Caley Brock)
79e2eff levelbuilder content changes (-Ram) (Continuous Integration)
851caa6 Merge pull request #9620 from code-dot-org/photo-credit (Tanya Parker)
0e067b3 Merge pull request #9661 from code-dot-org/peer_review_in_course_ui (Mehal Shah)
df67e16 I am annoyed that this works (Mehal Shah)
ac5bcd1 staging content changes (-Ram) (Continuous Integration)
6043087 Automatically built. (Continuous Integration)
c43f297 remove custom scroll handler, instead hide native scrollbar (Elijah Hamovitz)
@mehalshah mehalshah merged commit d9b0e4b into levelbuilder Jul 25, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants