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

21738 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baumgold
2f3d2ecac0 Fix undefined references to pytz 2014-03-10 16:19:10 -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
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
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
Andy Armstrong
2c9585ea5d Merge pull request #2811 from edx/andya/container-unit-tests 
Add more tests for the container page
 2014-03-07 11:31:41 -05:00
Calen Pennington
5f2de7653f 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-07 11:06:06 -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
9ef1fe0153 Merge pull request #2860 from edx/sarina/lms-2092 
Rename "Forum" roles on inst dash LMS-2092
 2014-03-07 10:54:44 -05:00
Sarina Canelake
e7bc771bb7 Update discussions documentation LMS-2092 2014-03-07 10:22:45 -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
Anton Stupak
b292f6c276 Merge pull request #2792 from edx/anton/fix-cc-button 
Anton/fix cc button
 2014-03-07 12:55:02 +02: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