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

29368 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
ee401f15f4 Make mongo/draft.py pass the active descriptor system through item loading 2015-03-31 09:43:51 -04:00
Calen Pennington
bf62c4b70e Extract a pure-XBlock version of MakoModuleDescriptor 2015-03-31 09:43:51 -04:00
Calen Pennington
b50876fc32 Make XBlockToXModuleShim use json-init-args to record the XModule constructor to shim to 2015-03-30 16:37:53 -04:00
Calen Pennington
1f17538d42 Clean up tests in preparation for switching Vertical from an XModule to an XBlock 2015-03-30 16:37:53 -04:00
Ned Batchelder
33361a05e4 Merge pull request #7490 from edx/ned/dont-put-test-data-in-working-tree 
Don't use the working tree as storage for test-created files.
 2015-03-27 11:30:04 -04:00
John Eskew
c5e198f754 Merge pull request #7469 from edx/jeskew/datadog_events_vs_compat 
Squashed and tests passed - merging.
 2015-03-26 17:19:00 -04:00
John Eskew
34adb256a6 Add datadog counters everywhere a "VS[compat]" comment exists. 
Conflicts:
	common/lib/xmodule/xmodule/xml_module.py
 2015-03-26 16:18:15 -04:00
Ben Patterson
5615f0bfed Merge pull request #7494 from edx/benp/flag-cohort-test-flaky 
Fix empty promise. It was always evaluating to true.
 2015-03-26 13:55:04 -04:00
Christopher Lee
4423510807 Merge pull request #7480 from edx/clee/MA-169_MA-77 
Clee/ma 169 ma 77
 2015-03-26 13:31:49 -04:00
Adam
c2dcbd70d1 Merge pull request #7492 from edx/release 
Release
 2015-03-26 12:56:41 -04:00
christopher lee
e8dfac091b MA-77 Auto VAL clone course 
MA-77 Automatically adds the course id to the videos in VAL
when a course is rerun.
 2015-03-26 12:36:43 -04:00
Ben Patterson
93068e0a36 Merge pull request #7439 from edx/benp/add-markdown-tests 
Benp/add markdown tests
 2015-03-26 12:28:47 -04:00
Ben Patterson
dae5cdfceb Fix empty promise. It was always evaluating to true. 
This addresses TNL-1808 (and likely other flaky tests
in this area).
 2015-03-26 12:27:30 -04:00
David Baumgold
c856b6dc64 Merge pull request #7457 from edx/db/openedx-logo-on-edx.org 
"Powered by Open edX" logo on edx.org footer
 2015-03-26 11:44:01 -04:00
Adam
a374419079 Merge pull request #7489 from edx/hotfix/2015-03-26 
default discussion modules' discussion_id field to xblock's UNIQUE_FIELD...
 2015-03-26 11:38:46 -04:00
Ben Patterson
b03c4eca63 Opening wiki editor should be extracted into a method. 2015-03-26 11:05:55 -04:00
Ben Patterson
6e2e40cc14 Add course wiki acceptance tests. 2015-03-26 11:05:55 -04:00
Sarina Canelake
d66bb883ac Fix footer stylings for RTL 2015-03-26 10:15:51 -04:00
Brian Talbot
67168869f5 Adjust styling for Open edX footer details 2015-03-26 10:15:51 -04:00
David Baumgold
8abfe4a850 Put Open edX logo in CMS footer 2015-03-26 10:14:37 -04:00
David Baumgold
89252ec12d Put Open edX logo in LMS edx.org footer 2015-03-26 10:14:37 -04:00
Ned Batchelder
84f6e11830 Don't use the working tree as storage for test-created files. 2015-03-26 09:38:09 -04:00
Christine Lytwynec
9edda95096 Merge pull request #7481 from edx/clytwynec/flaky-mathjax 
update bokchoy with fix for TNL-1770
 2015-03-26 08:57:11 -04:00
Adam Palay
43abe399f1 default discussion modules' discussion_id field to xblock's UNIQUE_FIELD (TNL-1771) 2015-03-26 08:49:21 -04:00
Christine Lytwynec
3a8716a36f update bokchoy with fix for TNL-1770 2015-03-25 17:02:10 -04:00
David Baumgold
609b114443 Merge pull request #7475 from edx/adjust-indentation 
Fix whitespace
 2015-03-25 15:58:01 -04:00
christopher lee
3b150da1d7 MA-169 return requested val encoded video profiles 
MA-169 Mobile api now calls for mobile_low (default), mobile_high,
 and youtube profiles instead of only mobile_low.
 2015-03-25 15:40:58 -04:00
