Calen Pennington
a237322b70
Merge pull request #359 from MITx/ichuang/minor-fix-edit-link
...
change edit link showhide to use <a> instead of <input> type submit
2012-08-07 11:40:31 -07:00
ichuang
9d2b821c26
change edit link showhide to use <a> instead of <input> type submit
...
(fixes issues with edit links in multipart problems and video)
2012-08-07 14:34:28 -04:00
Bridger Maxwell
638a5059da
Added stores_state attribute for xmoduledescriptors as a way to declare if the module stores state in the database.
2012-08-07 14:34:05 -04:00
Brittany Cheng
ed8595ad95
error styles
2012-08-07 14:31:04 -04:00
Tom Giannattasio
8c366e2d59
tweaking the text editor
2012-08-07 14:25:05 -04:00
Brittany Cheng
7962813014
info styles
2012-08-07 13:53:57 -04:00
Brittany Cheng
49840933c0
error handling
2012-08-07 13:48:43 -04:00
Bridger Maxwell
f872e41d1d
Added descriptor to xmodule init. Now xmodules have pointer to their descriptor.
2012-08-07 13:43:30 -04:00
Arjun Singh
26f31324c4
Moving a few static files out of lms into common
2012-08-07 13:39:59 -04:00
Calen Pennington
9cba2232d5
Run all tests all the way through before quitting on errors
2012-08-07 13:32:58 -04:00
thomasxiii
258b9eb530
Merge pull request #349 from MITx/feature/kfiedler/courseware-style
...
A bunch of various fixes and de-styling
2012-08-07 10:20:10 -07:00
Rocky Duan
dbb467365b
fixed error field for new post
2012-08-07 12:08:38 -04:00
Rocky Duan
aeb2d73cba
Merge branch 'discussion3' of github.com:dementrock/mitx
2012-08-07 12:05:52 -04:00
Rocky Duan
a9b171c81f
Merge branch 'discussion3' of github.com:dementrock/mitx
...
Conflicts:
lms/static/coffee/src/discussion/templates.coffee
2012-08-07 12:05:46 -04:00
Brittany Cheng
391d173018
similar posts styles
2012-08-07 12:05:01 -04:00
Rocky Duan
0560bb7eb7
add hide similar post button
2012-08-07 12:03:41 -04:00
Calen Pennington
96252aea80
Merge pull request #358 from MITx/kimth/lms-coderesponse
...
Kimth/lms coderesponse
2012-08-07 09:01:41 -07:00
Tom Giannattasio
d5302a0bd0
thread updates: follow/unfollow, grid tweaks
2012-08-07 12:00:17 -04:00
Kyle Fiedler
dd6ec19e80
Make the modal window work in the courseware
2012-08-07 11:59:49 -04:00
Brittany Cheng
4b9358fb72
similar posts styles
2012-08-07 11:55:31 -04:00
kimth
05646fbed7
Provide default xqueue in ModuleSystem
2012-08-07 11:54:09 -04:00
kimth
a9a19f40c3
Merge master
2012-08-07 11:51:44 -04:00
ichuang
c79da58175
add documentation on rake + unit tests
2012-08-07 11:48:01 -04:00
kimth
b6dc622e42
Remove temporary datetime
2012-08-07 11:43:00 -04:00
Rocky Duan
0863e34619
display actual username
2012-08-07 11:40:58 -04:00
kimth
c39edb650b
StudentModule lookups in queue callback use target user, rather than request.user
2012-08-07 11:38:04 -04:00
Brittany Cheng
5bec964606
Merge branch 'master' of github.com:dementrock/mitx into discussion3
2012-08-07 11:36:34 -04:00
Rocky Duan
547114a823
Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into ccp0101/moderation
2012-08-07 11:31:26 -04:00
kimth
501f2ccf14
CodeResponse uses 'is_file' helper function
2012-08-07 11:30:21 -04:00
Rocky Duan
6c2f53a495
to make it appear at least normal..
2012-08-07 11:28:52 -04:00
Tom Giannattasio
00a72cf86a
updated thread styles: voting, actions, comments, sort
2012-08-07 11:27:13 -04:00
Rocky Duan
25c05e702e
Merge branch 'brittany' of github.com:dementrock/mitx
2012-08-07 11:23:19 -04:00
Rocky Duan
0c311b8f13
search for similar posts without any styling..
2012-08-07 11:22:41 -04:00
kimth
f6202e5631
Tests provide xqueue params, rather than ModuleSystem.__init__
2012-08-07 11:16:48 -04:00
Brittany Cheng
1fb0e352b4
blank slate
2012-08-07 11:10:24 -04:00
Calen Pennington
e847bae267
Merge pull request #344 from MITx/feature/victor/file-per-descriptor
...
Feature/victor/file per descriptor
2012-08-07 08:09:59 -07:00
Victor Shnayder
b4e400ba56
Make tests pass again again
...
* Move lazyproperty decorator into xmodule so it's accessible during tests
* add default xqueue to test system
2012-08-07 11:08:56 -04:00
Victor Shnayder
932a9be747
Make tests pass again
...
* test enrolls in course before testing pages
* support github edit links with new file structure
* Some pep8 cleanups
2012-08-07 11:06:47 -04:00
Victor Shnayder
55edb1ef32
always export metadata in alphabetical order
2012-08-07 11:06:47 -04:00
Victor Shnayder
47b9441af5
a few pep8 cleanups
2012-08-07 11:06:47 -04:00
Victor Shnayder
5523c2883e
Generate error module url_names using sha1
...
* means we get the same url_name on each import of the same data.
2012-08-07 11:06:47 -04:00
Victor Shnayder
ecf432ad78
Make the simple course pass roundtrip test:
...
- add 'type' and 'points' to capa_module metadata
- replace old 'title' tag with display_name
2012-08-07 11:06:47 -04:00
Victor Shnayder
79e0bc25f8
Make url_names on error descriptors unique
2012-08-07 11:06:47 -04:00
Victor Shnayder
e6e290f525
Make initial import-export tests pass.
...
TODO:
* need unique slugs for errors so they don't overwrite each other on export.
- try to preserve origin slug. If not possible, generate random one.
* figure out what metadata to strip. e.g.
({'data': '<problem><p><h1>Finger Exercise 1...'},
{'data': '<problem points="1" type="lecture"><p><h1>Finger Exercise 1...'},
False)
- where did points and type come from? Do we want them there?
* separate broken and non-broken test courses
2012-08-07 11:06:47 -04:00
Victor Shnayder
b091dcabe0
metadata and file format cleanups
...
* course.xml is special--has org and course attributes in addition to url_name
* strip data_dir from metadata on export
* more asserts
* work on roundtrip import-export test
2012-08-07 11:06:47 -04:00
Victor Shnayder
6ed9052755
minor cleanups
2012-08-07 11:06:46 -04:00
Victor Shnayder
b285f50d92
Make unknown metadata persist accross import-export
...
* +improve test.
2012-08-07 11:06:46 -04:00
Victor Shnayder
d09e2261f3
New file structure--everything in own file
...
* needed for CMS performance (can now save just an item, not whole tree)
* remove split_to_file methods
* simplified AttrMap logic
* write each descriptor to a separate file
* detect format on import and adjust appropriately.
* update tests
2012-08-07 11:06:46 -04:00
ichuang
ca177570fa
Merge pull request #356 from MITx/kimth/lms-coderesponse
...
Kimth/lms coderesponse
2012-08-07 07:56:23 -07:00
ichuang
4c25baee43
Merge pull request #355 from MITx/arjun/choicegroup_text
...
Removing the <text> wrapper around choice text for radiogroup and checkboxgroup
2012-08-07 07:55:01 -07:00
