Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,515 Commits 1 Branch 0 Tags
209ddc700dfce5bb0aa151c19dafbac8ae7de2d2
Commit Graph

35515 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
wajeeha-khalid
588833ff43 MA-1051: DiscussionAPI - Removed http errors from api.py and refactored to more specific errors 2015-12-16 21:23:51 +05:00
wajeeha-khalid
6bc6b3f001 Merge pull request #10989 from edx/jia/MA-1046 
MA-1046 added valid form field test
 2015-12-16 21:22:26 +05:00
Chris Rodriguez
8de5529ca4 LMS: addressing contrast issues on the Progress page 2015-12-16 11:09:27 -05:00
Renzo Lucioni
a8a88390eb Merge pull request #11000 from edx/renzo/kill-it-with-fire 
Delete dead SUBDOMAIN_BRANDING setting.
 2015-12-16 11:09:12 -05:00
clrux
d8423a9018 Merge pull request #10914 from edx/clrux/ac-178 
LMS: addressing contrast on the Instructor dashboard
 2015-12-16 11:08:49 -05:00
Nimisha Asthagiri
e96e65a377 generate_course_overview management command error handling 2015-12-16 10:53:44 -05:00
Diana Huang
98f73c062b Merge pull request #10981 from edx/rc/2015-12-16 
Rc/2015 12 16
 2015-12-16 10:35:54 -05:00
Diana Huang
043584eaee Merge pull request #10983 from edx/diana/markup-helpers 
Add new i18n markupsafe helper methods.
 2015-12-16 09:53:10 -05:00
wajeeha-khalid
0847183458 MA-1046 added valid form field test 2015-12-16 19:06:35 +05:00
raeeschachar
edd4781d41 Merge pull request #10975 from edx/raees/chrome-bok-choy-test-toggle-by-clicking-note 
Fixed toggle by clicking on the note failing on Chrome
 2015-12-16 18:38:13 +05:00
Saleem Latif
22653b18d9 Disable 'Generate Exception Certificates' button when there are no certificate exceptions. 2015-12-16 10:30:02 +05:00
Saleem Latif
300825efc2 Remove unused imports 2015-12-16 10:27:24 +05:00
Saleem Latif
da0664c5fe Add i18n to strings 2015-12-16 10:26:23 +05:00
Saleem Latif
8b2c4994fa display certificate generate history in reverse chronological order 2015-12-16 10:22:56 +05:00
John Eskew
65ec853864 Merge pull request #10698 from edx/jeskew/TNL-3795_fix 
Protect against divide by zero in DataDog event.
 2015-12-15 16:34:28 -05:00
Diana Huang
fab7a071e3 Add new helper methods. 2015-12-15 16:21:14 -05:00
John Eskew
5382c86c1c Protect against divide by zero in DataDog event. 
Add test for zero total/max score in a problem.
 2015-12-15 15:10:57 -05:00
Douglas Hall
34b01bf8b7 Merge pull request #10569 from edx/muhhshoaib/PHX-161-studio-set-review-rules-for-proctored-exam 
PHX-161 Studio: Set Review Rules for a Proctored Exam
 2015-12-15 15:05:28 -05:00
Renzo Lucioni
23c582d01d Delete dead SUBDOMAIN_BRANDING setting. 2015-12-15 14:42:09 -05:00
Muhammad Shoaib
788cece45e PHX-161 
- added the new field review_rules for software secure
- added a new tab name "Additional Settings" for the proctored/timed exams
 2015-12-15 14:27:29 -05:00
Jesse Zoldak
9e5eda0ab6 Merge pull request #10999 from edx/revert-10506-shr/bug/TNL-2622-course_import_status_message 
Revert "set path explicitly for storing cookie"
 2015-12-15 14:21:15 -05:00
Renzo Lucioni
c14548d15f Merge pull request #10963 from edx/renzo/remove-dead-code 
Remove dead code
 2015-12-15 14:11:51 -05:00
Jesse Zoldak
83f7ffd743 Revert "set path explicitly for storing cookie" 2015-12-15 13:26:51 -05:00
clrux
92fa4d07cd Merge pull request #10917 from edx/clrux/ac-190 
CMS: removing H1 and H2, adding H4, H5, and H6 to TinyMCE
 2015-12-15 11:36:30 -05:00
Diana Huang
1ebb78c9fa Merge pull request #10996 from edx/ormsbee/revert_staff_info 
Revert "Remove staff debug category type whitelist."
 2015-12-15 10:54:28 -05:00
