Commit Graph

15790 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
Peter Fogg
9a61038c87 Merge pull request #432 from edx/peter-fogg/update-asset-deletion-prompt
Change delete asset prompt to Warning type for consistency.
2013-07-22 06:10:15 -07:00
Calen Pennington
1b6f81b0c2 Merge pull request #408 from edx/cale/make-release-email-script-wiki-friendly
Make release email script wiki-friendly
2013-07-22 05:59:02 -07:00
Jason Bau
6c3de222cc Merge pull request #450 from edx/jbau/configure-session
Allow session backend to be configurable
2013-07-21 20:44:15 -07:00
Calen Pennington
679b118ed3 Merge pull request #271 from edx/dhm/next-gen-modulestore
Next gen modulestore
2013-07-20 04:51:11 -07:00
Calen Pennington
6dab09f5f2 PEP8 and Pylint fixes 2013-07-20 06:26:38 -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
Will Daly
efc6a3081d Merge pull request #444 from edx/will/fix-acceptance-tests
Will/fix acceptance tests
2013-07-19 14:16:50 -07:00
Will Daly
76a63a6ef0 Disabled test failing due to bug in Studio 2013-07-19 17:13:51 -04:00
Renzo Lucioni
011ceb8e63 Merge pull request #418 from edx/renzo/in-context-progress
Renzo/in context progress
2013-07-19 14:01:40 -07:00
Will Daly
17daa2a023 Fixed two other tests 2013-07-19 16:49:16 -04:00
Will Daly
27d51b3453 Attempt to fix video test 2013-07-19 16:49:15 -04:00
Renzo Lucioni
9af87e41ba Resolve issues with persistence and sequential bar 2013-07-19 16:14:24 -04: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
Don Mitchell
913c601ac1 Move default set_many impl to xblock 2013-07-19 15:08:24 -04:00
Adam
032b02df24 Merge pull request #445 from edx/adam/fix/wiki
set django-wiki to its most recent version
2013-07-19 12:02:39 -07:00
Don Mitchell
549ef5d494 Ensure kvs up-to-date if code accessing it. 2013-07-19 14:55:49 -04:00