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

22819 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sarina Canelake
4121df4788 Fix "Course started?" display on beta dash LMS-1548 2014-03-06 19:48:35 -05:00
Sarina Canelake
78fe797e14 Merge pull request #2846 from edx/sarina/fix-splittest-quality 
Clean up quality violations in split_test module
 2014-03-06 19:48:19 -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
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
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
07cec31887 Add Han Su Kim to AUTHORS 2014-03-06 15:20:36 -05:00
Ned Batchelder
166748a340 Fix Paul-Olivier Dehaye's AUTHOR entry. 2014-03-06 14:26:45 -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
Mark Hoeber
f89396fae8 Merge pull request #2799 from edx/markhoeber/documentation/release-notes-3-4-14 
First Draft release notes 3-3-14
 2014-03-06 14:02:11 -05:00
Mark Hoeber
4db9d0c1a4 Merge pull request #2719 from edx/markhoeber/documentation/stud-1314 
External URL change in Files & Upoads
 2014-03-06 13:04:36 -05:00
Mark Hoeber
dd19ac64e1 External URL change in Files & Upoads 
STUD-1314
 2014-03-06 12:58:26 -05:00
Mark Hoeber
72f127de55 Release notes 3-3-14 
DOC-72
 2014-03-06 12:44:37 -05:00
David Adams
028e6a013f Merge pull request #2835 from edx/dcadams/fix_class_dashboard_setting 
Moved CLASS_DASHBOARD setting into the FEATURES dict.
 2014-03-06 09:06:27 -08: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
Sarina Canelake
d1442e7b2a Merge pull request #2839 from edx/sarina/fix-rake-i18n 
Skip generation of 'eo' files in i18n test suite
 2014-03-06 10:30:07 -05:00
Sarina Canelake
fbc76c5c48 i18n tests don't regenerate checked-in eo files 2014-03-06 09:54:01 -05: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