- 11 Dec, 2014 8 commits
-
-
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.
njdup committed -
Limit Upload File Sizes to GridFS
Sarina Canelake committed -
hotfix-2014-12-11
Clinton Blackburn committed -
Update pillow to 2.6.1
David Baumgold committed -
MA-182 Fix Mobile Subtitles.
Clinton Blackburn committed -
Nimisha Asthagiri committed
-
round-off weight value while returing grading policy
zubair-arbi committed -
TNL-884
zubair-arbi committed
-
- 10 Dec, 2014 23 commits
-
-
moving defaults for yaml config out of common.py
John Jarvis committed -
This reads configuration directly from yaml and imports it directly into settings
John Jarvis committed -
Add DEFAULT_FILE_STORAGE configuration.
Christina Roberts committed -
It might be different from the requested filename.
cahrens committed -
Tests in common are run with both CMS and LMS configuration (with different env files). Ensure the DEFAULT_FILE_STORAGE variables are in both environments.
cahrens committed -
Fix Mako templates to always use updated request context
Andy Armstrong committed -
add find_fixme task
Christine Lytwynec committed -
Upload CSV file for cohorting students
Christina Roberts committed -
Christine Lytwynec committed
-
Christine Lytwynec committed
-
TNL-735
Daniel Friedman committed -
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.
Andy Armstrong committed -
Clean up common/ images - moving, deleting, renaming as necessary
Sarina Canelake committed -
Sarina Canelake committed
-
OPEN-328
Sarina Canelake committed -
OPEN-328
Sarina Canelake committed -
spinner.gif and spinner-on-grey.gif are the same file. Explicitly give the LMS a spinner.gif file. OPEN-328
Sarina Canelake committed -
OPEN-328
Sarina Canelake committed -
OPEN-328
Sarina Canelake committed -
Corrected Import Statement
Ben Patterson committed -
Ben Patterson committed
-
MA-157 Move context back into properties.
Nimisha Asthagiri committed -
Clinton Blackburn committed
-
- 09 Dec, 2014 9 commits
-
-
Move app-generated context back into properties. Ignore BI events through segment's webhook. Ignore events without Data in Properties.
Nimisha Asthagiri committed -
Release 2014-12-10
Clinton Blackburn committed -
This commit puts a limit on the size of files that course staff can upload to MongoDB. The limit is enforced on the frontend in javascript as well as backend via the /upload endpoint. The limit is hard-coded in cms/envs/common.py and may be changed according to the user's custom needs. If the user tries to upload a file that's too large, an error message will pop up, with a customizable url that pointing the user to an external page with an alternate upload procedure. This url is specified im cms/envs/common.py. If not set, this url will not be displayed.
Jim committed -
Fix assert.
Clinton Blackburn committed -
Assert mistakenly had comma instead of double-equal - now correct.
John Eskew committed -
Legacy dash cleanup
Sarina Canelake committed -
Adam/add defunct states for cart
Adam committed -
Sarina Canelake committed
-
Brian Talbot committed
-