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

29468 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Patterson
f388ea131e Omit migrations when calculating bok-choy coverage. 
When we calculate bok-choy coverage, we are including various migraitons
as part of the calculation. This does not represent the kind of
code that bok-choy can cover, since that is part of the RDBMS build-out
and maintenance.
 2015-04-06 16:52:27 -04:00
Nimisha Asthagiri
58afd8a7c7 Merge pull request #7541 from edx/mobile/import_fix_course_id 
MA-410 Update video_module import to use target course_id.
 2015-04-02 19:56:04 -04:00
Adam
9ad4b71688 Merge pull request #7572 from edx/release 
Release
 2015-04-02 17:24:50 -04:00
Carol Tong
85b36acaa8 Merge pull request #7568 from edx/carol/docs/AdvancedSettingsUIHelp 
Edits to Advanced Settings UI text for Discussion Blackout Dates, Discussion Topic Mapping
 2015-04-02 17:03:47 -04:00
Jesse Zoldak
72f7b25a3c Merge pull request #7574 from edx/zoldak/fix-pep8 
Fix trailing whitespace issues
 2015-04-02 16:36:57 -04:00
Jesse Zoldak
5b93992ecb Fix trailing whitespace issues 2015-04-02 16:32:22 -04:00
Adam
61f7373a26 Merge pull request #7552 from edx/hotfix/2015-04-01 
Fixed static pages removed on import for split course.
 2015-04-02 16:08:50 -04:00
Carol Tong
4ebefce767 Fix line length 2015-04-02 16:04:32 -04:00
Jesse Zoldak
e9635e7f03 Merge pull request #7569 from edx/zoldak/SOL-618 
Decorate flaky test SOL-618
 2015-04-02 15:40:44 -04:00
Mark Hoeber
d7eb8cf7e4 Merge pull request #7309 from edx/markhoeber-doc1748 
Platform APIs Doc
 2015-04-02 14:47:10 -04:00
Carol Tong
f318f1b355 Edits to UI text for Discussion Blackout Dates, Discussion Topic Mapping 
to address DOC-1434, DOC-1828
 2015-04-02 14:32:25 -04:00
Jesse Zoldak
ab63243d01 Decorate flaky test SOL-618 2015-04-02 14:26:46 -04:00
Awais Jibran
037a189828 Merge pull request #7555 from awaisdar001/aj/tnl382-fix-lms-progress-page-invalid-url 
Fixed invalid URL in progress page.
 2015-04-02 22:14:18 +05:00
Nimisha Asthagiri
7e1104c421 MA-410 Update video_module import to use target course_id. 2015-04-02 11:38:01 -04:00
Will Daly
464bcf336e Show certificates for all verified modes 2015-04-02 11:21:54 -04:00
Waheed Ahmed
62a515f038 Fixed static pages removed on import for split course. 
PLAT-484
 2015-04-02 20:14:46 +05:00
Awais Qureshi
4db1753e57 Merge pull request #7530 from edx/aamir-khan/ECOM-912-in-course-reverification 
Aamir khan/ecom 912 in course reverification
 2015-04-02 19:05:08 +05:00
Waheed Ahmed
1e7dd06461 Merge pull request #7422 from edx/waheed/tnl1736-fix-beta-tester-functionality-for-ora 
Fixed beta tester functionality for ora problems.
 2015-04-02 17:52:58 +05:00
Waheed Ahmed
d9b685d5df Fixed beta tester functionality for ora problems. 
TNL-1736
 2015-04-02 16:51:58 +05:00
Awais Jibran
13e2ecee18 Code refector: Using replaced 'to_deprecated_string' with 'unicode' 2015-04-02 15:30:24 +05:00
Ahsan Ulhaq
badbc3e3b7 Merge pull request #7499 from edx/ahsan/tnl-1784-every-keystroke-triggers-aria-live-region-announcements 
DOM updates on every keystroke are triggering aria-live region announcements
 2015-04-02 15:07:10 +05:00
Awais
1d8b0e3e89 ECOM-1205-adding models and tests 2015-04-02 14:55:41 +05:00
Greg Price
0e6ed88664 Merge pull request #7557 from edx/gprice/video-upload-imported 
Add "Imported" state to Studio video upload page
 2015-04-01 17:15:26 -04:00
Mark Hoeber
b78f25c8d1 Platform API Documentation 2015-04-01 16:04:50 -04:00
Clinton Blackburn
2b5a854fd9 Merge pull request #7527 from edx/clintonb/edx-oauth2-provider-upgrade 
Updated edx-oauth2-provider to 0.5.1
 2015-04-01 15:35:30 -04:00
Carol Tong
80844e1bc3 Merge pull request #7531 from edx/carol/doc/TestsSidebarHelp 
DOC: Enhance Content Group and Experiment Group Config Sidebar Help
 2015-04-01 14:48:19 -04:00
