Calen Pennington
c1dbd98526
Fix bad reference to item_location
2013-03-11 13:07:28 -04:00
Brian Talbot
82a00104c2
studio - settings: revised markup and styling around disabled/readonly fields
2013-03-11 12:24:43 -04:00
Brian Talbot
603d11577f
studio - settings: matched up styling/treatment of disabled input fields in schedule/details settings view to new advanced settings UI
2013-03-11 11:40:36 -04:00
Brian Talbot
524db5e3f9
Merge branch 'master' into fix/btalbot/studio-sasscleanup
2013-03-11 11:35:25 -04:00
Brian Talbot
72a7ec9e07
studio - advanced settings: removed new/delete controls from advanced policies and makde key fields readonly/disabled since we're now showing all policy metadata
2013-03-11 11:31:48 -04:00
Will Daly
6b94090e67
Fixed jasmine test issue with cms caused by previous change
...
to order of file import. Introduced static_files list
in files.json (supported in original django_jasmine implementation)
that loads static files before any compiled files.
2013-03-11 11:27:49 -04:00
Brian Talbot
7a9fdb9069
studio - sass clean up: in progress business with git ignore issues
2013-03-11 11:04:43 -04:00
Calen Pennington
95f8f811c5
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
common/lib/xmodule/xmodule/course_module.py
2013-03-11 10:49:29 -04:00
Calen Pennington
9c85d920ee
Fixing tests created on master
2013-03-11 10:48:06 -04:00
Chris Dodge
d38b37f0b4
delete_item should update the parent's list of children to reflect the delete operation. Also added unit test
2013-03-11 10:47:22 -04:00
Calen Pennington
6395745c2b
Clean up serialization on some fields
2013-03-08 21:17:19 -05:00
cahrens
a68cdd35d8
Add advanced_modules course setting back in.
2013-03-08 16:07:59 -05:00
Calen Pennington
e3f7e6024f
Only display settings in the cms advanced settings page
2013-03-08 15:22:49 -05:00
Calen Pennington
93db5acc15
Make display_name defaulting explicit
2013-03-08 14:58:09 -05:00
cahrens
f5dd5d35e9
Need to trigger invalid instead of error, after changes for new version of Backbone.
2013-03-08 14:51:29 -05:00
Jay Zoldak
c5a9ec5e86
Speed up the lettuce test for no policy settings.
2013-03-08 13:34:28 -05:00
Jay Zoldak
3c3f6c3cbe
Revert lettuce css_find function to not fail if it does not find the element.
2013-03-08 13:34:28 -05:00
Brian Talbot
3bc73de1b4
studio - changed order of Sass import to account for variables needed in architecture
2013-03-08 12:56:00 -05:00
Brian Talbot
786ffd1092
studio - further small cleanup on Sass
2013-03-08 12:44:24 -05:00
Brian Talbot
e9a2413c04
studio - further small cleanup on Sass
2013-03-08 12:35:28 -05:00
Brian Talbot
f2a495bfeb
Merge branch 'master' into fix/btalbot/studio-sasscleanup
2013-03-08 12:23:10 -05:00
Brian Talbot
6418d033dd
studio - adding files I forgot to add when cleaning up Sass and originally committing
2013-03-08 12:20:40 -05:00
Calen Pennington
8ae336792a
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
2013-03-08 12:00:10 -05:00
Calen Pennington
d9b68e2de2
Merge pull request #1628 from MITx/feature/cale/heartbeat-metrics
...
Add datadog metrics capture around heartbeat timing
2013-03-08 08:59:44 -08:00
Brian Talbot
928ecb98fc
Merge branch 'master' into fix/btalbot/studio-sasscleanup
2013-03-08 11:47:51 -05:00
Brian Talbot
3b2c970248
studio - reorganized and documented used Sass for studio
2013-03-08 11:47:11 -05:00
Jay Zoldak
55eefd0ef6
Fix test that sets release date to work on all platforms
2013-03-08 11:15:15 -05:00
Jay Zoldak
24d088933e
Fix intermittent lettuce test failure on ubuntu.
2013-03-08 11:15:15 -05:00
Jay Zoldak
21e7bc5128
More robust handling for finding and clicking on objects by css.
...
Tag tests not working under PhantomJS to skip for now.
2013-03-08 11:15:14 -05:00
Jay Zoldak
b66d0cf5da
Fix signup test on ubuntu
2013-03-08 11:15:14 -05:00
Jay Zoldak
ad5d2a9624
Update update_templates reference
2013-03-08 11:15:14 -05:00
Jay Zoldak
e84fa63826
Catch WebDriverException
2013-03-08 11:15:14 -05:00
Jay Zoldak
21c15d8f1f
Click in the upper left of an element instead of the middle.
2013-03-08 11:15:14 -05:00
Jay Zoldak
3cec8f1a76
Catch WebDriverException
2013-03-08 11:15:14 -05:00
Jay Zoldak
b9e5ed9525
Click in the upper left of an element instead of the middle.
2013-03-08 11:15:14 -05:00
Calen Pennington
cd802d8e14
Add datadog metrics capture around heartbeat timing
2013-03-08 10:36:59 -05:00
Victor Shnayder
b0790921a3
Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged
2013-03-08 00:43:39 -05:00
Victor Shnayder
84f05f9f61
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/foldit_module.py
common/lib/xmodule/xmodule/tests/__init__.py
common/lib/xmodule/xmodule/tests/test_capa_module.py
common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
common/lib/xmodule/xmodule/tests/test_conditional.py
common/lib/xmodule/xmodule/tests/test_self_assessment.py
2013-03-08 00:40:18 -05:00
Chris Dodge
4c72dbfce3
fix fat fingers?
2013-03-07 22:03:38 -05:00
Don Mitchell
49db56ab7d
Merge pull request #1618 from MITx/bug/christina/misc
...
New version of Backbone has separate invalid event.
2013-03-07 11:02:52 -08:00
cahrens
98e410816e
New version of Backbone has separate invalid event.
2013-03-07 13:52:55 -05:00
cahrens
9ec33928ce
New version of Backbone has separate invalid event.
2013-03-07 13:37:10 -05:00
Brian Talbot
afa704c253
Merge branch 'master' into feature/btalbot/studio-alerts
2013-03-07 11:38:07 -05:00
Brian Talbot
559a311acb
studio - alerts: refactored static alerts demo view to have a different template/view/url name to help with user facing views vs. documentation views
2013-03-07 11:37:15 -05:00
chrisndodge
19eb6a3449
Merge pull request #1617 from MITx/bug/christina/misc
...
Disable Django toolbar-- breaking mongo updates.
2013-03-07 08:31:44 -08:00
cahrens
4434ca632e
Disable Django toolbar-- breaking mongo updates.
2013-03-07 11:30:00 -05:00
Chris Dodge
9ba759802c
make export a bit more resilient. If there's a piece of metadata that we can't serialize - i.e. someone wrote a new bool attribute and didn't put it in the type mapping table - then we log the exception and continue.
2013-03-07 10:43:36 -05:00
Chris Dodge
75872e1d28
remove getting of descriptor. location isn't defined here so it blows up. Anyhow, the descriptor is being passed into the function, so we don't need to fetch...
2013-03-06 22:28:44 -05:00
Calen Pennington
cec3475c9d
Remove references to .definition and .metadata in modules
2013-03-06 18:07:56 -05:00
Calen Pennington
af3c92c47e
Remove old cms templates
2013-03-06 17:28:25 -05:00
