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
Carlos Andrés Rocha
35bd38d677
Add status app with simple view to check celery workers
2013-05-17 11:33:14 -04:00
Carlos Andrés Rocha
c05efbc31e
Added base Celery settings
2013-05-17 11:33:14 -04:00
Carlos Andrés Rocha
95496b5c50
Cleanup dev settings a little bit
2013-05-17 11:33:14 -04:00
Diana Huang
dadcdd0599
Fix lettuce signup feature to match Drupal site.
2013-05-17 10:51:38 -04:00
Diana Huang
acfcd0f8a4
Fix the login lettuce feature for the new Drupal site.
2013-05-17 10:51:38 -04:00
Ned Batchelder
f856b69ab5
Merge branch 'feature/ned/sandboxed-python'
2013-05-17 10:28:06 -04:00
Your Name
867d69ed12
update views.py to add docstrings and change exception name to address pylint errors
2013-05-16 18:13:59 -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
Greg Price
37ec01dd8d
Handle ItemNotFoundError from the modulestore to avoid 500 errors
2013-05-16 16:50:03 -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
22cf0dfa97
Fix bug in lettuce tests where the unregister dialog wasn't
...
getting closed fast enough.
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
Jay Zoldak
71626f4ff6
Pep8 fixes of django_comment_client code
2013-05-16 15:57:34 -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
Arthur Barrett
adcd1dd886
update annotator.min.css with change to fix adder button and serve the minified one.
2013-05-16 14:48:06 -04:00
Arthur Barrett
52e5fe223c
update annotator.js library and fix the annotator-adder button hover state in courseware.
2013-05-16 14:27:21 -04:00
Ned Batchelder
e947218285
Merge master to here.
2013-05-16 14:21:51 -04:00
Arthur Barrett
e89cd7a397
fix test to check for 400 status code instead of 500.
2013-05-16 13:38:14 -04:00
Arthur Barrett
1fbe43a650
Merge branch 'master' into feature/abarrett/lms-notes-app
2013-05-16 13:23:12 -04:00
Arthur Barrett
0dd8dabf13
validation errors should return 400 status code instead of 500.
2013-05-16 13:18:36 -04:00
Will Daly
342b3bb0e9
Merge branch 'master' into feature/will/ci-lettuce-tests
...
Resolved conflict with changes to Rakefile in master
Conflicts:
rakefile
2013-05-16 11:21:59 -04:00
Your Name
a9db41d8d0
flag and unflag tests for comments and threads
2013-05-16 10:59:23 -04:00
Your Name
c7e0b576d0
fix missing paren
2013-05-16 10:59:23 -04:00
Kevin Chugh
03725de34a
flag abuse failing
2013-05-16 10:59:23 -04:00
Kevin Chugh
fa269d3c96
add flag thread django test
2013-05-16 10:59:23 -04:00
marco
71be3debc4
updated flagging icons to not use other libraries
2013-05-16 10:56:58 -04:00
Jay Zoldak
e1481d93a8
Work on view test for comment client code.
2013-05-16 10:56:58 -04:00
Jay Zoldak
7e63611478
Start adding view tests for discussion client. Note that these will not work unless you change your test.py to enable discussion forums.
2013-05-16 10:56:57 -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
marco
495cd305d4
adjusted cursor for span label on pins to be default
2013-05-16 10:29:34 -04:00
Your Name
e2d3aee768
styling inline flaggin
2013-05-16 10:29:34 -04:00
marco
65dbd3cf73
padding around icons for flags and pins
2013-05-16 10:29:34 -04:00
marco
0a43c0ff59
minor css tweaks to flag and pin icons
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
78097c7ee1
update css for better cursor on pinning and flagging
2013-05-16 10:29:33 -04:00
Your Name
121f678f1b
restore flagging to inline thread
2013-05-16 10:29:33 -04:00
Jay Zoldak
3b8a8a13b0
Revert "Revert "Merge pull request #1883 from MITx/feature/kevin/flagging_refactor_verbs""
...
This reverts commit 5560a4add4
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
Kevin Chugh
c410da91de
fix coffeescript error
2013-05-16 10:29:32 -04:00
Calen Pennington
0701e1a776
Use local node_modules as system_node_path if none is set
2013-05-15 15:25:42 -04:00
dcadams
67356cdcc8
Merge of master to get Jenkins running.
2013-05-15 09:54:53 -07:00
dcadams
6225950356
Merge branch 'master' of github.com:edx/edx-platform into feature-dcadams-usermanagement
2013-05-15 09:48:14 -07:00
Will Daly
1240c5ae92
Merge branch 'master' into feature/will/ci-lettuce-tests
2013-05-15 11:40:54 -04:00
