cahrens
|
dac174e448
|
Merge cleanup.
|
2013-06-13 11:31:18 -04:00 |
|
cahrens
|
9d0867ea11
|
Merge cleanup.
|
2013-06-13 11:31:10 -04:00 |
|
cahrens
|
c7e37887b3
|
Merge updates.
|
2013-06-13 11:22:34 -04:00 |
|
cahrens
|
fae8fd3841
|
Merge branch 'master' into feature/christina/unify-fields
Conflicts:
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/fields.py
common/lib/xmodule/xmodule/peer_grading_module.py
common/lib/xmodule/xmodule/tests/test_fields.py
requirements/edx/github.txt
|
2013-06-13 10:55:13 -04:00 |
|
cahrens
|
0f8d7c744c
|
Test cleanup.
|
2013-06-13 10:42:23 -04:00 |
|
James Tauber
|
d4d92135ca
|
Merge pull request #119 from kern3020/master
Fix formatting problem in README.md
|
2013-06-13 07:40:26 -07:00 |
|
Ned Batchelder
|
86cdc06d82
|
Merge branch 'release'
message to explain why this merge is necessary,
|
2013-06-13 10:35:56 -04:00 |
|
Peter Fogg
|
d52329be23
|
Merge pull request #128 from edx/peter-fogg/fix-video-captions-setting
Make video captions respect course author's setting.
|
2013-06-13 06:32:33 -07:00 |
|
cahrens
|
6e92ddf3dd
|
Cannot set String field to a dict anymore!
|
2013-06-12 17:07:41 -04:00 |
|
cahrens
|
89d0003603
|
Be strict about ModelType expected types, rename Object as Dict.
|
2013-06-12 14:59:17 -04:00 |
|
Calen Pennington
|
25aec96e86
|
Merge pull request #124 from edx/fix/cale/test-ruby-install
Do a bundle install before trying to use rake, so that we have all the p...
|
2013-06-12 11:30:10 -07:00 |
|
Calen Pennington
|
5b8163dc9c
|
Merge pull request #92 from edx/fix/cale/url-tests
Fix tests that vary urls.py
|
2013-06-12 10:47:13 -07:00 |
|
cahrens
|
86d952bf91
|
Change to putting serialize/de-serialize directly in xml_module.
|
2013-06-12 13:34:38 -04:00 |
|
Brian Talbot
|
45c1109c72
|
syncs up font-weight across problem button/input actions
(cherry picked from commit 14100ba14c)
|
2013-06-12 12:01:02 -04:00 |
|
Brian Talbot
|
10fd401157
|
syncs styling rules for buttons/inputs to ensure consistency
(cherry picked from commit 832da3ad48)
|
2013-06-12 12:00:52 -04:00 |
|
Brian Talbot
|
cb46cc6ac6
|
abstracts height rule to apply to the capa check, show, save actions
(cherry picked from commit 050846af71)
|
2013-06-12 12:00:42 -04:00 |
|
Brian Talbot
|
a684c6f679
|
removes HTML elemements from problem action Sass selectors
(cherry picked from commit 664efb9887)
|
2013-06-12 12:00:31 -04:00 |
|
Brian Talbot
|
04bfa01644
|
resolves height issue when display the check and show answer actions alongside problems
(cherry picked from commit a17bf5e2ce)
|
2013-06-12 12:00:21 -04:00 |
|
e0d
|
9acab2de70
|
added pylint ignores, fixed missing import
(cherry picked from commit 273df4e113)
|
2013-06-12 11:56:51 -04:00 |
|
e0d
|
bcc92ef8ef
|
Adding comments.
(cherry picked from commit c96511a278)
|
2013-06-12 11:56:51 -04:00 |
|
e0d
|
3ae11e860c
|
Better error handling.
(cherry picked from commit 1511ec841a)
|
2013-06-12 11:56:51 -04:00 |
|
e0d
|
d380c76df6
|
Adding a new env to handle escalating privileges to run db migrations.
(cherry picked from commit d2554909d8)
|
2013-06-12 11:56:51 -04:00 |
|
Brian Talbot
|
e641d2c6b5
|
Merge pull request #136 from edx/fix/btalbot/xmodule-showanswer
Problem Show Answer/Check Button Line Height Syncing
|
2013-06-12 08:56:08 -07:00 |
|
Brian Talbot
|
14100ba14c
|
syncs up font-weight across problem button/input actions
|
2013-06-12 11:44:00 -04:00 |
|
Brian Talbot
|
832da3ad48
|
syncs styling rules for buttons/inputs to ensure consistency
|
2013-06-12 11:43:59 -04:00 |
|
Brian Talbot
|
050846af71
|
abstracts height rule to apply to the capa check, show, save actions
|
2013-06-12 11:43:59 -04:00 |
|
Brian Talbot
|
664efb9887
|
removes HTML elemements from problem action Sass selectors
|
2013-06-12 11:43:59 -04:00 |
|
Brian Talbot
|
a17bf5e2ce
|
resolves height issue when display the check and show answer actions alongside problems
|
2013-06-12 11:43:59 -04:00 |
|
e0d
|
b11e748341
|
Merge pull request #142 from edx/e0d/pylint-and-import
added pylint ignores, fixed missing import
|
2013-06-12 08:38:32 -07:00 |
|
e0d
|
273df4e113
|
added pylint ignores, fixed missing import
|
2013-06-12 11:24:28 -04:00 |
|
Calen Pennington
|
d715c61d69
|
Merge pull request #118 from edx/fix/cale/xmodule-assets-deletion-error
Ignore files that don't exist when we try and delete them while compilin...
|
2013-06-12 08:10:36 -07:00 |
|
Calen Pennington
|
eccf800f47
|
Ignore files that don't exist when we try and delete them while compiling xmodule assets
|
2013-06-12 09:02:44 -04:00 |
|
e0d
|
fd4d816816
|
Merge pull request #133 from edx/e0d/migrate-as-other-user
Adding a new env to handle escalating privileges to run db migrations.
|
2013-06-12 05:10:28 -07:00 |
|
Diana Huang
|
58d561ac8e
|
Merge pull request #126 from edx/diana/fix-display-text
Fix typo and an unclear description.
|
2013-06-11 14:36:06 -07:00 |
|
Ned Batchelder
|
413202e7d6
|
Merged ned/whitelistable-sandbox
|
2013-06-11 16:49:45 -04:00 |
|
Diana Huang
|
f79d1e215a
|
Fix some typos and unclear descriptions.
|
2013-06-11 16:48:11 -04:00 |
|
e0d
|
c96511a278
|
Adding comments.
|
2013-06-11 16:37:37 -04:00 |
|
Jay Zoldak
|
7b7a3427d9
|
Fix broken lettuce tests
|
2013-06-11 16:35:17 -04:00 |
|
chrisndodge
|
e685ff7125
|
Merge pull request #129 from edx/fix/cdodge/cancel-asset-upload-crash
[STUD-256] Seems like on chrome when cancel is hit in the file chooser, the 'change...
|
2013-06-11 12:52:56 -07:00 |
|
Jay Zoldak
|
d4a5af850d
|
Merge pull request #135 from edx/zoldak/fix-lettuce-tests
Fix broken lettuce tests
|
2013-06-11 12:34:01 -07:00 |
|
Jay Zoldak
|
32562b7055
|
Fix broken lettuce tests
|
2013-06-11 15:16:12 -04:00 |
|
Peter Fogg
|
45527bf921
|
Reword acceptance test.
|
2013-06-11 15:07:01 -04:00 |
|
e0d
|
1511ec841a
|
Better error handling.
|
2013-06-11 15:00:39 -04:00 |
|
e0d
|
d2554909d8
|
Adding a new env to handle escalating privileges to run db migrations.
|
2013-06-11 14:42:39 -04:00 |
|
Chris Dodge
|
be6fbf913e
|
make local variable
|
2013-06-11 14:36:04 -04:00 |
|
Peter Fogg
|
fc6f0606c2
|
0;95;cRemove unnecessary boolean conversion.
|
2013-06-11 14:33:28 -04:00 |
|
Chris Dodge
|
1602f592b4
|
use better API
|
2013-06-11 14:32:33 -04:00 |
|
Don Mitchell
|
64b909c5f0
|
Merge pull request #12 from edx/feature/dhm/timeconv
Feature/dhm/timeconv
|
2013-06-11 11:11:05 -07:00 |
|
Peter Fogg
|
0149766710
|
Add acceptance test to ensure that show_captions has the right effect.
|
2013-06-11 14:07:40 -04:00 |
|
Jay Zoldak
|
3d89b697fd
|
Merge pull request #130 from edx/zoldak/fix-broken-lettuce
Update lettuce test for problems with new css for show and hide answers.
|
2013-06-11 10:56:11 -07:00 |
|