Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,188 Commits 1 Branch 0 Tags
826b070bfa047f94de6d14d43eaa9b598000d9ff
Commit Graph

1676 Commits

Author SHA1 Message Date
Your Name
43d4661c3f Merge branch 'master' into feature/kevin/groups_ui_changes 2013-01-29 17:23:29 -05:00
Your Name
3404011f16 update front end to support selection and display of cohort ids 2013-01-29 17:23:08 -05:00
David Ormsbee
40d59faa68 Merge pull request #1330 from MITx/diana/open-ended-ui-updates 
Rubric Integration and other UI improvements
 2013-01-29 14:10:18 -08:00
jarv
0b9262a478 Merge pull request #1378 from MITx/feature/jarv/certificate-restriction 
Minor update to embargo text
 2013-01-29 13:48:05 -08:00
John Jarvis
615e6da2f4 Minor update to embargo text 2013-01-29 16:47:09 -05:00
cahrens
26cb1c5a25 Fixes for https://edx.lighthouseapp.com/projects/102637/tickets/144 (progress tab not updating). 2013-01-29 16:30:41 -05:00
jarv
877f757f94 Merge pull request #1369 from MITx/feature/jarv/certificate-restriction 
Feature/jarv/certificate restriction
 2013-01-29 13:14:41 -08:00
Your Name
15a2890795 Merge branch 'master' into feature/marco/group 2013-01-29 15:05:38 -05:00
John Jarvis
3f740976bc Adding dashboard text for certificate restriction 2013-01-29 13:24:17 -05:00
John Jarvis
3a6d45e716 Grade a student even if they are on the restricted list 2013-01-29 11:13:30 -05:00
Victor Shnayder
37b82a66eb Merge pull request #1363 from MITx/marketing/victor 
Marketing/victor
 2013-01-29 08:12:33 -08:00
