Chris Dodge
|
79e48dde97
|
move the underscore tempaltes to /static/client-templates and update the references
|
2012-12-10 10:01:08 -05:00 |
|
Chris Dodge
|
402e031ecc
|
forgot to add a if {} guard on the CodeMirror instantiation on one use case
|
2012-12-07 15:27:00 -05:00 |
|
Chris Dodge
|
b81f802b1d
|
get CodeMirror to work - set the right background in the .scss, make sure the textarea is visible before binding it to CodeMirror
|
2012-12-07 14:38:03 -05:00 |
|
Chris Dodge
|
130de49b49
|
support the editing of course handouts via a generic editor until we have implemented the Rich HTML editor completed
|
2012-12-07 09:45:12 -05:00 |
|
Tom Giannattasio
|
7294e978d9
|
fixed firefox bug
|
2012-11-30 13:14:52 -05:00 |
|
Tom Giannattasio
|
63e38822bd
|
course handouts styled and basic view handling added
|
2012-11-30 10:41:10 -05:00 |
|
Don Mitchell
|
d943f44f10
|
Append screw up (naive python goof)
|
2012-11-30 10:41:10 -05:00 |
|
Tom Giannattasio
|
b75bca2583
|
new styles for the handouts sidebar
|
2012-11-30 10:41:10 -05:00 |
|
Tom Giannattasio
|
a25d6b0862
|
wrapped up data syncing and date format issues
|
2012-11-30 10:41:10 -05:00 |
|
Tom Giannattasio
|
335c6949f8
|
started consolidating editor functions
|
2012-11-30 10:41:10 -05:00 |
|
Tom Giannattasio
|
5dd90aa9cb
|
working on date picker; conflicts with ids
|
2012-11-30 10:41:10 -05:00 |
|
Tom Giannattasio
|
3d9961f874
|
started adding date picker
|
2012-11-30 10:41:10 -05:00 |
|
Tom Giannattasio
|
46d4e27cdc
|
update styles fixed; tweaks to white button mixins; add update to top of list; render updates upon save
|
2012-11-30 10:41:10 -05:00 |
|
Tom Giannattasio
|
261c43aade
|
add sidebar column; fixed main column float bug
|
2012-11-30 10:40:19 -05:00 |
|
Tom Giannattasio
|
f32388f2af
|
markup tweaks to fix content crunching
|
2012-11-30 10:40:19 -05:00 |
|
Don Mitchell
|
0b7bff4c3f
|
Everything tested and ready for Tom to fix
|
2012-11-30 10:40:19 -05:00 |
|
Don Mitchell
|
111e8521db
|
Hopefully the course-info changes I had made w/o link destruction
|
2012-11-30 10:40:19 -05:00 |
|
chrisndodge
|
89ad8cc564
|
Merge pull request #1086 from MITx/feature/studio/tom/tabs-cleanup
Static tabs cleanup
|
2012-11-29 06:49:28 -08:00 |
|
Tom Giannattasio
|
6cfabb76c1
|
finished styling for static tabs; required some rework of global styles
|
2012-11-28 15:39:43 -05:00 |
|
Tom Giannattasio
|
6ad8a9aced
|
most of the styling and function changes made
|
2012-11-28 15:10:46 -05:00 |
|
Chris Dodge
|
b3dcc140b7
|
made a special 'module preview' view for Static Tabs in the CMS. Per Tom, he'd like just the Display Name to show up in the static tab editor until the end-user clicks the Edit button
|
2012-11-26 14:22:13 -05:00 |
|
Calen Pennington
|
4e3da342d7
|
Merge pull request #1048 from MITx/feature/cdodge/xlint
Feature/cdodge/xlint
|
2012-11-26 08:11:34 -08:00 |
|
Chris Dodge
|
fff3782884
|
cleave xlint entry point in xml_importer.py to be separate from the import method
|
2012-11-26 11:05:57 -05:00 |
|
Tom Giannattasio
|
f2fec99efa
|
fixed header float bug
|
2012-11-26 10:46:02 -05:00 |
|
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 |
|
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 |
|
Tom Giannattasio
|
a98cead8ee
|
added basic lms styles
|
2012-11-20 13:02:08 -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 |
|
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 |
|
Chris Dodge
|
d21095367a
|
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/xlint
|
2012-11-15 13:16:02 -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 |
|
Jay Zoldak
|
58fef4a32a
|
Create factory for courses
|
2012-11-14 14:52:24 -05: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 |
|
Calen Pennington
|
630c2fa21e
|
Make jasmine testing quieter
|
2012-11-13 10:55:17 -05:00 |
|
Chris Dodge
|
1e598ad1f5
|
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/xlint
|
2012-11-13 10:34:31 -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 |
|
Jay Zoldak
|
5f926ebad0
|
Add better comments and modulestore cleanup.
|
2012-11-09 14:34:04 -05:00 |
|
Chris Dodge
|
da3c3e5f20
|
initial xlint implementation. Accumulate all import errors during XmlModuleStore importing. Also do checks post XmlModuleStore import and assert that the structure (course->chapter->sequential->vertical) is present in the courses.
|
2012-11-09 13:54:12 -05:00 |
|
Jay Zoldak
|
bc34d79dbf
|
Improve assertions by using HTML matchers.
|
2012-11-09 12:14:11 -05:00 |
|
Jay Zoldak
|
58eea1bc80
|
Remove section close tag that had no open tag.
|
2012-11-09 11:40:23 -05:00 |
|
Jay Zoldak
|
f249c227a5
|
Fix typo in close tag in header
|
2012-11-09 11:05:37 -05:00 |
|
Jay Zoldak
|
7efaa87c19
|
Add test for clone item. Also change password hashing for faster tests.
|
2012-11-09 10:54:50 -05:00 |
|
Chris Dodge
|
da8efc17de
|
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/xlint
|
2012-11-09 09:37:21 -05:00 |
|
Chris Dodge
|
01889df686
|
need to pass in course namespace when rewrite static links in the CMS
|
2012-11-09 09:23:48 -05:00 |
|
Jay Zoldak
|
14564b2310
|
Merge branch 'feature/cale/cms-master' into feature/jzoldak/cms-unit-testing
|
2012-11-09 08:58:48 -05:00 |
|
Jay Zoldak
|
ddfbf3b678
|
Add test for course overview page
|
2012-11-08 17:16:25 -05:00 |
|
Chris Dodge
|
3774c95b5e
|
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/xlint
|
2012-11-08 16:12:26 -05:00 |
|