Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,365 Commits 1 Branch 0 Tags
2c83dc3f09b49d740407daaffe05ab8fd549ed8a
Commit Graph

8693 Commits

Author SHA1 Message Date
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
cahrens
5920ea91ee One minor update. 2013-05-17 11:00:00 -04:00
Diana Huang
2b80b358ed Add in a test for the marketing_link function in mitxmako 2013-05-17 10:51:37 -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
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
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
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
Ned Batchelder
bbd1d8d09e From code review: the hash was shallow, so nested objects could have hashed differently when they didn't need to. 2013-05-16 13:58:05 -04:00
cahrens
a6c5e699ea Update combined open ended and peer grading per conversation with Vik. 2013-05-16 13:28:48 -04:00
Arthur Barrett
1fbe43a650 Merge branch 'master' into feature/abarrett/lms-notes-app 2013-05-16 13:23:12 -04:00
Ned Batchelder
f05b25d17a Added more to the safe_exec docstring. 2013-05-16 13:15:28 -04:00
Jay Zoldak
b97772a9c6 Gitignore jasmine_test_runner.html in the appropriate place. 2013-05-16 12:39:48 -04:00
Will Daly
1e1e6450df Pep8 fixes 2013-05-16 11:33:50 -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
82d2b78b96 update jasmine tests 2013-05-16 10:56:58 -04:00
Your Name
90892450b7 failed jasmine tests still failing 2013-05-16 10:56:57 -04:00
Jay Zoldak
cc2cc469fe more work on jasmine tests for forums 2013-05-16 10:56:57 -04:00
Jay Zoldak
cbdf93473b start to get the jasmine tests working for comment service 2013-05-16 10:56:57 -04:00
Jay Zoldak
ed3df10638 Set up rake task for jasmine tests for discussion forums code. 2013-05-16 10:56:57 -04:00
Jay Zoldak
ed5ad46192 Revert "Revert "fix merge conflict"" 
This reverts commit 2df3fe9344.

Conflicts:
	common/static/coffee/src/discussion/utils.coffee
 2013-05-16 10:29:33 -04:00
Your Name
4b806768ec more server trial and error 2013-05-16 10:29:33 -04:00
Your Name
8568ce7ad0 server django version generating 1 instead of True so test for both 2013-05-16 10:29:33 -04:00
Kevin Chugh
ab08fa94e4 coffeescript fixes 2013-05-16 10:29:32 -04:00
marco
ef14155306 cleaned up latex styling, polyfill function wrapper, draft number template update for polyfill 2013-05-16 09:50:16 -04:00
Ned Batchelder
8f3c1db1ef Add some notes for the future maintainer. 2013-05-15 17:00:39 -04:00
marco
bbb6a3c60d resolved metadata-edit conflict, adding in latex item into settings 2013-05-15 16:27:04 -04:00
marco
12dae84a07 commented out firefox polyfill ad well as xmodule css editor changes 2013-05-15 16:07:45 -04:00
Calen Pennington
ec7c47828f Merge pull request #1961 from edx/feature/cale/maintain-dev-environment 
Feature/cale/maintain dev environment
 2013-05-15 12:36:36 -07:00
cahrens
d72b6b05bf Merge branch 'master' into feature/christina/metadata-ui 
Conflicts:
	cms/static/sass/views/_static-pages.scss
 2013-05-15 15:29:27 -04:00
Calen Pennington
52d209d053 Use coffee installed in local node_modules for tests 2013-05-15 15:25:41 -04:00
cahrens
fa1dfd716a Update unit test for editable_metadata_fields. 2013-05-15 15:25:36 -04:00
Calen Pennington
964c21ff2b Add a jasmine test runner for capa 2013-05-15 15:23:56 -04:00
Calen Pennington
ef17e9368c Make capa specify distribute 0.6.28 like the rest of the project 2013-05-15 15:23:56 -04:00
Calen Pennington
14bf719538 Merge pull request #2019 from edx/fix/cale/xmodule-template-docs 
Add documentation of xmodule template files
 2013-05-15 12:20:10 -07:00
cahrens
d35b29031f Clean up editable_metadata_fields. 2013-05-15 14:01:18 -04:00
marco
b3e41d19f6 styling for static pages updated 2013-05-15 13:29:35 -04:00
Ned Batchelder
b32878e6c7 Added instructions for getting capa sandboxed. 2013-05-15 12:59:56 -04:00
dcadams
6225950356 Merge branch 'master' of github.com:edx/edx-platform into feature-dcadams-usermanagement 2013-05-15 09:48:14 -07:00