Vik Paruchuri
77eb35a75f
Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui
2013-07-19 13:35:37 -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
0ef6bc9043
Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui
2013-07-18 12:03:48 -04: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
Greg Price
7c5943a87c
Tweak behavior of submit buttons on register and login pages
...
The buttons are not re-enabled if the registration/login submission succeeds
(and, therefore, the user is about to be directed to another page). Also, any
error message that is present does not disappear immediately before the page
redirects.
2013-07-15 13:13:52 -04:00
Jason Bau
c9943306ef
put block around main_vendor js in main_django.html
...
should be a no-op for edx-east, but allow edx-west to remove
vendor.js with a blank {% block %}
in our password_reset_confirm.html to fix a bug
2013-07-12 23:22:50 -07:00
Vik Paruchuri
ffad965536
fix some combinedopenended ui and data routing
2013-07-12 15:06:11 -04:00
Vik Paruchuri
0cadc8af36
Change status bar UI
2013-07-12 14:13:53 -04:00
Miki Goyal
ae45f5461c
Fixed a spelling mistake. LMS-605
2013-07-12 12:19:15 -04:00
Miki Goyal
5fd84465e2
Fix alt text for the login page: LMS-600
2013-07-12 10:05:13 -04:00
Frances Botsford
b1653f0561
layout cleanup on LMS PDF Textbook viewer
2013-07-11 11:19:39 -04:00
Vik Paruchuri
d710d8e43a
Merge remote-tracking branch 'origin/master' into fix/vik/studio-oe
2013-07-11 10:52:50 -04:00
David Baumgold
caa2cf0d76
Removed all press releases from repo
...
They are on the Drupal site now
2013-07-09 11:38:15 -04:00
ichuang
ec20f568ea
remove extra bracket which had crept into instructor dashboard
2013-07-08 08:17:38 -04:00
caesar2164
b3723b1a22
Merge pull request #288 from edx/giulio/accessibility-2
...
Round 2 Accessibility Changes
2013-07-02 13:41:50 -07:00
Renzo Lucioni
42efd33cfa
Refactor Segment.io integration with sequentials and instructor dashboard pages
2013-07-02 13:49:33 -04:00
Giulio Gratta
86a1e4263d
added alt tags to course cover images and find course page logo
2013-07-02 09:26:41 -07:00
Giulio Gratta
7452381f1c
making sequence titles available to non-sighted users
2013-07-02 09:26:40 -07:00
Giulio Gratta
7af6409dc5
use jquery to focus on alert messages
2013-07-02 09:26:40 -07:00
Felix Sun
6890563d43
Fixed broken tests. Made the hint manager enabled in testing environments - this lets us test the hint manager.
2013-07-01 10:25:04 -04:00
Felix Sun
b64fe5c537
Finished prototype of hint moderation view. Began re-writing tests of the crowdsource hinter module. (Old tests no longer cover all the code, now that moderation has been added.)
2013-07-01 10:25:03 -04:00
Felix Sun
100f6bf11e
Began work on instructor view to hinting system.
...
Added moderation feature - you can now choose to hold all hints for moderator approval before showing.
2013-07-01 10:25:03 -04:00
Vik Paruchuri
8164ca9a78
Merge remote-tracking branch 'origin/master' into fix/vik/studio-oe
2013-06-27 16:11:24 -04:00
dcadams
6831e84834
Merge pull request #214 from edx/dcadams/email-on-invite
...
Dcadams/email on invite
2013-06-26 15:53:15 -07:00
dcadams
306ac48210
Email on enroll/un-enroll actions
...
Optionally email students on enroll/un-enroll actions
by instructor from enrollment tab in LMS.
2013-06-26 15:28:36 -07:00
Giulio Gratta
50f837d9d8
move marketing iframe breakout script to inside existing conditional
2013-06-26 10:22:59 -07:00
marco
84d505e8cc
modified html for discussion home to use tables instead of lists, cleaned up styling as well
2013-06-26 10:41:49 -04:00
Jason Bau
4a3165414d
Merge pull request #84 from edx/feature/jbau/activation-after-password-reset-confirm
...
Moves user activation from just clicking on reset password to following the link in the password reset email
2013-06-25 20:34:19 -07:00
marco
a24c3a9700
updated pinning icons and removed images
2013-06-25 13:28:55 -04:00
marco
05a7d664f7
updated flag icons to be font-awesome based
2013-06-25 13:28:55 -04:00
marco
770bfdc180
removed new post icon and added font-awesome replacement
2013-06-25 13:28:55 -04:00
marco
0f84a52023
new post button using font-awesome
2013-06-25 13:28:55 -04:00
marco
98cd032ade
cleaned up topic header to allow for multiple line titles still being visible
2013-06-25 13:28:55 -04:00
marco
b83d5aa42d
removed icon stack from email area of helpgrid
2013-06-25 13:28:55 -04:00
marco
b870679673
basic shell for home page exists, along with start of color cleanup for the rest of _discussion.scss
2013-06-25 13:28:54 -04:00
marco
52403420fd
cleaned up variables styling to sync up closer to studio, incorporated fontawesome icons into discusison home with basic positioning
2013-06-25 13:28:54 -04:00
marco
23f19423be
cleaned up font-awesome integration to work with new mako file .scss compiling, added in initial icon references
2013-06-25 13:28:54 -04:00
marco
8ef258d465
addition of font-awesome to LMS sass vendor assets, in additio nto light organization for applicaiton.scss to match studio sass breakdown.
2013-06-25 13:19:54 -04:00
marco
46998bd702
basic shell for discussion home page with both profile information and email notification settings
2013-06-25 13:19:53 -04:00
marco
3df08dc1c4
blankslate edited, header bar now with home button
2013-06-25 13:19:53 -04:00
Brian Wilson
332a440539
Enable per-student background tasks.
2013-06-24 18:47:50 -04:00
