Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,363 Commits 1 Branch 0 Tags
e8f067de8f2be4c7864ad1bdf4e0794de175e0dc
Commit Graph

2941 Commits

Author SHA1 Message Date
Diana Huang
486753a263 Display alerts from notifications on the panel. 2013-01-29 21:24:03 -05:00
Diana Huang
9f19eafcf0 Update main notification dashboard with new styles. 2013-01-29 21:24:03 -05:00
Diana Huang
d07bf0157e UI updates to the Open Ended Problems page 2013-01-29 21:24:03 -05:00
Vik Paruchuri
457afaaeda Making tab render properly for open ended notifications 2013-01-29 19:31:03 -05:00
Vik Paruchuri
f47c431faf Fix templating 2013-01-29 19:31:03 -05:00
Vik Paruchuri
8602e1595b Pass proper parameters, fix templating 2013-01-29 19:31:03 -05:00
Vik Paruchuri
6b7ba37999 Combined notification view 2013-01-29 19:30:04 -05:00
Vik Paruchuri
68db8b0d77 Refactor tab logic, start adding in combined notifications view 2013-01-29 19:30:04 -05:00
Vik Paruchuri
2191f3e228 Add in open ended problems view 2013-01-29 19:30:03 -05:00
David Ormsbee
c487e026f3 Merge pull request #1380 from MITx/press/bostonX 
BostonX press release
 2013-01-29 14:35:17 -08:00
Your Name
5bfd2c33b0 send cohort to post view context 2013-01-29 17:34:52 -05:00
Victor Shnayder
19c46d224f BostonX press release 2013-01-29 17:33:06 -05:00
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 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