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 |
|
Calen Pennington
|
ba69392f70
|
Fix inaccurate instructions around import
|
2013-03-06 17:10:45 -05:00 |
|
chrisndodge
|
05211d4fe8
|
Merge pull request #1607 from MITx/feature/christina/djdebug
Enable Django debug toolbar on Studio (including Mongo panel).
|
2013-03-06 13:14:19 -08:00 |
|
Brian Talbot
|
62514d85a3
|
studio - alerts: loosely wired advanced settings with new notification and alert messages
|
2013-03-06 15:36:38 -05:00 |
|
Calen Pennington
|
e7900859b6
|
Remove the 'title' alias for lms.display_name
|
2013-03-06 15:11:08 -05:00 |
|
Brian Talbot
|
9a7b6c7eaf
|
Merge branch 'master' into feature/btalbot/studio-alerts
|
2013-03-06 15:04:34 -05:00 |
|
cahrens
|
de225e6623
|
Enable Django debug toolbar on Studio (including Mongo panel).
|
2013-03-06 14:08:54 -05:00 |
|
Calen Pennington
|
8a9ba79d1f
|
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
Conflicts:
cms/djangoapps/contentstore/views.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
common/lib/xmodule/xmodule/peer_grading_module.py
|
2013-03-06 12:15:07 -05:00 |
|
cahrens
|
b706d4a1f5
|
Use readonly attribute instead of disabled. Disabled text fields are not selectable on FireFox.
#225
|
2013-03-06 11:50:23 -05:00 |
|
Christina Roberts
|
e093431d75
|
Merge pull request #1581 from MITx/feature/vik/advanced-studio
Feature/vik/advanced studio
|
2013-03-05 12:28:29 -08:00 |
|
Calen Pennington
|
b7680f3157
|
Fix tests except for conditional module and open ended grading
|
2013-03-05 15:04:59 -05:00 |
|
Vik Paruchuri
|
102c594e7b
|
Remove string and old import
|
2013-03-05 15:01:12 -05:00 |
|
Arthur Barrett
|
5bbb70ef8a
|
Advanced modules must now be specified individually in order to enable them on the 'advanced' component menu.
|
2013-03-05 13:47:02 -05:00 |
|
Will Daly
|
a018b8ac38
|
Merge pull request #1599 from MITx/feature/deena/testing
Feature/deena/testing
|
2013-03-05 09:48:23 -08:00 |
|
Arthur Barrett
|
c9b2a6a203
|
updated CSS to use the new advanced icon
|
2013-03-05 10:52:39 -05:00 |
|
Arthur Barrett
|
fa3961d4dd
|
merged openended and advanced categories per discussion at today's standup
|
2013-03-05 10:51:59 -05:00 |
|
Brian Talbot
|
ef9f963f49
|
studio - advanced modules: added in advanced module button icon per artie/vik work
|
2013-03-05 10:39:21 -05:00 |
|
Brian Talbot
|
156a702e08
|
Merge branch 'master' into feature/btalbot/studio-alerts
|
2013-03-05 09:57:35 -05:00 |
|
Brian Talbot
|
cbdf9ea25b
|
studio - alerts: proofing older, but still needed in page alerts (unit drafts) styling
|
2013-03-05 09:57:14 -05:00 |
|
Will Daly
|
faf5c3f0a2
|
Updated Deena's tests after merge with master to ensure that none
of the tests fail. Deleted some tests.
|
2013-03-05 09:10:02 -05:00 |
|
cahrens
|
d891361b4a
|
Merge branch 'master' into bug/christina/misc
|
2013-03-05 09:09:08 -05:00 |
|