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

7489 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
ee618d4223 Merge pull request #1069 from MITx/feature/cas/tom/lms-styles 
added basic lms styles
 2012-11-26 06:57:57 -08:00
Tom Giannattasio
86ebba3f0e removed askbot 2012-11-26 09:55:37 -05:00
Calen Pennington
c6a9f722cc Merge pull request #1049 from MITx/feature/jzoldak/cms-unit-testing 
Add Studio integration with factory boy for creating XModule objects in the data store
 2012-11-26 06:54:50 -08:00
Calen Pennington
2b6e2b5143 Merge pull request #1056 from MITx/bugfix/ichuang/xml_importer 
xml_importer bugfix - when importing without policy override use course_location
 2012-11-26 06:54:22 -08:00
chrisndodge
b250cad6ee Merge pull request #1075 from MITx/fix/cdodge/env-bad-checkin 
fix edit conflict
 2012-11-26 06:44:59 -08:00
Chris Dodge
2524cd614a fix edit conflict 2012-11-26 09:36:59 -05:00
Tom Giannattasio
a98cead8ee added basic lms styles 2012-11-20 13:02:08 -05:00
Calen Pennington
4e876b056e Merge pull request #1062 from MITx/fix/cdodge/xmodule-script-load-bug 
insert the xmodule.coffee dependency into HTMLSnippet().get_javascript()...
 2012-11-19 12:52:36 -08:00
Chris Dodge
ec6b1a12e9 insert the xmodule.coffee dependency into HTMLSnippet().get_javascript(). This allows us a single point to define this dependency. 2012-11-19 15:46:57 -05:00
ichuang
f84f08fae4 xml_importer bugfix - when importing without policy override use course_location 2012-11-17 21:38:15 -05:00
Calen Pennington
650f537763 Merge pull request #1043 from MITx/feature/cale/quieter-jasmine-tests 
Make jasmine testing quieter
 2012-11-16 13:35:45 -08:00
Calen Pennington
3b2b8ad4fa Merge pull request #1053 from MITx/feature/jzoldak/common-jasmine-tests 
Capa Problem jasmine tests running independently
 2012-11-16 13:35:19 -08:00
Calen Pennington
719277876f Merge pull request #1051 from MITx/fix/cdodge/code-mirror-crash-on-style-blocks 
remove 'mode' property when creating a new CodeMirror control. This appe...
 2012-11-16 12:52:33 -08:00
Jay Zoldak
8d0abcb974 Merge branch 'feature/cale/cms-master' into feature/jzoldak/common-jasmine-tests 2012-11-16 15:10:19 -05:00
Jay Zoldak
ea4c0ed86a Refactor fixtures for capa problems. 2012-11-16 14:59:46 -05:00
Jay Zoldak
a10a3209aa Fix all but 4 broken tests. 2012-11-16 14:47:09 -05:00
Jay Zoldak
6ae0add931 Fix the new problem create statements in the describe blocks for the capa display spec. 2012-11-16 13:26:16 -05:00
Jay Zoldak
718ce4db28 Get Problem constructor working again, and copy the helper file from lms. 2012-11-16 13:02:38 -05:00
Calen Pennington
0fff578e7d Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	.gitmodules
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/sass/course.scss
	lms/urls.py
 2012-11-16 09:03:15 -05:00
Chris Dodge
975d75c116 When importing a course, we need to set the 'display_name' on the static tab module from the course module's policy. This isn't ideal, but the static tab definition on disk does not encapsulate the tab's display name on the LMS - we have to take it from the course 2012-11-15 21:45:20 -05:00
Chris Dodge
2a35132b2a When importing a course, we need to set the 'display_name' on the static tab module from the course module's policy. This isn't ideal, but the static tab definition on disk does not encapsulate the tab's display name on the LMS - we have to take it from the course 2012-11-15 21:44:20 -05:00
Chris Dodge
9ae8558382 put htmlmixed.js and css.js includes in CMS base.html so that we can support html mode in CodeMirror 2012-11-15 20:35:45 -05:00
David Ormsbee
7c7ca3ff6b Merge pull request #1052 from MITx/feature/victor/actual-askbot-removal 
Removing Askbot
 2012-11-15 13:56:58 -08:00
