Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,444 Commits 1 Branch 0 Tags
cdcd5d79fea51733a09c2d12f8f58e8d1ca147d3
Commit Graph

4487 Commits

Author SHA1 Message Date
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
dfcbcd5435 Add a verification reminder to order confirmation emails 2014-12-16 10:28:33 -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
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
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
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
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
d919d2ae46 Teach LMS how to render XBlockAsides 
[PLAT-217]
 2014-12-13 08:26:28 -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
David Baumgold
3bcf18dd59 Merge pull request #6153 from edx/db/update-pep8 
Update pep8 to 1.5.7
 2014-12-12 15:00:13 -05:00
Sarina Canelake
2e5b96768a Merge pull request #5449 from Stanford-Online/njdup/bulk_emails_keyword_sub 
Implements keyword sub feature for bulk emails
 2014-12-12 12:57:21 -05:00
Afzal Wali
51e53587dc WL-105 Show course cards sorted by start dates, oldest first. 2014-12-11 20:05:04 -05:00
njdup
32bbb0e71a Implements keyword sub feature for bulk emails 
This commit pulls in changes from #4487 that implements keyword
substitution for bulk emails. With these changes, an instructor can
include keywords in their bulk emails which will be automatically substituted
with the corresponding value for the recepient of the email. Keywords are
of the form %%keyword%%, and the keywords implemented in this commit include:

%%USER_ID%% => anonymous_user_id
%%USER_FULLNAME%% => user profile name
%%COURSE_DISPLAY_NAME%% => display name of the course
%%COURSE_END_DATE%% => end date of the course

Client-side validations have also been implemented to ensure that only emails
with well-formed keywords can be sent.
The architecture is designed such that adding in new keywords in the future
would be relatively straight-forward.
 2014-12-11 15:03:29 -08:00
Clinton Blackburn
b1e5002b6b Merge pull request #6224 from edx/release 
hotfix-2014-12-11
 2014-12-11 13:23:37 -05:00
David Baumgold
36e77c7463 Fixing pep8 issues 2014-12-11 13:04:49 -05:00
Nimisha Asthagiri
aa309a8caf MA-182 Fix Mobile Subtitles. 2014-12-11 08:54:03 -05:00
Andy Armstrong
0836a89636 Merge pull request #6189 from edx/andya/fix-masquerade 
Fix Mako templates to always use updated request context
 2014-12-10 11:39:29 -05:00
Christina Roberts
77f5d90d6a Merge pull request #5961 from edx/dan-f/cohort-csv-upload 
Upload CSV file for cohorting students
 2014-12-10 11:04:14 -05:00
Daniel Friedman
3d91f43030 Support cohorting students via a CSV File. 
TNL-735
 2014-12-10 09:23:04 -05:00
Andy Armstrong
4d75c18098 Fix Mako templates to use latest request context 
Fixed the edX middleware to lazily create request
context for Mako templates, so that it is based on
any changes made to the request object.

Verified that with this fix the "Instructor" tab is
correctly hidden when a staff member is viewing
the course as a student.
 2014-12-09 23:38:31 -05:00
Sarina Canelake
db09c5529f Replace 'mit_dome.jpg' and 'simple_graph.png' with a default placeholder image 2014-12-09 22:28:09 -05:00
Clinton Blackburn
fc242ea23e Merge branch 'release' 
Release 2014-12-10
 2014-12-09 17:39:17 -05:00
Sarina Canelake
69fd063d95 Merge pull request #6014 from edx/sarina/legacy-dash-cleanup 
Legacy dash cleanup
 2014-12-09 15:05:03 -05:00
Sarina Canelake
a1c8f8c468 Style cleanups: legacy instructor dashboard 2014-12-09 13:57:21 -05:00
Sarina Canelake
bfa8349ec4 Clean up Datadump section on legacy dashboard 2014-12-09 13:57:20 -05:00
Sarina Canelake
5aeb412bbe Remove deprecated cohorts management on legacy dashboard 2014-12-09 13:57:20 -05:00
Sarina Canelake
762b0d9b6b Clean up Manage Groups section on legacy dashboard 2014-12-09 13:57:20 -05:00
Sarina Canelake
e3179c37cd Clean up Email section of legacy dashboard 2014-12-09 13:57:20 -05:00
Sarina Canelake
d4a06794d0 Clean up Forum Admin section of legacy dashboard 2014-12-09 13:57:19 -05:00
Sarina Canelake
5d7f820d93 Clean up Admin section of legacy dashboard 2014-12-09 13:57:19 -05:00
Sarina Canelake
d8904d9091 Clean up Grade Downloads section of legacy dash 2014-12-09 13:57:19 -05:00
Sarina Canelake
a15110f01c Remove Grade Adjustment code from legacy dash 2014-12-09 13:57:19 -05:00
Sarina Canelake
0a5af2a385 Rename legacy dash template 2014-12-09 13:57:19 -05:00
Adam Palay
abdae8261c add 'defunct' states for shoppingcart (ECOM-737) 
add retire method to order class
 2014-12-09 12:59:20 -05:00
chrisndodge
099d02d13d Merge pull request #6124 from edx/muhhshoaib/WL-164 
Unpurchased items in the shoppingcart should be removed if the enrollment period has closed
 2014-12-09 09:25:46 -05:00
Muhammad Shoaib
829f7dba5f Remove items from the shopping cart if they are for a course whose course enrollment window has closed 
changed the url name to verify_cart and change the color of the message in the shopping cart
 2014-12-09 12:20:37 +05:00
Clinton Blackburn
97bc506b45 Merge pull request #6179 from edx/sanchez/email_optin_third_party 
3rd-party pipeline supports updating email optin
 2014-12-08 14:56:30 -05:00
Clinton Blackburn
71bc536c6d Merge pull request #6183 from edx/renzo/email-opt-in-copy 
Improved support for multiple organization names
 2014-12-08 14:55:06 -05:00
stephensanchez
7ab0cb0730 3rd-party pipeline supports updating email optin 
Fix all the 3rd party auth scenarios.

Update pipeline to preserve parameters.

Updating tests
 2014-12-08 19:52:06 +00:00
Andy Armstrong
2b0f959bd7 Merge pull request #5942 from edx/cohorted-courseware 
Cohorted courseware
 2014-12-08 14:38:30 -05:00