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

2430 Commits

Author SHA1 Message Date
David Ormsbee
b06aafd5ad Merge pull request #697 from MITx/feature/arjun/run_specific_syllabi 
Try and find a run-specific syllabus before loading a course-specific syllabus
 2012-09-15 10:50:57 -07:00
Arjun Singh
08464725c3 Try and find a run-specific syllabus before loading a course-specific syllabus 2012-09-15 05:02:28 -07:00
Arjun Singh
2ee41ebf0c blockquotes may be fixed 2012-09-15 03:10:51 -07:00
Arjun Singh
3b13013ecc Merge whitespace fix 2012-09-15 02:14:01 -07:00
Arjun Singh
4efe1135cb fix up whitespace causing weirdness in inline response comment rendering 2012-09-15 02:12:52 -07:00
Ibrahim Awwal
c47f0ffb47 Hopefully fix code formatting showing up on comments? But it doesn't seem to happen everywhere... 2012-09-15 00:42:47 -07:00
Arjun Singh
7c86f324ea Fixes the one broken thread in prod; it had no lettters in its ID, so the id was being cast to a number. 2012-09-14 22:55:45 -07:00
Arjun Singh
b5351cc584 Support legacy anonymity 2012-09-14 21:59:09 -07:00
Arjun Singh
033ce7ef42 Discussioninfo needs to be multicourse-friendly.. 2012-09-14 18:34:37 -07:00
Arjun Singh
6d753ae323 Ensure that ability is present when showing endorse button 2012-09-14 17:41:02 -07:00
Rocky Duan
3e241182c7 Merge branch 'feature/arjun/new-discussions' of github.com:MITx/mitx into feature/arjun/new-discussions 2012-09-14 17:22:26 -07:00
Rocky Duan
9c19f64c01 for students, only display endorse icon if endorsed 2012-09-14 17:22:11 -07:00
Arjun Singh
aa61569110 Merge branch 'feature/arjun/new-discussions' of github.com:MITx/mitx into feature/arjun/new-discussions 2012-09-14 16:59:25 -07:00
Arjun Singh
84d2ebf631 fix font colors 2012-09-14 16:59:20 -07:00
David Ormsbee
3ee0f39b18 Merge pull request #696 from MITx/feature/dave/new-discussions 
Add AWS storage bucket name for S3 to make file uploads work
 2012-09-14 16:56:31 -07:00
Ibrahim Awwal
17c3dd913e Tooltips on follow and vote. 2012-09-14 16:55:16 -07:00
David Ormsbee
239e6e8cc5 Add AWS storage bucket name for S3 to make file uploads work 2012-09-14 19:55:13 -04:00
Arjun Singh
b2c88575ee fix deep comment links 2012-09-14 15:38:48 -07:00
Arjun Singh
46d830df13 Merge branch 'master' into feature/arjun/new-discussions 2012-09-14 15:15:21 -07:00
Arjun Singh
febba9b93a Merge branch 'feature/arjun/new-discussions' of github.com:MITx/mitx into feature/arjun/new-discussions 2012-09-14 15:10:06 -07:00
Arjun Singh
913403d1e0 increase font size for votes / comments 2012-09-14 15:09:55 -07:00
arjun810
8561469f8f Merge pull request #694 from MITx/feature/dave/new-discussions 
Don't explode if a forum content piece is by a user that doesn't exist
 2012-09-14 14:28:03 -07:00
David Ormsbee
ce9fc9ceab Don't explode if a forum content piece is by a user that doesn't exist 2012-09-14 17:25:12 -04:00
Arjun Singh
8631cb2644 Add a tiny bit of padding back to unexpanded form 2012-09-14 13:39:07 -07:00
Arjun Singh
190f25c0dd Merge branch 'feature/arjun/new-discussions' of github.com:MITx/mitx into feature/arjun/new-discussions 2012-09-14 13:35:43 -07:00
Tom Giannattasio
2f5ad06eec smoother comment form expansion 2012-09-14 16:34:55 -04:00
Arjun Singh
3756d31761 Placeholder for wmd editors; specifically comment form 2012-09-14 13:20:54 -07:00
Tom Giannattasio
5caa989e3c added transparent icons for the comment form 2012-09-14 16:17:34 -04:00
Kyle Fiedler
8fa8450fbf Added color to span and removed width from bottom sequence navigation 2012-09-14 16:13:37 -04:00
Tom Giannattasio
7b7ad3d8c2 new paragraph styles for comments 2012-09-14 16:07:45 -04:00
arjun810
0ad3e8a7b0 Merge pull request #692 from MITx/feature/dave/new-discussions 
Small fixes
 2012-09-14 13:06:53 -07:00
David Ormsbee
a32be2958c Change 'View discussion' link on user profile page to be a simple link rather than AJAX. 2012-09-14 16:00:09 -04:00
Arjun Singh
11289e6d90 comment styling 2012-09-14 12:59:10 -07:00
Arjun Singh
387c8ea1b5 make wmd editor for comments 2012-09-14 12:46:48 -07:00
David Ormsbee
820003b96c Prevent showing redundant roles for this user 2012-09-14 14:29:17 -04:00
Carlos Andrés Rocha
c72dafa906 Fix error when selecting all boards on the discussion pane 2012-09-14 13:45:01 -04:00
Tom Giannattasio
b98b43e8b9 sidebar height one pixel taller 2012-09-14 11:41:48 -04:00
Tom Giannattasio
19c5895cbe tweaked profile posted details template 2012-09-14 11:30:51 -04:00
David Ormsbee
2e34c4ae5c Merge pull request #676 from MITx/feature/kfiedler/ocw-links 
Feature/kfiedler/ocw links
 2012-09-14 07:26:53 -07:00
Arjun Singh
f656da46ec bump inline count, fix tiny bug for server startup 2012-09-14 06:00:01 -07:00
Arjun Singh
7dbea50d79 reasonable behavior when creating a thread 2012-09-14 05:52:49 -07:00
Arjun Singh
27b80bc8e8 Merge branch 'feature/arjun/new-discussions' of github.com:MITx/mitx into feature/arjun/new-discussions 2012-09-14 04:07:15 -07:00
Arjun Singh
edf02dd90e Fix context links for the 123187th time 2012-09-14 04:07:04 -07:00
Ibrahim Awwal
a570b6030a Prevent threads from being added to a discussion twice. 
Probably slow, but it works for now.
 2012-09-14 03:40:41 -07:00
Ibrahim Awwal
d05c92ba7c Merge branch 'feature/arjun/new-discussions' of github.com:MITx/mitx into feature/arjun/new-discussions 2012-09-14 02:59:58 -07:00
Ibrahim Awwal
a665f3aa18 Change CSS class for more pages button to .more-pages 2012-09-14 02:59:47 -07:00
Arjun Singh
8f63ec4d44 merge 2012-09-14 02:56:34 -07:00
Arjun Singh
fff7bcc5a7 Remove more tags; anonymity to peers 2012-09-14 02:50:08 -07:00
Ibrahim Awwal
154cb843dd Bump up threads per page again, because I don't think showing 5 threads at a time is 
particularly useful.
 2012-09-14 02:48:49 -07:00
Ibrahim Awwal
6057904d51 Fix sidebar height growing forever when loading more pages, and also jumping to top when loading more pages. 2012-09-14 02:40:15 -07:00