Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
28,956 Commits 1 Branch 0 Tags
41f08055a4b7be495e68d2b06ed70a257052c4cd
Commit Graph

10364 Commits

Author SHA1 Message Date
John Eskew
4cb4557176 Merge pull request #7151 from open-craft/ekolpakov/settings-service 
SettingsService for accessing django settings from XBlock
 2015-03-05 15:56:11 -05:00
David Baumgold
a37a50cf3b Merge branch 'release' 2015-03-05 12:10:27 -05:00
E. Kolpakov
c225d86e83 SettingsService for accessing server-wide settings from XBlock 2015-03-05 18:24:47 +03:00
ahsan-ul-haq
00899dd908 Merge pull request #7118 from edx/ahsan/tnl-1554-missing-accessible-label-with-lms-nav-elements 
Missing accessible label in lms <nav> elements.
 2015-03-05 16:59:52 +05:00
Ahsan Ulhaq
d116f84c12 Removed aria label from section tag 2015-03-05 15:13:21 +05:00
David Baumgold
a70cabc10f Merge pull request #7224 from edx/i18n-mixin-strings 
i18n some strings in LmsBlockMixin
 2015-03-04 16:20:11 -05:00
David Baumgold
6b90763d6b i18n some strings in LmsBlockMixin 2015-03-04 14:58:05 -05:00
Will Daly
616f2bb0df Merge pull request #7210 from edx/will/cert-error-management-command 
ECOM-1142: Management command for error certs.
 2015-03-04 14:44:21 -05:00
Ned Batchelder
7641fbf5d9 Merge pull request #6505 from mitocw/cg/add_sga 
Add Staff Graded Assignments XBlock to edx-platform
 2015-03-04 13:15:02 -05:00
ahsan-ul-haq
edb3055207 Merge pull request #7185 from edx/ahsan/tnl-1567-no-main-region-landmark-student-dashboard 
No "Main" region landmark on Student Dashboard
 2015-03-04 21:00:24 +05:00
Carson Gee
da9154d10e Add Staff Graded Assignments XBlock to edx-platform 2015-03-04 10:35:54 -05:00
Will Daly
13cb2c2834 ECOM-1142: Management command for error certs. 
Add a management comand to regenerate certificates with
status 'error', optionally restricted to a subset
of courses.
 2015-03-04 07:51:38 -05:00
Zia Fazal
e21ff20375 backend changes based on feedback 
Conflicts:
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/instructor_task/api.py

refined entrance exam student attempts reset

Quality improvements 1/16

added rescore, delete state and task history functionality

added unit tests for entrance exam reset attempts

added unit tests for re scoring of entrance exam and task history

improved test coverage

Got rid of pep violation

feedback changes and added jasmine test

added more jasmine tests for Javascript changes

added bok-choy tests for UI changes

replaced input containing <p> tags with <label>

Removed ee element assertions to avoid js error

Added call to super.setUp()

changes based on feedback on 2/18

Writing tests in JS instead of coffee script

commit related to skip entrance exam 2/13

fixed bad-continuation quality error

fixed broken bok-choy test

changes based on feedback on 2/18

added js tests and removed coffee script tests

fixed broken bok-choy and unit tests

changes left while rebasing

rephrase test titles

do not need these libs

changes based on feedback on 2/24

changes text which was left

Changes based on feedback on 3/3
 2015-03-04 15:32:56 +05:00
Andy Armstrong
6f118a3d8f Default profile visibility to off for now 2015-03-03 17:52:24 -05:00
Will Daly
7bad603978 Merge pull request #7076 from edx/will/deprecate-embargo 
Deprecate old embargo implementation.
 2015-03-03 15:54:41 -05:00
Jim Abramson
c351eaf18e Merge pull request #7081 from open-craft/nonunique-discussion-targets 
Fix issues with non-unique discussion targets
 2015-03-03 12:07:26 -05:00
Nimisha Asthagiri
818d59e820 Merge pull request #7197 from edx/bnotions/social-features 
Bnotions/social features
 2015-03-03 11:03:44 -05:00
Matjaz Gregoric
639ab0dc70 Fix issues with duplicate discussion targets. 
When two or more instances of Discussion XBlock were configured
with the same discussion target (Category/Subcategory),
only one of the blocks would be shown on the Course Discussion page.
This was the source of several bugs when trying to edit discussion threads.

This patch adds incrementing numbers to the title of each duplicate
subcategory when rendering the Course Discussion to make sure that
all of the threads are visible in Course Discussion.
 2015-03-03 23:55:15 +08:00
chrisndodge
006b06dd21 Merge pull request #7198 from edx/release 
Merge Release back to Master
 2015-03-03 08:49:10 -05:00
