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

4937 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Ormsbee
08e892ce9e Add command to seed forum permissions to existing users 2012-08-21 13:22:32 -04:00
David Ormsbee
1c84f8e2dd Remove student removal (we shouldn't ever delete users) 2012-08-21 13:00:06 -04:00
David Ormsbee
b0894c3973 Fix tests for other courses - create default discussion roles on demand if they don't exist 2012-08-21 12:38:39 -04:00
David Ormsbee
b31722bcff Merge branch 'master' into feature/bk_forum_int 2012-08-21 12:05:06 -04:00
David Ormsbee
6d371640d4 Removed signal removal in django_comment_client test (we're no longer doing user replication) 2012-08-21 12:04:24 -04:00
Calen Pennington
e0173d71a7 Merge pull request #471 from MITx/feature/bridger/new_wiki 
New wiki update
 2012-08-21 08:58:59 -07:00
Kyle Fiedler
63900ef425 Added new wiki 404 page 2012-08-21 11:55:30 -04:00
David Ormsbee
783a3905a4 disable user replication and associated tests 2012-08-21 11:39:36 -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
Rocky Duan
bca6699b58 updated seed_permissions_and_roles to accept course_id as a parameter 2012-08-20 22:37:26 -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
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
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
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
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
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