jsa
06eb5cdd93
Merge branch 'feature/kevin/email_notifications_panel' of https://github.com/edx/edx-platform into feature/kevin/email_notifications_panel
2013-07-29 18:13:46 -04:00
jsa
33d4ae69dd
add feature flag to enable/disable discussion home panel
2013-07-29 18:13:12 -04:00
marco
b7d6d77464
visual cleanup for email icon and discussion context label post branch merge
2013-07-29 17:49:34 -04:00
Your Name
7507921929
merge with Marcos new design
2013-07-29 13:58:08 -04:00
Your Name
13ca61ba7f
fix merge conflict with _variables.scss
2013-07-29 13:32:54 -04:00
Your Name
6276997180
update checkbox with get settings
2013-07-29 13:26:31 -04:00
Brian Talbot
2ee140eb79
edx.org: syncing up capitalization of register/login submit button copy
2013-07-29 10:21:54 -04:00
Brian Talbot
d61e4e50ec
edx.org: abstracting new edx.org button extends and colors with other themes in mind
2013-07-29 10:21:54 -04:00
Brian Talbot
76b0a03bc2
edx.org: revises iframe-based register/status buttons to match revised styles
2013-07-29 10:21:54 -04:00
Giulio Gratta
214a814b94
Adjustment to show sequence tool tips in LMS
2013-07-25 00:48:36 -04:00
Kevin Chugh
5d106ee048
Merge branch 'master' into feature/kevin/email_notifications_panel
2013-07-25 00:31:42 -04:00
Diana Huang
86ee2bca7a
Merge branch 'release'
...
Conflicts:
lms/djangoapps/courseware/tests/test_views.py
2013-07-23 17:57:07 -04:00
Diana Huang
2926c94330
Prevent XSS attack via submission_history page.
...
Conflicts:
lms/djangoapps/courseware/tests/test_views.py
2013-07-23 17:23:59 -04:00
marco
77a23a37d0
reordered email settings checkbox to impact styling for icon and cleaned up header navigation for discusisons
2013-07-23 15:43:12 -04:00
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
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
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
Greg Price
47b51e9329
Add endpoints to set user notification preference
...
Two endpoints are intended to be used by AJAX calls from the web UI with an
authenticated user. When enabled, the value of the preference is an encryption
of the username, to be used as a token for one-click unsubscribe links. The
third endpoint is the target of unsubscribe links, which displays a page with
an appropriate message to the user.
2013-07-22 11:50:26 -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
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
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
Renzo Lucioni
1fc4ac864e
Add feature showing current score next to problem title
2013-07-19 16:14:24 -04: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
Kevin Chugh
63b2b47106
update to render home page
2013-07-19 07:33:50 -04: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
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
Vik Paruchuri
915f815c63
Merge remote-tracking branch 'origin/master' into fix/vik/studio-oe
...
Conflicts:
common/lib/xmodule/xmodule/combined_open_ended_module.py
2013-07-18 11:55:37 -04:00
Jason Bau
c789642ebd
Merge pull request #396 from edx/jbau/fix/stanford-pwdreset-remove-vendor-js
...
put block around main_vendor js in main_django.html
2013-07-17 14:33:21 -07:00
frances botsford
033a36efb9
Merge pull request #371 from edx/fix/frances/lms-pdfviewer-cleanup
...
Quick LMS pdfviewer layout cleanup
2013-07-17 06:53:10 -07:00
Kevin Chugh
fbd0f1bec0
wire up static HTML to allow panel functionality
2013-07-15 20:09:01 -04:00
Frances Botsford
27b7e35bd3
i18n the PDF prev/next button text
2013-07-15 13:54:04 -04:00
