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

986 Commits

Author SHA1 Message Date
Matt Drayer
115b169259 mattdrayer/SOL-1519: Include course-level configuration in feature check 2015-12-13 09:57:29 -05:00
Sarina Canelake
e3a9721b42 Remove ORA1 references from LMS Python tests 2015-12-11 15:07:09 -05:00
Nimisha Asthagiri
c14c146d0e Merge pull request #10841 from edx/mobile/optimize-course-api 
Optimize Course Catalog using CourseOverview
 2015-12-11 10:03:35 -05:00
Nimisha Asthagiri
2b8441a072 Update Course Catalog to use CourseOverview 2015-12-10 20:37:50 -05:00
Calen Pennington
035f325fef Merge pull request #10704 from edx/ekolpakov/grade_event_user_id 
Removed user_id parameter from grade event
 2015-12-10 16:10:51 -05:00
Ned Batchelder
43ac38aa87 Add autospec to all mocks 2015-12-09 09:44:22 -05:00
Peter Fogg
5ecb9af294 Merge pull request #10896 from edx/release 
Release 2015-12-08
 2015-12-08 18:58:14 -05:00
Peter Fogg
a609e074c7 Fix Unicode errors in financial assistance. 2015-12-08 16:35:38 -05:00
chrisndodge
4334eb9bd1 Merge pull request #10885 from edx/release 
Release
 2015-12-08 15:21:48 -05:00
Zia Fazal
4f939f79f9 added new endpoint which renders certificate by uuid 
fixed broken tests and added some optimisations

fixed migration history
 2015-12-08 18:21:04 +05:00
Bill DeRusha
692e5d777a Update copy for HCFA 
Update Zendesk ticket to correctly add group.

Add logic to hide new audit certs
 2015-12-07 14:18:55 -05:00
Sarina Canelake
2cfeb34f45 Merge pull request #10825 from edx/kill-psycho 
Remove psychometrics app
 2015-12-04 17:23:20 -05:00
Sarina Canelake
e932632b49 Remove psychometrics app 2015-12-04 16:37:34 -05:00
alasdairswan
56ba7850a0 Integrated JS with Peter's Django wrapper 
Rendering form. Updated form field template to accept instructions for all input types
Added setExtraData function to FormView to allow non-form attributes to be added to the model before saving
 2015-12-04 15:54:34 -05:00
Nimisha Asthagiri
d170c92f3b Refactor course_image_url 2015-12-04 11:25:40 -05:00
Peter Fogg
9401beb837 Merge pull request #10787 from edx/peter-fogg/fa-page 
Add financial assistance page skeleton and Zendesk submission.
 2015-12-04 11:12:06 -05:00
Peter Fogg
66719b1b4a Add financial assistance page. 
Page skeleton and endpoint to submit FA requests to Zendesk.

ECOM-2824
ECOM-3038
 2015-12-04 09:39:22 -05:00
David Baumgold
58daa365cd re-enable edx.org comprehensive theme 2015-12-03 17:18:55 -05:00
Peter Fogg
497622d4b4 Switch default course mode to 'audit'. 
ECOM-2972
 2015-11-25 11:22:29 -05:00
Michael Frey
29b6ccf5e4 Added new Course List API. 2015-11-24 15:54:03 +00:00
Ned Batchelder
0872732cf0 Fix pylint C7630 (literal used as attribute) violations 
There's no need to use a string literal in setattr, delattr, or the
two-argument form of getattr.
 2015-11-23 15:32:54 -05:00
E. Kolpakov
d4f7ecde20 Removed user_id parameter from grade event 2015-11-23 18:00:55 +07:00
Ned Batchelder
f5d0f3ff55 Remove useless pylint suppressions 2015-11-22 07:41:19 -05:00
muhammad-ammar
8d5f153201 Merge remote-tracking branch 'origin/release' into dj18-release-merge 
Conflicts:
	common/djangoapps/util/testing.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/teams/tests/test_views.py
	openedx/core/djangoapps/programs/models.py
	openedx/core/djangoapps/user_api/accounts/tests/test_views.py
	requirements/edx/github.txt
 2015-11-18 17:53:44 +05:00
Usman Khalid
6cb62f2697 Rebase upgrade Django to v1.8.5 
Please note that this is a squshed commit and the work of:
Symbolist, macdiesel, nedbat, doctoryes, muzaffaryousaf and muhammad-ammar
 2015-11-10 15:00:19 -05:00
