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 |
|
Peter Fogg
|
6eeb12ad1c
|
Add Lettuce tests for autoplay in Studio.
|
2013-05-30 11:34:15 -04:00 |
|
Slater-Victoroff
|
72377e1a55
|
Merge branch 'slater/new_mac_dev_script' of https://github.com/edx/edx-platform into slater/new_mac_dev_script
|
2013-05-30 11:16:08 -04:00 |
|
Slater-Victoroff
|
715e324b29
|
Updated documentation in doc and README and made some small edits to bash script for added robustness
Added documenntation to the docs folder and edited the mac bash script in response to tests
|
2013-05-30 11:15:00 -04:00 |
|
Slater-Victoroff
|
e493ada3ff
|
Removed numpy and scipy files
|
2013-05-30 11:11:05 -04:00 |
|
Slater-Victoroff
|
84149f8f78
|
Merge branch 'slater/new_mac_dev_script' of https://github.com/edx/edx-platform into slater/new_mac_dev_script
|
2013-05-30 10:55:54 -04:00 |
|
Slater-Victoroff
|
0d56b9c2ff
|
Updated documentation in doc and README and made some small edits to bash script for added robustness
|
2013-05-30 10:55:39 -04:00 |
|
Slater-Victoroff
|
8b6bdb92c2
|
Added documenntation to the docs folder and edited the mac bash script in response to tests
|
2013-05-30 10:11:14 -04: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 |
|
Peter Fogg
|
5465bda5f3
|
Use MITX_FEATURES to tell if we're in the CMS; this is much cleaner. Also use $.data instead of a hidden div.
|
2013-05-29 17:00:25 -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 |
|
Peter Fogg
|
3bfe3de679
|
Do autoplay in lms, not in cms.
|
2013-05-29 16:07:43 -04:00 |
|
Peter Fogg
|
81d3aa1464
|
Use self.system.debug instead of self.system.course_id; this seems less hacky.
|
2013-05-29 16:00:43 -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 |
|
Peter Fogg
|
0332d22a02
|
Prevent autoplaying of videos in Studio.
|
2013-05-29 15:52:42 -04:00 |
|
cahrens
|
551a1c1516
|
pep8 and documentation cleanup.
|
2013-05-29 15:47:46 -04:00 |
|
Peter Fogg
|
e0d5118ca0
|
Add hidden HTML so that the video player knows whether or not we're in the LMS.
|
2013-05-29 15:45:36 -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 |
|
cahrens
|
7d07309f9d
|
Don't call setFixtures. Can stomp on other tests.
|
2013-05-29 14:03:16 -04:00 |
|
Slater-Victoroff
|
4335d7a208
|
Added largely functional bash script for setting up dev environment on macs. Due date of June 1st for open source deadline.
|
2013-05-29 13:14:08 -04:00 |
|
Ned Batchelder
|
c1f72887fc
|
Use latest CodeJail to prevent bytecode writing.
|
2013-05-29 12:40:57 -04:00 |
|
Chris Dodge
|
879f7d1051
|
fix Edge login to use the updated POST-back URL /login -> /login_ajax
|
2013-05-29 12:11:25 -04:00 |
|
cahrens
|
24707f8f85
|
Jasmine test for views.
|
2013-05-29 12:09:42 -04:00 |
|
Chris Dodge
|
eb4dd76328
|
update POST-back URL to the new one - post Drupal
|
2013-05-29 12:02:41 -04:00 |
|
Chris Dodge
|
25dae57226
|
add the new category which can act as a category
|
2013-05-29 11:16:33 -04:00 |
|
Jonah Stanley
|
fa6bbfb9e2
|
Merge pull request #2129 from edx/fix/jonahstanley/fix-flakey-test
Fixed Flakey Acceptance Test
|
2013-05-29 07:48:46 -07:00 |
|
Ned Batchelder
|
18f28457b8
|
Merge pull request #2134 from edx/ned/latest-codejail
Use latest CodeJail to prevent bytecode writing.
|
2013-05-29 06:57:02 -07:00 |
|
Chris Dodge
|
4c97d16edc
|
add hack to assets.rake to unblock the release train
|
2013-05-28 23:40:16 -04:00 |
|
Ned Batchelder
|
ce9acf9fb2
|
Use latest CodeJail to prevent bytecode writing.
|
2013-05-28 21:45:46 -04:00 |
|
jinpa
|
7a388587b5
|
Merge pull request #2133 from edx/jinpa/public-username-off-master
Copy changes to make dup email or public-username messages more informat...
|
2013-05-28 17:11:02 -07:00 |
|
Jane Manning
|
c976fee2d9
|
Copy changes to make dup email or public-username messages more informative
|
2013-05-28 15:32:53 -07:00 |
|