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

16638 Commits

Author SHA1 Message Date
David Ormsbee
ffeca6712f Merge pull request #19736 from edx/ormsbee/xblock_safe_depr 
Don't break exports for uninstalled XBlock content
 2019-02-07 11:40:20 -05:00
Stu Young
af94f3756f Merge pull request #19760 from edx/estute/fix-flaky-problem-test 
wait for ajax on problem reset in test
 2019-02-07 09:51:12 -05:00
Saleem Latif
ecc86f9827 Update final copy recovery feature copy 2019-02-07 15:55:42 +05:00
Saleem Latif
63f8074402 Update dashboard alert link and account settings page styling 2019-02-07 14:00:27 +05:00
Waheed Ahmed
bf6301c11e Merge pull request #19291 from edx/waheed/LEARNER-4434-discovery-support-beta-langs 
Add support for beta languages
 2019-02-07 13:10:27 +05:00
David Ormsbee
d0c353609d Don't break exports for uninstalled XBlock content 
When an unknown content type is encountered, it's imported as a
RawDescriptor, which will preserve the OLX and export it back out. But
if we import a course while an XBlock is installed and then export it
after that XBlock is removed, we export RawDescriptors that never got to
save the original OLX and have a blank "data" field. Attempting to
export this used to fail and break export altogether. We now test that
the export continues to complete, and just skips over anything it can't
serialize out.

Note that this will stil export pointers in the export, so if you
uninstalled a "AmazingBlock" and exported, you might see something like
the following in a vertical's XML::

<vertical display_name="Unit">
  <amazing url_name="2edebb68d5734395a06b8a62b9bb677e"/>
</vertical>

However there would be no corresponding file at:
  /amazing/2edebb68d5734395a06b8a62b9bb677e.xml

In fact, there would be no /amazing directory at all in the export.

The better long term solution is probably to leave the pointer as-is
and export some generic file that can't be mistaken for OLX (say a
JSON file) that represents the raw key-value data we have in
Modulstore for the now unknown XBlock type. However, this commit at
least keeps export from crashing out entirely.
 2019-02-06 15:36:59 -05:00
Stuart Young
ad6312b67b wait for ajax on problem reset in test 2019-02-06 15:29:31 -05:00
Calen Pennington
829227ade3 Merge pull request #19663 from cpennington/fbe-improve-course-api-performance 
Fbe improve course api performance
 2019-02-06 11:01:25 -05:00
Calen Pennington
419657d7a5 Prefetch course modes used in has_access calls in course api 2019-02-06 10:11:15 -05:00
Waheed Ahmed
c48df3214b update bokchoy db cache. 2019-02-06 16:13:24 +05:00
Matthew Piatetsky
9681ca36b8 fix unicode strings in common/ 2019-02-05 10:57:00 -05:00
Julia Eskew
ed239ed0fd Read client ID/secret from DOT application instead of DOP client. 2019-01-31 13:57:23 -05:00
Michael Youngstrom
e7898d153d Move to python3-saml 2019-01-30 16:35:16 -05:00
Michael Youngstrom
6a43ae2a5d Merge pull request #19672 from edx/youngstrom/balance-shards 
Bump bokchoy shards and rebalance to decrease test times
 2019-01-30 15:44:32 -05:00
Michael Youngstrom
0f3d0b69d6 Rebalance bokchoy sharding 2019-01-30 14:16:58 -05:00
Brian Mesick
c948f335bd Merge pull request #19665 from edx/bmedx/PLAT-2411 
Use correct language code in retirement emails
 2019-01-28 16:45:31 -05:00
Audrey
0589037545 Merge pull request #19661 from edx/aekao/REVEM-136/tearDownBundlingTest 
Tearing down data from bundling test
 2019-01-28 16:04:55 -05:00
Audrey Kao
3b4c4c30cb Tearing down data from bundling test, see REVEM-136 2019-01-28 15:00:28 -05:00
bmedx
43e1bf8e3c Use correct language code in retirement emails 2019-01-28 13:33:39 -05:00
Jeff Witt
13bfc7dc1b Update 09_play_pause_control.js 
change title attribute to aria-label on Play button for better screen reader UX
 2019-01-28 11:47:39 -05:00
Julia Eskew
48073300e7 Merge pull request #19106 from open-craft/clemente/fix-courseenrollment-admin-querydict 
Fix error when saving CourseEnrollment in admin
 2019-01-28 11:14:04 -05:00
Daniel Clemente Laboreo
e0b0c375be Fix error when saving CourseEnrollment in admin 2019-01-28 14:42:41 +02:00
Agha Awais
b239fd5aab Merge pull request #19520 from edx/awais/lett_2_bc_courseware_problems 
Courseware problems bokchoy tests
 2019-01-26 20:44:25 +05:00