Sven Marnach
dd79a69705 Merge pull request #10995 from open-craft/smarnach/activate-activetable 
Add the ActiveTable and Vector Draw XBlocks to ADVANCED_COMPONENT_TYPES.
 2015-12-15 16:42:46 +01:00
Chris Rodriguez
3baad89604 CMS: removing H1, adding H4, H5, and H6 to TinyMCE 2015-12-15 10:21:35 -05:00
Ned Batchelder
e3184ea997 Merge pull request #10977 from edx/ned/lower-pylint-threshhold 
Pylint count is below 5000
 2015-12-15 10:13:06 -05:00
David Ormsbee
e15907c76f Revert "Remove staff debug category type whitelist." 
This reverts commit bb25473a7c.

Reason for revert: Was breaking display on Course About and Info
pages.
 2015-12-15 10:06:40 -05:00
Sven Marnach
d35effc8d2 Add the ActiveTable and Vector Draw XBlocks to ADVANCED_COMPONENT_TYPES. 2015-12-15 13:58:06 +01:00
Syed Hasan raza
920fc0e7de Merge pull request #10506 from edx/shr/bug/TNL-2622-course_import_status_message 
set path explicitly for storing cookie
 2015-12-15 16:44:58 +05:00
Ned Batchelder
bc654887c0 Merge pull request #10987 from edx/ned/fix-api-doc-build 
Keep the API docs building
 2015-12-15 06:18:39 -05:00
Ned Batchelder
65c68d07ac Keep the API docs building 2015-12-14 19:02:22 -05:00
Renzo Lucioni
da16b3da22 Remove dead code 
Deletes unused code from an old implementation of microsites.
 2015-12-14 16:38:14 -05:00
Renzo Lucioni
bdea61c848 Merge pull request #10960 from edx/renzo/run-org-filtering 
Modify Course API to filter visible courses by org
 2015-12-14 16:35:18 -05:00
Renzo Lucioni
2cee39d535 Modify Course API to filter visible courses by org 
Org to filter by is provided to the Course API list view using a querystring argument. Filtering ultimately occurs at the database layer. ECOM-2761.
 2015-12-14 15:32:46 -05:00
Sarina Canelake
4385cc507e Merge pull request #10942 from edx/kill-legacy-dash 
Remove Legacy Instructor Dashboard
 2015-12-14 15:27:50 -05:00
Andy Armstrong
5b9e0e9dcf Merge pull request #10957 from edx/andya/studio-xblock-debugging 
Support local debugging of XBlock JavaScript
 2015-12-14 13:05:23 -05:00
clrux
a6e8383489 Merge pull request #10706 from edx/clrux/ac-188-no-draggabilly 
Video: Adding closed captioning to the video player (not draggable)
 2015-12-14 11:07:12 -05:00
Christine Lytwynec
06caf65b5b Merge pull request #10979 from edx/clytwynec/te-1105 
remove outdated references to specific .coveragerc files in docs
 2015-12-14 11:02:53 -05:00
chrisndodge
ac1ee17e44 Merge pull request #10555 from edx/cdodge/microsites-id-verification-status 
Add support for microsite overrides (template & configuration) for th…
 2015-12-14 10:34:21 -05:00
Chris Rodriguez
b883d52722 Adding closed captions (not draggable) 2015-12-14 10:19:11 -05:00
Sarina Canelake
a9fc7aca69 Remove Legacy Instructor Dashboard 2015-12-14 10:12:38 -05:00
Adam
029e1397c4 Merge pull request #10941 from edx/adam/fix-image-translations 
fix translations for profile images (TNL-3901)
 2015-12-14 09:55:55 -05:00
Christine Lytwynec
5e1bbef3ad remove outdated references to specific .coveragerc files in docs 2015-12-14 09:22:52 -05:00
Ned Batchelder
0632240331 Pylint count is below 5000 2015-12-14 09:18:29 -05:00
John Eskew
0ed7903234 Merge pull request #10838 from edx/jeskew/standardize_mongo_connections 
All feedback above was addressed, the commits were squashed, and tests passed. Merging.
 2015-12-14 09:16:38 -05:00
Nimisha Asthagiri
160f391408 Merge pull request #10959 from edx/course_overview/manual_seeding 
Course Overview - require manual seeding of the table
 2015-12-14 08:39:03 -05:00
Christine Lytwynec
e45ac60c9c Merge pull request #10928 from edx/clytwynec/problem-type-a11y-tests 
add AnnotationProblemTypeTest and SymbolicProblemTypeTest
 2015-12-14 08:38:42 -05:00
Bill DeRusha
67c322e77e Merge pull request #10946 from edx/bderusha/fa-require-country 
Validate country on FA form
 2015-12-14 08:36:40 -05:00