Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,811 Commits 1 Branch 0 Tags
03e79cc81952836b63aa1c19eb96fd30bf03c816
Commit Graph

2840 Commits

Author SHA1 Message Date
Don Mitchell
5709ff34f5 Refactored videos to a much simpler impl b/c about videos don't have 
speeds and don't use the video/default.yaml format.
 2012-12-18 12:46:54 -05:00
Don Mitchell
d1c0eb8fc2 Somehow linked file disappeared again. 2012-12-12 10:55:57 -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
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
Chris Dodge
46870f4391 be sure to always pass in a course namespace - which can be just the location of the module itself since it has the same org/course pair - when rewriting links. Also, allow for an option parameter in get_module() to disable the wrapping of the module's HTML with the xmodule_display.html. This is needed for ancillary course content such as 'about', 'course info', which are now stored as xmodules, but should not be wrapped in xmodule_display.html as it breaks some styling 2012-11-29 15:09:28 -05:00
Chris Dodge
71f16d40e1 wire through course asset path information to the video playback module and corresponding .coffee files 2012-11-26 11:19:51 -05:00
Chris Dodge
2524cd614a fix edit conflict 2012-11-26 09:36:59 -05:00
Don Mitchell
a9233dfd44 Merge branch 'course-info' into feature/dhm/cms-settings 
Conflicts:
	cms/djangoapps/contentstore/views.py
 2012-11-19 16:00:27 -05:00
Brian Wilson
cb36d675e3 add press mentions for October, update missing logos, and add sorting. 2012-11-19 10:28:40 -05:00
Brian Wilson
e56030ef18 update press page mentions through September, and home page pointers for early November. 2012-11-19 10:28:40 -05:00
Victor Shnayder
60368ec370 Revert overly aggressive killing. 
(don't worry--askbot is still dead)
 2012-11-19 10:24:41 -05:00
Victor Shnayder
b18136d0cd remove (almost) all references to askbot. 2012-11-19 10:18:03 -05:00
Calen Pennington
650f537763 Merge pull request #1043 from MITx/feature/cale/quieter-jasmine-tests 
Make jasmine testing quieter
 2012-11-16 13:35:45 -08: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
156dc1fb6c Merge branch 'master' into feature/victor/actual-askbot-removal 
Conflicts:
	lms/envs/aws.py
 2012-11-15 14:24:55 -05:00
Bridger Maxwell
ba57e8a7a5 Fixed redunant rounding of final grade percent, which was causing floating point weirdness. 2012-11-15 13:24:19 -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
08d9cd7e79 clean up commented-out links on main page 2012-11-14 12:01:04 -05: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
630c2fa21e Make jasmine testing quieter 2012-11-13 10:55:17 -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
Brian Wilson
f9f5850a55 update press page mentions through September, and home page pointers for early November. 2012-11-12 23:14:20 -05:00
Arjun Singh
5f97533caa add meta tag for google verification 2012-11-12 13:52:58 -08:00
Victor Shnayder
92ab5af627 bigger error messages 2012-11-12 16:23:40 -05:00
Vik Paruchuri
d5702fc712 Add in ability to define score points 2012-11-12 14:19:04 -05:00
Victor Shnayder
6a313fd562 more css tweaks 2012-11-12 13:17:26 -05:00
Victor Shnayder
0ad2154b86 merge in origin/master 2012-11-12 13:10:21 -05:00
Victor Shnayder
2b55c5906d css tweaks 2012-11-12 13:09:16 -05:00
Victor Shnayder
4922ab33c0 hook up reset button 2012-11-12 12:43:55 -05:00
Victor Shnayder
0ec7043e05 mostly working version of self-assessment 
TODO:
* better css
* green checkmark
* reset button
* tests
 2012-11-12 12:14:12 -05:00
John Jarvis
1e956d448f Do not display the grade when student is not passing 2012-11-10 02:18:59 -05:00
John Jarvis
ca6cfe4247 http->https 2012-11-09 23:40:18 -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
fc32032bd1 Cleanup django-admin commands 2012-11-09 18:53:29 -05:00
John Jarvis
d6403fe34c renmaing unusual to unicode, fixing syntax and removing id in 
enrolled_students query
 2012-11-09 18:51:31 -05:00
John Jarvis
2c41b94d11 Cleanup and django-admin commands 2012-11-09 18:18:37 -05:00
Victor Shnayder
c27913c505 bugfixes in template 2012-11-09 18:18:37 -05:00
Victor Shnayder
aedb02543c always return grade as part of cert status 2012-11-09 18:18:37 -05:00
Victor Shnayder
ca9cb86a7d show proper course will-start/started/ended text on dashboard 2012-11-09 18:18:37 -05:00
John Jarvis
9fbcb4445e adding migrations 2012-11-09 18:18:37 -05:00
Victor Shnayder
21c30002b1 fix syntax in template 2012-11-09 18:18:37 -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
cf33d85ef9 Wire up cert status 2012-11-09 18:18:36 -05:00
John Jarvis
01dcf291b6 Adding setting variable for CERT_QUEUE 2012-11-09 18:18:36 -05:00
John Jarvis
83b79fb87e Adding new certificate state for "notpassing" 2012-11-09 18:18:36 -05:00
Brian Talbot
c6bfb67b1a revised no certificate state for dashboard messages and removed course message UI for future work on separate branch 2012-11-09 18:18:36 -05:00
Brian Talbot
d155869f16 added in course-wide completion message static states and styling 2012-11-09 18:18:36 -05:00
Brian Talbot
be13bc6026 added in completed course status to dashboard and certificate availability states 2012-11-09 18:18:36 -05:00
John Jarvis
5d6687d897 Adding error_reason 2012-11-09 18:18:36 -05:00