Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,188 Commits 1 Branch 0 Tags
826b070bfa047f94de6d14d43eaa9b598000d9ff
Commit Graph

47 Commits

Author SHA1 Message Date
Brian Wilson
bfc4527590 Switch timed_module to store location, and use to navigate from timer when timer displays on non-exam course pages. 2013-02-06 15:23:11 -05:00
Arjun Singh
5f97533caa add meta tag for google verification 2012-11-12 13:52:58 -08:00
Carlos Andrés Rocha
8ec2c34ea5 Add google analytics to course info pages 2012-10-30 16:05:06 -04:00
Victor Shnayder
4fd530dbac fix python syntax in template for adding google analytics 2012-10-05 11:49:17 -04:00
Tom Giannattasio
33378bbafd added google analytics to all pages without a course object 2012-10-03 19:33:12 -04:00
Kyle Fiedler
b6e03c60b6 Added back the ie fixes from before 2012-09-12 16:01:39 -04:00
Kyle Fiedler
bce61cd6e5 Revert "Merge pull request #642 from MITx/bug/kfiedler/ie" 
This reverts commit 2b5e8a4944, reversing
changes made to db0549be78.
 2012-09-07 14:18:34 -04:00
Kyle Fiedler
aec8cc42dc Add ie fix for wiki 2012-09-07 12:59:30 -04:00
Rocky Duan
2fb02f1a73 Merge branch 'master' of github.com:MITx/mitx into merge 
Conflicts:
	lms/urls.py
 2012-08-07 16:58:14 -04:00
Kyle Fiedler
ac960ab9df Add images for book and fix styles for wiki 2012-08-06 16:08:40 -04:00
Brittany Cheng
f1e07024d4 Merge branch 'master' of github.com:MITx/mitx into discussion2 2012-07-31 18:43:21 -04:00
Kyle Fiedler
d30ae5389e Added fix for videos start to zero out colors and mit styles 2012-07-31 14:18:42 -04:00
Rocky Duan
63633ae1d3 files for wmd editor 2012-07-25 20:47:11 -04:00
Kyle Fiedler
18dc689d4d Added fix for where the course.css is being brought in 2012-07-25 14:57:44 -04:00
Kyle Fiedler
00596d2f20 Added courseware css back into the main template 2012-07-25 14:57:44 -04:00
Calen Pennington
3fa636e060 Move module javascript into common/lib/xmodule. Still TODO: run jasmine tests in that directory 2012-07-24 16:13:59 -04:00
Kyle Fiedler
2cb9e2997e Move the shiv back to the header 2012-07-23 18:22:21 -04:00
Kyle Fiedler
0f4976e069 Added some small IE fixes 2012-07-23 16:53:39 -04:00
Bridger Maxwell
c6f0c57b5e Fixed typo where favicon was references as image/image/x-icon 2012-07-23 16:19:41 -04:00
Kyle Fiedler
e6465e420a Changed around the css 2012-07-23 12:38:21 -04:00
Calen Pennington
d19e50aeb6 Merge remaining js files into django-pipeline groups 2012-07-23 11:27:22 -04:00
Calen Pennington
d2d29b2cf9 Move most javascript loading to below the body, rather than head 2012-07-23 11:27:22 -04:00
Calen Pennington
5915532a57 Consolidate code used for disabling USE_DJANGO_PIPELINE feature 2012-07-23 11:27:22 -04:00
Calen Pennington
5dd4e19c0b Move vendor js into a single file 2012-07-23 10:24:50 -04:00
Bridger Maxwell
9ebac1bdd7 Removed a bunch of non-necessary javascript from homepage. Most of it was put back in courseware. A new PIPELINE_JS group 'courseware' was created, for pipeline javascript files that should only be in the courseware. 2012-07-23 08:18:37 -04:00
Bridger Maxwell
0cac360225 Added a favicon. 2012-07-22 18:49:10 -04:00
Calen Pennington
64b92c35cc Include ie fixes in via django-pipeline 2012-07-20 19:54:07 -04:00
Kyle Fiedler
1b3f03e2e5 Added fixes for ie and an image change 2012-07-20 19:16:10 -04:00
Kyle Fiedler
c7e43d98dc Rearranged more images, made some smaller, made some slight changes to the design on the homepage and made all edX proper case 2012-07-20 11:18:39 -04:00
Matthew Mongeau
9c672f7bd0 Hook up forms for forgot password functionality. 2012-07-17 16:27:30 -04:00
Galen Frechette
597c1db585 updates basic html structure and base color 2012-07-10 19:59:51 -04:00
Calen Pennington
fdd9663699 Merge remote-tracking branch 'origin/master' into dormsbee/multicourse 
Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/modulestore/xml.py
	lms/djangoapps/courseware/views.py
	lms/templates/index.html
	lms/templates/info.html
	lms/templates/main.html
	lms/templates/navigation.html
	requirements.txt
 2012-07-10 13:39:19 -04:00
Calen Pennington
5406b9bb40 Make /static/ urls work in the courseware 2012-07-10 12:54:47 -04:00
Matthew Mongeau
3ae48d19b4 Passes course around for courseware. Fix static assets. 2012-07-03 12:13:15 -04:00
Galen Frechette
e0f01aa828 cleans up course info/profile page 2012-07-02 14:11:25 -04:00
Matthew Mongeau
cddf4cf6cf Wip on sign up form. 2012-06-28 15:38:39 -04:00
ichuang
5688e89fab change MITx -> edX in many lms templates 2012-06-28 10:26:59 -04:00
David Ormsbee
a32aeac013 Add info page support with multiple courses 2012-06-21 11:05:31 -04:00
Prem Sichanugrist
3e2031cd43 Update jQuery and jQuery-UI to latest version 2012-06-21 11:05:30 -04:00
Galen Frechette
78b0e86334 cleans up login modal and adds js for toggling login modal 2012-06-20 18:37:07 -04:00
Galen Frechette
94886643b0 gets app completly uptodate with prototype 2012-06-20 14:37:37 -04:00
Prem Sichanugrist
afaed83158 Update jQuery and jQuery-UI to latest version 2012-06-19 14:31:00 -04:00
Matthew Mongeau
8d66f5ee07 Menu work. 2012-06-14 14:52:10 -04:00
Matthew Mongeau
e048b3251d Get dropdown working 2012-06-14 14:19:47 -04:00
Matthew Mongeau
86826f8688 Integrate more pages. 2012-06-14 11:27:47 -04:00
Matthew Mongeau
47126dc686 wip 2012-06-13 14:50:25 -04:00
Calen Pennington
5ba03130aa Moving LMS code into subdirectory 2012-06-06 14:09:01 -04:00