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

13825 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Diana Huang
00378add25 Merge pull request #2065 from edx/diana/drupal/fix-link-test 
Drupal: Fix test so that it works with both CMS and LMS settings
 2013-05-17 12:08:46 -07:00
Greg Price
bc650887c9 Merge pull request #2070 from edx/fix/gprice/moar-cookies 
Ensure CSRF cookie is present for login and registration pages
 2013-05-17 11:56:59 -07:00
Ned Batchelder
61f135944d Print a message if the requirements files haven't changed. 2013-05-17 14:56:44 -04:00
Sarina Canelake
73e05b3e67 Add Frances Botsford as one of our authors 2013-05-17 14:48:11 -04:00
Will Daly
a28aed5803 Added tests for capa input templates. This includes tests 
for HTML we expect to be unescaped.
 2013-05-17 14:38:59 -04:00
Sarina
036be2a692 Merge pull request #2001 from edx/jtauber/intial-authors 
added initial AUTHORS file
 2013-05-17 11:37:51 -07:00
Greg Price
d4cee365e6 Ensure CSRF cookie is present for login and registration pages 2013-05-17 14:23:28 -04:00
Calen Pennington
280f09739f Batched coffee --watch compilation in smaller batches 
This is to work around an OSx issue that causes EMFILE errors in the
default configuration.
Ref: https://github.com/joyent/node/issues/2479
 2013-05-17 14:22:01 -04:00
Greg Price
f200bca6f8 Merge pull request #2066 from edx/fix/gprice/mktg-access-courseware 
Make "access courseware" buttons for marketing site break out of iframes
 2013-05-17 11:13:40 -07:00
Greg Price
db3189d5ad Disable marketing registration button for courses that user cannot enroll in 2013-05-17 14:10:04 -04:00
frances botsford
cb9d2c8879 Merge pull request #2064 from edx/bug/frances/studio-ffnavwrap 
Bug fix for Studio nav in FF on PC
 2013-05-17 11:08:03 -07:00
Frances Botsford
e69b5c4792 adjusted width of header nav to prevent wrapping in PC FF, also put max-width on Org name and Course number in header to prevent the nav from getting bumped way over 2013-05-17 14:07:06 -04:00
Greg Price
e4509ae3ad Make "access courseware" buttons for marketing site break out of iframes 2013-05-17 13:31:22 -04:00
Diana Huang
15a5e6c1ac Fix test so that it works with both CMS and LMS settings 2013-05-17 13:18:10 -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
Christina Roberts
f4044ed1e8 Merge pull request #2061 from edx/bug/christina/static-pages 
Make sure to get the correct modulestore on delete (static tabs do not e...
 2013-05-17 09:59:59 -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
Ned Batchelder
935905665c Have to look in subdirectories for requirements files. 2013-05-17 11:31:28 -04:00
Jay Zoldak
a1a33eb5e5 Fix path to phantom jasmine now that we install via node 2013-05-17 10:53: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
Diana Huang
2b80b358ed Add in a test for the marketing_link function in mitxmako 2013-05-17 10:51:37 -04:00
Brian Talbot
163a50c697 Merge pull request #2055 from edx/fix/btalbot/studio-tooltips 
Studio: Tooltip line-height/visual space fix
 2013-05-17 07:47:30 -07:00
Brian Talbot
85f2be44b5 studio - resolves line-height issue that core typography settings creates with tooltip rendering 2013-05-17 10:46:58 -04:00
Ned Batchelder
f856b69ab5 Merge branch 'feature/ned/sandboxed-python' 2013-05-17 10:28:06 -04:00
Your Name
6fb8adaa50 add flagging and unflagging tests to response show view 2013-05-17 09:52:02 -04:00
Your Name
ad5b71deae format content view test for readability 2013-05-17 09:34:41 -04:00
Your Name
296a878169 add flagging tests to DiscussionContentView 2013-05-17 09:31:12 -04:00
Your Name
ce2308b5bb add flagging tests to DiscussionContentView 2013-05-17 09:28:12 -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
cahrens
944d2d61f1 Make sure to get the correct modulestore on delete (static tabs do not exist in draft modulestore). 
#324
 2013-05-16 17:15:53 -04:00
Ned Batchelder
d0c4afb32f More info in the capa/safe_exec/README 2013-05-16 17:02:45 -04: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
Jay Zoldak
9fba56c0e2 Include running jasmine tests for discussion forums on jenkins 2013-05-16 16:49:25 -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
Greg Price
f30b9d91e9 Merge pull request #2057 from edx/fix/gprice/disable-courseware-links 
Disable courseware links on marketing site and dashboard if courseware is not accessible
 2013-05-16 13:23:19 -07:00
Jay Zoldak
71626f4ff6 Pep8 fixes of django_comment_client code 2013-05-16 15:57:34 -04:00
chrisndodge
ce56fa3066 Merge pull request #1990 from edx/feature/abarrett/lms-notes-app 
LMS Notes Djangoapp
 2013-05-16 12:38:56 -07:00
John Jarvis
2fd0b1b972 Merge pull request #2054 from edx/jarv/move-edx-requirements 
Jarv/move edx requirements
 2013-05-16 12:13:44 -07: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
d8fed59314 Use the latest CodeJail. 2013-05-16 14:54:13 -04:00