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

10317 Commits

Author SHA1 Message Date
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
Sarina Canelake
c60f2991cd Remove outdated CS188 stylesheet 2015-02-27 09:36:48 -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
Daniel Friedman
fa968c6218 Backport dummy SECRET_KEYs from django 1.5 upgrade 2015-02-26 11:54:37 -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
Will Daly
70455d3e36 Merge pull request #7090 from edx/will/cors-debugging 
Expose CORS_ORIGIN_ALLOW_ALL setting
 2015-02-25 11:08:54 -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
Will Daly
e9bb688911 Expose CORS_ORIGIN_ALLOW_ALL setting 2015-02-24 12:05:25 -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
1d985b9154 Fix right margin of LinkedIn add-to-profile button 2015-02-23 13:37:09 -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
Anton Stupak
767324dddb Merge pull request #6744 from edx/anton/edxnotes-caret-navigation 
TNL-716: Add possibility for notes creation via keyboard.
 2015-02-23 17:55:12 +02:00
Will Daly
0f19d1fcb5 Merge pull request #7067 from edx/will/query-count-middleware 
Include middleware database queries in Django debug toolbar
 2015-02-23 10:46:09 -05:00
Ahsan Ulhaq
ddc11c3bce changed view course as to Course View 2015-02-23 19:51:10 +05:00
ahsan-ul-haq
a02101bd99 Merge pull request #6928 from edx/ahsan/tnl-944-calculator-UI-difficult-access 
Calculator UI difficulit to access
 2015-02-23 19:42:04 +05:00
Ahsan Ulhaq
d10c6c41ec <nav> for the courseware section does not include aria label 
There is no accessible label provided for the <nav> in
courseware section.

TNL-1511
 2015-02-23 19:28:56 +05:00
Will Daly
4c252d5fce Include middleware database queries in Django debug toolbar 2015-02-23 09:17:17 -05:00
Ahsan Ulhaq
6536ab8452 change the description for ambiguous tests 2015-02-23 17:02:03 +05:00
ahsan-ul-haq
de64bfa0f1 Merge pull request #6956 from edx/ahsan/tnl-1382-css-background-used-home-link 
CSS Background Image used for important link
 2015-02-23 15:41:36 +05:00
polesye
d795ec2f20 TNL-716: Add possibility for notes creation via keyboard. 2015-02-22 13:52:46 +02: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
Sarina Canelake
6900bd27fe Merge pull request #7013 from stvstnfrd/pylint/low 
Fix Pylint violations (easy)
 2015-02-20 16:36:52 -05:00
Greg Price
84f9d03fc4 Merge pull request #6953 from edx/gprice/registration-endpoint-refactor 
Refactor registration endpoint and return field-specific detail in errors
 2015-02-20 16:19:10 -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
Greg Price
9ef0494092 Return field detail with registration API errors 
Also, make registration API CSRF exempt
 2015-02-20 11:31:55 -05:00