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

1624 Commits

Author SHA1 Message Date
Victor Shnayder
f44d794e63 Add course_id to StudentModule 
* Update all uses.
 2012-08-21 15:01:54 -04:00
Calen Pennington
9f23e4378e Merge remote-tracking branch 'origin/hotfix/1.0.4' 2012-08-21 14:56:35 -04:00
Calen Pennington
adf2d44d05 Merge pull request #482 from MITx/feature/dave/nav_fixes 
Remove non-functioning News tab. Enable Instructor tab from Discussion page
 2012-08-21 11:47:01 -07:00
Calen Pennington
86f20cc15d Merge pull request #478 from MITx/kimth/fix-sequence-modx 
Sequential modx/goto_position hits correct multicourse URL
 2012-08-21 11:39:17 -07:00
David Ormsbee
3f0fba71d9 Remove non-functioning News tab. Enable Instructor tab from Discussion page 2012-08-21 14:29:30 -04:00
kimth
7d1fd538f2 Use data(...) rather than hidden span 2012-08-21 13:36:49 -04:00
kimth
9b3f560c98 Fix MathJax in sequentials 2012-08-21 13:32:55 -04:00
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
Kyle Fiedler
63900ef425 Added new wiki 404 page 2012-08-21 11:55:30 -04:00
kimth
231aa4674c Sequential modx/goto_position hits correct multicourse URL 2012-08-21 08:39:08 -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
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
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
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
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
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
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
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
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
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
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
kimth
c084745290 Textbook TOC from S3 2012-08-20 13:32:13 -04:00
Kyle Fiedler
ab28e08591 Added new button classes 2012-08-20 13:22:21 -04:00