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

10188 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Rocky Duan
245bb7ce96 oops fixed following 2012-09-04 10:15:41 -07:00
Rocky Duan
2e45f2d95f Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-09-04 10:06:19 -07:00
Rocky Duan
8b0e459256 fixed endorse 2012-09-04 10:06:03 -07:00
Tom Giannattasio
78ae73cf3d tweaked dogear and discussion column styles 2012-09-04 13:05:51 -04:00
Tom Giannattasio
b5df53f9d5 fixed merge conflict 2012-09-04 13:01:08 -04:00
Tom Giannattasio
5c66924fd5 fixed drop filter 2012-09-04 12:59:45 -04:00
Arjun Singh
91aec6d38f Including courseware context in threads for non inline discussion 2012-09-04 09:55:18 -07:00
Arjun Singh
8680be38a7 Including courseware context in _ template 2012-09-04 09:53:54 -07:00
Arjun Singh
8475ffef20 merge 2012-09-04 09:49:00 -07:00
Arjun Singh
ebae40a392 fix search 2012-09-04 09:21:21 -07:00
Matthew Mongeau
10887ab117 Fix voting. 2012-09-04 11:53:07 -04:00
Tom Giannattasio
00abf08dc3 new icons for new post; fixed icons on reply 2012-09-04 11:22:46 -04:00
ichuang
d643057052 count all types of modules, not just childless ones 2012-09-04 11:21:18 -04:00
ichuang
4f8161df84 address two comments in https://github.com/MITx/mitx/pull/615 2012-09-04 11:10:22 -04:00
Tom Giannattasio
a574c48c13 fixed long lines in the category drop 2012-09-04 11:01:21 -04:00
David Ormsbee
41b5e5b81f Merge pull request #619 from MITx/feature/arjun/generalize_show 
Make show answer work for choiceresponse + javascriptinputs
 2012-09-04 07:49:02 -07:00
Tom Giannattasio
cc0b0e4365 Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-09-04 10:47:06 -04:00
Tom Giannattasio
658d99fafd fixed preview text overlapping content 2012-09-04 10:46:50 -04:00
Matthew Mongeau
e63f591d9b Comment should pass endorsed to template. 2012-09-04 10:29:19 -04:00
ichuang
258274f2a7 add string to model class unicode 2012-09-04 10:25:28 -04:00
John Jarvis
54f5e30992 * Removed tracking log comment 
* Additional PEP8 format cleanup
* Removed imports that are no longer necessary.
 2012-09-04 09:39:54 -04:00
Arjun Singh
91379aa9a6 improve date search, fix respnding, make sidebar expand when discussion column does 2012-09-04 03:53:37 -07: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
9064f81bc6 minor sidebar fix 2012-09-04 02:33:42 -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
Arjun Singh
890c5e50e1 fix up sidebar jitter 2012-09-04 02:29:28 -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
e8ac5860e1 Oops, this was needed for replies to be rendered in the main forum view. 2012-09-04 01:28:36 -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
6bae16098f Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-09-03 23:04:52 -07:00
Arjun Singh
629a8e7ed5 allowing for 0 top level topics 2012-09-03 23:04:30 -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
Arjun Singh
93ed042786 Make show answer work for choicegroups + javascriptinputs 2012-09-03 19:37:48 -07:00
ichuang
520d5620d0 more general catch for gunicorn sync error 2012-09-03 20:37:33 -04:00
ichuang
dbeca659bd suppress gunicorn error which is being caught by errortracker. The 
gunicorn error is of this form:

Traceback (most recent call last):
  File "/home/ike/mitx_all/python/local/lib/python2.7/site-packages/gunicorn/workers/sync.py", line 33, in run
    client, addr = self.socket.accept()
  File "/usr/lib/python2.7/socket.py", line 202, in accept
    sock, addr = self._sock.accept()
error: [Errno 11] Resource temporarily unavailable
 2012-09-03 20:32:07 -04:00
Rocky Duan
d9e7c5d962 fixed wmd editor / tag for new post 2012-09-03 17:01:19 -07:00
ichuang
a973c1c21e use module.descriptor.start for start date in xmodule_modifiers 2012-09-03 16:49:55 -04:00
ichuang
02d58a7ca2 display course load error messages on modulestore reload by instructor 2012-09-03 16:49:34 -04:00