Chris Dodge
|
7efcd98135
|
fix up styles in header for this particular use case
|
2013-05-31 11:25:28 -04:00 |
|
Jay Zoldak
|
a5ee903ef5
|
Pin capa to require distribute greater than 28 because an old branch had it at 30
|
2013-05-31 11:24:49 -04:00 |
|
Slater-Victoroff
|
1699d24c9a
|
Successful on mac, almost there on ubuntu
|
2013-05-31 11:24:07 -04:00 |
|
Peter Fogg
|
782cb05410
|
Add passing Lettuce testing for video autoplay in LMS.
|
2013-05-31 11:22:45 -04:00 |
|
e0d
|
2e84540af0
|
removing the request debugger entirely.
|
2013-05-31 11:15:28 -04:00 |
|
John Jarvis
|
800ec068bd
|
updating django minor release
|
2013-05-31 11:15:15 -04:00 |
|
Chris Dodge
|
62bacea371
|
use the right link to the login page in a particular use case: clicking activation email when not logged in
|
2013-05-31 11:10:14 -04:00 |
|
Peter Baratta
|
087834337a
|
Pep8 newline
|
2013-05-31 11:05:21 -04:00 |
|
Slater-Victoroff
|
821621cd52
|
small edits mostly taken care of
|
2013-05-31 11:05:20 -04:00 |
|
Jay Zoldak
|
86f62d5419
|
Pin distribute version to greater than 28 because old branches of capa required 30
|
2013-05-31 11:04:59 -04:00 |
|
Victor Shnayder
|
75f127d76b
|
Change help button text, fixing LMS-319
|
2013-05-31 10:59:00 -04:00 |
|
Slater-Victoroff
|
b489a5d773
|
distribute fix
|
2013-05-31 10:41:59 -04:00 |
|
Peter Baratta
|
80a27f9391
|
Add test and functionality for trailing period
|
2013-05-31 10:41:08 -04:00 |
|
Slater-Victoroff
|
660dbd80b9
|
small fix
|
2013-05-31 10:38:18 -04:00 |
|
Slater-Victoroff
|
433043b146
|
Removed starting courseware clone
|
2013-05-31 10:37:18 -04:00 |
|
Slater-Victoroff
|
49ed93a4e6
|
Fixed first stage bugs
|
2013-05-31 10:35:26 -04:00 |
|
Slater-Victoroff
|
b2cd6915e4
|
Draft 1 of cross-platform bash script is complete, but more testing needs to be done
|
2013-05-31 10:14:28 -04:00 |
|
cahrens
|
e6dfa8e81c
|
Merge branch 'master' into feature/christina/metadata-ui
|
2013-05-31 09:46:17 -04:00 |
|
JonahStanley
|
a49acc73ee
|
Removed the save_html line
|
2013-05-31 09:16:14 -04:00 |
|
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 |
|
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 |
|