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

2298 Commits

Author SHA1 Message Date
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
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
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
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
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