cahrens
|
06d315484f
|
Set "editing" name.
|
2013-05-15 11:52:38 -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
|
e157173c11
|
styling adjustments to codemirror and wrapped polyfill into a function
|
2013-05-15 10:53:54 -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 |
|
Calen Pennington
|
bd6bb8e9c1
|
Fix advanced modules list
|
2013-05-14 09:39:25 -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 |
|
marco
|
cb4019304a
|
cleaned up references to proper elements in settings header mode buttons
|
2013-05-13 16:22:14 -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 |
|
Steve Strassmann
|
9b7374ab73
|
pull from master
|
2013-05-13 15:07:14 -04:00 |
|
Steve Strassmann
|
10b7622018
|
declare exports from course, component
|
2013-05-13 15:06:52 -04:00 |
|
David Baumgold
|
f0bd73b2fb
|
Merge pull request #2022 from edx/kill-submodules
Install phantom-jasmine via npm, rather than git submodules
|
2013-05-13 12:02:41 -07:00 |
|
Steve Strassmann
|
b3cc9a1174
|
pep8 cleanups
|
2013-05-13 14:55:41 -04:00 |
|
Steve Strassmann
|
96c37089dc
|
whitespace for pep8
|
2013-05-13 13:47:51 -04:00 |
|
Steve Strassmann
|
cdc2de7e65
|
Merge branch 'master' of https://github.com/edx/mitx into feature/straz/views
pull from master
|
2013-05-13 13:22:39 -04:00 |
|
Steve Strassmann
|
b0cc989b1e
|
pull from master
|
2013-05-13 11:45:23 -04:00 |
|
David Baumgold
|
7c98981498
|
Install phantom-jasmine via npm, rather than git submodules
Because removing a step from our install process is a Good Thing™
|
2013-05-13 11:33:09 -04:00 |
|
Steve Strassmann
|
8bb6ad3689
|
relative imports
|
2013-05-13 11:31:56 -04:00 |
|
Chris Dodge
|
0ef2944d43
|
Merge branch 'master' of github.com:edx/mitx into fix/cdodge/textbooks-not-exporting
|
2013-05-13 11:13:43 -04:00 |
|
Mark L. Chang
|
85ae7b9744
|
Merge pull request #2012 from edx/feature/markchang/500-copy-change
copy change
|
2013-05-13 08:12:02 -07:00 |
|
Chris Dodge
|
4d197e10ec
|
fix some violations. Build up karma
|
2013-05-13 11:10:11 -04:00 |
|
Steve Strassmann
|
e03585d85c
|
pylint: refactor imports
|
2013-05-13 11:07:08 -04:00 |
|
Chris Dodge
|
d32e7a5b61
|
Merge branch 'master' of github.com:edx/mitx into fix/cdodge/textbooks-not-exporting
|
2013-05-13 11:06:49 -04:00 |
|
cahrens
|
5edbf3d8f7
|
Merge branch 'master' into feature/christina/metadata-ui
|
2013-05-13 10:55:32 -04:00 |
|
Chris Dodge
|
3cf865a88f
|
added another unit test check point for export/import of classic textbooks
|
2013-05-13 10:16:18 -04:00 |
|
Steve Strassmann
|
b288a8e3bd
|
fix export from tabs.__all__
|
2013-05-13 10:03:20 -04:00 |
|
Steve Strassmann
|
979e3be174
|
fix pep8: imports and blank lines
|
2013-05-13 09:58:30 -04:00 |
|
Chris Dodge
|
d98e726a8e
|
Merge branch 'master' of github.com:edx/mitx into fix/cdodge/textbooks-not-exporting
|
2013-05-13 09:51:05 -04:00 |
|
Steve Strassmann
|
5ab6d47264
|
pull from master
|
2013-05-13 09:39:33 -04:00 |
|
marco
|
68cd922e04
|
Merge branch 'feature/christina/metadata-ui' of github.com:edx/mitx into feature/christina/metadata-ui
|
2013-05-13 09:27:18 -04:00 |
|
marco
|
97de97cc18
|
minimal mce editor style changes to borders
|
2013-05-13 09:27:13 -04:00 |
|
Alexander Kryklia
|
bdc62e7d2e
|
word cloud studio integration
|
2013-05-13 14:44:09 +03:00 |
|
cahrens
|
125c9c13c1
|
Got clearing of fields working.
|
2013-05-12 15:45:31 -04:00 |
|
marco
|
c36046bedd
|
Merge branch 'feature/christina/metadata-ui' of github.com:edx/mitx into feature/christina/metadata-ui
|
2013-05-12 13:18:45 -04:00 |
|
marco
|
2360a111c8
|
attempt to trigger js event for mode button press, not breaking yet but nonfunctional
|
2013-05-12 12:08:04 -04:00 |
|
Mark L. Chang
|
f864a6c00c
|
more copy tweaks
|
2013-05-11 16:16:30 -04:00 |
|
Mark L. Chang
|
317831a813
|
copy change
|
2013-05-11 16:16:30 -04:00 |
|