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

3000 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Ormsbee
f25bae9c3e Merge pull request #171 from MITx/arjun/fix_marketing 
Temporary fix to allow pages that inherited the marketing template to display
 2012-07-11 14:38:38 -07:00
Arjun Singh
8fa9f19b65 Oops, committed a bad version. 2012-07-11 17:04:37 -04:00
Arjun Singh
d0630c44be Temporary fix to allow pages that inherited the marketing template to display (though poorly) 2012-07-11 17:00:46 -04:00
Calen Pennington
00f381dd7f Merge pull request #169 from MITx/jarv/remove-scss 
removing {marketing,marketing-ie,print}.scss from PIPELINE_CSS
 2012-07-11 12:59:57 -07:00
John Jarvis
c6bf160002 removing {marketing,marketing-ie,print}.scss from PIPELINE_CSS 2012-07-11 15:53:56 -04:00
John Jarvis
a21d37e23b adding html5shiv.js to static/js 2012-07-11 15:26:18 -04:00
Matthew Mongeau
b96f626425 Update UserProfile demographic fields: 
* Updated student.models.UserProfile
* Added migration to add: gender, date_of_birth, mailing_address, country, telephone_number, occupation
 2012-07-11 14:58:39 -04:00
John Jarvis
07eeaf7573 -f should be -r in requirements.txt 2012-07-11 11:39:51 -04:00
David Ormsbee
09efd867c8 Merge pull request #165 from MITx/cpennington/lms-collectstatic 
Make collectstatic run to completion
 2012-07-11 07:18:41 -07:00
Calen Pennington
100422a7f3 Make collectstatic run to completion 2012-07-11 10:14:51 -04:00
Calen Pennington
8fd9b05e15 Merge pull request #164 from MITx/dormsbee/multicourse 
Dormsbee/multicourse
 2012-07-11 07:04:29 -07:00
John Jarvis
61e593ca39 Merge branch 'dormsbee/multicourse' of github.com:MITx/mitx into dormsbee/multicourse 2012-07-11 09:23:28 -04:00
John Jarvis
039cc40598 rakefile updated so that python modules in the package will be installed at package install time 2012-07-11 09:23:20 -04:00
Calen Pennington
488e357519 Merge pull request #163 from MITx/dormsbee/multicourse 
Enable multicourse
 2012-07-11 06:18:43 -07:00
Calen Pennington
9c883420fd Fix typo when reading showanswer out of capa problem metadata 2012-07-11 09:17:30 -04:00
John Jarvis
06edcc0f9b adding repo-requirements for modules that are checked into the repo 2012-07-11 09:16:54 -04:00
Calen Pennington
bbe589ddc3 Make dashboard require login 2012-07-11 09:05:39 -04:00
Calen Pennington
5d8fd7d53c Don't error out trying to retrieve remember parameter in login request 2012-07-11 08:53:57 -04:00
Calen Pennington
2d56a21f92 Removing old js files that used to be used by the LMS 2012-07-11 08:53:57 -04:00
Calen Pennington
853a452699 Use appropriate indexes in mongo modulestore 2012-07-11 08:53:56 -04:00
Calen Pennington
f0a049a29e Don't depend on the mitx directory being named that, so that tests will run in jenkins where mitx is checked out as workspace 2012-07-11 08:53:56 -04:00
ichuang
4f830eb316 fix static_replace use of re.subs flags to be python2.6 compatible 2012-07-10 22:32:46 -04:00
ichuang
84838cf222 add CourseEnrollment and UserTestGroup to django admin view 2012-07-10 22:31:28 -04:00
ichuang
314c572825 fix capa_problem to call each responder's get_answers() just once 2012-07-10 22:30:32 -04:00
Galen Frechette
7a5d645b9f removes user avatar, imporves dashboard design 2012-07-10 19:59:51 -04:00
Galen Frechette
7f4de5df30 simplifies jobs page 2012-07-10 19:59:51 -04:00
Galen Frechette
597c1db585 updates basic html structure and base color 2012-07-10 19:59:51 -04:00
Galen Frechette
d8d3eb144c type tweeks in modals 2012-07-10 19:59:51 -04:00
Galen Frechette
8faa539a1a makes some tweeks to global nav style, home page header and font styles 2012-07-10 19:59:51 -04:00
Galen Frechette
f7a1873aee adds banner images to and refines header on find courses pages, various visual tweeks and imporvements 2012-07-10 19:59:50 -04:00
Galen Frechette
5484cfd08e adds links to university profile page 2012-07-10 19:59:50 -04:00
Galen Frechette
6afb8f7d94 fixes university attributes in course.html 2012-07-10 19:59:50 -04:00
Galen Frechette
1be9196d3c wip header, wip header refactoring, improves course object visual design, improves footer 2012-07-10 19:59:50 -04:00
David Ormsbee
897a89c5ca remove out of repo symlinks from static 2012-07-10 18:39:06 -04:00
John Jarvis
65e2de9058 Merge branch 'dormsbee/multicourse' of github.com:MITx/mitx into dormsbee/multicourse 2012-07-10 18:11:36 -04:00
John Jarvis
ec47b72caf updating rakefile so that starting gunicorn is non-fatal 2012-07-10 18:11:29 -04:00
David Ormsbee
3dd923d9b9 typo fix (it was just really bugging me) 2012-07-10 17:50:42 -04:00
Matthew Mongeau
347483203a Unscope URLCONF from mitx 2012-07-10 17:37:42 -04:00
Calen Pennington
1ac6e0a083 Add extra_filters_jinja needed for compressed_css filter 2012-07-10 16:22:05 -04:00
Bridger Maxwell
a9eab86aee Merge branch 'dormsbee/multicourse' of github.com:MITx/mitx into dormsbee/multicourse 2012-07-10 15:47:39 -04:00
Calen Pennington
a74024687e Make rake clobber remote test_root/*_repo directories that are used and should be cleaned up by tests 2012-07-10 15:03:35 -04:00
Calen Pennington
824f049289 Make packaging task not verbose 2012-07-10 15:00:47 -04:00
Calen Pennington
6dd141247d Fixing github_sync to work with multiple course data directories 2012-07-10 14:58:27 -04:00
Bridger Maxwell
aff904a69d Merge 2012-07-10 14:40:31 -04:00
David Ormsbee
8589a1d9a9 reorder requirements to make it a little easier to see django-related reqs 2012-07-10 14:36:18 -04:00
David Ormsbee
caad217ec2 add other django-* dependencies from my pip freeze results 2012-07-10 14:34:05 -04:00
David Ormsbee
15b0801ecb add django-keyedcache dependency 2012-07-10 14:31:35 -04:00
David Ormsbee
23f0bee8a9 django-followit 2012-07-10 14:29:58 -04:00
David Ormsbee
9ec0ecdc6e fix dependency for django-kombu 2012-07-10 14:26:55 -04:00
David Ormsbee
fd7eec72e6 add djkombu dependency 2012-07-10 14:23:55 -04:00