Calen Pennington
805f32a357 Revert "Allow courses api to return data incrementally" 2019-01-25 12:56:57 -05:00
Calen Pennington
c9ed838991 Merge pull request #19642 from cpennington/fbe-improve-course-api-performance 
Allow courses api to return data incrementally
 2019-01-25 11:31:24 -05:00
Calen Pennington
0d273e9506 Prefetch course modes used in has_access calls in course api 2019-01-25 10:30:09 -05:00
Agha Awais
fbb46b1cf7 Courseware problems bokchoy tests 2019-01-25 14:49:00 +00:00
Agha Awais
49cd4202df Merge pull request #19594 from edx/awais/lett_2_bc_html_editor_II 
Remaining bokchoy tests for HTML editor(II)
 2019-01-25 11:31:16 +05:00
Agha Awais
840ff1751a Remaining bokchoy tests for HTML editor(II) 2019-01-24 20:38:34 +00:00
Rabia Iftikhar
4e1b3f0b22 Merge pull request #19645 from edx/ri/EDUCATOR-3930-video-player-speed 
EDUCATOR-3930 fix video player speed adjustments
 2019-01-24 16:04:03 +05:00
Zubir Afzal
c3aa5149f1 ENT-1438 Update wording in account recovery flow 2019-01-24 13:39:56 +05:00
rabiaiftikhar
a85256e109 EDUCATOR-3930 fix video player speed adjustments 2019-01-23 17:15:25 +05:00
Jeremy Bowman
f7799bad9e Fix coverage on remote xdist nodes 2019-01-22 14:42:07 -05:00
Saleem Latif
46d97caa47 Consolidate recovery assistance forms 2019-01-22 15:09:11 +05:00
Jeff Witt
ccbd9d5b83 fix video player various buttons accessibility 2019-01-21 12:10:32 +05:00
DawoudSheraz
bd262e000b Update Mathjax version to include a11y 2019-01-17 13:20:07 +05:00
Ned Batchelder
48ac13e73e Merge pull request #19591 from cclauss/print_function 
Use print() function in both Python 2 and Python 3
 2019-01-16 17:59:11 -05:00
adeelehsan
31aec22785 Merge pull request #19605 from edx/aehsan/learner-6026/username_log_added_incase_of_exception 
Added logs
 2019-01-16 20:39:18 +05:00
Stu Young
4b9b77ede0 Merge pull request #19603 from edx/testeng/bokchoy_auto_cache_update_0d5c5af12582d9404cdbd74102fc36d99ea5777d 
Bokchoy db cache update
 2019-01-15 10:56:22 -05:00
edx-cache-uploader-bot
bad7d8e1b2 Updating migrations 2019-01-15 09:57:01 -05:00
adeelehsan
2390966e9b Added logs 
added username log if unable to authenticate
newly created user for 1st time while its
account is still inactive.
Purpose of log is to find specific useranme
inorder to investigagte LERANER-6026
 2019-01-15 18:31:53 +05:00
Agha Awais
c5caa17a54 Remaining bokchoy tests for pages 2019-01-15 08:16:51 +00:00
cclauss
8fca11b85c Use print() function in both Python 2 and Python 3 2019-01-13 17:16:37 +01:00
Agha Awais
03403e58c4 Problem Editor bokchoy tests II(remaining tests) 2019-01-11 14:23:55 +00:00
Agha Awais
db2cab0e4c Merge pull request #18810 from edx/awais/lett_2_bc_pages 
TE-2626: Studio Pages bokchoy tests
 2019-01-11 15:24:45 +05:00
zrana
fc56a6d47c Merge pull request #19456 from edx/zeeshan/lett_2_bc_grading_IV 
Grading IV tests
 2019-01-11 14:48:02 +05:00
Agha Awais
779be24c56 Studio Pages bokchoy tests 2019-01-11 09:43:31 +00:00
Ned Batchelder
1d3f062d05 Add some clarifying translator comments. 2019-01-10 13:50:04 -05:00
Matthew Piatetsky
e1fd793e86 Merge pull request #19560 from edx/REVMI-2 
add informational banners when masquerading as user who would not have access due to start date
 2019-01-10 13:48:29 -05:00
Stu Young
0a3b889365 Merge pull request #19574 from edx/testeng/bokchoy_auto_cache_update_65c853527c513863fc95edc70ccbf6ce07554a95 
Bokchoy db cache update
 2019-01-10 12:04:56 -05:00