Christina Roberts
3f07660d27 Merge pull request #7454 from edx/andya/user-api-transaction-handling 
Clean up transactional behavior in User API
 2015-03-25 15:08:21 -04:00
Andy Armstrong
a9dce7c331 Clean up transactional behavior in User API 2015-03-25 13:44:03 -04:00
Matt Drayer
8107f803f5 Merge branch 'release' 2015-03-25 13:38:43 -04:00
David Baumgold
6840ced41f Fix whitespace 
Don't mix tabs and spaces!
 2015-03-25 13:24:58 -04:00
Will Daly
aeff0880ac Merge pull request #7453 from edx/will/ecom-1198 
ECOM-1198: Login/Registration page can skip track selection.
 2015-03-25 11:46:04 -04:00
Will Daly
735b400998 Login/Registration page can skip track selection. 
Add querystring param "course_mode" to the login/registration
page so the user can skip track selection.

This supports upcoming changes to the course details page
that allow the user to choose the track when clicking
"enroll", which will replace the functionality of the track
selection page.
 2015-03-25 09:15:31 -04:00
Mark Sadecki
e1251bfecd Merge pull request #7416 from edx/cptvitamin/UX-1838-dashboard-heading-structure-n-context 
adds additional context for SR users and corrects heading order
 2015-03-24 13:51:33 -04:00
Christine Lytwynec
7f137487cc Merge pull request #7463 from edx/clytwynec/flaky-mathjax 
wait for both window.MathJax and window.MathJax.onReady
 2015-03-24 13:50:57 -04:00
Ned Batchelder
65356f8a36 Merge pull request #7446 from edx/ned/clean-up-eo 
Change how conf/locale/eo is cleaned up, so that it happens when needed
 2015-03-24 13:28:19 -04:00
Ned Batchelder
6401f453ca Change how conf/locale/eo is cleaned up, so that it always happens 2015-03-24 11:18:45 -04:00
Christine Lytwynec
5204fd6519 wait for both window.MathJax and window.MathJax.onReady 2015-03-24 11:03:09 -04:00
Chris
990f6a0b76 Merge pull request #7462 from edx/clrux/logistration-text-alignment-fix 
Centering the third-party social media buttons
 2015-03-24 10:55:46 -04:00
Chris Rodriguez
0bdb43a45f Centering social media buttons 2015-03-24 10:08:21 -04:00
Eugeny Kolpakov
dadc78aabd Merge pull request #7336 from open-craft/eugeny/course-team-to-backbone 
Unified Course Team and Library Users page. Converted both to Backbone.
 2015-03-24 17:06:38 +03:00
Ahsan Ulhaq
230287d43f Merge pull request #7334 from edx/ahsan/tnl-1699-remove-buttons-from-aria-live-region 
Ahsan/tnl 1699 remove buttons from aria live region
 2015-03-24 16:14:49 +05:00
E. Kolpakov
9a56b800ee Unified Course Team and Library Users page. Converted both to Backbone. 
Converted lettuce Course Team page tests to bok choy
 2015-03-24 12:09:19 +03:00
Ahsan Ulhaq
2e0d35f180 Remove submission buttons from aria-live region 
added a new aria-live region and added problem html into that.
Removed submission buttons out of the aria-live div scope.

TNL-1699
 2015-03-24 13:41:07 +05:00
Sarina Canelake
c6ab15c64c Merge pull request #7352 from edx/sarina/pep8-quality-report 
Improve pep8 reporting
 2015-03-23 21:10:58 -04:00
Sarina Canelake
e77211b713 Run pep8 on all files, and fix uncovered errors 2015-03-23 15:50:29 -04:00
Greg Price
0f0ee6a394 Merge pull request #7455 from edx/aleffert/video_web_only 
Add web-only setting to video module
 2015-03-23 15:38:18 -04:00
Sarina Canelake
bd090a6e58 Fix paver quality tests to reflect removed diff-quality call 2015-03-23 15:37:56 -04:00
chrisndodge
4900d7a5ab Merge pull request #7452 from edx/cdodge/get-courses-filter 
do the ORG filtering as part of the mongo query. Also, don't trigger met...
 2015-03-23 15:07:09 -04:00
Will Daly
a1e446d4ef Merge pull request #7445 from edx/will/ecom-803 
Update aria label on edX footer
 2015-03-23 15:05:08 -04:00