Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,094 Commits 1 Branch 0 Tags
735aa134965acf2e1da679abe9203bcd63ebdea2
Commit Graph

334 Commits

Author SHA1 Message Date
Chris Dodge
e70db062b2 Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge 
Conflicts:
	requirements.txt
 2013-01-03 10:46:24 -05:00
Chris Dodge
7229a9cdaf perform a new merge from master, resolve conflicts 2013-01-03 10:43:03 -05:00
Don Mitchell
ff490599fa Debugging unit tests 2012-12-26 10:29:35 -05:00
Don Mitchell
0a91a98dd0 Merge remote-tracking branch 'origin/feature/cale/cms-master' into 
feature/dhm/cms-settings

Conflicts:
	cms/djangoapps/contentstore/course_info_model.py
	cms/djangoapps/contentstore/views.py
	cms/static/js/models/course_info.js
	cms/static/js/template_loader.js
	cms/static/js/views/course_info_edit.js
	cms/templates/base.html
	cms/templates/course_info.html
	cms/urls.py
 2012-12-11 10:55:10 -05:00
Don Mitchell
39024a7fee Grading mostly working 2012-12-10 16:32:33 -05:00
chrisndodge
e1c452bc08 Merge pull request #1113 from MITx/feature/dhm/course-info 
move the underscore tempaltes to /static/client-templates and update the...
 2012-12-10 07:17:19 -08:00
Chris Dodge
79e48dde97 move the underscore tempaltes to /static/client-templates and update the references 2012-12-10 10:01:08 -05:00
Calen Pennington
c917725ff0 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	common/lib/xmodule/xmodule/seq_module.py
	common/lib/xmodule/xmodule/template_module.py
	common/lib/xmodule/xmodule/x_module.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/courseware/views.py
	lms/static/sass/course.scss
	requirements.txt
 2012-12-07 11:17:41 -05:00
Brian Wilson
cde20758f8 cosmetic cleanup 2012-12-04 13:25:04 -05:00
Brian Wilson
dfb9913100 clean up lms tests, and fix export/import 2012-12-04 11:52:35 -05:00
Brian Wilson
4ebd70dcc4 add support for utf8 in sequences, verticals and custom modules. 2012-12-04 03:54:36 -05:00
Brian Wilson
1d44ebb10c Add more non-ascii characters to full dataset, and make fixes in xmodule code. 2012-12-03 16:22:25 -05:00
Don Mitchell
50d7e6160e Move models from common to cms. 
Add unit tests.
 2012-12-03 12:20:15 -05:00
Don Mitchell
8379e3038d Moved settings models from common to cms 2012-11-30 10:42:23 -05:00
Chris Dodge
2aceb2e44a make sure when defining the course namespace in the replace url methods that we explicitly state the parameter name. There are some optional parameters and if we don't define the parameter name, it'll end put being interpreted as a different parameter 2012-11-29 15:56:03 -05:00
Brian Wilson
6a24ecebe7 decode utf-8 when reading html, and encode when writing. 2012-11-28 17:54:18 -05:00
Don Mitchell
c0da6e4249 Details done except for syllabus 2012-11-28 17:10:41 -05:00
Don Mitchell
a48a392eb2 Trying to get scss back 2012-11-28 10:02:01 -05:00
Don Mitchell
5331ae055f Got time change hooked up but gained a spurious call to change on date 
change.
 2012-11-27 15:15:28 -05:00
Don Mitchell
2238019539 Details tab works except for file references 2012-11-27 11:32:03 -05:00
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