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

27372 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
chrisndodge
b533e337f6 Merge pull request #6198 from edx/afzaledx/WL-105 
WL-105 Show course cards sorted by start dates, oldest first.
 2014-12-11 22:36:22 -05:00
Afzal Wali
51e53587dc WL-105 Show course cards sorted by start dates, oldest first. 2014-12-11 20:05:04 -05:00
Sarina Canelake
5c433ec9a1 Merge pull request #5731 from Stanford-Online/ataki/upstream 
Limit Upload File Sizes to GridFS
 2014-12-11 16:36:30 -05: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
4f823396ed Merge pull request #4276 from edx/db/update-pillow 
Update pillow to 2.6.1
 2014-12-11 10:34:19 -05:00
Clinton Blackburn
5f8d6261d9 Merge pull request #6221 from edx/hotfix/MA-182 
MA-182 Fix Mobile Subtitles.
 2014-12-11 10:29:30 -05:00
Nimisha Asthagiri
aa309a8caf MA-182 Fix Mobile Subtitles. 2014-12-11 08:54:03 -05:00
zubair-arbi
fbc48d5e31 Merge pull request #6092 from edx/zub/bugfix/tnl-884-save-weight-in-gradingpolicy 
round-off weight value while returing grading policy
 2014-12-11 13:14:28 +05:00
zubair-arbi
f62e5347e1 round-off weight, min_count and drop_count values while returing grading policy 
TNL-884
 2014-12-11 12:27:01 +05:00
John Jarvis
c252b717ce Merge pull request #6188 from edx/jarv/config-refactor-wip 
moving defaults for yaml config out of common.py
 2014-12-10 16:47:08 -05:00
John Jarvis
93f0c75fd3 Adding yaml_config, a new settings module 
This reads configuration directly from yaml
and imports it directly into settings
 2014-12-10 16:46:12 -05:00
Christina Roberts
c381ccf723 Merge pull request #6215 from edx/christina/test-file-cleanup 
Add DEFAULT_FILE_STORAGE configuration.
 2014-12-10 16:42:10 -05:00
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
Jim
fb9320afc1 Limit Upload File Sizes to GridFS. 
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.
 2014-12-09 13:30:45 -08: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