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

22396 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Rossi
7cb052e5fc Upgrade JSDraw. 2014-04-11 17:04:11 -04:00
chrisndodge
718bca63b7 Merge pull request #3279 from edx/waheed/lms2521-staff-grading-panel-broken-fixed 
Fixed import of "dog_stats_api" in staff_grading_service.py.
 2014-04-09 09:37:15 -04:00
Waheed Ahmed
9067ebe815 Fixed import of "dog_stats_api" in staff_grading_service.py. 
LMS-2521
 2014-04-09 18:11:40 +05:00
Julia Hansbrough
745924b7ab Merge pull request #3265 from edx/flowerhack/refund-message-patch 
Revert refund instruction message
 2014-04-08 15:52:34 -04:00
Julia Hansbrough
d71aa87748 Revert refund instruction message 2014-04-08 19:34:55 +00:00
Chris Dodge
a904fa09bd Revert "updated pdf viewer" 
This reverts commit b0a7443570.
 2014-04-08 12:59:04 -04:00
Diana Huang
9c0ec682af Merge pull request #3256 from edx/diana/fix-grading-service-login 
Return correct response when using _try_with_login
 2014-04-08 12:02:40 -04:00
Christina Roberts
550f9d7e0b Merge pull request #3244 from edx/christina/latex-bug-release 
Fix source editor for the case of no CodeMirror editor.
 2014-04-08 11:43:18 -04:00
Sarina Canelake
d296eea6a8 Merge pull request #3253 from edx/sarina/fix-capa-calls 
Explicitly declare `tags` in dog stats increment calls
 2014-04-08 11:30:55 -04:00
Diana Huang
ef3a2b8545 Use the correct response when using login. 2014-04-08 11:18:55 -04:00
cahrens
e008de88e6 Fix source editor for the case of no CodeMirror editor. 
In the HTML component, there is no longer a tabbed CodeMirror Editor. STUD-1516.
 2014-04-08 10:43:33 -04:00
Sarina Canelake
f617047f28 Explicitly declare tags in dog stats increment calls 2014-04-08 10:38:14 -04:00
Stephen Sanchez
3f0a40513e Updating ORA2 requirements for patch fix 2014-04-08 10:11:42 -04:00
Sarina Canelake
c51d418163 Merge pull request #3235 from edx/sarina/040714-language-update 
Sarina/040714 language update
 2014-04-07 14:44:41 -04:00
Dave St.Germain
25f722d35d Merge pull request #3212 from edx/dcs/log-codejail 
This should enable logging of codejail on prod
 2014-04-07 14:14:02 -04:00
Stephen Sanchez
64dd8d8005 Merge pull request #3236 from edx/sanchez/ora2-2014-04-07 
Updating the release with a tagged hash
 2014-04-07 13:43:48 -04:00
Sarina Canelake
42728d6826 Update translations (autogenerated message) 2014-04-07 13:19:25 -04:00
Sarina Canelake
d7f499f276 Don't pull unreviewed languages from Transifex 2014-04-07 13:19:25 -04:00
Greg Price
a77968660f Merge pull request #3228 from edx/gprice/FOR-542 
Change behavior of cohort addition interface
 2014-04-07 12:54:38 -04:00
Greg Price
707ee5f2c7 Change behavior of cohort addition interface 
Instead of noting users that are already in a cohort and not changing
such users, clobber the previous cohort and display a message indicating
the previous cohort membership.

JIRA: FOR-452
 2014-04-07 11:40:51 -04:00
Stephen Sanchez
af17ae9f6a Updating the release with a tagged hash 2014-04-07 11:38:21 -04:00
Stephen Sanchez
862828dbbe Merge pull request #3233 from edx/sanchez/update-ora2 
Updating the ORA2 hash for release week 2014-04-07
 2014-04-07 11:20:21 -04:00
Anton Stupak
1b28b6a7a7 Merge pull request #3215 from edx/anton/fix-test-video-position 
Video: Fix flaky test.
 2014-04-07 18:02:52 +03:00
Dave St.Germain
ad186e236e Merge pull request #2986 from edx/dcs/a11y-pdfreader 
Accessible PDF textbook viewer
 2014-04-07 10:32:28 -04:00
