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

4711 Commits

Author SHA1 Message Date
David Baumgold
0c368011da Move underscore templates into separate files, included in Mako templates 2013-05-22 15:55:50 -04:00
Ned Batchelder
b9d134e3d1 Merge pull request #2101 from edx/ned/fix-code-import-for-check-functions 
Check functions need access to course-local code also, so we need to sav...
 2013-05-22 12:32:43 -07:00
Ned Batchelder
392de8d40e Check functions need access to course-local code also, so we need to save the python path from the problem setup, and use it for the check function. 2013-05-22 13:27:24 -04:00
VikParuchuri
f8e68216a7 Merge pull request #2096 from edx/fix/vik/oe-cache 
Fix/vik/oe cache
 2013-05-22 09:59:33 -07:00
e0d
e4c3f92372 Merge pull request #2100 from edx/hotfix/e0d/code-jail 
Sandbox-installed packages will be really installed instead of -e instal...
 2013-05-22 09:05:03 -07:00
Vik Paruchuri
3bd04290f5 Add tests, address review comments 2013-05-22 11:58:03 -04:00
Vik Paruchuri
a44eacd474 Make fields stringy, remove false dict 2013-05-22 10:54:52 -04:00
Ned Batchelder
ce005072b0 Sandbox-installed packages will be really installed instead of -e installed. 2013-05-21 19:21:39 -04:00
Ned Batchelder
e59d345917 Use a different arbitrary dotted module, which Christina doesn't already have imported 2013-05-21 14:27:50 -04:00
Brian Talbot
31b5c4ab61 studio - adds back in older lh() Sass function/mixin and moves it to the inheritied/to-be-sunsetted mixins sheet 2013-05-20 15:20:17 -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
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
d4cee365e6 Ensure CSRF cookie is present for login and registration pages 2013-05-17 14:23:28 -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
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
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