Peter Fogg
e068765d3c Merge pull request #10521 from edx/peter-fogg/update-date-display 
Update date summary blocks.
 2015-11-06 14:46:37 -05:00
Peter Fogg
270dc22c1f Update display of dates on Course Home page. 
Adds UTC time to the "Today's Date" block, and a fuzzy/relative
timestamp to all other displayed dates.

ECOM-2807
 2015-11-06 09:54:13 -05:00
Syed Hasan raza
ab8aedc298 Merge pull request #9924 from edx/shr/bug/TNL-3168-import_from_youtube_html5_subs 
html5 transcript exists
 2015-11-06 04:28:02 -08:00
Syed Hassan Raza
a8c80535d3 html5 transcript sync 2015-11-06 16:32:13 -08:00
Nimisha Asthagiri
0698076440 Transformer: StudentViewTransformer 2015-11-05 23:29:12 +00:00
Peter Fogg
4c934614d2 Merge pull request #10512 from edx/peter-fogg/date-summary-bugfix 
Fix date summary blocks for courses without an end date.
 2015-11-05 12:09:34 -05:00
Peter Fogg
445386233e Fix date summary blocks for courses without an end date. 
I also took this opportunity to do some small cleanups of the date
summary code, specifically converting some attributes to properties in
order to remove a Pylint directive disabling warnings about missing
docstrings.
 2015-11-05 09:11:10 -05:00
Peter Fogg
b98c89117c Course pacing template changes. 
Instructor-led is changed to instructor-paced. Adds a label to the
course outline page to show the course pacing.

ECOM-2794
ECOM-2800
 2015-11-04 09:59:58 -05:00
stv
3a2c0e37dc Remove chat feature 
This was originally contributed upstream by Stanford, circa 2013.

We neither use nor support this feature in its current implementation,
and in fact, we may never have used this production. Until recently, we
had additional chat/Jabber code [1] (in the form of a Jabber djangoapp in
LMS); context there suggests this feature may have never been more than
a prototype. The original author is no longer on the team, so I can't directly
confirm this on our end.

Do you use this feature?

Stanford had already abandoned this Jabber-backed chat implementation,
in favor of an IRC backend, by the time I joined the team in early 2014.

[1] dbe52a6b13
 2015-11-02 14:08:58 -08:00
Peter Fogg
d7417d62cc Date summary blocks on the course home page. 
Enabled behind the
`SelfPacedConfiguration.enable_course_home_improvements` flag.

ECOM-2604
 2015-11-02 10:49:18 -05: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
chrisndodge
7868067879 Merge pull request #9744 from edx/cdodge/timed-exams 
Timed Exams
 2015-10-30 11:03:59 -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
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
Peter Fogg
4805946a83 Override due dates in the LMS for self-paced courses. 2015-10-28 14:33:11 -04:00
Nimisha Asthagiri
b1ae462ab7 Merge pull request #10361 from edx/mobile/refactor-has-access 
Refactor has_access for re-usability.
 2015-10-26 18:15:09 -04:00
Nimisha Asthagiri
95fdbd981c Refactor has_access for re-usability. 2015-10-26 16:26:41 -04:00
Zia Fazal
9bb6f6e88d use a generic function check if entrance_exam is enabled or not 2015-10-22 16:45:19 +05:00
Adam Palay
9b3841f62c Merge remote-tracking branch 'origin/release' into merge-release-into-master 
Conflicts:
	lms/djangoapps/teams/views.py
	lms/templates/courseware/progress.html
 2015-10-19 08:35:33 -05:00
Matt Drayer
3e5ad2989c Merge pull request #10115 from edx/ziafazal/SOL-1254 
ziafazal/SOL-1254: Student should see rest of courseware as soon as Entrance Exam is passed
 2015-10-15 10:18:21 -04:00
Zia Fazal
2d1ff75ba0 added user’s pass status to problem_check response if problem is in 
Entrance Exam.

unit test to check presence of entrance_exam_passed

changed based on Matt's feedback

changes after Asad's feedback
 2015-10-14 15:38:18 +05:00
Sarina Canelake
65aacc1adf Merge pull request #10078 from openedx-newbie/doc-2268 
DOC-2268 - Fix instances of "register" on the course about page
 2015-10-13 10:21:21 -04:00
openedx-newbie
895f4a36b2 Fix enrollment terminology in about page tests 2015-10-08 18:00:12 +02:00