Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

58450 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Ormsbee
1ebc810ae5 Fix some links taht were still pointing to the old courseware course_navigation pages. 2012-08-20 19:16:21 -04:00
Victor Shnayder
ef2bfac32a Merge branch 'master' of github.com:MITx/mitx 2012-08-20 19:11:58 -04:00
Victor Shnayder
c5aef50701 add test database for new toy course. Trying to fix build 2012-08-20 19:11:47 -04:00
David Ormsbee
eb96497cff Merge branch 'master' into feature/bk_forum_int 
Conflicts:
	lms/djangoapps/courseware/views.py
	lms/templates/courseware/courseware.html
	requirements.txt
 2012-08-20 18:57:46 -04:00
kimth
eaef8c70a7 Lowercase 2012-08-20 18:51:34 -04:00
kimth
7e7247d8bf Don't tabulate hidden chapters and sections in the Progress view 2012-08-20 18:47:18 -04:00
ichuang
e3ecd22fa0 github IPs in lms.envs.common; made create_user, create_groups, 
manage_course_groups management commands (in lms_migration)
 2012-08-20 18:38:05 -04:00
Rocky Duan
0b3e9909a4 Merge branch 'master' into refactor 
Conflicts:
	lms/djangoapps/django_comment_client/tests.py
	lms/static/coffee/src/discussion/content.coffee
	requirements.txt
 2012-08-20 15:35:31 -07:00
Rocky Duan
8684ae29b2 Merge branch 'master' of github.com:MITx/mitx into refactor 
Conflicts:
	lms/djangoapps/courseware/views.py
	lms/templates/courseware/courseware.html
	requirements.txt
 2012-08-20 15:31:51 -07:00
Rocky Duan
dc599c469f fixed test 2012-08-20 15:26:07 -07:00
Rocky Duan
f82c2e00d1 simplified mustache helper loading 2012-08-20 15:24:19 -07:00
Rocky Duan
1c161a769e removed unnecessary dependency 2012-08-20 15:16:40 -07:00
Tom Giannattasio
88d514e28d fixed merge conflict in extends 2012-08-20 18:15:09 -04:00
Tom Giannattasio
3ffcb2615f fix merge conflicts 2012-08-20 18:07:32 -04:00
jarv
46c3e8a286 Merge pull request #473 from MITx/feature/pystache_custom 
Remove pystache in favor of our custom version
 2012-08-20 15:05:49 -07:00
David Ormsbee
356fac144b Remove pystache in favor of our custom version 2012-08-20 18:04:37 -04:00
David Ormsbee
8ab98d33ea remove pystache dependency 2012-08-20 18:02:32 -04:00
Tom Giannattasio
a1ff34571e sequence nav changes were lost?! temporary fix 2012-08-20 18:01:57 -04:00
Tom Giannattasio
ee92ba0752 new sequence nav; new courseware sidebar; new textbook styling; fixed gradebook glitch 2012-08-20 17:56:51 -04:00
Victor Shnayder
868b076ea7 html escape errors 2012-08-20 17:55:59 -04:00
David Ormsbee
b6dfa50a73 Adjust settings so we can change the comments service URL from Django config 2012-08-20 17:33:45 -04:00
Bridger Maxwell
c0c23baac5 Removed inactive 'view this revision' button from history page. 2012-08-20 17:23:39 -04:00
Bridger Maxwell
8543f25358 Updated django-wiki version. 2012-08-20 16:51:39 -04:00
David Ormsbee
47bf516001 Remove unnecessary import that was failing a test 2012-08-20 16:48:31 -04:00
jarv
e89a7b67c5 Merge pull request #470 from MITx/jarv/dependency-update 
ensuring pystache>=0.5.2
 2012-08-20 13:46:02 -07:00
John Jarvis
bb80c66ed7 ensuring pystache>=0.5.2 2012-08-20 16:41:48 -04:00
David Ormsbee
d7327651eb Merge pull request #469 from MITx/jarv/dependency-update 
updating dependencies for pystache, networkx, graphviz and removing redu...
 2012-08-20 13:37:57 -07:00
John Jarvis
55251039d9 updating dependencies for pystache, networkx, graphviz and removing redundant dependency for django-staticfiles 2012-08-20 16:35:42 -04:00
David Ormsbee
3762efd2ec added pystache dependency 2012-08-20 16:34:13 -04:00
Bridger Maxwell
46d2e71ac1 Fixed bug in breadcrumbs. 2012-08-20 16:24:12 -04:00
Bridger Maxwell
d31f0c9f06 Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki 
Conflicts:
	requirements.txt
 2012-08-20 16:10:17 -04:00
Victor Shnayder
cc1dd65eb0 Merge branch 'master' of github.com:MITx/mitx 2012-08-20 16:04:41 -04:00
Victor Shnayder
5f612c7819 Oops. Make modx_dispatch and xqueue callback work again. 
- use get_instance, not get_item
- finish the id->location rename for modx_dispatch arg
 2012-08-20 16:04:16 -04:00
Rocky Duan
af17ba7a79 removed dependency on datehelper 2012-08-20 12:57:23 -07:00
thomasxiii
2f2a4cc6e7 Merge pull request #468 from MITx/feature/kfiedler/courseware-style 
Made save buttons blue, finished remaining askbot bugs, and removed all instances of $mit-red
 2012-08-20 12:53:03 -07:00
Tom Giannattasio
0f6c31b4bd started courseware sidebar styling 2012-08-20 15:51:10 -04:00
Kyle Fiedler
20d9e6e86d Made save buttons blue, finished remaining askbot bugs, and removed all instances of -red 2012-08-20 15:45:05 -04:00
Kyle Fiedler
7c824f774f Added styles for save button 2012-08-20 15:45:05 -04:00
Calen Pennington
de4abe300b Merge pull request #464 from MITx/kimth/textbook 
Kimth/textbook
 2012-08-20 12:38:14 -07:00
Calen Pennington
259e21364f Merge pull request #461 from MITx/feature/victor/multi-run-policy 
Keep each course's descriptors separate
 2012-08-20 12:35:55 -07:00
David Ormsbee
9bde5e7a4b Merge pull request #467 from MITx/bridger/feature/clean_up 
Bridger/feature/clean up
 2012-08-20 12:21:35 -07:00
Rocky Duan
7b5e66b68f python code for time_ago_in_words is unnecessary now 2012-08-20 12:05:02 -07:00
Rocky Duan
348a7b6eb7 render time ago in front end 2012-08-20 12:04:25 -07:00
Bridger Maxwell
9bc5aec01a Fixed up courseware-error view. Moved it to templates/courseware too. 2012-08-20 15:03:55 -04:00
Rocky Duan
71df263ff9 disable all course db related signals 2012-08-20 11:57:58 -07:00
jarv
bc2164e2be Merge pull request #465 from MITx/jarv/repo-requirements-update 
moving all requirements that use a repo to repo-requirements.txt includi...
 2012-08-20 11:56:29 -07:00
Bridger Maxwell
0ac5ded095 Moved the course template pages to be templates/courseware/ 2012-08-20 14:54:23 -04:00
Rocky Duan
1f50da8814 fixed discussion permission test 2012-08-20 11:41:36 -07:00
Rocky Duan
b4039fe89d Merge branch 'feature/bk_forum_int' of github.com:MITx/mitx into feature/bk_forum_int 
Conflicts:
	requirements.txt
 2012-08-20 11:41:19 -07:00
John Jarvis
1a2cdea966 removing dupe 2012-08-20 14:24:39 -04:00