Nate Hardison
cc7b2942ee
Handle Heroku's 503 maintenance mode response
...
The LMS comment client previously would try to parse the response
as JSON, choke, and return a 500 to the client. Now, the LMS client
displays a message indicating that the forums are down for
maintenance.
2013-05-21 10:03:51 -07:00
Greg Price
de5b4d7d27
Merge branch 'master' into drupal-new
2013-05-17 16:10:56 -04:00
Greg Price
5268d982ce
Merge pull request #2067 from edx/fix/gprice/mktg-button-closed-registration
...
Disable marketing registration button for courses that user cannot enrol...
2013-05-17 12:40:54 -07:00
Greg Price
db3189d5ad
Disable marketing registration button for courses that user cannot enroll in
2013-05-17 14:10:04 -04:00
Greg Price
e4509ae3ad
Make "access courseware" buttons for marketing site break out of iframes
2013-05-17 13:31:22 -04:00
Kevin Chugh
ef3204da69
Merge pull request #2059 from edx/feature/zoldak/forum-testing
...
Feature/zoldak/forum testing
2013-05-17 10:10:55 -07:00
Diana Huang
ba983d5f49
Merge pull request #2062 from edx/diana/drupal/lettuce-tests
...
Fix Lettuce Tests for Drupal site
2013-05-17 08:56:11 -07:00
Ned Batchelder
f856b69ab5
Merge branch 'feature/ned/sandboxed-python'
2013-05-17 10:28:06 -04:00
Greg Price
362736c4d1
Merge pull request #2060 from edx/fix/gprice/marketing-links
...
Fix marketing links in password reset pages
2013-05-16 14:24:13 -07:00
Greg Price
4e95aa053f
Fix marketing links in password reset pages
2013-05-16 16:57:56 -04:00
Diana Huang
b6c0081064
Look for the existence of the links, not for
...
the actual urls
2013-05-16 16:30:29 -04:00
Diana Huang
1c2175304e
Merge branch 'master' into drupal-new
2013-05-16 16:27:36 -04:00
Greg Price
b8d2276de7
Remove dashboard links for unstarted courses
...
If a course is not started, the course image and title on the dashboard link
to the course about page. Because the LMS course about pages do not exist
(i.e. 404) with the marketing site enabled, we simply do not use a link if
the course has not started.
2013-05-16 15:06:48 -04:00
Greg Price
ff2ba68d79
Tweak behavior of registration button for marketing site
...
If a user is already registered for a course but the course has not started
yet, display a grey button that says "you are registered" and goes nowhere
instead of the blue "access courseware" button, which goes to the LMS course
about page (which 404s).
2013-05-16 15:06:48 -04:00
Ned Batchelder
e947218285
Merge master to here.
2013-05-16 14:21:51 -04:00
marco
33e8621af6
cursor state for discussions (not inline) span text needed to be set to pointer
2013-05-16 10:29:34 -04:00
marco
18759b21d6
capitalization on tooltips
2013-05-16 10:29:34 -04:00
Your Name
90e7a84570
show inline pinning and flagging
2013-05-16 10:29:34 -04:00
Your Name
121f678f1b
restore flagging to inline thread
2013-05-16 10:29:33 -04:00
Jay Zoldak
ed5ad46192
Revert "Revert "fix merge conflict""
...
This reverts commit 2df3fe9344
2013-05-16 10:29:33 -04:00
Arthur Barrett
026773b508
fix pep8 warnings and add empty message to notes tab
2013-05-13 16:54:32 -04:00
Arthur Barrett
66d3ccff17
sanitize note text and other input in the model as well as escape template output to close potential security hole
2013-05-13 13:40:19 -04:00
Arthur Barrett
be98b5fa3e
merged master. resolved conflict in cms/djangoapps/contentstore/views.py (added word_cloud to advanced_modules list)
2013-05-13 13:26:55 -04:00
Vasyl Nakvasiuk
f1d1a3f606
refactoring after Python code review
2013-05-13 14:44:07 +03:00
Valera Rozuvan
13bed39dde
Refactoring after peer review.
2013-05-13 14:44:07 +03:00
Valera Rozuvan
f4b247d2bb
Refactoring, documenting, moving all HTML generation to template.
2013-05-13 14:44:07 +03:00
Vasyl Nakvasiuk
6deeb60278
update template for word_cloud, refactor empty json answer
2013-05-13 14:44:04 +03:00
Vasyl Nakvasiuk
dac9b5c038
Word Cloud: add full cycle Python + HTML + JS
2013-05-13 14:44:01 +03:00
Vasyl Nakvasiuk
dd5a7e7ba8
initialize JS for word_cloud
2013-05-13 14:44:01 +03:00
Alexander Kryklia
bb9bc42171
adds initial word_cloud_module files
2013-05-13 14:44:00 +03:00
Arthur Barrett
beabdf1434
Merge branch 'master' into feature/abarrett/lms-notes-app
2013-05-11 14:52:39 -04:00
Brian Talbot
e4b5d21ba6
edx.org - adds in text-decoration nullification and revised padding for course registration buttons
2013-05-10 17:24:48 -04:00
Brian Talbot
17affb0ac7
edx.org - reduces padding on course listing register buttons (all states) and resets box-sizing to border box to make a proper box model for element
2013-05-10 17:00:25 -04:00
Greg Price
ea4a8cf2ad
Merge pull request #1992 from edx/fix/gprice/login-button-link
...
Make login link button in header work with course enrollment flow
2013-05-10 11:14:39 -07:00
Greg Price
6f06a3d92a
Make login link button in header work with course enrollment flow
...
When an unauthenticated user clicks the registration button for a course, they
are redirected to the registration page with query params that are ultimately
included in the form that gets submitted so they can be enrolled in the course
upon successful registration. The header login button is fixed to pass the same
query parameters to the login page so the user can be enrolled in the course
upon successful login.
2013-05-10 11:03:38 -04:00
Greg Price
0a8d426706
Make activation complete page use non-modal login link
2013-05-10 11:02:39 -04:00
Greg Price
a0fb4d6c85
Merge branch 'master' into drupal-new
...
Conflicts:
lms/envs/aws.py
lms/envs/common.py
lms/static/sass/base/_base.scss
lms/templates/forgot_password_modal.html
2013-05-10 10:30:10 -04:00
Greg Price
c765906fc5
Merge pull request #1986 from edx/feature/gprice/fix-help-modal-text
...
Update "thank you" text in help modal
2013-05-09 14:37:13 -07:00
Greg Price
89d0dc1963
Update "thank you" text in help modal
...
As per request from Mary.
2013-05-09 17:16:43 -04:00
Arthur Barrett
dd583ce4f9
Merge branch 'master' into feature/abarrett/lms-notes-app
2013-05-09 14:32:05 -04:00
Diana Huang
e5b18a5688
Put Front End Developer back in.
2013-05-09 13:58:25 -04:00
Diana Huang
ec5f239d91
Add in new Coordinator position.
2013-05-09 09:12:07 -04:00
Diana Huang
1e61bbd1c8
Jobs page updates.
2013-05-08 16:06:08 -04:00
Greg Price
c82b28aac3
Merge pull request #1977 from edx/fix/gprice/drupal-registration-links
...
Fix links to honor code, ToS, and privacy policy for marketing site
2013-05-07 14:58:26 -07:00
Greg Price
7143749d7b
Fix links to honor code, ToS, and privacy policy for marketing site
2013-05-07 17:54:32 -04:00
Arthur Barrett
eca155f99a
Merge branch 'master' into feature/abarrett/lms-notes-app
2013-05-07 17:27:40 -04:00
Greg Price
50d8321bc5
Merge pull request #1975 from edx/fix/gprice/drupal-registration-button-text
...
Fix registration button text
2013-05-07 14:21:48 -07:00
Greg Price
23eacdbea2
Fix registration button text
2013-05-07 16:45:33 -04:00
Greg Price
dadb0b6931
Fix courses link in LMS header when not logged in
2013-05-07 16:35:08 -04:00
Giulio Gratta
91e2a39ec7
moving preventDefault() statements to the local script tag
2013-05-07 12:50:59 -07:00
