Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
65,817 Commits 1 Branch 0 Tags
624bef547c66da17048e29ff5d80126a665f1a0d
Commit Graph

65817 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Giannattasio
ed1bac7629 fixed container padding and sidebar fades 2012-08-21 08:28:24 -04:00
Bridger Maxwell
fa3734b6fc Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki 
Conflicts:
	repo-requirements.txt
 2012-08-21 08:24:29 -04:00
Arjun Singh
11ffc6bb88 Allowing filesubmissions to specify which files are allowed and require that certain files are present. 2012-08-21 02:40:21 -07:00
Rocky Duan
07f818da5a got reply working under backbone framework 2012-08-21 02:12:21 -07:00
Arjun Singh
0874369dc3 Minor change in extract_choices in choicegroup to allow for html in choice text 2012-08-21 01:59:01 -07:00
Rocky Duan
9dedd532c4 some progress 2012-08-20 23:43:47 -07:00
Rocky Duan
9ac26715a6 Merge branch 'feature/bk_forum_int' into refactor 
Conflicts:
	lms/djangoapps/courseware/views.py
	lms/templates/courseware/courseware.html
	lms/templates/discussion/index.html
	requirements.txt
 2012-08-20 22:42:32 -07:00
Rocky Duan
bca6699b58 updated seed_permissions_and_roles to accept course_id as a parameter 2012-08-20 22:37:26 -07:00
Rocky Duan
17683c43d4 attempt to migrate more code 2012-08-20 22:24:58 -07:00
Rocky Duan
a905ac9e1d updated backbone & single thread retrieval now working 2012-08-20 22:03:46 -07:00
Calen Pennington
b29e547d3d Merge pull request #474 from MITx/kimth/progress-hide 
Kimth/progress hide
 2012-08-20 19:31:14 -07:00
Calen Pennington
27c0104bfb Merge pull request #466 from MITx/feature/victor/html-escape-errors 
html escape errors
 2012-08-20 19:11:38 -07:00
Rocky Duan
d189a49ee5 continue working on backbone & got vote migrated and working 2012-08-20 17:32:36 -07:00
David Ormsbee
c3718e49b6 Meaningless commit to force build 2012-08-20 20:15:07 -04:00
David Ormsbee
66a9512e57 disable askbot and enable berkeley forum in AWS config 2012-08-20 19:30:45 -04:00
ichuang
65ea54f7e2 typo in common.py ALLOWED_GITRELOAD_IPS fixed 2012-08-20 19:23:15 -04:00
ichuang
e1c9e52fc5 move textinput display:inline into capa display.scss file as class 2012-08-20 19:18:00 -04:00
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