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

33577 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Sarina Canelake
2206b8a056 Merge pull request #10324 from stvstnfrd/debt/circuit 
Remove circuit djangoapp from LMS
 2015-10-29 11:15:15 -04:00
zubair-arbi
7f96474d01 basic programs api setup and dashboard integration 
ECOM-2578
 2015-10-29 20:07:51 +05:00
Muzaffar yousaf
9f89112ee1 Merge pull request #10419 from edx/muzaffar/pep8-fixes 
Fix pep8 & pylint warnings.
 2015-10-29 16:47:17 +05:00
muzaffaryousaf
35884195cc Fixing pep8/pylint violations. 
TNL-3650
 2015-10-29 15:37:52 +05:00
muzaffaryousaf
cc88cfaf64 Fixing "wrong-assert-type" pep8 warning. 
TNL-3650
 2015-10-29 15:01:49 +05:00
Peter Fogg
d9751a855a Merge pull request #10404 from edx/feature/self-paced 
Enable self-paced courses.
 2015-10-28 20:46:35 -04:00
Peter Fogg
505b2aa4d9 Disable setting course pacing during course run. 
Also adds improved styling for course pacing settings, and unit tests
around query counts for self-paced courses.

ECOM-2650
 2015-10-28 16:44:36 -04:00
Peter Fogg
5ffa06bed1 Responding to review comments. 2015-10-28 16:44:36 -04:00
Christina Roberts
e51dbc4db7 Merge pull request #10406 from edx/christina/delete-old-vendor-files 
Delete swfobject.js and analytics.js.
 2015-10-28 16:43:06 -04:00
Carol Tong
9d7a2bc97b Merge pull request #10379 from edx/carol/doc/DOC-2372 
TNL-3697/DOC-2372 Modify "Manage Users" template to indicate that course team members are not automatically enrolled in courses
 2015-10-28 15:34:59 -04:00
Douglas Hall
295cfccaab Add self to AUTHORS 2015-10-28 19:18:07 +00:00
cahrens
c8f1987a84 Delete swfobject.js and analytics.js. 2015-10-28 14:52:43 -04:00
Peter Fogg
4805946a83 Override due dates in the LMS for self-paced courses. 2015-10-28 14:33:11 -04:00
Peter Fogg
7f673604fb Allow setting self-paced on schedule & details page. 
Currently unstyled.

ECOM-2462
 2015-10-28 14:33:11 -04:00
Peter Fogg
0107525d41 Enable self-paced courses behind a feature flag. 2015-10-28 14:33:11 -04:00
Peter Fogg
9d88bef117 Allow setting self_paced through course details endpoint. 
ECOM-2489
 2015-10-28 14:33:11 -04:00
Peter Fogg
15d77fda3f Hide due/release dates on course outline in Studio. 
ECOM-2443
 2015-10-28 14:33:11 -04:00
Peter Fogg
dc7f09fc0e Add self_paced field to course module. 2015-10-28 14:33:11 -04:00
Peter Fogg
eaf6be2a54 Fix up quality errors in config model API. 2015-10-28 14:33:11 -04:00
Peter Fogg
96b49759de Add fixture for setting config models from Bok Choy. 2015-10-28 14:33:11 -04:00
Calen Pennington
49f9e31a00 Allow auto_auth on the LMS in bok_choy tests 2015-10-28 14:33:11 -04:00
Calen Pennington
a6917e34f0 Teach auto_auth to create superusers 2015-10-28 14:33:11 -04:00
Calen Pennington
bf493fffa3 Add a django-rest-framework APIView that supports reading/writing the current value of a configuration model 2015-10-28 14:33:11 -04:00
Nimisha Asthagiri
93656e39ee Merge pull request #10390 from edx/mobile/make-course-usage-key 
Add make_course_usage_key method to modulestore
 2015-10-28 13:47:33 -04:00
Clinton Blackburn
0fece869d3 Merge pull request #10349 from edx/multi-tenancy/update-receipt-page 
Updated receipt page to use order endpoint
 2015-10-28 13:33:05 -04:00
Ben Patterson
de7113a191 Merge pull request #10399 from edx/benp/upgrade-flaky 
Upgrade flaky for multiprocessing nose support.
 2015-10-28 13:24:45 -04:00
Clinton Blackburn
9bb3f703d7 Updated receipt page to use order endpoint 
The receipt page now retrieves data for orders instead of baskets. Going forward baskets will be deleted after an order has been placed, so there should be no permanent references to baskets. Orders will continue to be persisted permanently.

ECOM-2653
 2015-10-28 12:12:57 -04:00