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

5164 Commits

Author SHA1 Message Date
Chris Dodge
b3dcc140b7 made a special 'module preview' view for Static Tabs in the CMS. Per Tom, he'd like just the Display Name to show up in the static tab editor until the end-user clicks the Edit button 2012-11-26 14:22:13 -05:00
Don Mitchell
f0c94a2c7e Beginning test of details tab. 2012-11-21 15:17:18 -05:00
Don Mitchell
339949f934 Another checkpoint before pull/merge 2012-11-20 11:37:14 -05:00
Victor Shnayder
f8dc85b6f8 oops. used wrong variable name. 2012-11-20 10:28:47 -05:00
Victor Shnayder
5a03b53a2f cert bugfix: handle students who don't have a grade 2012-11-20 09:20:03 -05:00
Don Mitchell
241c9bb1ac Checkpoint to rebase 2012-11-19 16:02:30 -05:00
Carlos Andrés Rocha
8df425e5e8 Add backend for displaying news on the student dashboard 
[#39472239]
 2012-11-19 13:06:36 -05:00
Victor Shnayder
d723bb7103 simpify process_survey_link 2012-11-19 11:39:43 -05:00
Victor Shnayder
d1eec9bcf4 add a salt. using user.id since that's handy. 2012-11-19 11:34:31 -05:00
David Ormsbee
336caa0feb Batch together alter statements to minimize how long we lock the auth_users table 2012-11-19 10:30:22 -05:00
Victor Shnayder
956b704786 add migration to remove askbot columns 2012-11-19 10:19:31 -05:00
Calen Pennington
8525b898d7 Add migration to make columns added by askbot nullable, in preparation for eventually deleting them 2012-11-19 09:48:51 -05:00
Victor Shnayder
71b585bb61 move unique_id_for_user into student/models.py 2012-11-17 16:33:00 -05:00
Victor Shnayder
003dc7ef51 Get rid of check for non-existent CERTIFICATES_ENABLED flag... 2012-11-17 16:19:52 -05:00
Victor Shnayder
3a44f043d2 Add tests, make them pass. 2012-11-17 15:58:49 -05:00
Victor Shnayder
5bc0b4864a moving cert link and survey logic into views, adding tests. In-progress. 2012-11-17 15:24:38 -05:00
Calen Pennington
0fff578e7d Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	.gitmodules
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/sass/course.scss
	lms/urls.py
 2012-11-16 09:03:15 -05:00
David Ormsbee
eff3a7c3c7 Batch together alter statements to minimize how long we lock the auth_users table 2012-11-15 14:55:21 -05:00
David Ormsbee
156dc1fb6c Merge branch 'master' into feature/victor/actual-askbot-removal 
Conflicts:
	lms/envs/aws.py
 2012-11-15 14:24:55 -05:00
David Ormsbee
1ab7019607 Merge pull request #1044 from MITx/feature/brian/press-updates 
Feature/brian/press updates
 2012-11-14 10:01:16 -08:00
Brian Wilson
515d2f4b1e add press mentions for October, update missing logos, and add sorting. 2012-11-14 11:55:08 -05:00
Calen Pennington
dbcb1adfaf Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	lms/static/sass/course/courseware/_courseware.scss
 2012-11-13 10:22:42 -05:00
Carlos Andrés Rocha
5f5f56bbbd Fix syntax on dashboard template 2012-11-09 21:40:55 -05:00
Carlos Andrés Rocha
8c2cbede9e Quickfix to render the dashboard when there is no certificate db tables 2012-11-09 20:58:02 -05:00
John Jarvis
157c98a79d only check cert_status when certificates feature flag is enabled 2012-11-09 20:31:05 -05:00
Victor Shnayder
2846c61d15 Revert "remove (almost) all references to askbot." 
This reverts commit 793354a0dc.
 2012-11-09 18:18:37 -05:00
Victor Shnayder
0b69870d05 Reverting askbot removal for now 
Revert "add migration to remove askbot columns"

This reverts commit 9281f3c140.
 2012-11-09 18:18:36 -05:00
Victor Shnayder
cf33d85ef9 Wire up cert status 2012-11-09 18:18:36 -05:00
Victor Shnayder
d636d729c6 add migration to remove askbot columns 2012-11-09 18:18:33 -05:00
Victor Shnayder
76f0cf4a86 remove (almost) all references to askbot. 2012-11-09 18:18:33 -05:00
Calen Pennington
171e932266 Merge branch 'master' into feature/cale/cms-master 
Conflicts:
	rakefile
 2012-11-08 12:28:40 -05:00
David Ormsbee
e90d321142 Comments, whitespace from review. 2012-11-07 19:28:22 -05:00
David Ormsbee
4b02b2af2a Rearrange how we handle the auth tokens for our fake Pearson preliminary testing 2012-11-07 17:20:49 -05:00
David Ormsbee
528fcd7f4e Create a config option for enabling a Pearson login in a totally hacky manner. 2012-11-07 14:08:55 -05:00
David Ormsbee
92f2fbf0f8 Ugly, ugly hack needed so that Pearson can test something today, to be replaced by a real implementation later this week or early next. 2012-11-07 13:55:08 -05:00
Chris Dodge
87ff18dc56 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info 2012-11-07 09:35:21 -05:00
David Ormsbee
ad93f70e65 Re-add TestCenterUser along with a basic command to make an entry for a given user already in the system. 2012-11-07 09:24:38 -05:00
Calen Pennington
bca0134a35 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 2012-11-06 16:13:31 -05:00
Chris Dodge
55c69a1e13 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info 
Conflicts:
	lms/djangoapps/courseware/module_render.py
 2012-11-06 14:20:59 -05:00
David Ormsbee
847b2eb7e0 Merge branch 'master' into feature/dave/pearson_setup 2012-11-06 11:54:13 -05:00
Calen Pennington
0bfa443520 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 2012-11-02 11:09:19 -04:00
Calen Pennington
9cb2fbdd2f Remove newline from javascript source tags 2012-10-31 16:26:11 -04:00
Victor Shnayder
9281f3c140 add migration to remove askbot columns 2012-10-30 19:54:15 -04:00
Victor Shnayder
793354a0dc remove (almost) all references to askbot. 2012-10-30 18:23:07 -04:00
Chris Dodge
34c442a1dc removed unneeded trace log. Also don't need StudentModuleCache in 'about' section rendering 2012-10-30 16:04:51 -04:00
Chris Dodge
743f2b56dd make course about view methods render the about content as a module, so we get all the url rewriting goodness. Also, since we're now handling the url re-writing via the module get_html pipelines, we can remove the link rewriting inside the xmodules itself - which is good because there's a wierd bug in lxml.html rewriting 2012-10-30 15:12:13 -04:00
Chris Dodge
f4822c23de lots of tweeks to better support importing of existing courseware 2012-10-30 11:52:31 -04:00
Calen Pennington
7966c18d2e Add migration to make columns added by askbot nullable, in preparation for eventually deleting them 2012-10-29 15:12:15 -04:00
David Ormsbee
7a84bed916 hackish EAD export support 2012-10-26 15:50:32 -04:00
David Ormsbee
ab676d9d6d Merge pull request #952 from MITx/vik/add_instrumentation 
Vik/add instrumentation
 2012-10-24 12:23:31 -07:00