David Ormsbee
1a1c5edab4
Completely cosmetic fix to make the indentation clearer.
2012-09-02 16:56:17 -04:00
Arjun Singh
08693a1b41
Make customresponse respect point values on input fields
2012-09-02 02:52:59 -07:00
Arjun Singh
b64696dbd0
Allowing customresponse messages to be passed to the inputtype
2012-09-02 02:05:50 -07:00
Rocky Duan
fd31ab3057
make markdown & latex work for response / comments (not perfect)
2012-09-02 01:11:25 -07:00
Rocky Duan
77e0ef3fe3
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
2012-09-02 00:29:59 -07:00
Rocky Duan
d22feb1b8b
escape html
2012-09-02 00:29:48 -07:00
Ibrahim Awwal
1405cf97fd
Create a new template that inherits from course_navigation.html to avoid repeating the course navigation template and augment it with the new post button.
2012-09-01 21:17:23 -07:00
ichuang
9433e89710
add docs for gitreload
2012-09-01 10:16:38 -04:00
kimth
ea4019c0a0
Add comment to sequence/display.coffee
2012-09-01 09:01:19 -04:00
kimth
90bcb00e58
Allow ckt editor to be embedded in sequence
2012-09-01 08:56:16 -04:00
kimth
6f03ebb198
Add message for student in CustomResponse error
2012-09-01 08:26:54 -04:00
Arjun Singh
d82534bc23
improving new post
2012-09-01 05:10:29 -07:00
kimth
3de7c3a322
Merge branch 'master' into kimth/mark-graded
2012-09-01 08:05:29 -04:00
Arjun Singh
95cfbcc8c7
new post 'works'
2012-09-01 03:41:49 -07:00
Arjun Singh
b913c93f46
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
2012-09-01 02:01:01 -07:00
Arjun Singh
f6ee6f2a0f
working on newpost
2012-09-01 02:00:55 -07:00
Rocky Duan
7007814638
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
2012-09-01 01:07:09 -07:00
Rocky Duan
09dade0802
clear comment input after submit & not submit empty comment
2012-09-01 01:06:56 -07:00
Ibrahim Awwal
49f0dbd9e6
Make the index page not stupid, but not particularly useful either.
2012-09-01 00:03:23 -07:00
Rocky Duan
a67b76ae27
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
2012-08-31 23:46:33 -07:00
Rocky Duan
fde77b7a89
fixed user link and back button
2012-08-31 23:46:13 -07:00
Ibrahim Awwal
8d3a70df46
Remove empty script tag.
2012-08-31 23:44:32 -07:00
Ibrahim Awwal
f6ca91a504
Refactor some things more and make the forum index sort of work, although the sticky sidebar is broken, probably because there's no content in the thread view pane.
2012-08-31 23:43:13 -07:00
Arjun Singh
e3728f6898
fix new post dropdown
2012-08-31 21:07:36 -07:00
arjun810
3f07e5fdb1
Merge pull request #612 from MITx/feature/view_courseware_buttons
...
Don't show View Courseware buttons if they don't have access to load it
2012-08-31 18:57:37 -07:00
David Ormsbee
877ae91b7f
Don't show View Courseware buttons if they don't have access to load the courseware
2012-08-31 21:50:33 -04:00
kimth
de9c981aea
Merge branch 'master' into kimth/mark-graded
2012-08-31 21:25:53 -04:00
Ibrahim Awwal
ecc65d6ebc
Moved some templates into separate files.
2012-08-31 18:01:33 -07:00
David Ormsbee
059fc5e89e
Merge pull request #610 from MITx/feature/arjun/fix_jump_test
...
Fix jump to courseware test to expect a redirect
2012-08-31 17:51:50 -07:00
Arjun Singh
9eecd43a4a
Fix jump to courseware test to expect a redirect
2012-08-31 17:49:15 -07:00
kimth
ae022b662a
Merge branch 'kimth/mark-graded' of https://github.com/MITx/mitx into kimth/mark-graded
2012-08-31 20:46:34 -04:00
kimth
4800aca5c9
Merge pull request #609 from MITx/features/kfiedler/mark-graded
...
Features/kfiedler/mark graded
2012-08-31 17:46:07 -07:00
kimth
56cc237eef
Merge branch 'master' into kimth/mark-graded
2012-08-31 20:41:39 -04:00
David Ormsbee
b5b93cad30
Merge pull request #599 from MITx/feature/arjun/add_discussion_context
...
Add context about which bit of courseware a post is about
2012-08-31 17:22:07 -07:00
Ibrahim Awwal
4ce4c0c444
Fix the dropdown filtering so it actually ignores the unread messages count.
2012-08-31 17:15:31 -07:00
Ibrahim Awwal
f6ee08271d
Ensure that js files are returned in alphabetical order by django-pipeline.
...
On most systems this seems to be the default behavior, but glob2.glob's order isn't guaranteed and on my machine the order seems to be random, which causes javascript which depends on include order to fail.
2012-08-31 15:25:07 -07:00
Ibrahim Awwal
e600004b1f
Make the comment client not explode if it doesn't get a sort preference from the comment service.
2012-08-31 15:19:17 -07:00
Arjun Singh
26ca1f5f5b
Merge master
2012-08-31 15:13:50 -07:00
Arjun Singh
3a9542ebb1
Move function; stop shadowing map; add todo about caching for _DISCUSSIONINFO
2012-08-31 15:11:29 -07:00
kimth
05015a1375
Merge branch 'kimth/mark-graded' of https://github.com/MITx/mitx into kimth/mark-graded
2012-08-31 18:06:30 -04:00
kimth
8c0780bcdc
Adjust comments
2012-08-31 18:05:54 -04:00
kimth
e482a32d27
Accordion distinguishes items to be graded
2012-08-31 18:05:54 -04:00
kimth
01f875a124
Merge branch 'master' into kimth/mark-graded
2012-08-31 18:02:37 -04:00
Kyle Fiedler
e7a7c71324
Added icon to mark it as having a due date
2012-08-31 17:58:08 -04:00
kimth
648d54b027
Adjust comments
2012-08-31 17:05:48 -04:00
kimth
e8c4bc0c25
Accordion distinguishes items to be graded
2012-08-31 17:05:48 -04:00
Tom Giannattasio
881404bab7
Merge pull request #602 from MITx/bug/kfiedler/sequence-nav
...
Added fix for the sequnce nave hovers
2012-08-31 14:01:26 -07:00
Tom Giannattasio
d1238a277f
tweaked sidebar bugs
2012-08-31 16:58:13 -04:00
Kyle Fiedler
60ea621560
Remove problem-answer class that will now not be used
2012-08-31 16:55:50 -04:00
David Ormsbee
69ea7aa873
Merge pull request #597 from MITx/feature/victor/nested-links
...
Feature/victor/nested links
2012-08-31 13:48:05 -07:00