Jay Zoldak
bf6a147c85 Modify rake file to read in spec and src files correctly and also add in the lms helper file for stubRequests, etc. 2012-11-15 15:43:39 -05:00
Chris Dodge
0be0889d9c in order to support CodeMirror mode of 'text/html' we also have to include 'htmlmixed.js' as well as 'css.js' from the CodeMirror distro 2012-11-15 15:21:40 -05:00
David Ormsbee
eff3a7c3c7 Batch together alter statements to minimize how long we lock the auth_users table 2012-11-15 14:55:21 -05:00
David Ormsbee
156dc1fb6c Merge branch 'master' into feature/victor/actual-askbot-removal 
Conflicts:
	lms/envs/aws.py
 2012-11-15 14:24:55 -05:00
Chris Dodge
39c33b42b2 remove 'mode' property when creating a new CodeMirror control. This appears to completely crash if the user puts in a <style ...> tag in the input. This was causing imported static tabs to not be editable 2012-11-15 13:56:42 -05:00
David Ormsbee
dbe7346aae Merge pull request #1050 from MITx/bridger/feature/progress_percent_fix 
Fixed redunant rounding of final grade percent, which was causing floating point weirdness.
 2012-11-15 10:29:24 -08:00
Bridger Maxwell
ba57e8a7a5 Fixed redunant rounding of final grade percent, which was causing floating point weirdness. 2012-11-15 13:24:19 -05:00
Jay Zoldak
0654665b20 Enable XModule factories to work with the currently version of Factory Boy at PyPI (1.2.0) so that the code will work with 'pip install factory_boy' 2012-11-15 11:40:29 -05:00
Jay Zoldak
edb9f8ce40 Merge branch 'feature/cale/cms-master' into feature/jzoldak/cms-unit-testing 2012-11-14 15:16:17 -05:00
Jay Zoldak
6f5b3fa1bb Create factory for Xmodule items 2012-11-14 15:12:09 -05:00
Calen Pennington
93cc17cf3b Starting to generate jasmine tests for common/lib 2012-11-14 15:03:55 -05:00
Jay Zoldak
58fef4a32a Create factory for courses 2012-11-14 14:52:24 -05:00
chrisndodge
a1a3b92517 Merge pull request #1046 from MITx/fix/cdodge/asset-embed 
Change the Embed column in assest index page to just display the URL
 2012-11-14 10:38:26 -08:00
Chris Dodge
5c3db6f502 Change the Embed column in assest index page to just display the URL 2012-11-14 13:35:54 -05:00
David Ormsbee
b6ce46ca52 Merge pull request #1040 from MITx/feature/victor/add-test-problems 
Add test files to full test course
 2012-11-14 10:02:06 -08:00
David Ormsbee
1ab7019607 Merge pull request #1044 from MITx/feature/brian/press-updates 
Feature/brian/press updates
 2012-11-14 10:01:16 -08:00
Brian Wilson
08d9cd7e79 clean up commented-out links on main page 2012-11-14 12:01:04 -05:00
Brian Wilson
515d2f4b1e add press mentions for October, update missing logos, and add sorting. 2012-11-14 11:55:08 -05:00
Calen Pennington
630c2fa21e Make jasmine testing quieter 2012-11-13 10:55:17 -05:00
Victor Shnayder
23fa860f2a Add test files to full test course 
- I added them when playing with input types, but never merged them in
 2012-11-13 10:47:42 -05:00
Calen Pennington
5611fce3be Create the test_root/log directory on git checkout 2012-11-13 10:38:07 -05:00
Calen Pennington
3c90e2927a Create the test_root/log directory on git checkout 2012-11-13 10:35:54 -05:00
Calen Pennington
dbcb1adfaf Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	lms/static/sass/course/courseware/_courseware.scss
 2012-11-13 10:22:42 -05:00
Calen Pennington
eb92ad1fd8 Merge pull request #1032 from MITx/feature/jzoldak/cms-unit-testing 
Feature/jzoldak/cms unit testing
 2012-11-13 07:08:52 -08:00
Jay Zoldak
a060b8de9c Use xmodule.templates instead of hard coding them in the test 2012-11-13 08:35:22 -05:00
Brian Wilson
f9f5850a55 update press page mentions through September, and home page pointers for early November. 2012-11-12 23:14:20 -05:00
Arjun Singh
5f97533caa add meta tag for google verification 2012-11-12 13:52:58 -08:00