cahrens
|
c85cc5a3a7
|
Fix bad merge.
|
2013-05-15 15:35:18 -04: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 |
|
cahrens
|
724678dd3e
|
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
|
2013-05-15 15:26:02 -04:00 |
|
cahrens
|
d35b29031f
|
Clean up editable_metadata_fields.
|
2013-05-15 14:01:18 -04:00 |
|
marco
|
ba11d37ba9
|
clear button to match help icon visually
|
2013-05-15 13:58:08 -04:00 |
|
marco
|
2f8e8f4881
|
border around course introduction which was lost in code mirror styling for component editors
|
2013-05-15 13:50:19 -04:00 |
|
marco
|
cbdadaee1d
|
updates moved slightly, will not use new styling
|
2013-05-15 13:39:38 -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 |
|
Chris Dodge
|
6cec66979a
|
fix broken tests. Also drive by fix for the sporadic failure on tests which may go to a textbook page. The URL formatting was incorrect in the test
|
2013-05-15 11:16:47 -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 |
|
David Baumgold
|
1afe556161
|
Merge pull request #2039 from edx/fix-course-updates
Fix "Course Updates" page
|
2013-05-14 16:14:20 -07:00 |
|
Frances Botsford
|
6c119fa3ab
|
refixed extend for text-sr and text-hide
|
2013-05-14 17:17:43 -04:00 |
|
frances botsford
|
24b7defb43
|
removed mixin for text-sr and text-hide, replaced with extend
|
2013-05-14 17:17:42 -04:00 |
|
Brian Talbot
|
8b77111d58
|
Studio: more styling changes
typography, SASS, imports
|
2013-05-14 17:16:53 -04:00 |
|
Jay Zoldak
|
5d783d33ad
|
Update lettuce test for new css changes.
|
2013-05-14 17:16:51 -04:00 |
|
Brian Talbot
|
f069c1a1a1
|
Studio: style reorg
typography, SASS import, mixins/extends
|
2013-05-14 17:15:07 -04:00 |
|
David Baumgold
|
e9a8f408bf
|
Add {reset: true} to all collection.fetch() calls
This is to fix a bug with the Backbone 1.0 upgrade; some views were listening to
reset events that were not longer getting fired
|
2013-05-14 16:43:41 -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 |
|