Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,098 Commits 1 Branch 0 Tags
24756bdbea67e525d179db7e7b80574f1a4e29d6
Commit Graph

23098 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sarina Canelake
24756bdbea Update translations (autogenerated message) 2014-05-13 10:01:37 -04:00
Carson Gee
eadf3b59e2 Merge pull request #3464 from mitocw/cg/course_image_fixes 
Additional logic to handle more course_image URL edge cases
 2014-05-13 09:19:07 -04:00
Alison Hodges
489eceee83 Merge pull request #3690 from edx/ahodges/documentation/DOC326 
Added username as option for batch enrollment/unenroll
 2014-05-13 09:13:57 -04:00
Alison Hodges
f3d11250ee Added username as option for batch enrollment/unenroll 2014-05-13 09:13:29 -04:00
Alexander Kryklia
a3004de974 Merge pull request #3488 from edx/alex/paver_dev 
Add dev command to run in native envs.
 2014-05-13 10:53:29 +03:00
Nick Parlante
c30665fb59 Merge pull request #3677 from edx/nick/fix-feedback-bug 
Fix targeted-feedback bug
 2014-05-12 15:23:44 -07:00
Nick Parlante
f48e470f54 Fix targeted-feedback bug 
The bug is with the case of multiple-questions with targeted
feedback within a single problem.

Refactor the targeted-feedback tests to house
the most common xml in external files.

Move the capa test load_fixture function to __init__.py so it
can be used generally.
 2014-05-12 14:26:05 -07:00
Adam
7d6e3319eb Merge pull request #3595 from edx/adam/fix-typo-2 
put google analytics in quotation marks in linkedin email template
 2014-05-12 17:10:41 -04:00
Adam
4ecf41126a Merge pull request #3626 from edx/adam/fix-import-bug 
fix importing bug (STUD-1599)
 2014-05-12 16:54:21 -04:00
Adam
ae542aee3c Merge pull request #3664 from edx/adam-inherit-max-attempts 
add max_attempts to inheritance.py (LMS-2130)
 2014-05-12 16:44:17 -04:00
Carson Gee
f247adc4b7 Merge pull request #1 from edx/ned/tweaks-for-pr-3464 
Simple fixes
 2014-05-12 16:37:51 -04:00
Adam Palay
a51a0c558e fix importing bug (STUD-1599) 
add target_location_namespace check
 2014-05-12 15:59:41 -04:00
Adam Palay
e5fa0c5dd9 add max-attempts to inheritance.py (LMS-2130) 2014-05-12 15:55:15 -04:00
Ned Batchelder
2f7adda00d Simple fixes 
- Ensure temp files are cleaned up.
- Refactor a function with three return statements.
 2014-05-12 15:52:57 -04:00
Greg Price
d9817117ed Merge pull request #3647 from edx/gprice/comment-client-allow-extra-fields 
Allow extra fields returned from comments service
 2014-05-12 14:42:26 -04:00
Mark Hoeber
b00fa60ba5 Merge pull request #3686 from edx/markhoeber/documentation/release-notes-date-fix 
Release notes date fix
 2014-05-12 14:01:09 -04:00
Mark Hoeber
2c83e77c05 Release notes date fix 2014-05-12 13:56:28 -04:00
Mark Hoeber
65e9efb5ec Merge pull request #3601 from edx/markhoeber/documentation/doc-331 
Release Notes for 5-6-14
 2014-05-12 13:49:40 -04:00
Greg Price
57f14bded1 Allow extra fields returned from comments service 
Previously, an error was raised if the comments service returned data
including an unexpected field, which unnecessarily complicated the
release path for new features, since the list of allowed fields would
need to be modified before cs_comments_service could be modified, and
only then could edx-platform take advantage of the new CS feature. We
still log a warning if an unexpected field is returned, so we will
still be able to tell if the CS returns a corrupt response.

JIRA: FOR-180
 2014-05-12 13:49:24 -04:00
Carson Gee
ff1564382d Corrected test names and doc strings 2014-05-12 13:41:23 -04:00
Sarina Canelake
a7590e8588 Merge pull request #2865 from edx/sarina/change-default-dashboard 
WIP Switch default instructor dashboard to new dash
 2014-05-12 13:31:41 -04:00
Sarina Canelake
a5381db070 Only show banner on legacy dash for edx.org 
LMS-1296
 2014-05-12 12:42:19 -04:00
Stephen Sanchez
ea11fd0751 Merge pull request #3684 from edx/ora2/release-2014-05-12T12.57 
Release for May 12, 2014
 2014-05-12 12:35:12 -04:00
