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

33604 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
ae7b44bb4d Merge pull request #10497 from edx/rc/2015-11-03 
Fixing cert_status None bug
 2015-11-04 11:07:20 -05:00
Eric Fischer
dc469ea5ec Fix cert_status None. Add GeneratedCertificate to admin 2015-11-03 21:54:48 -05:00
Eric Fischer
0951dc3967 Merge pull request #10442 from edx/rc/2015-11-03 
Release 3 November 2015
 2015-11-03 14:43:19 -05:00
Eric Fischer
a5473a4e82 Merge pull request #10469 from edx/efischer/hotfix_management_command 
Post-migration management command
 2015-11-03 10:31:36 -05:00
Eric Fischer
3609cc7a99 Post-migration management command 
On devops recommendation, now handling the potential for an 'inconsistency
window' via a management command instead of a hacky "re-run the data migration"
bash script.
 2015-11-03 10:30:43 -05:00
David Ormsbee
923c24df53 Merge pull request #10472 from edx/ormsbee/nr_xblock_handler_reporting_fix 
New Relic transaction naming now ignores suffix most of the time.
 2015-11-03 07:52:04 -05:00
Bill DeRusha
f4dc1f33e2 Merge pull request #10471 from edx/bderusha/refund-follow-on 
Compare all refund dates in UTC
 2015-11-02 22:38:04 -05:00
David Ormsbee
0aa58f5033 New Relic transaction naming now ignores suffix most of the time. 
The only time it should include the suffix is when the handler is
explicilty "xmodule_handler", meaning it's an old-style handler
that routes everything. For example, Capa uses one handler for
all its AJAX requests, and only differentiates actions based on
suffix ("get", "problem_check", etc.).

What prompted this change is that LTIDescriptor defines a handler
"lti_2_0_result_rest_handler" which encodes user-specific
information into the suffix. This is a perfectly valid thing to
do, but it blows out the number of named transactions in our
metrics.
 2015-11-02 22:17:46 -05:00
Bill DeRusha
6123827ab1 Compare all refund dates in UTC 2015-11-02 20:00:06 -05:00
Eric Fischer
36f05c860c Applying security patch 
Applying a security patch from last week that has made its way through
the disclosure period already. FYI @robrap
 2015-11-02 09:37:22 -05:00
Eric Fischer
e6226d1365 Merge pull request #10447 from edx/cdodge/mark-test-as-flakey2 
mark test_can_reset_attempts as flakey as it sporadically fails
 2015-11-01 18:17:38 -05:00
Eric Fischer
923917c033 Merge pull request #10452 from edx/bderusha/rc-2015-11-03-bug 
Fix dashboard page load error when cert_status is None
 2015-11-01 18:17:21 -05:00
Bill DeRusha
62f3cf9c46 Fix cert_status None bug 2015-11-01 18:16:16 -05:00
Jim Abramson
9724684d03 Merge pull request #10453 from edx/jsa/fix-xseries-dash 
Show xseries upsell even if the course is not yet in session
 2015-11-01 18:10:28 -05:00
jsa
c68af9d21e Show xseries upsell even if the course is not yet in session 
ECOM-2780
 2015-11-01 15:54:33 -05:00
Chris Dodge
cb4901431d mark test_can_reset_attempts as flakey as it sporadically fails 2015-10-30 15:46:13 -04:00
Sarina Canelake
02744481ae Merge pull request #10441 from edx/sarina/20151030-update-translations 
Update translations (autogenerated message)
 2015-10-30 13:50:12 -04:00
Nimisha Asthagiri
6ab20b71c0 Merge pull request #10388 from edx/nimisha/course-factory 
Add SampleCourseFactory and ToyCourseFactory
 2015-10-30 13:23:05 -04:00
Eric Fischer
e0380ad7ab Merge pull request #10295 from edx/efischer/cohort_membership_model 
TNL-3478 Cohort Membership race condition fix
 2015-10-30 13:08:56 -04:00
Eric Fischer
c4c5effb7b Merge pull request #10438 from edx/efischer/flaky_test 
Marking flaky test
 2015-10-30 13:07:49 -04:00
Jesse Zoldak
e4aa1fa5be Merge pull request #10437 from jzoldak/zoldak/quiet-circle-pylint 
Increase the test output timeout and quiet the pylint output.
 2015-10-30 13:07:41 -04:00
Sarina Canelake
7301ea77c4 Update translations (autogenerated message) 2015-10-30 13:02:31 -04:00
Christina Roberts
d1aa7e2cc6 Merge pull request #10436 from edx/christina/remove-comments 
Move comments within the script block.
 2015-10-30 12:57:51 -04:00
Awais Qureshi
0e88668e2b Merge pull request #10372 from edx/awais786/ECOM-2451-xseries-to-dashboard 
Add the html and css changes required for XSeries
 2015-10-30 21:51:05 +05:00
Eric Fischer
74906f248b Marking flaky test 
common.test.acceptance.tests.video.test_video_module.YouTubeVideoTest.test_video_component_stores_speed_correctly_for_multiple_videos
is flaky, see for details.
 2015-10-30 12:12:55 -04:00
