Commit Graph

5467 Commits

Author SHA1 Message Date
marco
820544c1c4 pin and flag icons using fontawesome now render properly through inline discussions 2013-07-22 15:36:44 -04:00
marco
5b3cb53689 visual cleanup for discussion home bar 2013-07-22 15:17:10 -04:00
marco
747102cfc2 additional git rebase cleanup 2013-07-22 14:09:40 -04:00
marco
83b4dc634a final cleanup from git rebase 2013-07-22 13:51:52 -04:00
marco
3495cebf31 modified html for discussion home to use tables instead of lists, cleaned up styling as well 2013-07-22 13:46:47 -04:00
marco
9eca557761 updated flag icons to be font-awesome based 2013-07-22 13:44:19 -04:00
marco
646ff9ea75 removed new post icon and added font-awesome replacement 2013-07-22 13:43:19 -04:00
marco
d8498bfbcf new post button using font-awesome 2013-07-22 13:43:19 -04:00
marco
78ffc12ae0 cleaned up margin and padding to use baseline variable 2013-07-22 13:39:14 -04:00
marco
a9ea00aa27 removed border to the right of discussion list 2013-07-22 13:38:31 -04:00
marco
e87d07184d basic shell for home page exists, along with start of color cleanup for the rest of _discussion.scss 2013-07-22 13:20:27 -04:00
marco
e2f02cdf46 cleaned up variables styling to sync up closer to studio, incorporated fontawesome icons into discusison home with basic positioning 2013-07-22 13:16:09 -04:00
marco
37c9de7a01 cleaned up font-awesome integration to work with new mako file .scss compiling, added in initial icon references 2013-07-22 13:07:53 -04:00
marco
2c9e4ca54a addition of font-awesome to LMS sass vendor assets, in additio nto light organization for applicaiton.scss to match studio sass breakdown. 2013-07-22 13:04:07 -04:00
marco
38e040ae0d basic shell for discussion home page with both profile information and email notification settings 2013-07-22 11:55:29 -04:00
marco
8d49007666 blankslate edited, header bar now with home button 2013-07-22 11:48:52 -04:00
marco
9c452935b5 updated pinning icons and removed images 2013-07-22 11:38:43 -04:00
marco
0e0ceb4806 updated flag icons to be font-awesome based 2013-07-22 11:37:57 -04:00
marco
642b649f76 removed new post icon and added font-awesome replacement 2013-07-22 10:58:58 -04:00
marco
e2779468e4 new post button using font-awesome 2013-07-22 10:26:38 -04:00
marco
90e60c1fb6 cleaned up topic header to allow for multiple line titles still being visible 2013-07-22 10:15:49 -04:00
marco
1a267a5067 removed icon stack from email area of helpgrid 2013-07-22 10:15:49 -04:00
marco
d2fae78824 icon color changes and profile link style to match profile page 2013-07-22 10:15:49 -04:00
marco
ff9f5714dd sass build cleanup for baseline fixes 2013-07-22 10:15:49 -04:00
marco
a0f54aaf26 cleaned up margin and padding to use baseline variable 2013-07-22 10:15:49 -04:00
marco
b55b34ff0c removed border to the right of discussion list 2013-07-22 10:15:06 -04:00
marco
f674e61f7a basic shell for home page exists, along with start of color cleanup for the rest of _discussion.scss 2013-07-22 10:15:06 -04:00
marco
6657ac189a cleaned up variables styling to sync up closer to studio, incorporated fontawesome icons into discusison home with basic positioning 2013-07-22 10:13:22 -04:00
marco
1fe54ba005 cleaned up font-awesome integration to work with new mako file .scss compiling, added in initial icon references 2013-07-22 10:13:22 -04:00
marco
0812867ab7 added in vendor font references to lms for font-awesome 2013-07-22 10:10:23 -04:00
marco
8216bb611d addition of font-awesome to LMS sass vendor assets, in additio nto light organization for applicaiton.scss to match studio sass breakdown. 2013-07-22 10:10:23 -04:00
marco
8886b59684 basic shell for discussion home page with both profile information and email notification settings 2013-07-22 10:10:23 -04:00
marco
17f4579f7d blankslate edited, header bar now with home button 2013-07-22 10:10:22 -04:00
Jason Bau
034de2cfd2 Allow session backend to be configurable and also add PLATFORM_NAME
to cms settings (it was throwing 500s for Stanford when the CMS
calls render_from_lms)
2013-07-19 17:43:37 -07:00
Renzo Lucioni
1fc4ac864e Add feature showing current score next to problem title 2013-07-19 16:14:24 -04:00
Adam
73e6e6f443 Merge pull request #394 from edx/fix/foldit-leaderboard
Fix/foldit leaderboard
2013-07-19 12:09:37 -07:00
Joe Blaylock
044a69d63d Merge pull request #52 from edx/nate/simple-chat
Simple port of Class2Go's chat feature
2013-07-19 10:10:32 -07:00
Vik Paruchuri
a2522c492c Merge pull request #160 from edx/fix/vik/studio-oe
Fix/vik/studio oe
2013-07-19 08:44:16 -07:00
Ned Batchelder
66ca7d750e Merge pull request #411 from edx/ned/studentmodulehistory-cleaner-command
Ned/studentmodulehistory cleaner command
2013-07-19 08:33:37 -07:00
Adam Palay
a04539af5d change models to filter by course 2013-07-19 11:03:25 -04:00
Joe Blaylock
50c906732f Chat rebase, test update
Rebase on today's master and update to unit test to include settings
where needed.
2013-07-18 15:00:54 -07:00
Nate Hardison
293bd30a59 Use chat settings when deciding whether to render
Only render the chat widget if both the site has enabled it in the
`MITX_FEATURES` and if the course has enabled it. In addition, fail
gracefully with a log warning if the `JABBER_DOMAIN` is not set, and
do not try to render the widget. However, do go ahead and render the
rest of the courseware.
2013-07-18 15:00:54 -07:00
Nate Hardison
3aec9fdb77 Add setting to enable/disable chat site-wide
To protect against chat blowing things up, we include a way to
enable and disable it on an entire site-wide basis.
2013-07-18 15:00:54 -07:00
Nate Hardison
f4ae0e0cae Test generation of chat settings
Ensure that the chat connection settings are generated properly for
the template context.
2013-07-18 15:00:54 -07:00
Nate Hardison
c53a550f3b Remove additional jQuery include
jQuery already available across the whole site at the top level, so
no need to include it again specifically for the chat widget.
2013-07-18 15:00:54 -07:00
Nate Hardison
a0ab47658a Move Candy.js files to new vendor/ directory 2013-07-18 15:00:54 -07:00
Nate Hardison
bf8e5e6ba1 Simple port of Class2Go's chat feature
Embed a chat widget (much like the calculator widget) into the
courseware. To use, you must point it at an ejabberd box,
configured as `JABBER_DOMAIN` in the settings.
2013-07-18 15:00:53 -07:00
Ned Batchelder
89c48f4a30 Use CodeJail with FSIZE support, and default to 50k 2013-07-18 17:25:05 -04:00
Sarina Canelake
7615a0638b Merge pull request #310 from robertjmarks/master
Adds in changes for stat2.3x question type
2013-07-18 13:44:00 -07:00
Diana Huang
3f9431e8cf Provide implicit saves for XBlocks and XModules.
Update existing tests and provide new ones to test new paradigm.
2013-07-18 16:37:34 -04:00