Sarina Canelake
543adcfbc1 Merge pull request #7559 from mcgachey/mcgachey-authors 
Adding phil_mcgachey@harvard.edu to the AUTHORS list
 2015-04-01 14:28:23 -04:00
Will Daly
bedba6a600 Merge pull request #7529 from edx/will/cors-iframe-proxy 
Add proxy to allow IE9 to make xdomain requests
 2015-04-01 14:18:42 -04:00
Carol Tong
437d3229db Enhancements to Content Group and Experiment Group Config Sidebar Help 2015-04-01 13:53:14 -04:00
Christine Lytwynec
e69e94029d Merge pull request #7556 from edx/clytwynec/skip_acid_block_tests 
skip acid block tests [TE-812]
 2015-04-01 13:25:56 -04:00
Phil McGachey
44796c5878 Adding phil_mcgachey@harvard.edu to the AUTHORS list 2015-04-01 13:13:31 -04:00
Greg Price
eafd12d8de Add "Imported" state to Studio video upload page 
Imported VAL videos get the value "imported" for their status. We
considered not including imported videos on the upload page but have
instead decided to include them, so it is necessary to have a display
string for the imported status value.
 2015-04-01 12:25:07 -04:00
Christine Lytwynec
0370e90611 skip acid block tests 2015-04-01 12:23:31 -04:00
Clinton Blackburn
9bf2712512 Updated edx-oauth2-provider to 0.5.1 2015-04-01 12:22:01 -04:00
MAC
973e3d0306 Fixed invalid URL in progress page. 
TNL-382
 2015-04-01 20:33:35 +05:00
zubair-arbi
1f9ead5d46 Merge pull request #7547 from edx/zub/bugfix/ecom-1273-enrollment-api-catch-NoneType-courses 
log and ignore invlaid/deleted courses in Enrollment API
 2015-04-01 19:23:40 +05:00
Will Daly
fcc5b1e347 Add proxy to allow IE9 to make xdomain requests 
Adds an /xdomain_proxy.html endpoint that serves
the proxy file from the xdomain library.  This
allows IE9 users to iframe in the proxy page
to simulate a cross-domain request with cookies.
 2015-04-01 09:16:42 -04:00
zubair-arbi
ec2f4dc2fe Merge pull request #7523 from edx/zub/bugfix/ecom-579-change-education-level-option-label 
change education level option label to read "Associate" degree
 2015-04-01 17:17:58 +05:00
Jesse Zoldak
4f8357799d Merge pull request #7539 from edx/jeskew/vertical_ee_test_fix 
Remove mocked has_dynamic_children method.
 2015-04-01 07:35:51 -04:00
zubair-arbi
a9b13f0e72 log and ignore invlaid/deleted courses in Enrollment API 
ECOM-1273
 2015-04-01 16:26:24 +05:00
Greg Price
c860f790c2 Merge pull request #7508 from edx/gprice/export-import-val 
Include VAL data in video module export/import
 2015-03-31 20:28:31 -04:00
Greg Price
cfcb304885 Include VAL data in video module export/import 
This is required so that an a video module exported by one Open edX
deployment and imported by another will work correctly if it contains an
edx_video_id but does not populate other URL fields.

JIRA: MA-110
 2015-03-31 19:35:06 -04:00
John Eskew
39c0939d7f Remove mocked has_dynamic_children method - un-needed after vertical 
block conversion.
 2015-03-31 17:58:01 -04:00
Calen Pennington
e394c18188 Merge pull request #7476 from cpennington/bulk-assert-all-assertions 
Make BulkAssertionTest.bulk_assertions work with any assert* method
 2015-03-31 15:19:44 -04:00
Sarina Canelake
c1f3f558f2 Merge pull request #7524 from louyihua/underscore_extraction 
Fix string extraction error in underscore files
 2015-03-31 14:30:44 -04:00
Jesse Zoldak
8bfc948b37 Merge pull request #7533 from cpennington/add-mixins-to-mixed-modulestore-tests 
Pass standard list of xblock mixins to MixedModulestore in tests
 2015-03-31 14:29:35 -04:00
Matt Drayer
cbf336e8e0 Merge pull request #7293 from edx/ziafazal/access-gating-for-entrance-exam 
Entrance exam gating
 2015-03-31 13:38:00 -04:00
Calen Pennington
462cdfd9b4 Pass standard list of xblock mixins to MixedModulestore in tests 2015-03-31 13:31:30 -04:00
louyihua
46342a3f48 Fix string extraction error in underscore files 
The written style ```interpolate(gettext('some text'), {...}, ...)``` will will cause the string inside gettext() not be extracted.
So a separate line is needed for ```gettext``` when gettext function is directly called inside a call to the interpolate function.
 2015-04-01 01:23:36 +08:00
Sarina Canelake
4a4478fd8b Merge pull request #7526 from delftswa2014/readmes 
added READMEs for top level directories
 2015-03-31 13:16:29 -04:00