Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

6923 Commits

Author SHA1 Message Date
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 Talbot
38e3d7371b drupal integration - added in right side copy to registration marketing requested 2013-01-24 12:46:35 -05:00
Brian Wilson
0cb5f101ae add UTC time to registration end date 2013-01-24 01:18:10 -05:00
John Jarvis
80bcf060a0 javascript to redirect the user to the dashboard after reg 2013-01-23 18:22:14 -05:00
Brian Talbot
8374534802 drupal integration - revised copy, layout, and styles per marketing feedback 2013-01-23 18:22:13 -05:00
Brian Talbot
cbe35eeab3 drupal integration - further color sync, copy edits, and removing courseware button when on login page 2013-01-23 18:22:13 -05:00
Brian Talbot
a15bf74f7c drupal integration - styled and revised markup/copy for password reset modal 2013-01-23 18:22:13 -05:00
Brian Talbot
633126234e drupal integration - adding back in modal assets for password recovery - wip 2013-01-23 18:22:13 -05:00
Brian Talbot
c500896913 drupal integration - adding back in modal assets for passwor recovery - wip 2013-01-23 18:22:13 -05:00
Brian Talbot
de4f35df77 drupal integration - plumbing in password reset UI updates - wip 2013-01-23 18:22:13 -05:00
Brian Talbot
2019af4170 drupal integration - revised/proofed header and footer styles to match spacing of marketing site and renamed social icons 2013-01-23 18:22:13 -05:00
Brian Talbot
42d4b4d69b drupal integration - revised padding between content and footer globally, removed secondary form actions for time being 2013-01-23 18:22:13 -05:00
Brian Talbot
2f6255378f drupal integration - revised UI of global footer to matched marketing site footer content and feel 2013-01-23 18:22:13 -05:00
Brian Talbot
d6354fd8b1 drupal integration - revised general header HTML and Sass to coincide with marketing site nav and theme 2013-01-23 18:22:12 -05:00
Brian Talbot
eaeae03315 drupal integration - further sass refinment and hiding example error states 2013-01-23 18:22:12 -05:00
Brian Talbot
7c7d0da5b4 drupal integration - styled page layout, form fields and states, added in status message areas/standards and revised Sass 2013-01-23 18:22:12 -05:00
Brian Talbot
1db87e0533 drupal integration - added sass files to architecture and plumbed HTML for login and register views 2013-01-23 18:22:12 -05:00
John Jarvis
9af7c6cc5d adding login views 2013-01-23 18:22:12 -05:00
Brian Talbot
ed39ca2303 initial branch creation for reg/login revisions with drupal 2013-01-23 18:22:12 -05:00
Diana Huang
cc67017d4c Merge branch 'master' into diana/open-ended-ui-updates 2013-01-23 16:45:40 -05:00
Calen Pennington
993c24b72b WIP: Model data caching work 2013-01-23 14:51:07 -05:00
Calen Pennington
abb21ab111 staff_problem_info.html only renders for staff, so don't check for staff access 2013-01-23 14:47:06 -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
jmvt
549a5e9fe9 Merge remote-tracking branch 'origin/master' into jmpm-analytics 2013-01-23 12:02:48 -05:00
jmvt
4f005044d6 Added time of query display. 2013-01-23 10:17:17 -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