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

5146 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Ormsbee
cdc8e02aeb Add discussion coffee scripts to courseware js so we don't add a dependency on Backbone to non-courseware JS 2012-08-22 23:34:03 -04:00
David Ormsbee
99614ea302 Merge pull request #511 from MITx/feature/dave/forum_fixes 
Forum refactoring/fixes
 2012-08-22 17:55:07 -07:00
David Ormsbee
baa6eadfb5 Merge branch 'master' into feature/dave/forum_fixes 2012-08-22 20:30:49 -04:00
David Ormsbee
3fa5205780 Merge pull request #509 from MITx/feature/victor/better-courseware-errors 
Feature/victor/better courseware errors
 2012-08-22 17:22:32 -07:00
Victor Shnayder
1b25433a39 Allow error-template-rendering errors to propagate to top-level 500 handler 
* hopefully won't come up, but if they do, our 500 page
  should be better than  HttpResponse("There was an unrecoverable error")
 2012-08-22 20:21:10 -04:00
Victor Shnayder
44ee0200a5 Fix undefined variables if LMS_MIGRATION was off 2012-08-22 20:19:58 -04:00
David Ormsbee
aeee2791ea Merge remote-tracking branch 'rocky/master' into feature/dave/forum_fixes 
Conflicts:
	lms/lib/comment_client/utils.py
	lms/templates/discussion/mustache/_content.mustache
 2012-08-22 20:00:06 -04:00
David Ormsbee
2e39131b31 Tiny fix to handle when data_or_params isn't passed in 2012-08-22 19:16:28 -04:00
Rocky Duan
952c9d56cf moved some stuff 2012-08-22 15:57:04 -07:00
Rocky Duan
ee21751848 Merge branch 'merge' 2012-08-22 15:52:00 -07:00
Rocky Duan
631aaaf5ba removed unnecessary file 2012-08-22 15:51:45 -07:00
Rocky Duan
05d28200ef Merge branch 'master' of github.com:MITx/mitx into merge 2012-08-22 15:51:08 -07:00
David Ormsbee
ebf971fad3 Profiles and permalinks both appear to be broken, so disabling both for now 2012-08-22 18:22:50 -04:00
David Ormsbee
3913427c6a Merge pull request #507 from MITx/kimth/fix_syllabus 
Quick workaround on syllabus_present that broke staging
 2012-08-22 14:51:31 -07:00
kimth
0d689b3164 Quick workaround on syllabus_present that broke staging 2012-08-22 17:50:21 -04:00
Rocky Duan
908a5c5d59 Merge branch 'master' of github.com:MITx/mitx into merge 2012-08-22 14:11:44 -07:00
David Ormsbee
ca36fb6792 Merge pull request #506 from MITx/feature/tomg/fall-design 
additional firefox bug
 2012-08-22 14:11:31 -07:00
Rocky Duan
3cbaba1961 fixed autosubscribe 2012-08-22 14:11:19 -07:00
Tom Giannattasio
c1befd5fd4 Merge branch 'master' into feature/tomg/fall-design 2012-08-22 17:06:03 -04:00
Tom Giannattasio
1a7b5b8564 fixed tutorial sequence nav bug 2012-08-22 17:05:42 -04:00
Rocky Duan
3b76fe16d8 make inline page working 2012-08-22 14:04:42 -07:00
Rocky Duan
951fb06341 Merge branch 'master' of github.com:MITx/mitx into merge 
Conflicts:
	lms/envs/dev.py
 2012-08-22 14:04:34 -07:00
David Ormsbee
fafbe41644 Merge pull request #502 from MITx/pmitros/berkeley_enrollment_hack 
Enrollment hack for allowing Berkeley to add their students.
 2012-08-22 13:59:07 -07:00
Calen Pennington
e206bf2ffc Merge pull request #505 from MITx/feature/tomg/fall-design 
Feature/tomg/fall design
 2012-08-22 13:34:39 -07:00
Piotr Mitros
69a3ea63bc Fixed minor issues (removed two unnecessary lines) 2012-08-22 16:32:14 -04:00
David Ormsbee
3b24ae1068 Merge pull request #501 from MITx/kimth/autodisable-syllabus 
Dynamically disable syllabus per-course
 2012-08-22 13:15:24 -07:00
Piotr Mitros
3777cd2f5e Added missing file 2012-08-22 16:15:24 -04:00
David Ormsbee
c86ee73bd8 Merge pull request #504 from MITx/feature/bridger/new_wiki 
Feature/bridger/new wiki
 2012-08-22 13:13:33 -07:00
Tom Giannattasio
a05cf05462 Merge branch 'master' into feature/tomg/fall-design 2012-08-22 16:09:30 -04:00
Tom Giannattasio
2c827c46f9 fixed firefox outline bugs 2012-08-22 16:09:09 -04:00
Calen Pennington
e093a365a4 Merge pull request #503 from MITx/feature/ichuang/fix-staff-debug 
staff debug view currently presents an empty window - this fixes
 2012-08-22 13:01:31 -07:00
Bridger Maxwell
a694d1034e We use django-wiki's built-in wikilinks markdown extension. They were clashing. 2012-08-22 15:57:44 -04:00
ike
7c242939f2 fix staff debug view, and also add new source_link 2012-08-22 15:51:08 -04:00
Piotr Mitros
a301abd5ad Enrollment hack for allowing Berkeley to add their students. 2012-08-22 15:49:48 -04:00
Kyle Fiedler
cca5fe2f04 Delete page 2012-08-22 15:40:56 -04:00
Kyle Fiedler
f4f8b7bf73 Added delete page and padding and hid th on overflow 2012-08-22 15:39:24 -04:00
kimth
f46607710f Merge master 2012-08-22 15:25:07 -04:00
kimth
64788a73aa Remove ENABLE_SYLLABUS flag from envs/common 2012-08-22 15:22:58 -04:00
Calen Pennington
5b7ae1a99b Add more excludes to rakefile 2012-08-22 15:14:25 -04:00
kimth
960cf5792b Dynamically disable syllabus per-course 2012-08-22 15:12:49 -04:00
Kyle Fiedler
7464332180 added fix for error styles and swapped some the button order 2012-08-22 15:09:20 -04:00
Rocky Duan
9b26a20989 fixed search highlighting 2012-08-22 12:04:32 -07:00
David Ormsbee
8b8ee9f434 Merge pull request #500 from MITx/feature/cale/university-branding 
Feature/cale/university branding
 2012-08-22 12:02:19 -07:00
Calen Pennington
2eb0de99eb Merge pull request #494 from MITx/feature/arjun/course_specific_css 
Feature/arjun/course specific css
 2012-08-22 11:55:20 -07:00
Calen Pennington
d735190570 Merge pull request #499 from MITx/feature/bridger/new_wiki 
Added optional <wiki> tag to course to specify an alternative wiki page.
 2012-08-22 11:54:39 -07:00
Arjun Singh
23e3d371ef adding more details about the state of course.css_class 2012-08-22 11:49:26 -07:00
Calen Pennington
55984e31fc Add HarvardX- and MITx- on-edx-logo.png files 2012-08-22 14:47:50 -04:00
Calen Pennington
5ca636e606 Use the university profile page for courses and index if we are in a branded subdomain. N.B. THIS DOESN'T WORK WITH MIT_SSL_AUTH 2012-08-22 14:43:49 -04:00
Kyle Fiedler
1277c5f892 Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki 2012-08-22 14:43:15 -04:00
Kyle Fiedler
d0c92aa159 Added styles for the wiki directory 2012-08-22 14:43:03 -04:00