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

1335 Commits

Author SHA1 Message Date
chrisndodge
13700316a6 Merge pull request #1025 from MITx/feature/cdodge/static-tab-edit 
Feature/cdodge/static tab edit
 2012-11-08 13:10:51 -08:00
Chris Dodge
c3c6a7af7e address feedback from cale 2012-11-08 13:29:46 -05:00
Calen Pennington
171e932266 Merge branch 'master' into feature/cale/cms-master 
Conflicts:
	rakefile
 2012-11-08 12:28:40 -05:00
Calen Pennington
3230345204 Make coverage reports only include code from the source directories 2012-11-08 12:25:12 -05:00
Ned Batchelder
28bb4724e7 Put the coverage data files in the reports dir, where they will be treated like the disposable things they are. 2012-11-08 11:20:23 -05:00
Ned Batchelder
3dc23eb131 Coverage xml and html reports are now a separate 'xml' and 'html' step from 'test'. 2012-11-08 11:20:22 -05:00
Ned Batchelder
90e3386751 WIP for quieter tests with coverage. 2012-11-08 11:19:33 -05:00
Chris Dodge
7dbabce4db fix up styling by reusing existing CSS class names. Also refactor some code regarding the management of static_tabs so that it's in the course as course contains references to static_tabs in the current data model 2012-11-08 09:55:52 -05:00
Carlos Andrés Rocha
25d482099e Merge pull request #955 from MITx/louis/srt_downloads 
Add support for subtitle download link
 2012-11-07 15:31:02 -08:00
Chris Dodge
a99277275d add new files 2012-11-07 15:56:16 -05:00
Chris Dodge
9cc1af5052 first pass at static tab editing. Doesn't yet support drag/drop as well as new tab creation, which needs to modify the policy on the course 2012-11-07 15:27:44 -05:00
Chris Dodge
87ff18dc56 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info 2012-11-07 09:35:21 -05:00
Carlos Andrés Rocha
07da271747 Merge pull request #1022 from MITx/ie8patch 
revert to using getElementsByClassName in .dialog b/c jQuery was
 2012-11-06 14:14:07 -08:00
Don Mitchell
ce623bcf17 revert to using getElementsByClassName in .dialog b/c jQuery was 
undefined on the content passed in & whole widget is disabled in ie8.
 2012-11-06 17:05:44 -05:00
Calen Pennington
bca0134a35 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 2012-11-06 16:13:31 -05:00
Chris Dodge
55c69a1e13 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info 
Conflicts:
	lms/djangoapps/courseware/module_render.py
 2012-11-06 14:20:59 -05:00
Calen Pennington
6212507b55 Merge pull request #1008 from MITx/ie8patch 
merge to master
 2012-11-06 06:18:01 -08:00
David Ormsbee
f38ba3ce5c Merge pull request #1012 from MITx/bugfix/victor/xml-loading 
Fix a bug with pointer-tag detection on load
 2012-11-02 14:04:53 -07:00
Victor Shnayder
55a0cada7b Fix a bug with pointer-tag detection on load 
if a tag has text but no children, wasn't properly detected as an inline definition.
 2012-11-02 16:59:41 -04:00
Calen Pennington
e35d1483c6 Merge pull request #1009 from MITx/bug/lyla/latextemplate 
fixed typo
 2012-11-02 13:38:40 -07:00
Victor Shnayder
9db977feae Merge pull request #1002 from MITx/feature/victor/inputtypes-refactor 
More inputtype refactor …
 2012-11-02 13:05:40 -07:00
Don Mitchell
8089be3354 Minor stylistic change on jQuery pattern. 2012-11-02 15:31:02 -04:00
Victor Shnayder
79174259cb Address Ike's comments. 
- change a few comments / strings
- move extract_choices into the ChoiceGroup class
 2012-11-02 14:00:51 -04:00
Calen Pennington
0bfa443520 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 2012-11-02 11:09:19 -04:00
Victor Shnayder
d05f6c8a06 Merge pull request #1005 from MITx/fix-alex-vsepr-2-mitx 
Fix alex vsepr 2 mitx
 2012-11-01 17:52:16 -07:00