Stephen Sanchez
3e13962930 Release for May 12, 2014 2014-05-12 11:39:55 -04:00
Frances Botsford
b90f1e41e5 UI cleanup of new instructor dashboard 
Stylize warning banners; more UI touches for the intructor dash:
clean up nav structure, compact header so content is higher on the page

LMS-1296
 2014-05-12 10:18:28 -04:00
Sarina Canelake
bc0c13828f Add segment.io tracking for legacy instructor dashboard 
LMS-1296
 2014-05-12 10:18:28 -04:00
Sarina Canelake
b7a0de7f3b Change URL patterns for instructor dashboard 
Fix acceptance and unit tests

LMS-1296
 2014-05-12 10:18:28 -04:00
Sarina Canelake
09442ef4ac Port spoc gradebook to new instructor dash 
LMS-1296
 2014-05-12 10:18:28 -04:00
Sarina Canelake
c224fe57ef Add banners to the instructor dashboard 
Notification banner to default dash to announce the change

Warning banner on legacy instruction dashboard to explain it has been deprecated

LMS-1296
 2014-05-12 10:18:27 -04:00
Sarina Canelake
ced09a6b04 Switch default instructor dashboard to new dash 
LMS-1296
 2014-05-12 10:18:27 -04:00
Alexander Kryklia
c13282462a Modify paver run_all_servers to allow different settings for LMS and Studio. 2014-05-12 17:12:40 +03:00
Anton Stupak
d37006c657 Merge pull request #3681 from edx/anton/fix-video-tests 
Video: Fix acceptance tests.
 2014-05-12 17:07:08 +03:00
polesye
2d64a2773f Fix acceptance tests. 2014-05-12 16:22:05 +03:00
Anton Stupak
839887246c Merge pull request #3643 from edx/anton/fix-video-in-ff 
Anton/fix video in ff
 2014-05-12 10:24:47 +03:00
David Ormsbee
77c7ebd704 Merge pull request #2768 from carsongee/cg/ssl-next-url 
Modified ssl certificate authentication to handle next redirection
 2014-05-11 20:12:12 -04:00
Sarina Canelake
b7003a1d76 Merge pull request #3672 from edx/sarina/fix-unicode 
Remove unicode character inserted into video_xfields
 2014-05-09 16:57:12 -04:00
ichuang
34c28cf42d Merge pull request #3068 from edx/fix/ichuang/capa-customresponse-anonid 
allow capa problems access to anonymous_student_id
 2014-05-09 16:21:36 -04:00
David Baumgold
c0a5171c75 Merge pull request #3466 from lduarte1991/lduarte-harvardx 
Reconnecting Token Generator for Annotation Tool
 2014-05-09 16:14:42 -04:00
Sarina Canelake
22d17a21ec Remove unicode character inserted into video_xfields 2014-05-09 15:25:56 -04:00
Andy Armstrong
a454502b63 Merge pull request #3666 from edx/andya/fix-translation-string 
Improve the translatability of Studio's paging header
 2014-05-09 15:16:11 -04:00
Carson Gee
74578cd720 Merge pull request #3493 from carsongee/cg/sysdash_git_info 
Adding additonal path to search for git information on sysadmin dashboard
 2014-05-09 15:14:10 -04:00
Sarina Canelake
193a816395 Merge pull request #3609 from edx/sarina/i18n-cleanup 
Clarify strings for i18n
 2014-05-09 15:00:36 -04:00
Dave St.Germain
eab8445eb1 Merge pull request #3156 from edx/dcs/LMS-1740 
Fixes LMS-1740 by activating the zooming diagram with the spacebar.
 2014-05-09 14:28:24 -04:00
Carson Gee
cbf525f6cf Fix infinite redirect loop on logout caused by django caching 2014-05-09 14:22:11 -04:00
Carson Gee
5452de20d8 Modified ssl certificate authentication to handle next redirection 
Makes small changes in lms and cms both so that user's go to the
original page they intended to if they weren't already logged in
 2014-05-09 14:22:10 -04:00
Ned Batchelder
4ea3945d78 Merge pull request #3667 from edx/ned/more-links-in-pr-guidelines 
Add more links in the PR guidelines.
 2014-05-09 14:01:41 -04:00
Ned Batchelder
c7543dd33d Add more links in the PR guidelines. 2014-05-09 13:53:16 -04:00
Andy Armstrong
e75f273329 Apply Sarina's code review suggestions 2014-05-09 13:39:17 -04:00
Carson Gee
379745e3a4 Merge pull request #2686 from edx/feature/ichuang/add-reset-links-to-staff-debug 
add problem reset link to staff debug page
 2014-05-09 13:29:29 -04:00
srpearce
d756b4a96d Merge pull request #3617 from edx/sylvia/docs/DOC-359 
Sylvia/docs/doc 359
 2014-05-09 13:26:39 -04:00