Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
27,453 Commits 1 Branch 0 Tags
28fb3c8e6954d8cb2dee8a258b00295830cc6860
Commit Graph

27453 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Eskew
28fb3c8e69 Merge pull request #6180 from edx/jeskew/import_export_asset_xml_pt_2 
Import/export modulestore-stored asset metadata as XML from/to exported course.
 2014-12-16 17:14:48 -05:00
Stephen Sanchez
402b8b1547 Merge pull request #6261 from edx/sanchez/add-activate-account 
Add the activate account step to the verified workflow.
 2014-12-16 16:56:06 -05:00
John Eskew
b518cfa0a0 Add wrapper class that enables storage of Mongo document id separately 
from dictionary of all asset metadata by asset type.
 2014-12-16 15:42:38 -05:00
John Eskew
94ea35d3be Export modulestore-stored asset metadata as XML to exported course. 
Import asset metadata XML into modulestore.
Optimize importing many items of asset metadata by avoiding multiple
round-trips to MongoDB.
 2014-12-16 15:42:38 -05:00
John Eskew
e66cb05c03 Return empty values and log a warning instead of raising NotImplemented 
exceptions for XML modulestore asset metadata methods.
 2014-12-16 15:42:38 -05:00
Stephen Sanchez
2341bf1d1b Merge pull request #6272 from edx/sanchez/change-skip-step-logic 
Positive filtering which steps can be skipped.
 2014-12-16 15:38:30 -05:00
stephensanchez
96e22097b2 Add the activate account step to the verified workflow. 
Changing approach such that email activation is not a step.

Removing stale line of code.

Update activate account step according to new UI changes.

Adding new test for activation.
 2014-12-16 20:24:50 +00:00
stephensanchez
c84a604949 Positive filtering which steps can be skipped. 2014-12-16 18:20:41 +00:00
Renzo Lucioni
7699b5ff94 Merge pull request #6273 from edx/renzo/fix-shoppingcart-tests 
Fix unit test failure due to stale urls.py
 2014-12-16 13:06:50 -05:00
Renzo Lucioni
cdcd5d79fe Fix unit test failure due to stale urls.py 2014-12-16 12:09:01 -05:00
Will Daly
b4a8302e66 Merge pull request #6268 from edx/will/simplify-template-loading 
Inline underscore templates; add pre render step
 2014-12-16 11:42:06 -05:00
Renzo Lucioni
9faddd9b64 Merge pull request #6267 from edx/renzo/remove-webcam-approve-button 
Remove webcam capture approval button (checkmark)
 2014-12-16 11:15:49 -05:00
Renzo Lucioni
95025dfce9 Merge pull request #6201 from edx/renzo/postpayment-email 
Add a verification reminder to order confirmation emails
 2014-12-16 10:53:22 -05:00
Renzo Lucioni
dfcbcd5435 Add a verification reminder to order confirmation emails 2014-12-16 10:28:33 -05:00
Renzo Lucioni
94b22bcde9 Remove webcam capture approval button (checkmark) 2014-12-16 10:01:55 -05:00
zubair-arbi
5371d17312 Merge pull request #6246 from edx/zub/bugfix/plat-332-location-revison-error 
fix location revision error for multi parent draft
 2014-12-16 19:39:27 +05:00
David Baumgold
6b82489728 Merge pull request #5685 from edx/uncomment-thumbnail-tests 
Uncomment thumbnail tests
 2014-12-16 09:08:05 -05:00
Will Daly
80f5d4216a Inline underscore templates; add pre render step 2014-12-16 08:38:28 -05:00
chrisndodge
cb1058ac00 Merge pull request #6142 from edx/muhhshoaib/WL-106-MIT-Course-Information-Page-side-bar 
MIT: Course Information Page side bar
 2014-12-15 20:46:22 -05:00
AlasdairSwan
70c2adb9ef Merge pull request #6264 from edx/alasdair/dashboard-prof-ed-banner 
ECOM-728 updated dashboard course banners so all types of course are now...
 2014-12-15 16:14:09 -05:00
AlasdairSwan
9b59e387b5 ECOM-728 updated dashboard course banners so all types of course are now supported as per the new design. Included some other small tweaks to other text on the page in consultation with AndyWaldrop 2014-12-15 15:08:40 -05:00
Will Daly
788cc350dd Merge pull request #6260 from edx/will/combine-intro-and-make-payment 
Combine payment and intro step
 2014-12-15 14:59:26 -05:00
