Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,775 Commits 1 Branch 0 Tags
2ae18c005fe6045787e1aaa7f8d8f1f35018a246
Commit Graph

7771 Commits

Author SHA1 Message Date
Giulio Gratta
2ae18c005f change 'modal' wording to something more general and less jargony 2014-03-11 11:05:42 -07:00
frances botsford
28382316aa Merge pull request #2867 from edx/frances/feature/lms-inst-dash-cleanup 
cleanup of instructor dash membership
 2014-03-11 13:38:36 -04:00
Frances Botsford
fd1014457d cleanup of instructor dash membership 2014-03-11 13:05:30 -04:00
Gabe Mulley
779d0aab7f Merge pull request #2827 from mulby/gabe/report-downloads 
Generalize grade report to allow display of any report
 2014-03-11 11:23:58 -04:00
Gabe Mulley
d0b12ee3be Generalize grade report to allow display of any report 
We would like to be able to generate arbitrary reports and expose them to the instructor by simply uploading them to S3.  The existing grade download infrastructure pretty much supported that already, however, all of the internal and external structures were referring to the reports as exclusively grading related.

Fixes: AN-590
 2014-03-11 10:14:37 -04:00
Dave St.Germain
26b49c8b87 Merge pull request #2884 from edx/dcs/fix-update-css 
Fixed course update css to match changed tags
 2014-03-11 09:26:15 -04:00
Dave St.Germain
a6977baed0 Fixed course update css to match changed tags 2014-03-11 09:25:54 -04:00
Usman Khalid
c85905d648 Merge pull request #2877 from edx/usman/lms2327-instructor-dashboard-problem-urls 
Fixed module urls creation in legacy instructor dashboard.
 2014-03-11 15:24:59 +05:00
Dave St.Germain
cc76690db7 Merge pull request #2874 from edx/dcs/remove-old-codemirror 
remove old version of codemirror css, to prevent confusion
 2014-03-10 17:13:16 -04:00
Calen Pennington
31a070d480 Merge remote-tracking branch 'edx/release' into merge-release-2014-03-10 
Conflicts:
	cms/envs/common.py
	lms/envs/common.py
 2014-03-10 16:21:08 -04:00
Calen Pennington
0a79b30ec4 Delay import of xmodule packages until after sys.path fixup 2014-03-10 12:04:00 -04:00
Xavier Antoviaque
73f75f23bb Update import location of prefer_xmodules 2014-03-10 12:01:56 -04:00
Xavier Antoviaque
c3ae0306f1 Only add mentoring application to INSTALLED_APPS when in virtualenv 2014-03-10 12:01:56 -04:00
Usman Khalid
8824973759 Fixed module urls creation in legacy instructor dashboard. 
LMS-2327
 2014-03-10 19:22:57 +05:00
Dave St.Germain
aaf4515ac3 remove old version of codemirror, to prevent confusion 2014-03-10 09:43:56 -04:00
Usman Khalid
7b185db751 Refactored permissions check for course_wiki pages. 
CourseRole names have a new format (type_org.number.run). Previously
when checking if a user was staff for a course wiki type_org/number/run
and type_number format role names were checked by parsing user group names.

This logic has been refactored to first fetch all courses which use the
particular wiki_slug and then use courseware.access.has_access to check if the
user has staff permissions on any of the courses.

LMS-2136
 2014-03-10 16:13:17 +05:00
Sarina Canelake
472d8f5f52 Minor changes to instructor Analytics tab 2014-03-08 08:51:36 -05:00
Sarina Canelake
2da9042cc6 Merge pull request #2863 from edx/sarina/violations 
Fix some simple pep8 and pylint violations
 2014-03-07 17:27:05 -05:00
Han Su Kim
2eaddefb3d Merge pull request #2866 from edx/release 
Release Hotfix-03-06-2014
 2014-03-07 15:15:57 -05:00
Sarina Canelake
6be6ec4e79 Minor changes to instructor Analytics tab 2014-03-07 14:44:21 -05:00
Han Su Kim
f42d42d1f8 Merge branch 'master' into release 
Conflicts:
	cms/envs/common.py
	lms/envs/common.py
 2014-03-07 14:39:09 -05:00
Ned Batchelder
13c076e628 Merge pull request #2736 from johncox-google/johncox/feature/auth 
Add auth module
 2014-03-07 14:28:41 -05:00
