Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,731 Commits 1 Branch 0 Tags
435c3c633811ea5164311caefc7d94de1595c435
Commit Graph

17975 Commits

Author SHA1 Message Date
Vik Paruchuri
0887383ca7 Don't show peer grading button unless there is a peer grading element in the course 2013-05-21 14:18:00 -04:00
Calen Pennington
158948336f Merge pull request #2046 from edx/fix/cale/pylint-cleanup 
Fix/cale/pylint cleanup
 2013-05-21 10:27:13 -07:00
Calen Pennington
cfe220a746 Add exceptions for unused imports in settings files 2013-05-21 13:07:04 -04:00
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
Chris Dodge
094e396556 Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master 2013-05-21 09:47:11 -04:00
Calen Pennington
241ef68f4f Start linting envs files, add task to only pylint errors, and move pylintrc file to the correct location 2013-05-21 09:34:12 -04:00
Vik Paruchuri
d0e8965a3c Fix pep8/pylint issues 2013-05-20 16:42:27 -04:00
Vik Paruchuri
3b3cf19c47 Fix tests and add in jasmine test 2013-05-20 15:52:19 -04:00
Vik Paruchuri
23269359c1 Jasmine tests, fix some review issues 2013-05-20 15:31:56 -04:00
e0d
a7b02e0029 actually needs to be 255 given unicode requirements 2013-05-20 14:40:05 -04:00
Vik Paruchuri
7699c1794c Merge remote-tracking branch 'origin/master' into feature/vik/oe-editor 2013-05-20 14:16:04 -04:00
Vik Paruchuri
16e1ecf686 fix some pylint violations 2013-05-20 12:46:12 -04:00
e0d
0e37564490 pep8 fixes 2013-05-20 12:01:25 -04:00
e0d
a54ecb98c6 resizing uri column 2013-05-20 11:59:56 -04:00
Vik Paruchuri
55fda26fd8 Fix tests, fix xqueue error, minor polish 2013-05-20 11:29:19 -04:00
Chris Dodge
a44e816877 remove_open_ended_panel_tab() -> remove_extra_paneltab(). Also, update new forums test factors to use refactored Models.py 2013-05-20 10:33:52 -04:00
Chris Dodge
fbbae44988 Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master 
Conflicts:
	cms/djangoapps/contentstore/views/course.py
	lms/djangoapps/django_comment_client/base/views.py
	lms/djangoapps/django_comment_client/management/commands/show_permissions.py
	lms/djangoapps/django_comment_client/models.py
	lms/djangoapps/django_comment_client/tests/test_utils.py
	lms/envs/common.py
 2013-05-20 10:22:36 -04:00
Vik Paruchuri
4c80325db3 Start working on COE editor, fix name checking in module_render 2013-05-20 08:11:54 -04:00
e0d
f8e9c4d4d1 Merge pull request #2078 from edx/hotfix/rocha/celery-default-queue-name 
Set the default celery queue name in addition to the default routing key
 2013-05-17 15:02:31 -07:00
Carlos Andrés Rocha
34d39dde9a Set the default celery queue name in addition to the default routing key 2013-05-17 17:59:51 -04:00
Greg Price
372084e0b6 Merge branch 'drupal-new' 
Conflicts:
	lms/envs/common.py
 2013-05-17 16:17:35 -04: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
Carlos Andrés Rocha
0042988ea7 Merge pull request #2063 from edx/feature/rocha/lets-use-celery 
Add Celery configuration to LMS and CMS
 2013-05-17 12:36:23 -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
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