Renzo Lucioni
c6b1ca34a7 Merge pull request #6263 from edx/renzo/full-name-placeholder 
Use current full name as placeholder text
 2014-12-15 14:34:23 -05:00
Renzo Lucioni
9874a8d396 Use current full name as placeholder text 2014-12-15 14:25:31 -05:00
Ben Patterson
a0629003ae Merge pull request #6240 from edx/benp/fix-analytics-init 
Mock out the underlying segment-io call.
 2014-12-15 13:44:54 -05:00
Will Daly
d3c3f73428 Combine payment and intro step 2014-12-15 13:23:07 -05:00
Will Daly
18f6980922 Merge pull request #6247 from edx/will/update-verified-requirements 
Separate verification / payment flow.
 2014-12-15 13:11:45 -05:00
Will Daly
93cc03a570 Separate verification / payment flow. 2014-12-15 13:11:33 -05:00
Muhammad Shoaib
914ecac9ac added the course price in the course about page 2014-12-15 12:53:37 -05:00
Will Daly
49cb0486a6 Merge pull request #6245 from edx/will/email-opt-in-updates 
Add header row to email opt in list; add default date
 2014-12-15 12:13:27 -05:00
Adam
ce89823f1a Merge pull request #6233 from edx/adam/fix-preview-courseruns 
fix preview link generation for course reruns (PLAT-336)
 2014-12-15 10:01:26 -05:00
Adam Palay
59343ed63f fix preview link generation for course reruns (PLAT-336) 2014-12-15 09:21:38 -05:00
zubair-arbi
99b86d7b0f fix location revision error for multi parent draft 
PLAT-332
 2014-12-15 17:32:48 +05:00
Will Daly
5df1ffebc1 Add header row to email opt in list; add default date 2014-12-15 06:13:47 -05:00
zubair-arbi
baaf5fa8a7 Merge pull request #6210 from edx/zub/bugfix/tnl-922-key-error-getting-position 
set position to default value if POST request don't have position argume...
 2014-12-15 16:02:30 +05:00
zubair-arbi
1d6d2f2a7f set position to default value if POST request don't have position argument 
TNL-922
 2014-12-15 11:59:52 +05:00
chrisndodge
8a685ceca0 Merge pull request #6242 from edx/cdodge/move-shoppingcart-button-detection 
change the context_processor in the shopping cart to return a pointer to...
 2014-12-14 13:15:03 -05:00
Chris Dodge
1148366998 change the context_processor in the shopping cart to return a pointer to a function so that only the templates that actually need to know if the shopping cart button should be shown will actually make the database roundtrips 2014-12-14 11:34:19 -05:00
Ben Patterson
e0f83ded6d Pipe analytics client output to stdout instead of devnull. 2014-12-13 20:02:53 -05:00
Ben Patterson
352fce6e02 Fix another analytics.init secret error message (noise). 2014-12-13 19:28:15 -05:00
Calen Pennington
d0b3fcc09c Merge pull request #6162 from cpennington/xblock-asides 
XBlockAsides in LMS
 2014-12-13 10:08:52 -05:00
Calen Pennington
822eaa20c6 Make ErrorDescriptor more resistent to errors 2014-12-13 08:26:28 -05:00
Calen Pennington
d919d2ae46 Teach LMS how to render XBlockAsides 
[PLAT-217]
 2014-12-13 08:26:28 -05:00
Ben Patterson
7be7b50ba9 Mock out the underlying segment-io call. 
TE-532
 2014-12-12 21:47:43 -05:00
Calen Pennington
e20fe2b879 Add a configuration model for managing XBlockAsides 2014-12-12 21:45:21 -05:00
Calen Pennington
980f30c17f Move lms.lib.xblock into lms.djangoapps.lms_xblock in preparation add database backed configuration to it 2014-12-12 21:45:21 -05:00
Calen Pennington
42792e978c Extract common base functionality for storing xblock fields in the relation db 2014-12-12 21:45:21 -05:00
Calen Pennington
ccbff2dafc Make a generic django field for storing OpaqueKey classes 2014-12-12 21:45:21 -05:00
Christine Lytwynec
0bce5569e2 Merge pull request #6238 from edx/clytwynec/fix_failing_git_export_tests 
fix git_export tests
 2014-12-12 17:28:23 -05:00
Christine Lytwynec
a63013c292 Merge pull request #6239 from edx/clytwynec/fix_pep8_violation 
fix pep8 violation
 2014-12-12 16:25:39 -05:00