Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,146 Commits 1 Branch 0 Tags
7d4ccf621e9f400ef9deacb3db92fbfc876492e2
Commit Graph

18146 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Giulio Gratta
7d4ccf621e Merge pull request #1066 from edx/giulio/ORA-fixes-2 
Second batch of ORA UI fixes (with an ICE bonus!)
 2013-09-26 10:30:25 -07:00
Giulio Gratta
bbd902f87e Last Changes before Merge 
- Change variable name to make it more clear
 2013-09-26 09:52:30 -07:00
Giulio Gratta
68ce6ed1c8 Second batch of ORA UI fixes: 
- Change wording when done with peer grading ("evals" -> "assessments")
- Added ICE legend item for comment syntax
- Added conditionals to display human readable 'grader_type' to alleviate confusion
- Rename 'Show/Hide Prompt' to 'Show/Hide Question'
- Reworded grading flags
- Make ICE grading container larger to more easily allow users to read and edit larger texts
- Adjusted lots of text and word choices to make them more user friendly
- Disable previous arrow on first grader feedback and next arrow on last grader feedback
- hide ORA instructions and ICE legend when calibrating so students don't feel like they need to write feedback

Changes after comments:

- Renamed instructions element and fixed casing issue
- Renamed legend class to ice-legend
- Changing condition from != to >= to not only fix incorrect one but also catch possible weirdness
- Grammar fix in a message
- Removing grader_type conditional in HTMl to give way to the one in python
- Moving ice feedback area height styling to CSS file

More changes:

- Update ICE version
- Modifying test to reflect code change
- Adding ICE undo feature
 2013-09-26 09:26:35 -07:00
Christina Roberts
42f286b325 Merge pull request #1069 from edx/christina/lock-assets 
Add asset locking to the Studio asset page.
 2013-09-26 07:54:29 -07:00
Don Mitchell
190b418387 Merge pull request #1121 from edx/dhm/timezone_display 
Replace date lib w/ simpler tzAbbr
 2013-09-26 07:43:22 -07:00
Brian Talbot
9f93c3c244 Merge pull request #1012 from edx/fix/frances/sass-debug-off 
Dev Environment: Disabling Sass Debug Mode
 2013-09-26 06:23:17 -07:00
Frances Botsford
111a6ae5b9 turning off sass debug mode in assets.rake 2013-09-26 09:22:52 -04:00
Nick Parlante
08cb469409 Merge pull request #1104 from edx/nick/anon-userids 
Add "Download CSV of all student anonymized IDs" button to instructor dashboards
 2013-09-25 20:58:34 -07:00
cahrens
2cbdaaee7d Updates based on switching to checkbox for locking. 2013-09-25 17:29:47 -04:00
Frances Botsford
79c2cdc7ba switching studio assets lock to use checkbox instead of link 2013-09-25 17:29:47 -04:00
cahrens
1d7f891145 Delete asset from cache. 2013-09-25 17:29:47 -04:00
cahrens
5e475c8732 Code review feedback. 2013-09-25 17:29:47 -04:00
cahrens
6dce7f299f Asset locking feature. 2013-09-25 17:29:46 -04:00
Frances Botsford
7700ec68bb addressing PR sass/html comments on studio assets 2013-09-25 17:29:27 -04:00
cahrens
f10cf29425 Update upload test for what actually works now. 2013-09-25 17:29:27 -04:00
Frances Botsford
370872f274 ui changes from design team feedback on studio assets page 2013-09-25 17:29:27 -04:00
cahrens
c64e04d8c2 Add the ability to lock assets. 2013-09-25 17:29:27 -04:00
Diana Huang
78829a37b5 Merge pull request #1127 from edx/diana/modes-expiration-dates 
Add the ability to set expiration dates on course modes.
 2013-09-25 14:22:22 -07:00
Nick Parlante
d225b85d1a Port get-anonymized-id feature to new instructor dashboard 2013-09-25 13:52:05 -07:00
Renzo Lucioni
c124a33036 Merge pull request #829 from edx/renzo/ab-testing 
Split Testing
 2013-09-25 13:29:46 -07:00
Renzo Lucioni
ac0e65ab2a Update CHANGELOG 2013-09-25 16:26:04 -04:00
Don Mitchell
82af8d4b09 Merge pull request #1124 from edx/dhm/asset_policy 
Just write the loc name as the key in the policy file
 2013-09-25 13:20:21 -07:00
Diana Huang
37d906e4db Add the ability to set expiration dates on course modes. 2013-09-25 16:15:42 -04:00
Don Mitchell
f932881424 Test importing exported course over a new course 2013-09-25 14:41:42 -04:00
Don Mitchell
ef26e8baa3 Just write the loc name as the key in the policy file 2013-09-25 14:41:42 -04:00
Will Daly
47621b56ff Merge pull request #1112 from edx/will/shard-acceptance-tests 
Added tags to acceptance tests to define multiple shards.
 2013-09-25 11:36:18 -07:00
Will Daly
2338ed2d8a Merge pull request #1126 from edx/will/fix-openid-test 
Fix intermittent failure in OpenID test
 2013-09-25 11:36:02 -07:00
Calen Pennington
f4b37b28b1 Merge pull request #1060 from cpennington/lazy-textbooks 
Make Textbooks properly lazy
 2013-09-25 11:32:09 -07:00
