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

9410 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Chris Dodge
1787157e00 put back the 'position' argument to get_module() which got accidentially - or so I think - dropped in a previous commit 2013-01-24 21:38:02 -05:00
Victor Shnayder
771a55a631 turn forums on in test.py 
- this may not be a good idea, but needed for testing cohorts for now...
 2013-01-24 18:35:34 -05:00
Victor Shnayder
d17aedf3b4 the reverse isn't working for some reason... need to figure it out 2013-01-24 18:08:51 -05:00
Victor Shnayder
0b7e7b35dc stub out django comment client test system 2013-01-24 17:33:40 -05:00
Victor Shnayder
22ccf9c500 Some test cleanups 2013-01-24 17:33:25 -05:00
David Ormsbee
d31229360f Merge pull request #1348 from MITx/fix/zoldak/ie-keyword 
Fix broken IE due to using the word function
 2013-01-24 14:07:59 -08:00
Jay Zoldak
896933a3c4 Fix broken IE 2013-01-24 17:02:18 -05:00
Victor Shnayder
69711a91ff Fix inline discussion cohorting, debug logging 2013-01-24 16:58:19 -05:00
Brian Wilson
368e3d5c97 Merge branch 'feature/apenney/pearson-merge' of github.com:MITx/mitx into feature/apenney/pearson-merge 2013-01-24 16:38:07 -05:00
Brian Wilson
872f4b6c13 fix handling of rejected accommodations 2013-01-24 16:37:02 -05:00
David Ormsbee
acfafa6516 Merge pull request #1347 from MITx/fix/cdodge/remove-duplicate-assign-default-role 
fix merge problem. assign_default_role() ended up being defined twice as...
 2013-01-24 13:00:40 -08:00
Chris Dodge
dfbe7dd4f9 fix merge problem. assign_default_role() ended up being defined twice as that code was added in both master and cms-master branches, but the merge didn't pick it up as a conflict 2013-01-24 15:54:02 -05:00
Victor Shnayder
fb7614a81c oops--fix logging bug 2013-01-24 15:47:41 -05:00
Victor Shnayder
ea3aebdfe5 add logging, explicit check whether course is cohorted 2013-01-24 15:46:22 -05:00
Ashley Penney
135369a3d7 Merge branch 'feature/apenney/pearson-merge' of github.com:MITx/mitx into feature/apenney/pearson-merge 2013-01-24 15:20:49 -05:00
Ashley Penney
b02ebc4618 Add these two options in as well. 2013-01-24 15:20:27 -05:00
Victor Shnayder
103db8aaf3 add conflict detection--users should be in at most one cohort per course 2013-01-24 15:14:34 -05:00
Victor Shnayder
5fa8cf5a78 Only show cohort config for cohorted courses 2013-01-24 15:14:34 -05:00
Victor Shnayder
3bfe9decf4 Change config keys to use underscores for consistency with other policy keys 2013-01-24 15:14:34 -05:00
Victor Shnayder
de02721158 Add removing students from cohorts. 2013-01-24 15:14:33 -05:00
Victor Shnayder
9e84ae14d4 Started integration work with Kevin's cohort changes 
- Create new cohorts.py file
- moved code there from models.py
- implemented necessary functions.

Next: testing :)
 2013-01-24 15:14:33 -05:00