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 |
|
Arthur Barrett
|
beabdf1434
|
Merge branch 'master' into feature/abarrett/lms-notes-app
|
2013-05-11 14:52:39 -04:00 |
|
Steve Strassmann
|
c071ee448f
|
pep8 compliance
|
2013-05-10 16:51:26 -04:00 |
|
Jason Bau
|
408e26a0c1
|
parameterizes CMS email settings
|
2013-05-10 13:42:28 -07:00 |
|
cahrens
|
f4b06b2e96
|
Beginnings of is-set work.
|
2013-05-10 16:41:07 -04:00 |
|
Steve Strassmann
|
571a9af0c0
|
declared exports
|
2013-05-10 16:37:28 -04:00 |
|
cahrens
|
fd52980a2d
|
Option view, changes getting persisted.
|
2013-05-10 16:02:22 -04:00 |
|
Chris Dodge
|
1db66957af
|
Merge branch 'master' of github.com:edx/mitx into fix/cdodge/textbooks-not-exporting
|
2013-05-10 15:44:55 -04:00 |
|
Steve Strassmann
|
70cca0540d
|
reorder imports for pep8
|
2013-05-10 15:23:28 -04:00 |
|
Steve Strassmann
|
01d4fbeb7c
|
reorder imports
|
2013-05-10 14:14:36 -04:00 |
|
Steve Strassmann
|
8c8377f1df
|
Merge branch 'master' of https://github.com/edx/mitx into feature/straz/views
pull master
|
2013-05-10 13:59:07 -04:00 |
|
Steve Strassmann
|
9350a2c067
|
refactoring views
|
2013-05-10 13:56:30 -04:00 |
|
marco
|
04bb7335e7
|
removed extra section heading in settings DOM, placed settings after editor
|
2013-05-10 13:18:43 -04:00 |
|
Greg Price
|
a0fb4d6c85
|
Merge branch 'master' into drupal-new
Conflicts:
lms/envs/aws.py
lms/envs/common.py
lms/static/sass/base/_base.scss
lms/templates/forgot_password_modal.html
|
2013-05-10 10:30:10 -04:00 |
|
Chris Dodge
|
51809965fe
|
Merge branch 'master' of github.com:edx/mitx into feature/cdodge/autoprovision-forums-master
|
2013-05-10 10:01:53 -04:00 |
|
Chris Dodge
|
1b0eff52ed
|
create test cases to simulate error exporting/importing textbooks
|
2013-05-10 10:01:10 -04:00 |
|
Steve Strassmann
|
0bea50ede1
|
start refactoring views.py
|
2013-05-09 16:24:21 -04:00 |
|
Calen Pennington
|
ea859bd6c7
|
Filter out the template course from the mongo modulestore get_courses function
|
2013-05-09 16:22:23 -04:00 |
|
marco
|
004018c1eb
|
Merge branch 'feature/christina/metadata-ui' of github.com:edx/mitx into feature/christina/metadata-ui
|
2013-05-09 14:59:01 -04:00 |
|
marco
|
6dbfa7499b
|
removed metadata-edit styling
|
2013-05-09 14:58:54 -04:00 |
|
cahrens
|
b314b5ce59
|
Renaming of some files.
|
2013-05-09 14:51:16 -04:00 |
|
cahrens
|
4a7f7d6537
|
Update the other templates that include metadata-edit.html.
|
2013-05-09 14:34:52 -04:00 |
|
Arthur Barrett
|
dd583ce4f9
|
Merge branch 'master' into feature/abarrett/lms-notes-app
|
2013-05-09 14:32:05 -04:00 |
|
marco
|
cad8ae1b9b
|
merged in new data requirements for html
|
2013-05-09 14:19:31 -04:00 |
|
David Baumgold
|
d09e93142f
|
Merge pull request #1980 from edx/backbone-1.0.0
Upgrade to Backbone 1.0.0
|
2013-05-09 09:34:35 -07:00 |
|
cahrens
|
60f41eb108
|
Cleanup.
|
2013-05-09 11:49:09 -04:00 |
|
cahrens
|
cf491b1184
|
Remove component.html changes.
|
2013-05-09 11:46:47 -04:00 |
|
cahrens
|
7e42512bfa
|
Merge branch 'ux/marco/studio-componentsettings' into feature/christina/metadata-ui
|
2013-05-09 11:20:04 -04:00 |
|
cahrens
|
bfdbcc2f32
|
Beginnings of Backbone views/models.
|
2013-05-09 11:16:12 -04:00 |
|
marco
|
3ebd5de744
|
added rest of settings list
|
2013-05-09 10:54:10 -04:00 |
|
marco
|
3284247905
|
restyling of the input fields, partway through adding in examples of all settings
|
2013-05-09 09:35:31 -04:00 |
|
Arthur Barrett
|
c7197cd567
|
Merge branch 'master' into feature/abarrett/lms-notes-app
|
2013-05-08 18:04:24 -04:00 |
|
Brian Talbot
|
25dd2c7d67
|
studio - alerts: synced up example HTML to show advanced settings live notification, aria roles, and action classes; integrated typography mixins
|
2013-05-08 15:30:17 -04:00 |
|
Chris Dodge
|
d8d4111a99
|
Merge branch 'master' of github.com:edx/mitx into feature/cdodge/autoprovision-forums-master
|
2013-05-08 12:15:26 -04:00 |
|
David Baumgold
|
7f69e45b9e
|
whitespace changes
|
2013-05-08 09:29:20 -04:00 |
|
Arthur Barrett
|
eca155f99a
|
Merge branch 'master' into feature/abarrett/lms-notes-app
|
2013-05-07 17:27:40 -04:00 |
|
Arthur Barrett
|
0ed07779c8
|
kludged in the note tab panel so it can be turned on and off using the policy editor by adding "notes" to "advanced_modules."
|
2013-05-07 17:27:06 -04:00 |
|