polesye
6a207714a3 BLD-970: Fix flaky test. 2014-04-07 17:03:40 +03:00
Stephen Sanchez
6c43f279d4 Updating the ORA2 hash for release week 2014-04-07 2014-04-07 09:57:55 -04:00
Waheed Ahmed
059c5ce840 Merge pull request #3065 from edx/waheed/lms2442-fix-is_authenticated-in-roles 
Change user.is_authenticated to user.is_authenticated() in roles.py.
 2014-04-07 13:05:31 +05:00
Waheed Ahmed
c0b50c7f62 Change user.is_authenticated to user.is_authenticated() in roles.py. 
LMS-2442
 2014-04-07 12:20:20 +05:00
Christina Roberts
c73ac2af62 Merge pull request #3208 from edx/christina/container-reorder 
Move overview drag and drop code to a utility class.
 2014-04-06 13:41:14 -04:00
Jay Zoldak
d45cd90df1 Merge pull request #3218 from edx/zoldak/bok-choy-contentstore 
Fix the pointer to the contentstore in the bok-choy settings
 2014-04-05 20:21:58 -04:00
cahrens
aade444f00 Move overview drag and drop code to a utility class. 2014-04-05 17:03:18 -04:00
srpearce
2f16bbe184 Merge pull request #3226 from edx/sylvia/documentation/DOC-269 
Updates to ORA2 documentation
 2014-04-04 17:04:35 -04:00
Alison Hodges
f75561ab00 Merge pull request #3221 from edx/ahodges/documentation/excel 
AN-836: draft info about spreadsheets and UTF8, illustrations
 2014-04-04 16:53:03 -04:00
Alison Hodges
1580ee6e8b AN-836: draft info about spreadsheets and UTF8, illustrations 2014-04-04 16:52:11 -04:00
Sylvia Pearce
b02d609eeb Updates to ORA2 documentation 2014-04-04 16:49:18 -04:00
Alison Hodges
e1887d81ce Merge pull request #3223 from edx/ahodges/documentation/spacing 
Stray space made html file formatting incorrect
 2014-04-04 16:18:52 -04:00
chrisndodge
c407e89889 Merge pull request #2781 from edx/cdodge/password-history-enforcements 
Add some optional policies around password resets, such as password reus...
 2014-04-04 16:14:43 -04:00
Alison Hodges
5f95d2a2de Stray space made html file formatting incorrect 2014-04-04 15:44:04 -04:00
Giulio Gratta
d2bac9bf8d Merge pull request #2552 from edx/giulio/edit-in-cms-links 
Add "View in Studio" links throughout LMS
 2014-04-04 11:25:28 -07:00
frances botsford
562875e635 Merge pull request #3184 from edx/frances/fix/lms-wiki-icons 
Remove double icons on LMS wiki page
 2014-04-04 13:32:37 -04:00
Giulio Gratta
3456c1173b Added "Edit in CMS" links throughout courseware 2014-04-04 10:23:51 -07:00
Jay Zoldak
72259b2fe1 Fix the pointer to the contentstore in the bok-choy settings 2014-04-04 12:30:09 -04:00
David Baumgold
6292e55997 Merge pull request #3204 from edx/db/upgrade-django-nose 
Upgrade django_nose to 1.2
 2014-04-04 10:43:37 -04:00
Anton Stupak
40d5f1e564 Merge pull request #3195 from edx/anton/force-flash 
Force video player in flash mode.
 2014-04-04 15:29:48 +03:00
polesye
d55554705f BLD-958: Force video player in flash mode. 2014-04-04 14:53:14 +03:00
Usman Khalid
da470afc4f Merge pull request #3187 from edx/adam/fix-alter-xblock-student-state 
Adam/fix alter xblock student state
 2014-04-04 15:29:34 +05:00
Usman Khalid
b3075e286b Merge pull request #3205 from edx/usman/lms2498-mako-template-tests 
Test that TemplateLookup dirs are not cleared during lms startup
 2014-04-04 15:22:12 +05:00
Anton Stupak
ec6388b87d Merge pull request #3153 from edx/anton/caption_refactor 
Refactor video caption module.
 2014-04-04 13:03:02 +03:00
Dave St.Germain
011a2fcf13 This should enable logging of codejail on prod 2014-04-03 16:33:37 -04:00
Julia Hansbrough
dd7bae432d Merge pull request #3164 from edx/flowerhack/better-xmodule-metrics 
XModule datadog metrics
 2014-04-03 16:04:06 -04:00