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

28558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Christine Lytwynec
197f50b980 fix pep8 violation 2014-12-12 16:22:00 -05:00
Daniel Friedman
5be9488f3f Merge pull request #6235 from edx/dan-f/fix-test-typo 
Fix typo in cms unit test
 2014-12-12 15:42:44 -05:00
Christine Lytwynec
b24a237cee Merge pull request #6232 from edx/clytwynec/fix_failing_cohort_test 
fixes failing unit test in course_groups
 2014-12-12 15:21:13 -05:00
Christine Lytwynec
b9668acb32 fix git_export tests 2014-12-12 15:06:49 -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
David Baumgold
48c349ffde Re-add and clarify comment 2014-12-12 14:19:49 -05:00
Daniel Friedman
7e2e90e409 Fix typo in cms unit test 2014-12-12 14:01:42 -05:00
Christine Lytwynec
3c1821a7ed fixes failing unit test in course_groups 2014-12-12 13:34:05 -05:00
Sarina Canelake
035a48046e Merge pull request #6230 from edx/sarina/fix-openedx-logo 
Change openedx footer image to a non-broken link
 2014-12-12 12:58:06 -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
Adam Palay
c1dd64c07a fix enrollment issue in instructor dash (ECOM-776) 2014-12-12 12:14:17 -05:00
Sarina Canelake
d2b119914f Change openedx footer image to a non-broken link 2014-12-12 12:09:15 -05:00
David Baumgold
08a8afa619 For methods on PasswordHistory, only calculate if necessary 
Check settings.FEATURES["ADVANCED_SECURITY"] first
 2014-12-12 11:53:02 -05:00
David Baumgold
e53263d937 Merge pull request #6225 from edx/studio-i18n-improvements 
Don't break up i18n string
 2014-12-12 11:09:58 -05:00
David Baumgold
e8d62ff6a8 Replace — with literal emdash 2014-12-12 11:09:26 -05:00
Jesse Zoldak
b999714e1d Merge pull request #6111 from edx/zoldak/modulestore-test-config 
Unit test speed improvements
 2014-12-12 10:53:24 -05:00
David Baumgold
4fcf1f9eae Move simplefilter comments before call 2014-12-12 10:47:58 -05:00
David Baumgold
838ce74a3f Add comments about disabled pep8 rules 2014-12-12 10:21:34 -05:00
David Baumgold
1fe72d89bf Double quotes for i18n string 2014-12-12 09:44:21 -05:00
David Baumgold
71a74c41c7 Don't break up i18n string 2014-12-12 09:43:27 -05:00
Shrhawk
cc377e8c38 Merge pull request #6211 from Shrhawk/shr/bug/TNL-964-navbar-display-display-issue 
Fix white spaces inside navigation
 2014-12-12 11:52:55 +05:00
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
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
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
4152f5e4e8 Address pylint issue from diff-cover 2014-12-11 13:09:23 -05:00
David Baumgold
530c16326d Ignore "deprecated form of raising exception" PEP8 warning 
We do this intentionally, to preserve tracebacks
 2014-12-11 13:04:53 -05:00
David Baumgold
36e77c7463 Fixing pep8 issues 2014-12-11 13:04:49 -05:00
David Baumgold
d65d3094cf Update pep8 to 1.5.7 2014-12-11 11:36:18 -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
Jesse Zoldak
77bbd30396 Do not create a modulestore unnecessarily in tests 2014-12-10 11:18:12 -05:00
Jesse Zoldak
789a9dc978 Change the default dir for loading xml files. 
This should always be overridden by the testcases if needed.
 2014-12-10 11:18:11 -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