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

7765 Commits

Author SHA1 Message Date
polesye
ddf41ce9c5 BLD-915: Fix issues with different videoIDs. 2014-03-11 20:21:06 +02:00
Usman Khalid
e117957e2a Fixed module urls creation in legacy instructor dashboard. 
LMS-2327
 2014-03-11 13:40:00 -04:00
Sarina Canelake
e6c9a6c9d9 Merge pull request #2889 from edx/sarina/fix-abtest-for-sequentials 
Bugfix for split test on sequential save
 2014-03-11 11:59:17 -04:00
Sarina Canelake
119ffd4677 Bugfix for split test on sequential save 
Bug would occur when comparing Groups or UserPartitions - because these types
lacked comparator methods, different objects would come up as different when
their values were equal.
 2014-03-11 10:51:39 -04:00
Dave St.Germain
be239bdbca remove old version of codemirror, to prevent confusion 2014-03-11 09:31:29 -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
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
Don Mitchell
43df25d42b Point to prefer_xmodules new locn 2014-03-05 14:40:34 -05:00
Don Mitchell
ca0dd8390f Mixed no longer translates 2014-03-05 14:40:33 -05:00
Don Mitchell
432249e9cf making mixed ms capable of front ending all modulestores for most operations including CRUD 
STUD-600
 2014-03-05 14:32:56 -05:00
Diana Huang
bce7d9e43d Add tests and clean up A/B testing 
Also fixes STUD-1351
 2014-03-05 13:46:03 -05:00
Calen Pennington
2d5c37b2a0 Track renders of split_test children 
[LMS-2098]
 2014-03-05 13:45:08 -05:00
Calen Pennington
d101933617 Add course tags to all events where a course-id can be extracted from the url 
[LMS-2105]
 2014-03-05 13:45:08 -05:00