Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,363 Commits 1 Branch 0 Tags
e8f067de8f2be4c7864ad1bdf4e0794de175e0dc
Commit Graph

3005 Commits

Author SHA1 Message Date
Renzo Lucioni
f1ccf1c06b Integrate split testing and LMS tabs experiments 2013-09-25 00:27:36 -04:00
Diana Huang
4ee9ef61cf Clean up some old pep8/pylint violations 
Also, deletes some unused code.
 2013-09-24 17:12:31 -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
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
Will Daly
f898f72920 Added tags to acceptance tests to define multiple shards. 2013-09-24 11:47:53 -04:00
Jay Zoldak
002f3ef9e2 Speed up waiting for elements not present on remote webdriver sessions. 2013-09-24 11:27:42 -04:00
Jay Zoldak
20ea28748b Speed up problems feature tests 2013-09-24 11:09:37 -04:00
Jay Zoldak
f30364906d Speed up lti acceptance test for remote webdriver. 2013-09-24 11:09:37 -04:00
Usman Khalid
761590bc8f Merge pull request #1053 from edx/usman/static-book-url 
Added missing test in StaticImageBookTest
 2013-09-24 06:24:43 -07:00
Adam Palay
e9b15b6f02 add unicode support for course_wiki 2013-09-23 16:15:47 -04:00
Usman Khalid
231b130911 Removed hardcoded case for edge for /courses 2013-09-23 15:30:00 +00:00
Usman Khalid
b2af990d3c If setting COURSES_ARE_BROWSABLE is off return 404 on /courses 2013-09-23 15:19:32 +00:00
Usman Khalid
3c3edac05f Fixed tests name in staticbook 2013-09-23 12:58:14 +00:00
David Ormsbee
61e7cbb567 Add extra error checking and logging to Software Secure callback 2013-09-22 15:47:43 -04:00
Vik Paruchuri
d8af16dca2 Merge pull request #1058 from edx/fix/vik/oe-staff-error 
Fix OE AJAX post error
 2013-09-20 10:46:20 -07:00
Vik Paruchuri
d6a2e06d9f Test empty list behavior 2013-09-20 12:02:22 -04:00
jmclaus
66bd8127e6 Acceptance tests now pass 2013-09-20 14:04:58 +02:00
jmclaus
cbc4bd5c3a Modified acceptance test to reflect autoplay=false as a default for lms 2013-09-20 14:04:57 +02:00
jmclaus
7af892e66a Disabled video autoplay for students 2013-09-20 14:04:57 +02:00
Diana Huang
c65e21c779 Merge pull request #1071 from edx/diana/order-integrity-errors 
If the current course doesn't have a verified course mode
 2013-09-19 14:10:27 -07:00
Diana Huang
3140270590 Merge pull request #1040 from edx/diana/no-ordering-twice 
Don't try to purchase the same order twice
 2013-09-19 14:07:17 -07:00
Diana Huang
2f001041ee Merge pull request #1048 from edx/diana/cybersource-unicode-handling 
Add unicode handling to the signing and verifying logic
 2013-09-19 14:04:53 -07:00
Diana Huang
ec5e767bb4 If the current course doesn't have a verified course mode 
kick the user out of the verify registration flow.
 2013-09-19 16:59:28 -04:00
Adam
75b7514c4f Merge pull request #965 from felipemontoya/features/fmo/lms-i18n-strings 
Features/fmo/lms i18n strings
 2013-09-19 12:05:35 -07:00
Vik Paruchuri
a1a431f7ba Fix staff-facing error with open ended 2013-09-19 14:56:02 -04:00
Felipe Montoya
893d22515d Something for the user dashboard 2013-09-19 10:52:29 -05:00
Jason Bau
46fddc6d26 Merge pull request #1052 from edx/jbau/staff-needs-to-grade-use-get 
use .get when checking combined notifications to handle missing keys
 2013-09-19 07:49:39 -07:00
Diana Huang
3b66852235 Add unicode handling to the signing and verifying logic 2013-09-19 10:07:49 -04:00
Usman Khalid
d8e9ffbb0b Added missing test in StaticImageBookTest 2013-09-19 12:38:32 +00:00
Jason Bau
aa0801907d use .get when checking combined notifications to handle missing keys 2013-09-18 23:47:31 -07:00
Calen Pennington
9643fd463f Rename xblock_field_data to xmodule_field_data 2013-09-18 10:49:41 -04:00
Diana Huang
67af3d5ced Don't try to purchase the same order twice 2013-09-18 10:25:10 -04:00
Calen Pennington
d35a03a0d6 Merge pull request #908 from cpennington/reference-runtime 
Replace references to .system
 2013-09-18 05:43:20 -07:00
Giulio Gratta
d4687aa6df 4 OE/ORA UI fixes to make it easier to use 
- require confirmation when clicking Open Ended reset button (now working)
- require confirmation when submitting Open Ended essay (now working)
- disable text feedback area during calibration and let users know that they should give feedback when grading
- fixed error message typos
 2013-09-17 16:13:36 -07:00
Diana Huang
d191847ff5 Merge branch 'release' 
Conflicts:
	lms/static/sass/views/_verification.scss
 2013-09-17 10:55:22 -04:00
chrisndodge
0601761d27 Merge pull request #1000 from edx/fix/cdodge/courseware-index-perf-tweek 
Fix/cdodge/courseware index perf tweek
 2013-09-17 06:50:33 -07:00
Chris Dodge
1a5edcd998 we already have the descriptor, so call get_module_for_descriptor() rather than refecting that subtree which is multiple round-trips to DB 
fix line indents
 2013-09-17 08:15:00 -04:00
Jason Bau
706b386a57 Revert "4 OE/ORA UI fixes to make it easier to use" 
This reverts commit 3b29d6056e.
 2013-09-16 20:22:18 -07:00
Jay Zoldak
30b13d3cf1 Improve code clarity and error messages for css selection 2013-09-16 16:49:18 -04:00
Jay Zoldak
2ff056df8c Simplify retry logic for ui helper functions 2013-09-16 16:49:17 -04:00
Jay Zoldak
6531918af5 Skip verified cert acceptance tests that upload to s3 2013-09-16 16:11:21 -04:00
David Ormsbee
4245c229d8 Don't verify SSL cert when submitting to Software Secure (they're using self-signed cert for the moment). 2013-09-16 14:21:03 -04:00
Giulio Gratta
3b29d6056e 4 OE/ORA UI fixes to make it easier to use 
- require confirmation when clicking Open Ended reset button
- require confirmation when submitting Open Ended essay
- disable text feedback area during calibration and let users know that they should give feedback when grading
- fixed error message typos
 2013-09-16 10:27:13 -07:00
David Ormsbee
99841be604 Update docstring on ssencrypt.body_string to be more useful. 2013-09-16 10:23:31 -04:00
David Ormsbee
ab6018a0e5 Replace signature validation with access-key and add logging around Software Secure callbacks. 2013-09-16 10:07:07 -04:00
David Ormsbee
b1be80b848 Extend message signing code to work with dicts, lists. 2013-09-16 10:07:07 -04:00
David Ormsbee
3b44ec11e0 Convert JSON dumps output to UTF-8 before sending to Software Secure 2013-09-16 10:07:07 -04:00
Diana Huang
47ce9082e4 Merge branch 'release' 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	lms/djangoapps/courseware/tests/modulestore_config.py
 2013-09-13 17:15:44 -04:00
David Ormsbee
1ac71223c1 Merge pull request #979 from edx/ormsbee/ss_small_fixes 
Send JSON messages to Software Secure in UTF-8, without escaping
 2013-09-13 12:25:44 -07:00