Will Daly
|
1c48279563
|
Added requirement for pip>=1.3
|
2013-05-31 08:13:18 -04:00 |
|
Valera Rozuvan
|
37cffd0835
|
Added videoalpha to advanced components in component.py file.
|
2013-05-31 13:48:17 +03: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 |
|
Will Daly
|
34d1ea9e63
|
Consolidated coverage report generation into one rake command.
Added diff coverage reports using diff-coverage tool.
|
2013-05-30 15:09:39 -04: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 |
|
Slater-Victoroff
|
5883ee8a5a
|
Added directory structure tests
|
2013-05-30 15:03:48 -04:00 |
|
Peter Fogg
|
1ead857792
|
Working on Lettuce tests for video in LMS.
In progress, committing for the great git history rewrite.
|
2013-05-30 15:01:23 -04:00 |
|
JonahStanley
|
c27391ce8f
|
Accidently left in a set_trace and forgot to include files
|
2013-05-30 15:00:01 -04:00 |
|
JonahStanley
|
ccc253d5c0
|
Sped up tab lettuce test
|
2013-05-30 14:56:08 -04:00 |
|
Slater-Victoroff
|
9cdcc9df8c
|
Bringing the create-dev-env.sh script up to date and generalizing for mac and debian-based systems
|
2013-05-30 14:52:15 -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 |
|
JonahStanley
|
7fe206a9d2
|
Sped up some Lettuce Tests
|
2013-05-30 14:23:49 -04:00 |
|
JonahStanley
|
62b74008e6
|
Added tests for Limited Attempt Problems and Showing the Answer
|
2013-05-30 14:22:37 -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 |
|
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 |
|