Ahsan Ulhaq
c47311b11f Add the html and css and backend changes required for the xseries. 2015-10-30 20:59:26 +05:00
cahrens
9aecd10ab3 Move comments within the script block. 2015-10-30 11:44:30 -04:00
Eric Fischer
dbbc64ff88 CohortMembership Race Condition Test 
By using the before_after library, we can force a race condition to reliably
occur in the CohortMembership.save() method. This unit test will do just that,
and ensure that our race-condition-handling code functions as it should.
 2015-10-30 11:07:25 -04:00
Eric Fischer
08ed3b547f CohortMemberships Unit Test Updates 
Updating previously-existing unit tests to function with the new
CohortMembership model.
 2015-10-30 11:07:25 -04:00
Eric Fischer
83163e58f8 CohortMemberships Code Changes 
The code changes needed to get CohortMembership functioning properly.

The key of this change is twofold: first, CohortMemberships are unique
per-user, per-course. This is enforced at the database level. Secondly,
the updates are done using a select_for_update, which ensures atomicity.
 2015-10-30 11:07:25 -04:00
Eric Fischer
56d49e7390 CohortMemberships Migrations 
These are the migrations needed for CohortMembership to function.
0005 establishes the table, 0006 will be used to move existing data
into the table as needed.

Per product guidance, we can just arbitrarily reassign problem users.
Implementing that decision, as well as the remainder of the data migration.

Also including a short script to re-run the 0006 migration after code changes
are live, to prevent a potential issue where the database become out-of-sync.
 2015-10-30 11:07:25 -04:00
chrisndodge
7868067879 Merge pull request #9744 from edx/cdodge/timed-exams 
Timed Exams
 2015-10-30 11:03:59 -04:00
Jesse Zoldak
f4df2ac1ca Increase the test output timeout and quiet the pylint output. 2015-10-30 10:47:25 -04:00
Bill DeRusha
717f5dc5e8 Merge pull request #10384 from edx/bderusha/refund-window 
Refund windows
 2015-10-30 10:29:29 -04:00
Matt Drayer
90f1473bfc Merge pull request #10418 from edx/ziafazal/SOL-1340 
SOL-1340: added vertical spacing around issued certificates section
 2015-10-30 10:02:16 -04:00
Bill DeRusha
1f77810fad Add configurable refund window 
Add configuration model for enrollment refunds.

Use order info from otto in refund window calculation

Delete dupe tests. Extend tests to include window tests

Move ecom client from lib to djangoapps in openedx
 2015-10-30 09:01:53 -04:00
Nimisha Asthagiri
ce466619e4 Add SampleCourseFactory and ToyCourseFactory 2015-10-30 08:52:29 -04:00
Muhammad Shoaib
9476898df0 Add Timed Exams as a feature to edx-platform 2015-10-30 08:44:33 -04:00
Zia Fazal
830b2e0ac5 added vertical spacing 
wrapped issued certificates section with p tags to add some vertical
spacing

changes after feedback from frances

indent code
 2015-10-30 12:01:39 +05:00
wajeeha-khalid
16ab4f4333 Merge pull request #10105 from edx/jia/MA-1189 
MA-1189 - Discussion API: implemented GET comment children
 2015-10-30 11:37:41 +05:00
chrisndodge
2301bcbf8f Merge pull request #10403 from edx/afzaledx/MAYN-149_survey_report 
MAYN-149 Survey Report CSV upload for Professional Education courses.
 2015-10-29 18:24:31 -04:00
Ben Patterson
e066fc0a73 Merge pull request #10427 from edx/benp/fix-scripts-pylint-bug 
Pylint results should be piped.
 2015-10-29 15:27:31 -04:00
Ben Patterson
8833db6a56 Pylint results should be piped. 
In the event of a pylint failure, we need to cat the log. This will also
ensure that the remaining scripts in the job can run.
 2015-10-29 14:32:13 -04:00
Douglas Hall
af832a76bf Merge pull request #10407 from edx/task/douglashall/add_to_authors 
Add Douglas Hall to AUTHORS
 2015-10-29 14:19:22 -04:00
Afzal Wali
5a11f75a48 Add the ability for self-service course survey reports 2015-10-29 13:26:28 -04:00
Zubair Afzal
fed0964c51 Merge pull request #10304 from edx/zub/story/ecom-2578-basic-programs-api-client-setup 
basic programs api setup and dashboard integration
 2015-10-29 22:21:12 +05:00
Christina Roberts
3382a955c9 Merge pull request #10378 from edx/christina/fix-mathjax-preview 
Disable Fast Preview for version 2.5.
 2015-10-29 12:41:30 -04:00
Christina Roberts
55d1fb989e Merge pull request #10333 from edx/christina/delete-time-reference 
time.coffee no longer exists
 2015-10-29 12:41:12 -04:00
cahrens
deb4e35f92 Disable Fast Preview for version 2.5. 
Except for the Discussion Tab.
TNL-3693, TNL-3365
 2015-10-29 11:56:08 -04:00
David Ormsbee
87ded08d49 Merge pull request #10389 from edx/mobile/handler-url 
Changes to handler URL generation
 2015-10-29 11:39:35 -04:00