cahrens
|
fa1dfd716a
|
Update unit test for editable_metadata_fields.
|
2013-05-15 15:25:36 -04:00 |
|
cahrens
|
d35b29031f
|
Clean up editable_metadata_fields.
|
2013-05-15 14:01:18 -04:00 |
|
cahrens
|
305b555d63
|
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
|
2013-05-15 13:33:41 -04:00 |
|
marco
|
b3e41d19f6
|
styling for static pages updated
|
2013-05-15 13:29:35 -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 |
|
cahrens
|
06d315484f
|
Set "editing" name.
|
2013-05-15 11:52:38 -04:00 |
|
marco
|
5f4bded3db
|
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
|
2013-05-15 11:41:24 -04:00 |
|
marco
|
56df114edb
|
style changes to component header
|
2013-05-15 11:41:19 -04:00 |
|
cahrens
|
a16740691f
|
Minor update.
|
2013-05-15 11:39:07 -04:00 |
|
cahrens
|
4152e4602d
|
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
Conflicts:
cms/static/coffee/src/views/module_edit.coffee
|
2013-05-15 11:36:32 -04:00 |
|
cahrens
|
faf31d9728
|
Get toggling between Editor and Settings working.
|
2013-05-15 11:34:49 -04:00 |
|
marco
|
63960ee4a2
|
style change for is-set
|
2013-05-15 11:26:34 -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 |
|
marco
|
b9fc3f9e07
|
updated styles for input type numbers
|
2013-05-15 00:04:41 -04:00 |
|
marco
|
47a4d6b6a1
|
initial polyfill implementation and metadata number entry javascript validation
|
2013-05-14 23:55:34 -04:00 |
|
marco
|
98e692d15e
|
fixed broken coffee script caused by errant pseudo code I checked in
|
2013-05-14 23:03:33 -04:00 |
|
marco
|
81e95f27db
|
basic tab switching added
|
2013-05-14 22:31:11 -04:00 |
|
marco
|
6ec1a29201
|
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
|
2013-05-14 15:05:29 -04:00 |
|
marco
|
064d21c4e2
|
clean up of editor header styling
|
2013-05-14 15:05:22 -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 |
|
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 |
|
Jay Zoldak
|
3657fbe33b
|
Merge pull request #2035 from edx/fix/zoldak/phantom-jasmine-version
Specify version of phantom jasmine to use.
|
2013-05-14 07:32:14 -07:00 |
|
Jay Zoldak
|
b590d344f5
|
Specify version of phantom jasmine to use.
|
2013-05-14 10:30:50 -04:00 |
|
Calen Pennington
|
465a2652b9
|
Merge pull request #2034 from edx/fix/cale/advanced-modules
Fix advanced modules list
|
2013-05-14 07:17:14 -07:00 |
|
Calen Pennington
|
bd6bb8e9c1
|
Fix advanced modules list
|
2013-05-14 09:39:25 -04:00 |
|
Jay Zoldak
|
c69c69d27b
|
Merge pull request #2033 from edx/fix-phantom-jasmine-lms
Forgot to update phantom-jasmine location for LMS
|
2013-05-14 06:13:13 -07:00 |
|
marco
|
0aaaf84f62
|
added number metadata template, cleaned up editor theme ui bordering and settings styles
|
2013-05-14 08:22:36 -04:00 |
|
David Baumgold
|
d376cb52ca
|
Forgot to update phantom-jasmine location for LMS
|
2013-05-13 17:31:57 -04:00 |
|
cahrens
|
f42850c8a4
|
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
|
2013-05-13 17:28:17 -04:00 |
|
cahrens
|
aaffee5081
|
Initial cleanup of open_ended_module and peer_grading_module.
|
2013-05-13 17:27:59 -04:00 |
|
Jay Zoldak
|
38ee7bea5a
|
Merge pull request #2031 from edx/fix/zoldak/repo-name
Update repo name in jenkins test shell script.
|
2013-05-13 13:52:04 -07: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 |
|
Steve Strassmann
|
b412dd57b6
|
Merge pull request #2026 from edx/bug/straz/pep8
pep8 cleanups
|
2013-05-13 13:37:57 -07:00 |
|
Sarina
|
c4c3b202ce
|
Merge pull request #2030 from edx/victor/fix-word-cloud-rotation
fix order of operations to make things rotate correctly
|
2013-05-13 13:33:17 -07:00 |
|
Jay Zoldak
|
30e8e2e2ae
|
Update repo name in jenkins test shell script.
|
2013-05-13 16:30:01 -04:00 |
|
Victor Shnayder
|
4f2c3b78da
|
fix order of operations to make things rotate correctly
|
2013-05-13 16:27:27 -04:00 |
|
marco
|
cb4019304a
|
cleaned up references to proper elements in settings header mode buttons
|
2013-05-13 16:22:14 -04:00 |
|
Calen Pennington
|
f8a72e5cbe
|
Merge pull request #1932 from edx/feature/e0d/flexible-base.sh
flexible org repos parsing tested locally
|
2013-05-13 13:09:06 -07:00 |
|
e0d
|
5e0afc63e0
|
Merge pull request #2024 from edx/bugfix/e0d/make-course-dynamic
Enable Delft and Georgetown to be handled by the dynamic path
|
2013-05-13 12:49:16 -07:00 |
|
Steve Strassmann
|
d26dc95709
|
pull from master
|
2013-05-13 15:42:43 -04:00 |
|
cahrens
|
2a8b8e2010
|
Merge branch 'master' into feature/christina/metadata-ui
|
2013-05-13 15:36:15 -04:00 |
|
cahrens
|
8c36918abf
|
Support display names for choices.
|
2013-05-13 15:35:55 -04:00 |
|
Steve Strassmann
|
7b71271bc1
|
prefix unused vars with _
|
2013-05-13 15:21:29 -04:00 |
|
jarv
|
4774a1e92b
|
Merge pull request #2004 from edx/jarv/repo-rename
repo rename to edx-platform
|
2013-05-13 12:18:16 -07:00 |
|