cahrens
|
57f8bbf69d
|
Updates to Selenium test based on feedback.
|
2013-05-31 11:26:31 -04:00 |
|
cahrens
|
ab5834fb41
|
Pylint cleanup.
|
2013-05-31 11:26:19 -04:00 |
|
cahrens
|
e6dfa8e81c
|
Merge branch 'master' into feature/christina/metadata-ui
|
2013-05-31 09:46:17 -04:00 |
|
marcotuts
|
46967a78dc
|
Merge pull request #6 from edx/release
Release 2013-05-29, with Hotfix 2013-05-30 back into master
|
2013-05-30 16:34:22 -07:00 |
|
marcotuts
|
3614a72a2c
|
Merge pull request #1 from edx/hotfix/advanced-settings
Put back in the blocks for Advanced Settings.
|
2013-05-30 15:41:09 -07:00 |
|
David Baumgold
|
bdc9570cd1
|
Removed Symbolset font files
|
2013-05-30 16:09:17 -04:00 |
|
Peter Baratta
|
e17f9f6c37
|
Merge pull request #2108 from edx/pbaratta/calc-tests
Add some testing to calc.py prior to changes
|
2013-05-30 12:54:52 -07:00 |
|
cahrens
|
62d2ad8986
|
Put back in the blocks for Advanced Settings.
|
2013-05-30 15:50:01 -04:00 |
|
Calen Pennington
|
6c7491a35a
|
Merge pull request #2153 from edx/fix/cale/remove-secrets
Remove secrets from master
|
2013-05-30 12:43:56 -07:00 |
|
David Baumgold
|
c12cb59b96
|
Merge pull request #2154 from edx/fix/db/advanced-settings-notifications
Put the advanced settings notifications back in
|
2013-05-30 12:27:19 -07:00 |
|
Calen Pennington
|
57c382d587
|
Remove secrets from master
|
2013-05-30 15:09:12 -04:00 |
|
David Baumgold
|
4f1e6c484e
|
Put the advanced settings notifications back in
|
2013-05-30 15:08:40 -04:00 |
|
Calen Pennington
|
858453fb83
|
Merge pull request #2152 from edx/fix/cale/remove-secrets
Remove secrets from master
|
2013-05-30 11:43:15 -07:00 |
|
cahrens
|
6c06599d75
|
Prepare for Peter's change.
|
2013-05-30 14:30:28 -04:00 |
|
Calen Pennington
|
0cdc58bf12
|
Remove secrets from master
|
2013-05-30 14:26:40 -04:00 |
|
cahrens
|
46cf5e3338
|
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
|
2013-05-30 14:13:14 -04:00 |
|
cahrens
|
8fd15ce45d
|
Review feedback.
|
2013-05-30 14:13:10 -04:00 |
|
Jay Zoldak
|
86afe7279b
|
Refactor user factory usage for lettuce tests. Fix merge conflict.
|
2013-05-30 13:48:07 -04:00 |
|
cahrens
|
1c20978974
|
Merge branch 'master' into feature/christina/metadata-ui
|
2013-05-30 12:57:31 -04:00 |
|
cahrens
|
c0c5e920a3
|
Go back to setFixtures.
|
2013-05-30 12:56:55 -04:00 |
|
chrisndodge
|
0728086336
|
Merge pull request #2151 from edx/fix/cdodge/hack-for-deploy
applying same hack from rc to master until real fix is ready
|
2013-05-30 09:54:41 -07:00 |
|
Chris Dodge
|
10761f102f
|
applying same hack from rc to master until real fix is ready
|
2013-05-30 12:53:30 -04:00 |
|
Jay Zoldak
|
2f504ec4bf
|
fix merge conflict
|
2013-05-30 12:42:50 -04:00 |
|
Jay Zoldak
|
a1b62912f3
|
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
|
2013-05-30 12:33:15 -04:00 |
|
Jay Zoldak
|
4a64c0c9b6
|
Merge in from origin/feature/christina/metadata-ui
|
2013-05-30 12:33:02 -04:00 |
|
cahrens
|
14eb9c9a3b
|
Merge branch 'master' into feature/christina/metadata-ui
|
2013-05-30 12:27:03 -04:00 |
|
Jay Zoldak
|
6627ca5635
|
Tidy up the new lettuce tests for metadata editing a bit.
|
2013-05-30 12:26:18 -04:00 |
|
cahrens
|
5d41e2a952
|
Updates from code review.
|
2013-05-30 12:26:01 -04:00 |
|
marcotuts
|
8a0c470259
|
Merge pull request #2131 from edx/rc/2013-05-29
Rc/2013 05 29, merging into release after adding release-2013-05-29 tag
|
2013-05-30 09:00:14 -07:00 |
|
Diana Huang
|
5118b06ef2
|
Merge pull request #2147 from edx/diana/fix-error-descriptor
Fix XML Error Module so that it no longer shows the data to non-staff.
|
2013-05-30 08:52:41 -07:00 |
|
chrisndodge
|
5eaa6aea23
|
Merge pull request #2140 from edx/fix/cdodge/add-randomize-to-list-of-collections
add the new category which can act as a category
|
2013-05-30 06:20:21 -07:00 |
|
chrisndodge
|
91c8570c37
|
Merge pull request #2142 from edx/fix/cdodge/repair-edge-login
update POST-back URL to the new one - post Drupal
|
2013-05-29 21:16:48 -07:00 |
|
David Baumgold
|
31ea1eba06
|
Merge pull request #2148 from edx/remove-symbolset
Removed Symbolset font files
|
2013-05-29 14:51:13 -07:00 |
|
David Baumgold
|
4720f41bc2
|
Removed Symbolset font files
|
2013-05-29 17:49:49 -04:00 |
|
cahrens
|
b2fe7f5c01
|
Update documentation (per Toddi).
|
2013-05-29 17:19:33 -04:00 |
|
cahrens
|
f0260757c5
|
Cleanup.
|
2013-05-29 16:50:22 -04:00 |
|
Diana Huang
|
910324fb49
|
Fix XML Error Module so that it no longer shows the data to non-staff.
|
2013-05-29 16:31:11 -04:00 |
|
cahrens
|
d7a1dda937
|
Update display name.
|
2013-05-29 16:23:31 -04:00 |
|
Ned Batchelder
|
9d13ac0dd7
|
One more tweak to CodeJail
|
2013-05-29 16:09:03 -04:00 |
|
Ned Batchelder
|
956998496a
|
Pass safe_exec a slug, the problem or response id; Use the latest CodeJail, with slug support.
|
2013-05-29 16:08:54 -04:00 |
|
Ned Batchelder
|
0714b97511
|
Give all response types an id attribute. CustomResponse had one, with a silly name. Use it for all ResponseTypes.
|
2013-05-29 16:08:37 -04:00 |
|
Ned Batchelder
|
c6dae2f17f
|
Merge pull request #2145 from edx/ned/codejail-slug
Ned/codejail slug
|
2013-05-29 12:58:07 -07:00 |
|
cahrens
|
b77919a849
|
Remove unnecessary fields.
|
2013-05-29 15:53:30 -04:00 |
|
cahrens
|
551a1c1516
|
pep8 and documentation cleanup.
|
2013-05-29 15:47:46 -04:00 |
|
cahrens
|
4920f08d2a
|
i18n
|
2013-05-29 15:15:31 -04:00 |
|
chrisndodge
|
42a55fafb2
|
Merge pull request #1714 from edx/feature/valera/videoalpha1_studio
Added videoalpha version 1 to the advanced components in studio.
|
2013-05-29 12:01:18 -07:00 |
|
cahrens
|
e3bc5e6bef
|
Update for metadata changes.
|
2013-05-29 14:43:31 -04:00 |
|
Ned Batchelder
|
3a030df5a7
|
One more tweak to CodeJail
|
2013-05-29 14:38:37 -04:00 |
|
Ned Batchelder
|
34911f68a7
|
Pass safe_exec a slug, the problem or response id; Use the latest CodeJail, with slug support.
|
2013-05-29 14:25:24 -04:00 |
|
Ned Batchelder
|
1d5f32d065
|
Give all response types an id attribute. CustomResponse had one, with a silly name. Use it for all ResponseTypes.
|
2013-05-29 14:24:43 -04:00 |
|