Christina Roberts
|
424cfd3cd7
|
Merge pull request #1372 from MITx/feature/dhm/drag
Auto expand on hover of drag&drop unit
|
2013-01-29 12:10:38 -08:00 |
|
Don Mitchell
|
574d6e8e28
|
Simple zIndex rather than fancy stack works best.
|
2013-01-29 15:00:49 -05:00 |
|
Don Mitchell
|
63d269acf1
|
draggable is not the collapsed item :-( but ui.helper seems to be.
|
2013-01-29 14:31:14 -05:00 |
|
Don Mitchell
|
87d8598abe
|
subsection drag
|
2013-01-29 13:43:58 -05:00 |
|
Don Mitchell
|
b3d7dc779d
|
Merge branch 'feature/dhm/drag' of github.com:MITx/mitx into feature/dhm/drag
|
2013-01-29 13:17:15 -05:00 |
|
Don Mitchell
|
5fcb6bfcd4
|
Remove debug code
|
2013-01-29 13:16:21 -05:00 |
|
Don Mitchell
|
ba95cf2385
|
Auto expand on hover of drag&drop unit
|
2013-01-29 13:10:23 -05:00 |
|
David Ormsbee
|
a98c924d47
|
Merge pull request #1371 from MITx/victor/cohorts-tweaks
make links look like links
|
2013-01-29 08:35:07 -08:00 |
|
Victor Shnayder
|
39a9c47512
|
make links look like links
|
2013-01-29 11:33:26 -05:00 |
|
David Ormsbee
|
0a1f5bc154
|
Merge pull request #1368 from MITx/feature/brian/pearson-status
add pearson_dump command.
|
2013-01-29 08:19:41 -08:00 |
|
Brian Wilson
|
15a11e9cb7
|
add validation of accommodation codes
|
2013-01-29 11:16:23 -05:00 |
|
Victor Shnayder
|
37b82a66eb
|
Merge pull request #1363 from MITx/marketing/victor
Marketing/victor
|
2013-01-29 08:12:33 -08:00 |
|
Brian Wilson
|
69ff879e95
|
add more validation for countries
|
2013-01-29 10:41:41 -05:00 |
|
Don Mitchell
|
17930e4186
|
Merge pull request #1370 from MITx/feature/cdodge/add-course-about-video-to-xlint
imports should have a marketing video. Treat it as a warning as every co...
|
2013-01-29 07:37:14 -08:00 |
|
Brian Wilson
|
09ab52bc94
|
fix log message in pearson import
|
2013-01-29 10:21:41 -05:00 |
|
Chris Dodge
|
5a4c0fb907
|
imports should have a marketing video. Treat it as a warning as every course might not have one.
|
2013-01-29 09:38:59 -05:00 |
|
Brian Wilson
|
bae2162fa0
|
add pearson_dump command. Modify rule for determining authorization transaction type.
|
2013-01-28 18:29:34 -05:00 |
|
Jay Zoldak
|
a0ccba6bf8
|
Merge pull request #1366 from MITx/bugfix/victor/fix-cohorts-test-in-cms
make tests pass with cms config as well as lms
|
2013-01-28 12:13:53 -08:00 |
|
Victor Shnayder
|
734a8bd6e5
|
make tests pass with cms config as well as lms
|
2013-01-28 15:07:44 -05:00 |
|
chrisndodge
|
2e19de2d77
|
Merge pull request #1364 from MITx/bug/btalbot/lms-coursewaremenu
LMS - added in additional JQUI accordion parameter...
|
2013-01-28 10:32:41 -08:00 |
|
Jay Zoldak
|
64a4dea429
|
Merge pull request #1365 from MITx/bugfix/brian/pearson-unittest
Fix Pearson unit tests.
|
2013-01-28 10:27:14 -08:00 |
|
Brian Wilson
|
9cf0f0900b
|
Fix Pearson unit tests.
|
2013-01-28 12:56:26 -05:00 |
|
Ashley Penney
|
d1e5632880
|
Remove the specific version of ruby here because it's breaking the dev scripts amongst other things.
|
2013-01-28 12:51:05 -05:00 |
|
Brian Talbot
|
ef3a124281
|
LMS - added in additional JQUI accordion parameter needed to display full height of active element in courseware sidebar
|
2013-01-28 11:13:21 -05:00 |
|
chrisndodge
|
163400e268
|
Merge pull request #1362 from MITx/feature/edz/revert-explicit-charset
Feature/edz/revert explicit charset
|
2013-01-27 15:29:54 -08:00 |
|
Victor Shnayder
|
1f6331161c
|
Update FAQ (LH #125)
|
2013-01-27 18:10:14 -05:00 |
|
Victor Shnayder
|
37a9dccbe7
|
Update media kit download (LH #168)
|
2013-01-27 17:50:53 -05:00 |
|
Victor Shnayder
|
d697c6b94c
|
Add associate legal counsel job description (LH #166)
|
2013-01-27 17:46:27 -05:00 |
|
Victor Shnayder
|
aee8c863cd
|
Make 'Students' link on FAQ page point to /help (LH #164)
|
2013-01-27 17:38:56 -05:00 |
|
e0d
|
c8e6bedc1a
|
add
|
2013-01-27 17:19:12 -05:00 |
|
e0d
|
6a7997f9ba
|
add
|
2013-01-27 17:19:00 -05:00 |
|
e0d
|
313eab90c3
|
add
|
2013-01-27 17:18:55 -05:00 |
|
David Ormsbee
|
fd8df0122e
|
Merge pull request #1361 from MITx/feature/victor/cohorts
Fix missing import
|
2013-01-27 07:20:59 -08:00 |
|
Victor Shnayder
|
c1f7b109d8
|
Fix missing import
|
2013-01-27 10:19:36 -05:00 |
|
chrisndodge
|
2b824c844a
|
Merge pull request #1360 from MITx/edz/feature/explicit-css-charset
adding explicit charset declaration to additional css
|
2013-01-26 18:44:16 -08:00 |
|
chrisndodge
|
d5e9c0db8f
|
Merge pull request #1359 from MITx/feature/edz/explicit-csrf-domain
explicitly set the domain for the csrf cookie to match the session domai...
|
2013-01-26 18:43:43 -08:00 |
|
e0d
|
d747f54fc8
|
adding explicit charset declaration to additional css
|
2013-01-26 21:29:05 -05:00 |
|
e0d
|
956ccb06e9
|
explicitly set the domain for the csrf cookie to match the session domain.
|
2013-01-26 21:10:14 -05:00 |
|
David Ormsbee
|
a725fa1f17
|
Merge pull request #1358 from MITx/bugfix/dave/force_sass_utf8
Force charset for application.sass to be UTF-8
|
2013-01-26 11:47:08 -08:00 |
|
David Ormsbee
|
eff5093cbf
|
Force charset for application.sass to be UTF-8
|
2013-01-26 14:38:49 -05:00 |
|
David Ormsbee
|
d3a7be3484
|
Merge pull request #1357 from MITx/feature/victor/cohorts
refactor tests, add test for is_commentable_cohorted, fix a bug
|
2013-01-26 11:06:44 -08:00 |
|
Victor Shnayder
|
46570b01ef
|
refactor tests, add test for is_commentable_cohorted, fix a bug
|
2013-01-26 13:49:12 -05:00 |
|
David Ormsbee
|
4afa31550b
|
Merge pull request #1350 from MITx/feature/victor/cohorts
Feature/victor/cohorts
|
2013-01-26 10:07:07 -08:00 |
|
Victor Shnayder
|
439acf2df7
|
Fix docstring and test for get_cohort
Returns None if course isn't cohorted, even if cohorts exist. Shouldn't happen on prod, but could if cohorting is turned off mid-course.
|
2013-01-26 13:06:09 -05:00 |
|
Victor Shnayder
|
6847779f22
|
Merge remote-tracking branch 'origin/master' into feature/victor/cohorts
Conflicts:
common/djangoapps/student/models.py
|
2013-01-26 12:37:26 -05:00 |
|
Calen Pennington
|
d237e68af2
|
Merge pull request #1356 from MITx/feature/cale/fix-gemfile
Add a .ruby-version file for use w/ rbenv
|
2013-01-25 21:45:10 -08:00 |
|
Calen Pennington
|
ad2dc8a322
|
Add a .ruby-version file for use w/ rbenv
|
2013-01-26 00:10:20 -05:00 |
|
Calen Pennington
|
109689fe9a
|
Fix versions in gemfile
|
2013-01-26 00:01:55 -05:00 |
|
David Ormsbee
|
c07917d918
|
Merge pull request #1354 from MITx/feature/ichuang/fix-flashing-background-in-video
fix bug in video player:if from=xx:xx:xx is used then bkgrnd flashes
|
2013-01-25 13:55:16 -08:00 |
|
David Ormsbee
|
ca28796a86
|
Merge pull request #1345 from MITx/feature/apenney/pearson-merge
Pearson export/import code. (No merging before 25th Jan)
|
2013-01-25 13:54:55 -08:00 |
|