Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,922 Commits 1 Branch 0 Tags
9dedd532c4d0a44be6605bb2d2af817136100a68
Commit Graph

4922 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
David Ormsbee
b6dfa50a73 Adjust settings so we can change the comments service URL from Django config 2012-08-20 17:33:45 -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
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
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
Bridger Maxwell
ee3f46fd30 Changed titles on course pages. 2012-08-20 14:19:47 -04:00
Bridger Maxwell
5b38f9d4ac Removed empty sidebar from Progress page. 2012-08-20 14:15:41 -04:00
Bridger Maxwell
1159b14b0d Merge branch 'master' of github.com:MITx/mitx 2012-08-20 14:08:48 -04:00
Bridger Maxwell
70c7ee42ed Fixed tests from profile->progress rename. 2012-08-20 14:08:42 -04:00
John Jarvis
5f72e0c7a0 moving all requirements that use a repo to repo-requirements.txt including github requirements 2012-08-20 14:05:51 -04:00
thomasxiii
38f96b72a1 Merge pull request #463 from MITx/feature/kfiedler/courseware-style 
Feature/kfiedler/courseware style
 2012-08-20 10:58:46 -07:00
Bridger Maxwell
92a293f07e Removed profile info from Profile page and renamed it to Progress. 2012-08-20 13:50:28 -04:00