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 |
|
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 |
|
Arthur Barrett
|
0e7573a2cc
|
Merge branch 'master' into feature/abarrett/lms-notes-app
|
2013-05-14 13:45:17 -04:00 |
|
cahrens
|
69832c57a9
|
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
|
2013-05-14 12:40:25 -04:00 |
|
cahrens
|
82899d6d2e
|
Number view.
|
2013-05-14 12:40:17 -04:00 |
|
marco
|
8d8c8d83df
|
updated unit styling, added polyfill js library, updated javascript handling for modes swap
|
2013-05-14 12:38:52 -04:00 |
|
Greg Price
|
2c1b0c831f
|
Merge pull request #2032 from edx/fix/gprice/zendesk-log-error
Add a prefix string to Zendesk errors to be more searchable in Splunk
|
2013-05-14 09:35:33 -07:00 |
|
Chris Dodge
|
5df23d15f2
|
Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master
Conflicts:
cms/djangoapps/contentstore/views/course.py
|
2013-05-14 10:57:11 -04:00 |
|
Arthur Barrett
|
5e39971fcc
|
merge master. resolved conflicts in component.py and course.py.
|
2013-05-14 10:54:21 -04:00 |
|
Chris Dodge
|
ef78c99f70
|
pep8/pylint violations fixes
|
2013-05-14 10:53:10 -04:00 |
|
Calen Pennington
|
799ad92ecd
|
Add documentation of xmodule template files
|
2013-05-14 09:37:13 -04:00 |
|
marco
|
0aaaf84f62
|
added number metadata template, cleaned up editor theme ui bordering and settings styles
|
2013-05-14 08:22:36 -04:00 |
|
cahrens
|
aaffee5081
|
Initial cleanup of open_ended_module and peer_grading_module.
|
2013-05-13 17:27:59 -04:00 |
|
Greg Price
|
a5bb31792b
|
Add a prefix string to Zendesk errors to be more searchable in Splunk
|
2013-05-13 16:38:52 -04:00 |
|
Victor Shnayder
|
4f2c3b78da
|
fix order of operations to make things rotate correctly
|
2013-05-13 16:27:27 -04:00 |
|
Arthur Barrett
|
bea943d537
|
merged master. resolved conflict with the cms contentstore/views.py that was refactored into separate modules.
|
2013-05-13 16:26:28 -04:00 |
|
dcadams
|
3890701cbb
|
Merge branch 'master' of github.com:edx/edx-platform into feature-dcadams-usermanagement
|
2013-05-13 13:10:16 -07:00 |
|
Chris Dodge
|
cbe205328a
|
Merge branch 'master' of github.com:edx/mitx into feature/cdodge/autoprovision-forums-master
Conflicts:
cms/djangoapps/contentstore/views.py
|
2013-05-13 15:47:33 -04:00 |
|