jmclaus
3a740c0479 BLD-844: Add possibility to download transcripts in different formats. 2014-03-07 19:22:22 +01:00
Sarina Canelake
87495891b6 Fix some simple pep8 and pylint violations 2014-03-07 12:20:28 -05:00
Calen Pennington
6e94919561 Delay import of xmodule packages until after sys.path fixup 2014-03-07 11:46:00 -05:00
Xavier Antoviaque
81cfb6c3bd Update import location of prefer_xmodules 2014-03-07 11:06:06 -05:00
Xavier Antoviaque
bde9513539 Only add mentoring application to INSTALLED_APPS when in virtualenv 2014-03-07 11:06:05 -05:00
Sarina Canelake
502384b889 Rename "Forum" roles on inst dash LMS-2092 2014-03-07 10:03:06 -05:00
Sarina Canelake
b227c311b1 Merge pull request #2858 from edx/sarina/lms-2109 
Adjust wording around grade reports LMS-2109
 2014-03-07 09:30:56 -05:00
Anton Stupak
58eaaf29ff Merge pull request #2813 from edx/anton/fix-transcript-in-full-screen-mode 
Fix video positioning in full view mode.
 2014-03-07 16:27:57 +02:00
Sarina Canelake
69e7b73e9d Adjust wording around grade reports LMS-2109 2014-03-07 08:31:22 -05:00
polesye
fe8e6026a1 BLD-852: Fix video positioning in full view mode. 2014-03-07 15:17:39 +02:00
Sarina Canelake
c34fef6c72 Merge pull request #2850 from edx/sarina/lms-1548 
Fix "Course started?" display on beta dash LMS-1548
 2014-03-07 08:10:38 -05:00
polesye
65adb7b272 BLD-896: Fix cc button in HTML5 videos. 2014-03-07 11:24:30 +02:00
John Cox
8ecfa8679a Add common/djangoapps/third_party_auth; update pylintrc to allow test_* names. 
third_party_auth contains a working settings mechanism, the start of the provider interface + 3 implementations (Google, Mozilla Persona, LinkedIn), and a stub for the auth pipeline. Modified existing lms settings files to use but deactivate the module.
 2014-03-06 17:20:58 -08:00
Sarina Canelake
4121df4788 Fix "Course started?" display on beta dash LMS-1548 2014-03-06 19:48:35 -05:00
Sarina Canelake
29be1288ba Clean up quality violations in split_test module 2014-03-06 18:42:59 -05:00
Han Su Kim
bf754c867b Merge pull request #2848 from antoviaque/xblock-mentoring-optionalapp-fix 
Only add mentoring application to INSTALLED_APPS when in virtualenv
 2014-03-06 18:26:11 -05:00
Xavier Antoviaque
76ae57c7ec Update import location of prefer_xmodules 2014-03-06 18:49:39 -04:00
Carson Gee
b3ac3b6f4d Merge pull request #2283 from carsongee/cg/feature/git_branch_import 
Add option for importing a course from a named branch of a git repo
 2014-03-06 17:38:34 -05:00
Carson Gee
b67b89e562 Fixed bug of checking out the same branch multiple times and code review fixes 
Translator comments and language fixes
 2014-03-06 17:30:07 -05:00
Xavier Antoviaque
62628f6bd2 Only add mentoring application to INSTALLED_APPS when in virtualenv 2014-03-06 18:23:33 -04:00
Han Su Kim
0db4a899f4 Merge branch 'release' 2014-03-06 16:57:06 -05:00
Han Su Kim
bdfd81d2f3 Merge remote-tracking branch 'origin/master' into release, conflicts resolved 
Conflicts:
	cms/envs/common.py
	common/lib/xmodule/xmodule/seq_module.py
	lms/envs/common.py
	requirements/edx/edx-private.txt
 2014-03-06 16:56:16 -05:00
Carson Gee
9d55c88c76 Add option for importing a course from a named branch of a git repo 2014-03-06 16:26:25 -05:00
Carson Gee
b0af8ff421 Merge pull request #2702 from carsongee/cg/cas_fixes 
Correct misaligned django-cas integration
 2014-03-06 16:17:13 -05:00
Ned Batchelder
9425974b40 Merge pull request #2837 from ionis-education-group/shopping-cart-unicode-fix 
Fix unicode issue in shopping cart
 2014-03-06 14:16:53 -05:00
Bertrand Marron
01c5cd5dc4 Fix unicode issue in shopping cart 
Fails when course name contains non-ascii characters.
 2014-03-06 11:46:53 +01:00
David Adams
dcb169fb37 Moved CLASS_DASHBOARD setting into the FEATURES dict. 2014-03-05 15:47:23 -08:00
Don Mitchell
b44780812c Merge pull request #2738 from edx/dbarch/mixed_ms_router 
Dbarch/mixed ms router
 2014-03-05 17:17:07 -05:00