Chris Dodge
b788b9d659 add to existing test cases to exercise the 'course extras as modules' work in the CMS import. Also add to the existing 'full' test data collection to include policy, tabs, etc. 2012-11-01 15:08:26 -04:00
Александр
3ed4b77d8c removed testsing comments 2012-11-01 17:43:41 +02:00
Lyla Fischer
8ed4ef4412 fixed typo 2012-11-01 11:36:41 -04:00
Александр
07a2a105ca added comments 2012-11-01 17:35:27 +02:00
Александр
5ba2c2e785 converted unittests 2012-11-01 16:48:44 +02:00
Александр
5755325a41 changed syntax to support e1,e2 in AX6 and add convert_to_p behavior 2012-11-01 16:26:54 +02:00
David Ormsbee
ddc4f705e0 Remove raise that was there just for debugging purposes 2012-11-01 04:50:23 -04:00
David Ormsbee
8a453e99ca Implement basic ability to close off a forum for a given course such that Students can no longer post or edit, but can still view. 2012-11-01 04:37:16 -04:00
Александр
fa2cf6a49c add convert_to_perepherial flag and removed order flags 2012-11-01 08:22:33 +02:00
Victor Shnayder
b78fb8dff6 Refactored the rest of the input types 2012-11-01 00:05:48 -04:00
Victor Shnayder
3a0999702b Merge remote-tracking branch 'origin/master' into feature/victor/inputtypes-refactor 2012-10-31 23:50:10 -04:00
Victor Shnayder
7fcf02a0cc Further refactor 
- small Attribute and InputTypeBase interface changes to make things cleaner
- move html quoting into templates (use ${blah | h} syntax)
- converting input types to use new format.
 2012-10-31 23:40:19 -04:00
Chris Dodge
17528906ab make sure paths are path() objects rather than strings so that the '/' operator works as expected. Also some path cleanup and remove duplicate computation 2012-10-31 22:16:11 -04:00
Victor Shnayder
74e23546af More inputtype refactor 
- add an Attribute class
- input types just need to declare which attributes they want, and how to transform and validate them, and the base class will do all the rest.
- change OptionInput to new format.
 2012-10-31 18:40:10 -04:00
Victor Shnayder
e4c49f3a1e Merge pull request #1001 from MITx/feature/victor/inputtypes-refactor 
Feature/victor/inputtypes refactor
 2012-10-31 15:18:28 -07:00
Victor Shnayder
cf2402aee9 bugfix: always set queue len 2012-10-31 18:17:12 -04:00
Don Mitchell
2b5e55b662 Use try/catch to detect undefined globals for canvas 2012-10-31 17:29:19 -04:00
Don Mitchell
6bbe82b697 Make work w/ ie8. Still complains that HTMLCanvasElement is undefined 
but doesn't try to manipulate it.
 2012-10-31 17:05:46 -04:00
Chris Dodge
87dadd40c4 address some of Cale's feedback 2012-10-31 14:11:24 -04:00
Carlos Andrés Rocha
e5b11a9c57 Add HD control to video player 2012-10-30 19:21:17 -04:00
Chris Dodge
ba9a03410b remove unneeded debugging traces 2012-10-30 15:56:02 -04:00
Chris Dodge
743f2b56dd make course about view methods render the about content as a module, so we get all the url rewriting goodness. Also, since we're now handling the url re-writing via the module get_html pipelines, we can remove the link rewriting inside the xmodules itself - which is good because there's a wierd bug in lxml.html rewriting 2012-10-30 15:12:13 -04:00
Chris Dodge
f4822c23de lots of tweeks to better support importing of existing courseware 2012-10-30 11:52:31 -04:00
David Ormsbee
535980eb6d Allow optional advertised_start metadata in Course, to let people pre-launch thier courses quietly if desired. 2012-10-30 11:06:50 -04:00
Victor Shnayder
a155265409 minor whitespace + comment fixes 2012-10-29 23:44:38 -04:00