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

7462 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Talbot
0114366c36 settings - revised discussion settings UI to include standard discussion categories and adding new ones 2012-11-19 08:05:52 -05:00
Brian Talbot
bf4f678bde settings - revised faculty photo and syllabus states to either has or does not have 2012-11-19 07:38:59 -05:00
Brian Talbot
731ea22687 settings - added disabled states for course name/org/number 2012-11-19 07:19:13 -05:00
Brian Talbot
968b604b94 adding in datepicker functionality - wip 2012-11-16 12:25:06 -05:00
Brian Talbot
8918762493 roughed in all form fields - wip 2012-11-16 12:17:36 -05:00
Brian Talbot
5b44a330d2 added and wired in SymbolSet font icon library assets 2012-11-16 09:32:09 -05:00
Brian Talbot
6f52fea09c added and wired in SymbolSet font icon library assets 2012-11-16 09:23:33 -05:00
Brian Talbot
74dec7f172 settings - wip 2012-11-16 09:14:18 -05:00
Brian Talbot
6014a7a299 Merge remote-tracking branch 'origin/feature/cale/cms-master' into feature/btalbot/cms-settings 
Conflicts:
	cms/djangoapps/contentstore/views.py
 2012-11-15 16:51:53 -05:00
Brian Talbot
4c220ea420 in progress discussion work 2012-11-15 16:45:16 -05:00
Brian Talbot
1a297674ce added in fields for problems and discussions portions of CMS settings 2012-11-15 14:31:16 -05:00
Brian Talbot
65869461f8 finalized layout and styling for course details and faculty settings 2012-11-14 14:50:48 -05:00
chrisndodge
a1a3b92517 Merge pull request #1046 from MITx/fix/cdodge/asset-embed 
Change the Embed column in assest index page to just display the URL
 2012-11-14 10:38:26 -08:00
Chris Dodge
5c3db6f502 Change the Embed column in assest index page to just display the URL 2012-11-14 13:35:54 -05:00
Calen Pennington
3c90e2927a Create the test_root/log directory on git checkout 2012-11-13 10:35:54 -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
Calen Pennington
eb92ad1fd8 Merge pull request #1032 from MITx/feature/jzoldak/cms-unit-testing 
Feature/jzoldak/cms unit testing
 2012-11-13 07:08:52 -08:00
Jay Zoldak
a060b8de9c Use xmodule.templates instead of hard coding them in the test 2012-11-13 08:35:22 -05:00
Arjun Singh
5f97533caa add meta tag for google verification 2012-11-12 13:52:58 -08:00
Victor Shnayder
f54d424124 Merge pull request #1038 from MITx/vik/add_self_assessment 
Vik/add self assessment
 2012-11-12 13:35:29 -08:00
Victor Shnayder
3f95116ac1 only ask for hints if assessed as wrong 2012-11-12 16:23:58 -05:00
Victor Shnayder
92ab5af627 bigger error messages 2012-11-12 16:23:40 -05:00
Victor Shnayder
6e5a6f9753 make textboxes read-only when that makes sense. 
- also make reset hide the original output
 2012-11-12 16:23:29 -05:00
Vik Paruchuri
39210fa95f Move point where input box is disabled 2012-11-12 14:20:44 -05:00
Vik Paruchuri
d5702fc712 Add in ability to define score points 2012-11-12 14:19:04 -05:00
Vik Paruchuri
ba8781ddf4 Modify to store scores instead of correct/incorrect, remove student ability to edit response 2012-11-12 14:07:06 -05:00
Victor Shnayder
b378af87be Merge pull request #1011 from MITx/vik/add_self_assessment 
Vik/add self assessment
 2012-11-12 10:21:48 -08: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
68fb5c9799 bugfixes re: button state 2012-11-12 13:03:12 -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
jarv
50415acbff Merge pull request #1037 from MITx/fix/rocha/dashboard-without-certificates 
Fix syntax on dashboard template
 2012-11-09 18:42:39 -08:00
Carlos Andrés Rocha
5f5f56bbbd Fix syntax on dashboard template 2012-11-09 21:40:55 -05:00
jarv
e37a71b67b Merge pull request #1036 from MITx/fix/rocha/dashboard-without-certificates 
Quickfix to render the dashboard when there is no certificate db tables
 2012-11-09 18:01:16 -08: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
Carlos Andrés Rocha
39a5b6ebde Merge pull request #1035 from MITx/feature/jarv/cert-feature-flag 
only check cert_status when certificates feature flag is enabled
 2012-11-09 17:32:05 -08:00
John Jarvis
157c98a79d only check cert_status when certificates feature flag is enabled 2012-11-09 20:31:05 -05:00
jarv
6857dae0eb Merge pull request #1034 from MITx/feature/rocha/cert 
Feature/rocha/cert
 2012-11-09 15:54:12 -08: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
35acbc840e add note about new end_of_course_survey_url flag to docs 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
Victor Shnayder
1b2371d64a fix bug in has_ended 2012-11-09 18:18:37 -05:00