Victor Shnayder
1f6331161c Update FAQ (LH #125) 2013-01-27 18:10:14 -05:00
Victor Shnayder
d697c6b94c Add associate legal counsel job description (LH #166) 2013-01-27 17:46:27 -05:00
Victor Shnayder
aee8c863cd Make 'Students' link on FAQ page point to /help (LH #164) 2013-01-27 17:38:56 -05:00
Victor Shnayder
6847779f22 Merge remote-tracking branch 'origin/master' into feature/victor/cohorts 
Conflicts:
	common/djangoapps/student/models.py
 2013-01-26 12:37:26 -05:00
Carlos Andrés Rocha
f35d4a16c3 Added one more year! 2013-01-25 13:31:23 -05:00
Victor Shnayder
5fa8cf5a78 Only show cohort config for cohorted courses 2013-01-24 15:14:34 -05:00
Victor Shnayder
de02721158 Add removing students from cohorts. 2013-01-24 15:14:33 -05:00
Victor Shnayder
7bdb5c23e1 Allow listing of users in cohorts and adding users 
- still needs style, more features, but basic functionality works
 2013-01-24 15:12:53 -05:00
Victor Shnayder
bab3b0c39e Add initial set of views for managing cohorts 
- lets user see and add cohorts
- needs styling
- needs to allow them to actually manage membership!
 2013-01-24 15:12:53 -05:00
Brian Wilson
0cb5f101ae add UTC time to registration end date 2013-01-24 01:18:10 -05:00
Diana Huang
cc67017d4c Merge branch 'master' into diana/open-ended-ui-updates 2013-01-23 16:45:40 -05:00
Calen Pennington
ae2a8e0c58 Whitespace cleanup 2013-01-23 14:37:42 -05:00
Calen Pennington
6c181470c6 staff_problem_info.html is only put on the page for staff, so we don't need to check staff_access inside it 2013-01-23 14:37:36 -05:00
Diana Huang
5ca1586e0c Merge branch 'feature/diana/rubric-input' into diana/open-ended-ui-updates 2013-01-23 08:57:47 -05:00
Diana Huang
71e4541c69 Merge branch 'master' into feature/diana/rubric-input 2013-01-23 08:56:55 -05:00
marco
7b12dac021 added make visible to menu, and visibility description to threads 2013-01-22 15:47:23 -05:00
Calen Pennington
75b0a8eed6 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 2013-01-22 14:47:52 -05:00
Diana Huang
24f23176af Add the ability to set up custom text for short form and 
and long form results.
 2013-01-22 13:17:37 -05:00
Diana Huang
9a53c37530 Use something more visually easy to use for self-assessment. 2013-01-22 11:25:12 -05:00
Diana Huang
ba1cd8117f Rename 'Pending' column to something more descriptive 2013-01-22 10:33:07 -05:00
Diana Huang
a34a9dd038 Merge branch 'master' into diana/open-ended-ui-updates 2013-01-22 08:40:40 -05:00
Diana Huang
e7bc32fd4d Merge branch 'master' into feature/diana/rubric-input 2013-01-22 08:38:17 -05:00
Carlos Andrés Rocha
183721ecf5 Correct last screenshot caption of media-kit page. 
[#159]
 2013-01-21 16:58:35 -05:00
Carlos Andrés Rocha
899c501d3d Add announcement of Walter Lewin's course 
[#157]
 2013-01-21 16:58:27 -05:00
Diana Huang
dd20226ec3 Merge branch 'master' into feature/diana/rubric-input 
Fix some merge issues involving rubric rendering

Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_rubric.py
	common/lib/xmodule/xmodule/open_ended_module.py
	common/lib/xmodule/xmodule/self_assessment_module.py
 2013-01-18 16:36:22 -05:00
Diana Huang
f500958439 More fixes for the merge and some display updates. 2013-01-18 13:52:50 -05:00
Diana Huang
2e791043e8 Merge branch 'master' into diana/open-ended-ui-updates 
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_rubric.py
	common/lib/xmodule/xmodule/open_ended_module.py
	common/lib/xmodule/xmodule/self_assessment_module.py
 2013-01-18 09:21:38 -05:00
Diana Huang
481580c702 Remove hints from self-assessment and misc display fixes 2013-01-18 08:48:50 -05:00
Chris Dodge
44cfcb88a3 Merge branch 'master' into feature/cdodge/cms-master-merge4 2013-01-17 20:30:22 -05:00
marco
2b23c40345 minor tweaks to dropdown text and addition of dropdown menu (without data links) for intructor visilibility dropdown in main discussion forum; 2013-01-17 15:25:35 -05:00
David Ormsbee
18d5792025 Merge pull request #1302 from MITx/bugfix/brian/pearson-reg 
Bugfix/brian/pearson reg
 2013-01-17 11:42:00 -08:00
Diana Huang
87990b36f4 Rubric sizing tweaks and text improvements. 2013-01-17 14:35:49 -05:00
Diana Huang
7171e6b7cc Merge branch 'feature/diana/rubric-input' into diana/open-ended-ui-updates 2013-01-17 14:02:00 -05:00
Diana Huang
18a3d5e734 Merge branch 'master' into feature/diana/rubric-input 2013-01-17 14:00:43 -05:00
Diana Huang
3646ff53d8 Display updates and fixes. 2013-01-17 14:00:02 -05:00
Diana Huang
2b4e9f45b9 Updates to the CSS and html formatting for statuses 
and self-assessment
 2013-01-17 11:34:44 -05:00
Brian Talbot
fdd395e0b3 pearson registration - synced up link text for emailing edx 2013-01-17 10:50:58 -05:00
Brian Talbot
59b328f4b2 pearson registration - removed telephone/fax placeholder attributes since they can't represent both domestic and international formatting easily 2013-01-17 10:49:57 -05:00
Carlos Andrés Rocha
9fdb4d0923 Replace front page video 
[#154]
 2013-01-17 10:47:50 -05:00