Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,388 Commits 1 Branch 0 Tags
23c582d01d86a00a8d987154cd2ee42434afc446
Commit Graph

34388 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Renzo Lucioni
23c582d01d Delete dead SUBDOMAIN_BRANDING setting. 2015-12-15 14:42:09 -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
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
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
Adam Palay
70552845ca fix translations for profile images (TNL-3901) 2015-12-14 08:19:00 -05:00
John Eskew
74e70119a2 Use a common MongoDB connection function. 
Add some missing @autoretry_read() decorators.
Change to PyMongo 3.x-compatible syntax.
 2015-12-14 07:42:38 -05:00
Matt Drayer
e9c8b4b07b Merge pull request #10972 from edx/ziafazal/SOL-1375-text-update 
SOL-1375: org help text updated
 2015-12-14 06:04:14 -05:00
Zia Fazal
772a4d4ba1 org help text updated 2015-12-14 12:39:44 +05:00
Nimisha Asthagiri
d6364312f4 Course Overview - require manual seeding of the table. 2015-12-13 23:35:46 -05:00
Matt Drayer
7a8f372e25 Merge pull request #10968 from edx/mattdrayer/SOL-1519 
mattdrayer/SOL-1519: Include course-level configuration in feature check
 2015-12-13 11:29:22 -05:00
Matt Drayer
115b169259 mattdrayer/SOL-1519: Include course-level configuration in feature check 2015-12-13 09:57:29 -05:00
Sarina Canelake
5386d0a4ca Merge pull request #10845 from edx/kill-ora1 
Remove ORA1: Main Pull Request
 2015-12-11 17:31:41 -05:00
Bill DeRusha
5504050abd Validate country on FA form 2015-12-11 17:16:21 -05:00
Clinton Blackburn
2695e7b3cb Merge pull request #10965 from edx/clintonb/credit-followup 
Followup to Credit Patch
 2015-12-11 17:06:24 -05:00
Sarina Canelake
be1adc3887 Merge pull request #10964 from edx/kill-abtest 
Remove outdated abtest_module
 2015-12-11 16:53:36 -05:00
Peter Desjardins
557a411c60 Merge pull request #10952 from edx/pdesjardins/DOC-2478 
Pdesjardins/doc 2478 - Fix problems with the doc build
 2015-12-11 16:46:39 -05:00
Sarina Canelake
21e4c90c3f Keep 'peergrading' and 'combinedopenended' defined as deprecated 2015-12-11 16:16:08 -05:00
Clinton Blackburn
27f853d605 Followup to Credit Patch 
- Removed unused variable
- Updated message class and text
- HTML-escaping relevant fields

ECOM-2893
 2015-12-11 15:53:18 -05:00
Andy Armstrong
cc24ca55e6 Support local debugging of XBlock JavaScript 
It turns out that loading JavaScript with $.getScript
causes Chrome to treat the file as an XHR request
and not JS. I've switched over to using RequireJS
to load the URL which already has the ability to
dynamically load files and have the browser
recognize them.
 2015-12-11 15:50:38 -05:00
Sarina Canelake
2b4a1be60f Comment out mock call to ORA1 stub server 2015-12-11 15:30:27 -05:00
Clinton Blackburn
2f131fafed Merge pull request #10961 from edx/release 
Merging patch/2015-12-11
 2015-12-11 15:16:52 -05:00
Sarina Canelake
dea671f927 Remove ORA1 tabs from setup.py 2015-12-11 15:07:13 -05:00
Sarina Canelake
71a2a2a001 Remove ORA1 lettuce tests 2015-12-11 15:07:13 -05:00
Sarina Canelake
c6c5230941 Create sample deprecated blocks for bok choy tests 2015-12-11 15:07:12 -05:00
Sarina Canelake
ef035524bf Disable failing calculator test 2015-12-11 15:07:12 -05:00
Sarina Canelake
2e4bba0a79 Remove ORA1 test units from xmodule test courses 2015-12-11 15:07:12 -05:00
Sarina Canelake
6280ccdbcf Remove combined_open_ended XModule CSS (ORA1) 2015-12-11 15:07:11 -05:00