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

1736 Commits

Author SHA1 Message Date
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
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
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
Bridger Maxwell
788c74e07a Added optional <wiki> tag to course to specify an alternative wiki page. 2012-08-22 14:25:05 -04:00
Calen Pennington
b841591b0a Remove special styling for courseware header logo 2012-08-22 14:08:36 -04:00
Rocky Duan
37c78524a8 migrated threads reloading related stuff 2012-08-22 11:07:02 -07:00
Calen Pennington
82bab71ccf First pass at branding the header logo on subdomains 2012-08-22 14:05:19 -04:00
Kyle Fiedler
02f29c22c9 Added stsyles for toc 2012-08-22 13:41:20 -04:00
Bridger Maxwell
14382702bc Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki 
Conflicts:
	lms/templates/wiki/settings.html
 2012-08-22 13:09:42 -04:00
Calen Pennington
aa933cb38f Merge pull request #497 from MITx/feature/victor/catch-module-errors 
Catch errors in module load
 2012-08-22 10:05:08 -07:00
Victor Shnayder
365495521e Catch errors in module load 
* if error is in xmodule_constructor(), catch and return an ErrorModule
* if error is somewhere else in get_module(), return None
 2012-08-22 12:58:46 -04:00
Bridger Maxwell
3796bb4a12 Changed title of default root wiki page to just be Wiki. 2012-08-22 12:42:03 -04:00
Tom Giannattasio
fb1d9ca06c Merge branch 'master' into feature/tomg/fall-design 2012-08-22 11:41:19 -04:00
Tom Giannattasio
7d903c4089 sidebar hover and firefox bug fixes 2012-08-22 11:40:59 -04:00
Bridger Maxwell
96f0f7cbde Changed default contents of new course wiki. 2012-08-22 11:36:06 -04:00
Tom Giannattasio
b7ce475adb accordion hovers 2012-08-22 09:35:17 -04:00
Tom Giannattasio
8344fe88bd removed funky footer logo animation 2012-08-22 09:08:42 -04:00
Tom Giannattasio
885efc47c4 darker background for increased contrast 2012-08-22 09:03:38 -04:00
Arjun Singh
a9126aa276 Fixed syllabus to look good with new courseware styling 2012-08-22 05:25:48 -07:00
Arjun Singh
0b6bf77373 Adding a course-specific css class to body so that we can have course-targeted styles as a last resort 2012-08-22 05:00:39 -07:00
Tom Giannattasio
7e645e7f91 Merge branch 'master' into feature/tomg/fall-design 2012-08-22 07:35:26 -04:00
Tom Giannattasio
441d1955f9 fixed anonymous header bug 2012-08-22 07:34:55 -04:00
Rocky Duan
4a3975c78d adjusted frontend stuff 2012-08-21 23:33:13 -07:00
Rocky Duan
a90af0c471 render permalink in backend 2012-08-21 23:26:06 -07:00
Rocky Duan
654075e03f migrated follow thread 2012-08-21 23:08:32 -07:00
Bridger Maxwell
723519ee74 Removed wiki/settings.html so the default one will be used. 2012-08-22 00:55:03 -04:00
Bridger Maxwell
a285d1a60e Updated wiki preview template and django-wiki version. 2012-08-22 00:07:37 -04:00
Bridger Maxwell
9162bdb1b9 Changed wiki setting so article owners can't change permissions. 2012-08-21 23:06:45 -04:00
Bridger Maxwell
9e81ea3981 Added instructor tabs to wiki course nav. 2012-08-21 22:31:13 -04:00
Bridger Maxwell
e655b4a3b3 Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki 
Conflicts:
	cms/static/sass/_base.scss
	repo-requirements.txt
 2012-08-21 22:25:21 -04:00
Bridger Maxwell
82d414690b Updated to latest version of django-wiki with lots of deletion fixes. Removed child article list until it can be styled. 2012-08-21 22:23:40 -04:00
Rocky Duan
11e3276e80 update comment count based on operations 2012-08-21 17:43:20 -07:00
Rocky Duan
273af4a5ba make delete work 2012-08-21 17:15:52 -07:00
Rocky Duan
fd0eff46e7 Merge branch 'feature/rocky/discussion_api_key' into refactor 
Conflicts:
	lms/djangoapps/django_comment_client/tests.py
	lms/lib/comment_client/utils.py
	lms/templates/courseware/courseware.html
 2012-08-21 17:14:25 -07:00
Rocky Duan
4b97e70a4c fixed bug when no data is transmitted otherwise 2012-08-21 17:10:29 -07:00
David Ormsbee
9bcd3cd495 Merge pull request #490 from MITx/feature/rocky/discussion_api_key 
Feature/rocky/discussion api key
 2012-08-21 17:09:26 -07:00
Rocky Duan
de4b477649 make edit working 2012-08-21 17:02:17 -07:00
Tom Giannattasio
202eb7b1e9 Merge branch 'master' into feature/tomg/fall-design 2012-08-21 19:26:10 -04:00
Tom Giannattasio
bbc95cb589 fixed accordion nav glitch 2012-08-21 19:25:32 -04:00
David Ormsbee
f7539e8bce Merge pull request #488 from MITx/kimth/fix-choiceresponse 
Protect asciimath2jax in seq_contents, fix choiceresponse on CS169x
 2012-08-21 15:46:32 -07:00
Rocky Duan
e3a3f7094a added shared key authentication 2012-08-21 15:45:41 -07:00
Rocky Duan
fe091b7bc1 Merge branch 'master' of github.com:MITx/mitx into feature/rocky/discussion_api_key 2012-08-21 15:45:24 -07:00
Bridger Maxwell
214fb9185d Disabling anonymous wiki access until styling supports it. 2012-08-21 18:42:20 -04:00
Tom Giannattasio
88505b3948 fixed discussion sidebar 2012-08-21 18:41:06 -04:00