Will Daly
2b54922285 Fix intermittent failure in OpenID test 2013-09-25 13:05:56 -04:00
jkarni
7bd54546e3 Merge pull request #597 from edx/feature/msteele/scrollup 
Add scroll-to-top when switching verticals from bottom nav buttons.
 2013-09-25 08:38:24 -07:00
Jay Zoldak
6b7cb42e15 Merge pull request #1123 from edx/zoldak/speedy-cms-acceptance 
Knock 10 more seconds off the acceptance tests.
 2013-09-25 07:30:48 -07:00
Valera Rozuvan
a8349a06cd Merge pull request #1120 from edx/valera/fix_for_unnecessary_outline_around_video 
Fix for bug BLD-359: Unnecessary focus outline around Video Player.
 2013-09-25 07:00:47 -07:00
Jay Zoldak
cae6e82bf7 Knock 10 more seconds off the acceptance tests. 2013-09-25 09:46:18 -04:00
Diana Huang
19ee540a33 Merge pull request #1115 from edx/diana/verify-pep8-pylint 
Clean up some old pep8/pylint violations
 2013-09-25 06:23:47 -07:00
Don Mitchell
dd788c8fb2 Merge pull request #1107 from edx/dhm/bug_attrs 
Ensure location is valid before trying to fetch
 2013-09-25 05:50:49 -07:00
Valera Rozuvan
8b4489233e Fix for bug BLD-359: Unnecessary focus outline around Video Player. 2013-09-25 14:53:46 +03:00
Renzo Lucioni
e7e03f10fb Refactor tab tests 2013-09-25 00:27:36 -04:00
Renzo Lucioni
f1ccf1c06b Integrate split testing and LMS tabs experiments 2013-09-25 00:27:36 -04:00
Don Mitchell
fd06640de5 Merge pull request #1091 from edx/assets/persist_lock 
Export asset attrs to a policy file
 2013-09-24 14:25:52 -07:00
Diana Huang
4ee9ef61cf Clean up some old pep8/pylint violations 
Also, deletes some unused code.
 2013-09-24 17:12:31 -04:00
Don Mitchell
20e4d585c8 Add documentation and comments. 2013-09-24 16:31:21 -04:00
Don Mitchell
8e7fc1537f Test asset import/export roundtrip w/ lock setting. 2013-09-24 16:31:21 -04:00
Don Mitchell
d1a82f2ac5 Import/export static content properties 
Even though xml based courses will ignore.
 2013-09-24 16:31:20 -04:00
Nick Parlante
1b5903935e Add "Download CSV of all student anonymized IDs" button to instructor dashboard 
This is a recurrent ops problem, so we wanted to make it available
on the instructor dashboard.
 2013-09-24 12:59:42 -07:00
Greg Price
7275f85232 Merge branch 'release' 2013-09-24 15:27:18 -04:00
jkarni
ad939b1e7c Merge pull request #1090 from edx/jkarni/feature/middleware-locked-assets 
Jkarni/feature/middleware locked assets
 2013-09-24 12:25:05 -07:00
Julian Arni
1a0b752a81 Review fixes 2013-09-24 14:59:07 -04:00
Jay Zoldak
7669b4d777 Namespace the acceptance tests so they show up nicely in jenkins 
Conflicts:
	cms/djangoapps/contentstore/features/advanced-settings.feature
	cms/djangoapps/contentstore/features/checklists.feature
	cms/djangoapps/contentstore/features/component.feature
	cms/djangoapps/contentstore/features/course-overview.feature
	cms/djangoapps/contentstore/features/course-settings.feature
	cms/djangoapps/contentstore/features/course-team.feature
	cms/djangoapps/contentstore/features/course-updates.feature
	cms/djangoapps/contentstore/features/courses.feature
	cms/djangoapps/contentstore/features/discussion-editor.feature
	cms/djangoapps/contentstore/features/grading.feature
	cms/djangoapps/contentstore/features/html-editor.feature
	cms/djangoapps/contentstore/features/problem-editor.feature
	cms/djangoapps/contentstore/features/section.feature
	cms/djangoapps/contentstore/features/signup.feature
	cms/djangoapps/contentstore/features/static-pages.feature
	cms/djangoapps/contentstore/features/subsection.feature
	cms/djangoapps/contentstore/features/textbooks.feature
	cms/djangoapps/contentstore/features/upload.feature
	cms/djangoapps/contentstore/features/video-editor.feature
	cms/djangoapps/contentstore/features/video.feature
	lms/djangoapps/courseware/features/certificates.feature
	lms/djangoapps/courseware/features/help.feature
	lms/djangoapps/courseware/features/high-level-tabs.feature
	lms/djangoapps/courseware/features/homepage.feature
	lms/djangoapps/courseware/features/login.feature
	lms/djangoapps/courseware/features/lti.feature
	lms/djangoapps/courseware/features/navigation.feature
	lms/djangoapps/courseware/features/problems.feature
	lms/djangoapps/courseware/features/registration.feature
	lms/djangoapps/courseware/features/signup.feature
	lms/djangoapps/courseware/features/video.feature
	lms/djangoapps/courseware/features/word_cloud.feature
 2013-09-24 14:35:12 -04:00
Jay Zoldak
73e038834c Merge pull request #1083 from edx/zoldak/speedy-lms-acceptance 
Speed up lms acceptance tests
 2013-09-24 11:28:30 -07:00
stroilova
6d41669bbb Merge pull request #809 from edx/event_spec_update 
Update event doc from wiki
 2013-09-24 10:44:31 -07:00