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

4784 Commits

Author SHA1 Message Date
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
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
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
cahrens
7dc0598b25 Delete ENABLE_NEW_DASHBOARD code. 2015-02-26 16:41:40 -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
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
Jim Abramson
353b8ea45e Merge pull request #5460 from Kelketek/forum-tracking 
Do event tracking for major forum events.
 2015-02-26 10:14:04 -05:00
Jonathan Piacenti
be02613aac Do event tracking for major forum events. 2015-02-25 23:30:30 +00:00
Christina Roberts
9d956e03e7 Merge pull request #7053 from edx/christina/account-api 
User account API
 2015-02-25 17:11:55 -05:00
Daniel Friedman
c8434ef9c8 Check access for discussion modules in forums 
TNL-650
 2015-02-25 11:31:18 -05:00
Awais
28b633f9df ECOM-1086 adding tracking event for cert generation. 2015-02-25 10:12:23 +00:00
Clinton Blackburn
0385a8b504 Fixed Course List Endpoint 
Updated filter to ensure only course descriptors are returned.
 2015-02-24 14:42:47 -05:00
Adam
0b9e5719c1 Merge pull request #7080 from edx/adam/merge-release-into-master 
Adam/merge release into master
 2015-02-24 06:40:10 -08:00
Nimisha Asthagiri
b280e44fe1 Merge pull request #7025 from edx/mobile/oauth2-allow-inactive-user 
MA-291 Allow API access without email activation.
 2015-02-24 09:12:30 -05:00
Adam Palay
338ab4a6a9 fix quality violation 2015-02-24 08:20:04 -05:00
Nimisha Asthagiri
83a3adb97b MA-291 Allow API access without email activation 2015-02-24 06:05:18 -05:00
Adam Palay
3aca0d5472 Merge remote-tracking branch 'origin/release' into adam/merge-release-into-master 
Conflicts:
	common/djangoapps/student/models.py
	lms/djangoapps/bulk_email/tasks.py
 2015-02-23 18:40:45 -05:00
Zia Fazal
b3f85e1d4a Instructor Dashboard management tools for Entrance Exams 
Conflicts:
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/instructor_task/api.py

refined entrance exam student attempts reset
added rescore, delete state and task history functionality
 2015-02-23 15:04:05 -05:00
Will Daly
80ae71765d Merge pull request #7071 from edx/will/ecom-1108 
Preserve enrollment_action and course_id querystring params in header 'Sign In' button
 2015-02-23 14:08:56 -05:00
Will Daly
f854726efc Add tracking code to LinkedIn URL. 
Add client-side analytics event for LinkedIn Add to Profile button click.

Add management command for generating certs for testing.

Update styling of the certificate messages.
 2015-02-23 11:52:47 -05:00
Will Daly
badcb78ac9 Force English for email opt in text appearing on the marketing site 2015-02-23 11:40:41 -05:00
Syed Hassan Raza
cfb2df113d python standard logging 2015-02-23 11:40:41 -05:00
Will Daly
0f17d8c99e Preserve enrollment_action and course_id querystring params in header 'Sign In' button 2015-02-23 11:12:06 -05:00
Adam Palay
c12b542136 split up bulk email query for students and unenrolled course staff (TNL-1332) (TNL-1143) 2015-02-23 10:58:37 -05:00
Awais
726b7f2cfe ECOM-1046 adding functionality for generating the certs. 
ECOM-1046 minor change in code. rename file name.
 2015-02-21 04:31:32 +05:00
Jesse Zoldak
1d5b2e2b27 Merge pull request #7054 from edx/zoldak/TE-572 
Skip intermittently failing test TE-572
 2015-02-20 16:40:16 -05:00
cahrens
023e6ec8cd GET method for user account API. 2015-02-20 14:52:46 -05:00
Jesse Zoldak
5b0b25d69a Skip intermittently failing test TE-572 2015-02-20 13:46:55 -05:00
stv
3ffa967af8 Fix Pylint: W0105(pointless-string-statement) 2015-02-19 19:56:52 -08:00
stv
49fb96631e Fix Pylint: C0202(bad-classmethod-argument) 2015-02-19 19:56:51 -08:00
stv
66f28fd8da Fix Pylint: I0022(deprecated-pragma) 2015-02-19 19:56:51 -08:00
stv
e17504d7b8 Fix Pylint: E0012(bad-option-value) 2015-02-19 19:56:51 -08:00
stv
2e1400f842 Fix Pylint: W0613(unused-argument) 2015-02-19 19:56:51 -08:00
stv
416f7090b1 Fix Pylint: C0112(empty-docstring) 2015-02-19 19:56:51 -08:00
Christina Roberts
985a492efd Merge pull request #4891 from aboudreault/discussion-digest-default 
Add ENABLE_DISCUSSION_EMAIL_DIGEST feature
 2015-02-19 10:36:59 -06:00
Will Daly
4384e57f0f Force English for email opt in text appearing on the marketing site 2015-02-19 09:02:35 -05:00
Alan Boudreault
ac445d6eff Add ENABLE_DISCUSSION_EMAIL_DIGEST feature, to enable discussion emails digest by default for all users 2015-02-19 14:34:10 +08:00
Sarina Canelake
1fb580e3ef Merge pull request #6938 from mitocw/bdero/gitlog-pagination 
Add pagination to sysadmin dashboard Git import logs
 2015-02-18 10:04:22 -05:00
Syed Hassan Raza
8b599ee424 python standard logging 2015-02-18 19:47:07 +05:00
Xavier Antoviaque
132cadb517 Merge pull request #2968 from edx-solutions/xblock-external-ui 
xblock-external-ui: Add XBlock API call to render XBlock views
 2015-02-18 08:58:33 +01:00