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

27358 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cahrens
07b036f380 Return the filename as returned from default storage's save. 
It might be different from the requested filename.
 2014-12-10 15:23:56 -05:00
cahrens
e472937854 Add DEFAULT_FILE_STORAGE configuration. 
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.
 2014-12-10 15:23:48 -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
Christine Lytwynec
5007e98034 Merge pull request #6173 from edx/clytwynec/add_find_fixme_method 
add find_fixme task
 2014-12-10 11:08:25 -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
Christine Lytwynec
7cb26650e4 Updating testing.md for find_fixme 2014-12-10 10:43:16 -05:00
Christine Lytwynec
7f23c88dd3 add find_fixme task 2014-12-10 10:43:16 -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
dfc4da1574 Merge pull request #6135 from edx/sarina/categorize-common-images 
Clean up common/ images - moving, deleting, renaming as necessary
 2014-12-09 23:28:28 -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
Sarina Canelake
7779f742c9 Rename pl-faculty.png to placeholder-faculty.png 
OPEN-328
 2014-12-09 22:28:09 -05:00
Sarina Canelake
5106710d13 Move wiki icons to the LMS, where they are used 
OPEN-328
 2014-12-09 22:28:08 -05:00
Sarina Canelake
0c535e44d5 Remove duplicate image files 
spinner.gif and spinner-on-grey.gif are the same file.
Explicitly give the LMS a spinner.gif file.

OPEN-328
 2014-12-09 22:28:08 -05:00
Sarina Canelake
f5588ed4fe Remove image that is duplicated in LMS and CMS 
OPEN-328
 2014-12-09 22:28:08 -05:00
Sarina Canelake
a790d9f8fb Move images from common to LMS that are only used in LMS 
OPEN-328
 2014-12-09 22:28:08 -05:00
Ben Patterson
cdca3fcbc2 Merge pull request #6208 from edx/clintonb/release-fix 
Corrected Import Statement
 2014-12-09 21:29:46 -05:00
Ben Patterson
6e1471edc4 Fix import statement. 2014-12-09 21:20:00 -05:00
Nimisha Asthagiri
c6f991fc8f Merge pull request #6172 from edx/mobile/update-analytics 
MA-157 Move context back into properties.
 2014-12-09 20:25:06 -05:00
Clinton Blackburn
947064f6ab Corrected Import Statement 2014-12-09 20:19:00 -05:00
Nimisha Asthagiri
a6003991a5 MA-157 Mobile analytics end-to-end. 
Move app-generated context back into properties.
Ignore BI events through segment's webhook.
Ignore events without Data in Properties.
 2014-12-09 18:44:06 -05:00
Clinton Blackburn
fc242ea23e Merge branch 'release' 
Release 2014-12-10
 2014-12-09 17:39:17 -05:00
Clinton Blackburn
ea18e5c356 Merge pull request #6203 from edx/jeskew/fix_pylint_error 
Fix assert.
 2014-12-09 16:02:07 -05:00
John Eskew
2c09c5674a Fix assert. 
Assert mistakenly had comma instead of double-equal - now correct.
 2014-12-09 15:57:56 -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
Adam
4654593538 Merge pull request #6151 from edx/adam/add-defunct-states-for-cart 
Adam/add defunct states for cart
 2014-12-09 14:21:13 -05:00
Sarina Canelake
a1c8f8c468 Style cleanups: legacy instructor dashboard 2014-12-09 13:57:21 -05:00
Brian Talbot
a5913a4836 LMS: adding in basic is-deprecated visual styling 2014-12-09 13:57:20 -05:00
Sarina Canelake
919e411fd9 Only show "Course Statistics at a Glance" in the Admin tab 2014-12-09 13:57:20 -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
3474601321 Add CSS rules for legacy dash deprecation warnings 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
Clinton Blackburn
9a309448b6 Merge pull request #6200 from edx/jeskew/fix_500_error_mongo_fmt_change 
Upon fail-over check, change asset metadata document to new format.
 2014-12-09 12:15:59 -05:00
John Eskew
755241f5eb Upon fail-over check, change asset metadata document to new format. 2014-12-09 11:24:30 -05:00
jmclaus
910466e0d8 Merge pull request #5829 from edx/jmclaus/load_ova_js_from_templates_with_requirejs 
In LMS, load OVA JS only in four OVA templates with requireJS. [TNL-693-outdated]
 2014-12-09 11:03:35 -05:00
Clinton Blackburn
5110632ecf Merge pull request #6197 from edx/talbs/fix-lms-calculator-toggle 
FIX - LMS: removing un-needed utility Sass mixin from calc styling
 2014-12-09 09:55:06 -05:00
jmclaus
082cb3b9ed Load OVA JS with requireJS in LMS. 2014-12-09 09:49:45 -05:00
Brian Talbot
39125bcc0a LMS: removing un-needed utility Sass mixin from calc styling 2014-12-09 09:41:57 -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
Will Daly
26dfb3b346 Merge pull request #6194 from edx/will/ecom-757 
ECOM-757: Fix reference error with emailOptIn variable
 2014-12-09 09:04:26 -05:00
Will Daly
0fd6dddbae Fix reference error with emailOptIn variable 2014-12-09 08:31:03 -05:00
Waheed Ahmed
b0eba8a62e Merge pull request #6114 from edx/waheed/tnl892-fix-css-background-image-for-important-visual-indicator 
Added IMG tag instead of css background property for important visual indicator.
 2014-12-09 14:11:39 +05:00