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

21755 Commits

This Branch
This Branch
All Branches
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
Andy Armstrong
750640b6f0 Merge pull request #2902 from edx/usman/lms2136-wiki-slug-renamespacing-fix 
Do not remap the wiki_slug if reimporting into the same course.
 2014-03-11 13:08:03 -04:00
marco
2f2ce555c1 adjusted visual styling for editing state of xblocks, html, and video components which had extra padding applied to it from the container page xblock styling 
STUD-1410
 2014-03-11 12:00:17 -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
Usman Khalid
cb2243a495 Do not remap the wiki_slug if reimporting into the same course. 
LMS-2136
 2014-03-11 20:47:21 +05: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
Sarina Canelake
e3a70ce6df Fix for CourseFactory bug - course object not saved after setattr called 2014-03-11 10:00:42 -04:00
Dave St.Germain
be239bdbca remove old version of codemirror, to prevent confusion 2014-03-11 09:31:29 -04:00
Calen Pennington
d21e68301e Merge pull request #2885 from cpennington/merge-release-2014-03-10 
Merge release from 2014-03-10
 2014-03-10 16:22:21 -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
Han Su Kim
603a97fa79 Merge pull request #2880 from edx/cale/fix-crazy-items-error 
Cale/fix crazy items error
 2014-03-10 15:34:52 -04:00
Greg Price
08ed1c5439 Merge pull request #2832 from edx/gprice/create-account-lang-pref 
Save language preference on account creation
 2014-03-10 15:13:15 -04:00
Greg Price
fa29a35ab8 Save language preference on account creation 
This is necessary to allow non-browser-based services (e.g. notifier)
to know a user's preferred language even if the user has not explicitly
selected one.
 2014-03-10 13:28:12 -04:00
Sarina Canelake
a10d8d41d2 Merge pull request #2878 from edx/sarina/LMS-2302 
Put language modal in alphabetical order LMS-2302
 2014-03-10 12:51:17 -04:00
Calen Pennington
0a79b30ec4 Delay import of xmodule packages until after sys.path fixup 2014-03-10 12:04:00 -04:00
Calen Pennington
760027bd2a Normalize the representation of Scope.content data in MongoModulestore FieldData 
Without this, the new 'items' field in the course_info xmodule caused
bizarre behavior. If you added the text 'items' to a course_info
section, then the LMS would throw a 500, because the field name isn't
'data', but the stored data is a string, leading to the check of
`key.field_name in self._data`, where key.field_name is the string 'items',
and self._data is the content string.
 2014-03-10 12:01:57 -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
Sarina Canelake
cdfb5c0c07 Put language modal in alphabetical order LMS-2302 2014-03-10 11:07:13 -04:00
ichuang
171650d253 Merge pull request #2870 from edx/bugfix/ichuang/capa-display-status 
fix capa textline display to leave "inline" alone upon status change
 2014-03-10 10:47:47 -04:00
ichuang
c543dbb695 Merge pull request #2869 from edx/bugfix/ichuang/textline-inline-for-jspre 
fix capa textline to properly use inline if specified when using math preprocessor
 2014-03-10 10:47:01 -04:00
Sarina Canelake
ede0916ab8 Merge pull request #2876 from edx/sarina/update-translations-031014 
Update translations (autogenerated message)
 2014-03-10 10:11:40 -04:00
Sarina Canelake
5e8f5611d7 Update translations (autogenerated message) 2014-03-10 10:10:08 -04:00
Sarina Canelake
26773ee172 Merge pull request #2873 from edx/sarina/update-dummy 
Update dummy Esperanto strings
 2014-03-10 09:58:32 -04:00
ichuang
cac669364f more robust capa math preprocessor test, and new test for inline 2014-03-10 09:52:25 -04:00
Sarina Canelake
a2bcf545e4 Update dummy Esperanto strings 2014-03-10 09:21:52 -04:00
jmclaus
76de7f6055 Merge pull request #2855 from edx/anton/fix-fullscreen-in-flash 
Fix video resizing in Flash mode.
 2014-03-10 14:08:18 +01:00
Usman Khalid
8d15acc962 Merge pull request #2559 from edx/usman/lms2136-wiki-access 
Refactor of permissions checking for wiki pages.
 2014-03-10 17:13:40 +05:00
Usman Khalid
d335713da5 Export CourseDescriptor wiki_slug field to xml. 
LMS-2136
 2014-03-10 16:13:18 +05:00
Usman Khalid
8f3cfa5a5f When creating a course in studio set a unique wiki_slug for it. 
Currently wiki_slug is set to course number. However, since multiple
courses can have the same number this may lead to clashes. So wiki_slug
will be set to org.course.name. To maintain the active wiki_slugs for
xml courses this cannot be changed in the CourseDescriptor.

LMS-2136
 2014-03-10 16:13:18 +05: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
Usman Khalid
3c55c91c5a Added get_courses_for_wiki(self, wiki_slug) to mongo, xml and mixed modulestores. 
This method returns a list of courses which use the particular wiki_slug. It is used for
checking permissions in the course_wiki app.

LMS-2136
 2014-03-10 16:13:17 +05:00
Don Mitchell
98c66d9035 Added get_courses_for_wiki method. 
LMS-2136
 2014-03-10 16:13:17 +05:00
polesye
07ed368505 BLD-905: Fix video resizing in Flash mode. 2014-03-09 12:36:17 +02:00
Sarina Canelake
21db0bff78 Merge pull request #2871 from edx/sarina/idash-analytics-wording 
Minor changes to instructor Analytics tab
 2014-03-08 17:05:48 -05:00
Sarina Canelake
472d8f5f52 Minor changes to instructor Analytics tab 2014-03-08 08:51:36 -05:00
ichuang
a35d524de2 fix text-input-dynamath_data test in test_input_templates.py 2014-03-07 22:14:22 -05:00
ichuang
eb1cc23ca5 fix capa textline display to leave "inline" alone upon status change 2014-03-07 21:45:50 -05:00
ichuang
8d0db64f78 fix capa textline to properly use inline if specified when using js preprocessor 2014-03-07 20:08:37 -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
1900f937fc Merge pull request #2868 from edx/sarina/idash-analytics-wording 
Minor changes to instructor Analytics tab
 2014-03-07 14:51:43 -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
Han Su Kim
680005592e Merge pull request #2864 from edx/cale/fix-crazy-items-error 
Cale/fix crazy items error
 2014-03-07 14:23:24 -05:00
jmclaus
9e88fb15c2 Merge pull request #2844 from edx/jmclaus/feature_download_transcript_button_with_options 
Add .txt and .srt options to the "download transcript" button [BLD-844]
 2014-03-07 19:51:18 +01:00
jmclaus
3a740c0479 BLD-844: Add possibility to download transcripts in different formats. 2014-03-07 19:22:22 +01:00
Han Su Kim
ae562f5e5b typo error in this file causing it to fail to install 2014-03-07 12:25:07 -05:00