Commit Graph

2941 Commits

Author SHA1 Message Date
Kyle Fiedler
05c3e028c2 Added new press releases 2012-09-12 10:38:17 -04:00
Tom Giannattasio
ff94541e40 tweaked inline hide/show and new post buttons 2012-09-12 09:41:34 -04:00
Kyle Fiedler
064b5e7932 Remove widows in accordion header 2012-09-11 11:25:54 -04:00
Ibrahim Awwal
2d105265f9 Add @references for deeply nested (3+) comments. 2012-09-11 05:43:21 -07:00
Ibrahim Awwal
ce16d22451 Fix anonymous posts on the inline discussion view. 2012-09-11 04:09:53 -07:00
Ibrahim Awwal
b60feb164c Remove user_id from content renderer although I'm 99.9% sure this isn't
used anywhere anyway.
2012-09-11 01:51:16 -07:00
Ibrahim Awwal
45ba58318f Hide usernames for anonymous posts. 2012-09-11 01:33:59 -07:00
Arjun Singh
a49b638027 Edit post works now. 2012-09-11 01:07:03 -07:00
Ibrahim Awwal
c2f741c392 Revert "Disable posting anonymously for now."
This reverts commit 6ee6e1c656.
2012-09-10 20:18:46 -07:00
Arjun Singh
ca8b299711 drop unread counts for now 2012-09-10 19:16:57 -07:00
Matthew Mongeau
6ee6e1c656 Disable posting anonymously for now. 2012-09-10 16:14:04 -07:00
Arjun Singh
7ad9b39b98 Merge master 2012-09-10 15:33:59 -07:00
Tom Giannattasio
d0c2d31558 new show/hide button for inline discussions 2012-09-10 12:12:46 -07:00
Arjun Singh
aa7af4e6fe Make thread view with subview work 2012-09-10 11:40:52 -07:00
ichuang
ccbbb5a993 commit_id may be specified for modulestore reload - for multi-worker configs
also show pid in migration and instructor dashboard views for thread debugging
2012-09-09 19:39:11 -04:00
ichuang
2045500c6e make external_auth table searchable in django admin; fix
missed instance of login link which should have been behind DISABLE_LOGIN_BUTTON
2012-09-08 23:21:34 -04:00
ichuang
ab0a58fb7a add psychometrics - grade histograms, check time diffs, and IRT plots 2012-09-08 22:31:45 -04:00
Arjun Singh
80a9620a84 Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-09-07 14:20:03 -10:00
Tom Giannattasio
a0c887cd5f new inline post styles 2012-09-07 16:24:25 -04:00
Lyla Fischer
9ad9359d48 quick wording change 2012-09-07 15:57:43 -04:00
Victor Shnayder
bbd57ef79b don't show empty list if there is no error data 2012-09-07 15:10:26 -04:00
Tom Giannattasio
319d7e149e restyled inline new post form 2012-09-07 14:43:44 -04:00
Kyle Fiedler
bce61cd6e5 Revert "Merge pull request #642 from MITx/bug/kfiedler/ie"
This reverts commit 2b5e8a4944, reversing
changes made to db0549be78.
2012-09-07 14:18:34 -04:00
Kyle Fiedler
4d4e5824cd Change form style for login and signup modals so it is consistant in every browser and we have no usability problems 2012-09-07 13:29:49 -04:00
Kyle Fiedler
aec8cc42dc Add ie fix for wiki 2012-09-07 12:59:30 -04:00
David Ormsbee
db0549be78 Merge pull request #594 from MITx/feature/ibrahim/discussion_distinguish_instructors
Feature/ibrahim/discussion distinguish instructors
2012-09-07 06:52:15 -07:00
Kyle Fiedler
bd199ef5c3 Added opencourseware box on course about page 2012-09-07 09:49:43 -04:00
David Ormsbee
8312ddf01d Merge pull request #629 from MITx/feature/victor/save-course-position
Feature/victor/save course position
2012-09-07 06:42:48 -07:00
Arjun Singh
e1c3696b3f Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-09-07 02:06:18 -10:00
Ibrahim Awwal
b2f3eee93b Pagination in inline discussion views. 2012-09-07 03:37:19 -07:00
Arjun Singh
4b74354973 Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-09-06 22:43:17 -10:00
Ibrahim Awwal
c3e3fee963 Convert expand/collapse into buttons and change default sort order to date. Buttons should be styled better but I don't know how to do it. 2012-09-06 23:37:43 -07:00
Arjun Singh
36b3524552 Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-09-06 18:22:15 -10:00
Ibrahim Awwal
c4c956dbbb Fix accidental code formatting of abbreviated posts and put administrative buttons in the expanded content. 2012-09-06 18:09:09 -07:00
Tom Giannattasio
9923323fdc styled new post error messages 2012-09-06 17:22:00 -04:00
Carlos Andrés Rocha
fc793b94fc Added proctored exams news to the frontpage 2012-09-06 16:33:10 -04:00
Carlos Andrés Rocha
11399d6031 Added protored exam press release page 2012-09-06 16:06:57 -04:00
David Ormsbee
bea6db620a Merge pull request #533 from MITx/feature/halogenandtoast/calculator
Put in calculator in courseware
2012-09-06 13:00:09 -07:00
John Jarvis
587725ee61 more template updates to rename MITx to edX 2012-09-06 15:12:19 -04:00
Tom Giannattasio
2b5718a98b fixed blank slate sidebar resize glitch 2012-09-06 14:02:23 -04:00
David Ormsbee
39a773616b Merge pull request #630 from MITx/jarv/update-email
Jarv/update email
2012-09-06 08:10:32 -07:00
John Jarvis
517e6ddeda Contact email address updates 2012-09-06 09:26:52 -04:00
John Jarvis
26ff14172c Email update for module-error template 2012-09-06 09:24:20 -04:00
Ibrahim Awwal
58f4f01ecd Fix follow dogear causing page to scroll up on click. 2012-09-06 04:49:38 -07:00
Ibrahim Awwal
2811822b93 Attach the discussion_id to posts made from the embedded discussion forum. 2012-09-06 02:11:47 -07:00
Ibrahim Awwal
00d21acd79 Add newly posted threads to the inline thread list. 2012-09-06 01:33:40 -07:00
Ibrahim Awwal
2eb763e4ce New post form on inline discussion, works, with some bugs in styling. 2012-09-06 00:25:54 -07:00
Ibrahim Awwal
00a6526fd0 Make voting render properly in inline discussions. Also might have fixed
following if it wasn't working before.
2012-09-05 17:58:18 -07:00
kimth
d3cd85d81f Merge pull request #627 from MITx/feature/kfiedler/problems
Style changes to problems
2012-09-05 16:06:16 -07:00
Arjun Singh
bf5eba4d76 Change new post copy 2012-09-05 15:09:08 -07:00