chrisndodge
f87e5cefab
Merge pull request #1152 from MITx/feature/dhm/cms-settings
...
Don't save null about items to db as it chokes lms.
2012-12-13 17:20:56 -08:00
Don Mitchell
e2918c2dbd
Don't save null about items to db as it chokes lms.
2012-12-13 17:23:40 -05:00
Don Mitchell
e0849e8b5a
Cache to debug other branch
2012-12-13 16:34:58 -05:00
chrisndodge
094856e229
Merge pull request #1149 from MITx/style/studio/tom/ui-cleanups
...
Various Style/UI Tweaks
2012-12-13 12:41:10 -08:00
cahrens
e77a67a93a
Protect against graceperiodjson being null.
...
r.don
2012-12-13 13:36:37 -05:00
Brian Talbot
69c26a08e3
settings/style - general UI clean up - wip
2012-12-13 13:06:56 -05:00
Chris Dodge
10b417c85e
initial checkin of export
2012-12-13 11:53:52 -05:00
Chris Dodge
4ebc9a589d
fix up some test failures
2012-12-13 11:29:00 -05:00
Don Mitchell
cd23c8f8b6
Python path bug
2012-12-12 11:02:42 -05:00
Don Mitchell
c4f4da5e46
Giving up for now on unit tests which mock http posts
2012-12-11 17:10:04 -05:00
Don Mitchell
a46c1f4883
Updated underscore (using _.invert())
...
The scss junk comes from trying to sync w/ several branches. I believe
it's right but mostly unnecessary (surprised it showed up).
Debugged the merge w/ cms-master
Fixed grace period to be absolute time difference not a date on the
client side.
2012-12-11 14:18:13 -05:00
Don Mitchell
0a91a98dd0
Merge remote-tracking branch 'origin/feature/cale/cms-master' into
...
feature/dhm/cms-settings
Conflicts:
cms/djangoapps/contentstore/course_info_model.py
cms/djangoapps/contentstore/views.py
cms/static/js/models/course_info.js
cms/static/js/template_loader.js
cms/static/js/views/course_info_edit.js
cms/templates/base.html
cms/templates/course_info.html
cms/urls.py
2012-12-11 10:55:10 -05:00
Don Mitchell
5ea5a7c0a7
It works!!!
2012-12-10 18:55:35 -05:00
Don Mitchell
c43aa62fce
Need to still add create and delete but otherwise done.
2012-12-10 18:01:28 -05:00
Don Mitchell
39024a7fee
Grading mostly working
2012-12-10 16:32:33 -05:00
Christina Roberts
6acae5b440
Show error if organization name has invalid characters
2012-12-10 15:19:34 -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
Don Mitchell
50d7e6160e
Move models from common to cms.
...
Add unit tests.
2012-12-03 12:20:15 -05:00
Don Mitchell
8379e3038d
Moved settings models from common to cms
2012-11-30 10:42:23 -05:00
Don Mitchell
d943f44f10
Append screw up (naive python goof)
2012-11-30 10:41:10 -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
Don Mitchell
c0da6e4249
Details done except for syllabus
2012-11-28 17:10:41 -05:00
Don Mitchell
a48a392eb2
Trying to get scss back
2012-11-28 10:02:01 -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
Don Mitchell
f0c94a2c7e
Beginning test of details tab.
2012-11-21 15:17:18 -05:00
Don Mitchell
a9233dfd44
Merge branch 'course-info' into feature/dhm/cms-settings
...
Conflicts:
cms/djangoapps/contentstore/views.py
2012-11-19 16:00:27 -05:00
Don Mitchell
88cc5a080b
Everything tested and ready for Tom to fix
2012-11-19 10:38:58 -05:00
Don Mitchell
91a91f4ddb
Hopefully the course-info changes I had made w/o link destruction
2012-11-19 10:38:58 -05:00
Victor Shnayder
b18136d0cd
remove (almost) all references to askbot.
2012-11-19 10:18:03 -05:00
Don Mitchell
842bbe92d1
Everything tested and ready for Tom to fix
2012-11-16 12:53:49 -05:00
Don Mitchell
fbc48026f2
Hopefully the course-info changes I had made w/o link destruction
2012-11-16 12:51:31 -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
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
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