Lee Newton
c375f666d2 bnotions contributions to mobile api 2015-03-02 22:27:27 -05:00
Adam
ee0ae6eef9 Merge pull request #7194 from edx/adam/add-purchasing-logging 
add extra logging for postpay callbacks from cybersource (ECOM-1034) (EC...
 2015-03-02 17:28:08 -05:00
Andy Armstrong
dfe0057b79 Implement profile API 
TNL-1491

See the API design here:

https://openedx.atlassian.net/wiki/display/TNL/User+API
 2015-03-02 16:28:52 -05:00
Adam Palay
34e8ee6be8 add extra logging for postpay callbacks from cybersource (ECOM-1034) (ECOM-1089) 2015-03-02 16:06:59 -05:00
Will Daly
9530021b3f ECOM-1139: Example certificates. 
Add the ability to generate "example" certificates to
test that certificate generation is working correctly for a course.

Add the ability to enable/disable self-generated certificates
on a per-course basis.
 2015-03-02 15:13:26 -05:00
Will Daly
c07badecdd Show the payment section if no contribution amount is selected 2015-03-02 14:01:04 -05:00
ahsan-ul-haq
57f051b5b2 Merge pull request #7064 from edx/ahsan/tnl-1510-nav-issue-for-footer-and-navigation 
<nav> for the footer and navigation does not include aria-label
 2015-03-02 19:51:21 +05:00
Syed Hassan Raza
7b194a3324 Unicode handling for transcript filename 
TNL-1253 https://openedx.atlassian.net/browse/TNL-1253
 2015-03-02 16:39:49 +05:00
Ahsan Ulhaq
206961f0b4 No "Main" region landmark on Student Dashboard 
On student dashboard currently there was currently no main region landmark.
So added the role with the main conents of the dashboard.

TNL-1567
 2015-03-02 13:55:58 +05:00
Clinton Blackburn
dc491c4c10 Merge pull request #7156 from edx/clintonb/cs-celery-serialize-fix 
Fixed Celery Serialization Bug
 2015-02-27 19:57:05 -05:00
Andy Armstrong
d42adcf46b Merge pull request #7123 from edx/christina/account-api 
Add name and email change requests to accounts API.
 2015-02-27 17:21:17 -05:00
cahrens
3ed31c2b1b Add name change and email change support to accounts API. 
Name change is immediate, email change is multi-step.
 2015-02-27 16:35:05 -05:00
Sarina Canelake
a11f287769 Merge pull request #6998 from stvstnfrd/quality/pep8 
Extend PEP8 coverage
 2015-02-27 15:53:45 -05:00
Christina Roberts
99e85556ea Merge pull request #7140 from edx/christina/delete-enable-new-dashboard 
Delete ENABLE_NEW_DASHBOARD code.
 2015-02-27 15:37:41 -05:00
Calen Pennington
820b0118f4 Merge pull request #7155 from edx/django-upgrade/unicode-csrf-tokens 
Teach edx-mako to force csrf_tokens to unicode (from smart_strings)
 2015-02-27 15:33:43 -05:00
stv
4131898180 Remove "nopep" pragma 2015-02-27 11:49:51 -08:00
Calen Pennington
cbcb0ee8ab Teach edx-mako to force csrf_tokens to unicode (from smart_strings) 2015-02-27 13:38:16 -05:00
Clinton Blackburn
d39a51a100 Merge pull request #7138 from edx/clintonb/cs-sorting-fix 
Fixed Sorting Bug
 2015-02-27 10:42:05 -05:00
Sarina Canelake
8b81dca096 Merge pull request #7153 from edx/sarina/remove-old-stylesheet 
Remove outdated CS188 stylesheet
 2015-02-27 10:40:47 -05:00
Calen Pennington
8e93c1891f Merge pull request #6016 from cpennington/django-toolbar-upgrade 
Upgrade django-debug-toolbar to 1.2.2
 2015-02-27 10:39:32 -05:00
Clinton Blackburn
4062b94a0f Fixed Celery Serialization Bug 
CourseLocator is not JSON-serializable. Passing course keys as Unicode instead when scheduling tasks to update course structure.
 2015-02-27 09:59:18 -05:00
Sarina Canelake
c60f2991cd Remove outdated CS188 stylesheet 2015-02-27 09:36:48 -05:00
cahrens
7dc0598b25 Delete ENABLE_NEW_DASHBOARD code. 2015-02-26 16:41:40 -05:00
Braden MacDonald
88747024b5 Upgrade django-debug-toolbar to 1.2.2 
This is compatible with Django > 1.5, and allows us to re-enable the ProfilingDebugPanel
 2015-02-26 15:57:03 -05:00
Clinton Blackburn
59b4b64937 Fixed Sorting Bug 
Sorting on unicode value of course ID since CourseLocator objects cannot be compared to SlashSeparatedCourseKey objects.
 2015-02-26 14:30:18 -05:00
Nimisha Asthagiri
bee58106d7 Merge pull request #7129 from edx/django-upgrade/spelling-errors 
minor fixes found from the django-upgrade work.
 2015-02-26 13:39:59 -05:00
Clinton Blackburn
6a54b1d610 Merge pull request #7126 from edx/django-upgrade/simplejson-to-json 
Replaced simplejson with json
 2015-02-26 13:13:08 -05:00
Daniel Friedman
3538074c7a Merge pull request #7125 from edx/django-upgrade/backport-changes/SECRET_KEY 
Backport dummy SECRET_KEYs from django 1.5 upgrade
 2015-02-26 12:47:13 -05:00
ahsan-ul-haq
f908059067 Merge pull request #7068 from edx/ahsan/tnl-1511-courseware-section-nav-accessibility-issue 
<nav> for the courseware section does not include aria label
 2015-02-26 22:34:51 +05:00
Nimisha Asthagiri
052dd52ae4 minor fixes found from the django-upgrade work. 2015-02-26 12:26:13 -05:00
Clinton Blackburn
2fca3f032f Replaced simplejson with json 
simplejson has been removed from future versions of Django (which we will eventually use).
 2015-02-26 12:13:46 -05:00