Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,431 Commits 1 Branch 0 Tags
17930e418627df8ea72b080e236cb38501645a57
Commit Graph

9431 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
ichuang
c56982e6f0 fix bug in video player:if from=xx:xx:xx is used then bkgrnd flashes 2013-01-25 16:45:16 -05:00
Victor Shnayder
87e92644b6 Make all tests pass 
caveat: with a bit of hackery.  Need to do better testing once things are live.
 2013-01-25 16:13:55 -05:00
chrisndodge
72c9d9f70c Merge pull request #1352 from MITx/feature/dhm/drag 
min height on droppable areas and add padding to top/bottom on hover.
 2013-01-25 12:57:06 -08:00
Victor Shnayder
00dd3ad9f8 Fix some of the test bugs. Still more to fix. 2013-01-25 15:40:13 -05:00
Brian Talbot
8a6dc040a9 studio - styled first children in an overview's subsection list for drag and drop work 2013-01-25 15:26:25 -05:00
Don Mitchell
0009430b59 min height on droppable areas and add padding to top/bottom on hover. 2013-01-25 14:30:51 -05:00
chrisndodge
c9a877b77c Merge pull request #1336 from MITx/feature/dhm/drag 
unit/subsection/section drag and drop on overview page
 2013-01-25 10:51:57 -08:00
Victor Shnayder
d453a6136b fix regexp 2013-01-25 13:42:04 -05:00
Victor Shnayder
faaf290e10 Merge pull request #1351 from MITx/content/rocha/most-important-change-ever 
Added one more year!
 2013-01-25 10:37:54 -08:00
Victor Shnayder
76c4730532 whitespace 2013-01-25 13:33:25 -05:00
Victor Shnayder
66934ce220 Address Dave's comments on https://github.com/MITx/mitx/pull/1350 2013-01-25 13:33:19 -05:00
Carlos Andrés Rocha
f35d4a16c3 Added one more year! 2013-01-25 13:31:23 -05:00
Don Mitchell
e58193f87f Updated comment 2013-01-25 13:03:54 -05:00
Victor Shnayder
3d303518eb Remove old user replication code. 
- we don't use it, and if we do want to change the arch, we should have a proper central user info service.
 2013-01-25 12:51:34 -05:00
Don Mitchell
45393ac6f8 Merge branch 'feature/dhm/drag' of github.com:MITx/mitx into feature/dhm/drag 2013-01-25 12:46:09 -05:00
Don Mitchell
5ef3f3ee66 Update jquery ui. Overrode draggable w/ an in place fix for scroll 
racing condition.
 2013-01-25 12:44:58 -05:00
Ashley Penney
a54778551e This needs to be a list of strings. 2013-01-25 10:49:20 -05:00
Victor Shnayder
0e78d9eb61 Merge pull request #1349 from MITx/fix/cdodge/position-jumping-fix 
put back the 'position' argument to get_module() which got accidentially...
 2013-01-24 18:49:25 -08:00
Kevin Chugh
07c1999a95 prep for staging 2013-01-24 21:43:36 -05:00