Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,212 Commits 1 Branch 0 Tags
3b165da17047b13c696ee319fa8798d20f8cff04
Commit Graph

4914 Commits

Author SHA1 Message Date
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
marco
0422350e8c final changes to codemirror styling, and clean up style for settings button clearing 2013-05-15 12:05:43 -04:00
Will Daly
1240c5ae92 Merge branch 'master' into feature/will/ci-lettuce-tests 2013-05-15 11:40:54 -04:00
Arthur Barrett
3a178bab1f Merge branch 'master' into feature/abarrett/lms-notes-app 2013-05-15 11:12:42 -04:00
marco
d264c943a4 Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui 2013-05-15 10:54:15 -04:00
marco
e157173c11 styling adjustments to codemirror and wrapped polyfill into a function 2013-05-15 10:53:54 -04:00
cahrens
d4d38827b4 Updates for showanswer. 2013-05-15 10:35:40 -04:00
Chris Dodge
ce52be1e57 Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master 2013-05-15 09:59:26 -04:00
Will Daly
8e069c1faa Skip tests that break on Ubuntu due to alerts (which will be removed 
soon anyway).  Removed @skip-phantom and @skip-firefox tags

Fixed sign up test to work in Ubuntu

Added comments
 2013-05-15 09:39:07 -04:00
Will Daly
ee5f0ac0ce Workaround for Ubuntu ChromeDriver issue. Now retries 
until it acquires a valid session.
 2013-05-15 08:24:27 -04:00
Vasyl Nakvasiuk
b02e92a80c fix word cloud test 2013-05-15 11:42:43 +03:00
Vasyl Nakvasiuk
0eb1b97ffc add more docs 2013-05-15 11:42:43 +03:00
Vasyl Nakvasiuk
0afe6c11ab word cloud: fix pylint warnings, use MetadataOnlyEditingDescriptor instead of RawDescriptor 2013-05-15 11:42:43 +03:00
marco
47a4d6b6a1 initial polyfill implementation and metadata number entry javascript validation 2013-05-14 23:55:34 -04:00
Brian Talbot
26b149e742 Merge pull request #1997 from edx/fix/btalbot/studio-FEDcleanup 
Studio Front End Development Clean-up
 2013-05-14 14:22:41 -07:00
Brian Talbot
8b77111d58 Studio: more styling changes 
typography, SASS, imports
 2013-05-14 17:16:53 -04:00
Carlos Andrés Rocha
9a671f12d7 Fix import con resposetype when importing xqueue_interface 2013-05-14 17:15:46 -04:00
Brian Talbot
f069c1a1a1 Studio: style reorg 
typography, SASS import, mixins/extends
 2013-05-14 17:15:07 -04:00
Ned Batchelder
4ea7607648 Check that the directory being added to the Python path is really inside the course. 2013-05-14 14:59:19 -04:00
Will Daly
9dbcf0baa4 Updated login session handling to fix issue with ChromeDriver on Ubuntu 2013-05-14 14:47:50 -04:00
cahrens
17750a7d6d Use min, max, and step values from server. 2013-05-14 14:20:10 -04:00
cahrens
5bd0442ffb Merge branch 'master' into feature/christina/metadata-ui 2013-05-14 13:53:03 -04:00