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

4617 Commits

Author SHA1 Message Date
Nimisha Asthagiri
801165b266 Remove support for outdated ispublic field on Course Descriptor 
Also remove its corresponding ACCESS_REQUIRE_STAFF_FOR_COURSE feature
flag.
 2015-12-10 20:37:39 -05:00
Bill DeRusha
55810061b3 Update Financial Aid copy. 2015-12-10 16:20:22 -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
a66d05ae69 Merge pull request #9940 from edx/ned/autospec-all-the-things 
Add autospec to more mocks
 2015-12-10 09:47:28 -05:00
Bill DeRusha
3e96357867 Merge pull request #10912 from edx/bderusha/auto-deadlines-sp 
Auto setting of verification deadlines with manual overrides
 2015-12-09 13:42:19 -05:00
Bill DeRusha
522095e112 Auto setting of verification deadlines with manual overrides 2015-12-09 11:59:55 -05:00
Christine Lytwynec
175241d709 Merge pull request #10814 from edx/clytwynec/problem-type-a11y-tests 
Problem type bok choy and a11y tests
 2015-12-09 11:51:51 -05:00
Ned Batchelder
43ac38aa87 Add autospec to all mocks 2015-12-09 09:44:22 -05:00
Sarina Canelake
bc822b7f93 Merge pull request #10873 from edx/kill-callstackmanager 
Remove CallStackManager (PLAT-931)
 2015-12-08 20:46:21 -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
David Ormsbee
ae1f415597 Merge pull request #10840 from edx/ormsbee/new_relic_course_org_attrs 
Add course/org info to New Relic in courseware and XBlock rendering.
 2015-12-08 14:42:28 -05:00
Christine Lytwynec
a9b308e5e1 Convert some problem type tests to bok choy and add a11y test 2015-12-08 14:39:23 -05:00
Sarina Canelake
596e93a293 Add __unicode__ method on StudentModuleHistory 2015-12-08 11:16:02 -05:00
Sarina Canelake
8928e9ef19 Remove CallStackManager (PLAT-931) 2015-12-08 10:21:55 -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
b05488f826 Update spacing in FA form 2015-12-07 17:34:58 -05:00
Peter Fogg
c84258d84e Merge pull request #10858 from edx/bderusha/hcfa-language 
Update copy for HCFA & don't show audit certs
 2015-12-07 14:58:53 -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
David Baumgold
1a2ffbda68 Disable footer for courseware-chromeless.html 2015-12-07 13:54:23 -05:00
Sarina Canelake
84a96e40c4 Remove 'Fold It' XModule 2015-12-06 11:38:05 -05:00
David Ormsbee
67a31ac577 Add course/org info to New Relic in courseware and XBlock rendering. 
This will make it much easier for us to slice courseware requests by
organization and course in Insights performance analysis.
 2015-12-04 20:06:24 -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
8b97ca1b24 Merge pull request #10802 from edx/feature/remove-honor-code-certs 
Remove default honor code.
 2015-12-03 14:55:30 -05:00
Peter Fogg
497622d4b4 Switch default course mode to 'audit'. 
ECOM-2972
 2015-11-25 11:22:29 -05:00
Peter Fogg
5043b46525 Merge pull request #10602 from edx/peter-fogg/update-footer-config 
Update LMS footer links.
 2015-11-24 15:50:46 -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
Peter Fogg
c5fac6ce68 Update LMS footer links. 
SWAT-92
 2015-11-13 10:08:10 -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
John Eskew
69e3385c83 Merge pull request #9920 from edx/jeskew/report_request_response_times 
Add response times to get_many/set_many/delete_many.
 2015-11-05 14:53:55 -05: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
John Eskew
ac05012d23 Add response times to get_many/set_many/delete_many. 2015-11-05 11:02:49 -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
acf5bb57cb Merge pull request #10509 from edx/peter-fogg/course-pacing-label-changes 
Course pacing template changes.
 2015-11-04 14:11:49 -05:00