Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,188 Commits 1 Branch 0 Tags
826b070bfa047f94de6d14d43eaa9b598000d9ff
Commit Graph

1676 Commits

Author SHA1 Message Date
Ibrahim Awwal
5c64945e0a Make appended_id for WMD editor a little less hacky by getting it from data-id of the 'reply-body' element instead of from _id of the wrapper. 2012-09-05 00:04:00 -07:00
Ibrahim Awwal
39185ce191 Fix WMD editor reply boxes on embedded discussions, although I think the way it's implemented is something of a hack. 2012-09-04 23:49:56 -07:00
Rocky Duan
0c6f05f45c oops previous commit breaks comments (now fixed) 2012-09-04 20:13:55 -07:00
Rocky Duan
9f3a95a30e make delete work for responses 2012-09-04 19:53:16 -07:00
Rocky Duan
e6721941e0 only bind delete events to threads but not responses 2012-09-04 19:41:25 -07:00
Rocky Duan
2143835659 Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 
Conflicts:
	lms/static/coffee/src/discussion/views/discussion_thread_view.coffee
	lms/static/coffee/src/discussion/views/thread_list_item_view.coffee
 2012-09-04 19:41:03 -07:00
Carlos Andrés Rocha
0f1db7969d [#35491529] Small corrections to OpenID provider login page 2012-09-04 20:53:51 -04:00
ichuang
566b9694c4 revert inadvertent change to course.html 2012-09-04 19:47:37 -04:00
Matthew Mongeau
2380e7fff4 Change default text to All. 2012-09-04 14:35:46 -04:00
Tom Giannattasio
ffab52be36 fixed typo on profile page and reworded button text 2012-09-04 14:11:24 -04:00
Tom Giannattasio
4778002b68 fixed merge conflict 2012-09-04 14:05:48 -04:00
Tom Giannattasio
4a3f85b417 styled closed post notice 2012-09-04 14:05:09 -04:00
Arjun Singh
fb88df4508 Merge underscore template 2012-09-04 10:45:50 -07:00
Tom Giannattasio
0a1361842c Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-09-04 13:40:39 -04:00
Tom Giannattasio
398e79dc8c simple blank slate view 2012-09-04 13:40:21 -04:00
Arjun Singh
0e1b247a7b courseware context links in discussion 2012-09-04 10:38:28 -07:00
Rocky Duan
bb13a613f2 added moderator buttons for thread responses 2012-09-04 10:30:36 -07:00
Rocky Duan
e149951382 fixed close threads 2012-09-04 10:27:59 -07:00
Arjun Singh
8680be38a7 Including courseware context in _ template 2012-09-04 09:53:54 -07:00
Matthew Mongeau
10887ab117 Fix voting. 2012-09-04 11:53:07 -04:00
ichuang
258274f2a7 add string to model class unicode 2012-09-04 10:25:28 -04:00
Ibrahim Awwal
c4eec80e5e Somewhat compacted the embedded thread view, but it probably needs a more thorough redesign. 2012-09-04 02:34:27 -07:00
Arjun Singh
2ca51f066b Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-09-04 02:29:38 -07:00
Rocky Duan
b2821c5354 Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-09-04 01:54:59 -07:00
Rocky Duan
d39e3de51b fit permission into new discussion view structure; admin actions not working yet 2012-09-04 01:54:39 -07:00
Ibrahim Awwal
32ccf51e97 Embedded discussions displayed with the new style but without replying yet. 
Needs different CSS to make it more appropriate in the embedded view.
 2012-09-04 01:14:18 -07:00
Arjun Singh
dbfe3b35f0 Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-09-03 23:29:30 -07:00
Arjun Singh
52e780e0b2 add all filter 2012-09-03 23:28:44 -07:00
Rocky Duan
9a7afb5889 Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-09-03 23:02:58 -07:00
Arjun Singh
098b90ebac Top level discussions 2012-09-03 23:02:14 -07:00
Rocky Duan
d9e7c5d962 fixed wmd editor / tag for new post 2012-09-03 17:01:19 -07:00
David Ormsbee
999343d641 Merge pull request #618 from MITx/feature/victor/hide-progress-tab 
Feature/victor/hide progress tab
 2012-09-03 11:40:35 -07:00
Victor Shnayder
f926925ca6 Add a hide_progress_tab course policy flag 
- for internal cs50 until we have grade integration set up (only really needed for external version)
 2012-09-03 14:12:43 -04:00
David Ormsbee
bce4e0f1bc Merge pull request #595 from MITx/feature/ibrahim/discussion_sort_preferences 
Feature/ibrahim/discussion sort preferences
 2012-09-03 10:25:04 -07:00
David Ormsbee
df85ac5762 Merge pull request #616 from MITx/feature/dave/external_forum 
Add support for external forum link. Reviewed by Victor.
 2012-09-03 07:54:38 -07:00
ichuang
91dcef7fd0 add gitreload to instructor dashboard 2012-09-02 22:41:27 -04:00
David Ormsbee
5194dc3177 Add support for discussion_link attribute in course policy files as a kludge to support CS50's external forums 2012-09-02 22:22:01 -04:00
ichuang
2efe481237 move instructor dashboard into its own lms djangoapp; add new 
functionality - grade dump and download as csv, manage staff list,
force reload of course from xml
 2012-09-02 19:05:34 -04:00
ichuang
7664f910b1 add is_released 2012-09-02 19:04:55 -04:00
Ibrahim Awwal
722ce53e61 Pull out discussion-thread-list-template into its own file. 2012-09-02 15:14:54 -07:00
Rocky Duan
cae338a46c dropdown filter 2012-09-02 14:00:25 -07:00
David Ormsbee
1a1c5edab4 Completely cosmetic fix to make the indentation clearer. 2012-09-02 16:56:17 -04: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
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