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

8178 Commits

Author SHA1 Message Date
Dave St.Germain
be239bdbca remove old version of codemirror, to prevent confusion 2014-03-11 09:31:29 -04:00
Valera Rozuvan
fc4686b8e2 Add a missing comment documenting the changes done in PR 2841. 2014-03-11 15:20:59 +02:00
Valera Rozuvan
1136336fc4 Converting collapsible module to JavaScript. 2014-03-11 11:28:46 +00:00
Valera Rozuvan
cf47f522c0 Fix Firefox YouTube default Flash mode 
BLD-895
 2014-03-11 10:47:47 +00: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
David Baumgold
2f3d2ecac0 Fix undefined references to pytz 2014-03-10 16:19:10 -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
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
ichuang
cac669364f more robust capa math preprocessor test, and new test for inline 2014-03-10 09:52:25 -04:00
Dave St.Germain
aaf4515ac3 remove old version of codemirror, to prevent confusion 2014-03-10 09:43:56 -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
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
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
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
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
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
polesye
fe8e6026a1 BLD-852: Fix video positioning in full view mode. 2014-03-07 15:17:39 +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
Sarina Canelake
29be1288ba Clean up quality violations in split_test module 2014-03-06 18:42:59 -05:00
Don Mitchell
d754791213 Make course_id a required arg to split.create_course 
and remove attempt to make it unique. Instead raise exception on dupe.
STUD-1359
 2014-03-06 17:21:10 -05: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
b0af8ff421 Merge pull request #2702 from carsongee/cg/cas_fixes 
Correct misaligned django-cas integration
 2014-03-06 16:17:13 -05:00
Alexander Kryklia
683f12ec70 Fix typo in transcripts_utils. 2014-03-06 18:26:04 +02:00
Bertrand Marron
efa8bd6755 Add method to clear mako template lookups 
Quick and dirty fix (edxapp.startup.run is called twice, once before
loading the configuration, so the paths defined in lms.startup are
basically ignored).
 2014-03-06 17:09:40 +01:00
zubair-arbi
06c0aa530a Merge pull request #2803 from edx/zub/bugfix/std1248-handoutlocmapp 
add location of handouts in loc_mapper
 2014-03-06 16:43:15 +05:00
Valera Rozuvan
b4c8e63f9f Merge pull request #2744 from edx/valera/move_slider_and_vcr_to_start_time_2 
Show start time or starting position on slider and VCR
 2014-03-06 13:42:40 +02:00
zubiar-arbi
c17cb38cd9 add location of handouts in loc_mapper 
STUD-1248
 2014-03-06 15:53:45 +05:00
Valera Rozuvan
b85130bb29 Show start time or starting position on slider and VCR. 
When the start time is set, or a initial position is
set,the VCR timer and the time slider should jump to
correct starting point before the video starts playing.

BLD-823
 2014-03-06 12:33:22 +02:00
zubiar-arbi
84a70279f6 properly set tinymce editor startContent 
STUD-1336
 2014-03-06 15:09:04 +05:00
Sef Kloninger
f484807419 make embargo template theme-able 
Use "Stanford-style" theming to enable you to put your own embargo
notice up.
 2014-03-05 15:22:22 -08:00