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

58450 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bridger Maxwell
80eb89a23d Added the course image to the about page, even if the video doesn't exist. 2012-07-18 16:20:11 -04:00
David Ormsbee
16eeb43a04 Add University Profile page with images and text blurbs 2012-07-18 16:17:12 -04:00
David Ormsbee
bbcc19bf87 Merge pull request #208 from MITx/release_fixes 
Release fixes
 2012-07-18 13:08:42 -07:00
Bridger Maxwell
a9078ac0b0 check_course didn't have the right exception being caught. 2012-07-18 16:00:03 -04:00
Bridger Maxwell
75e9ef12b6 The dashboard links to the about page for courses that haven't started yet. 2012-07-18 15:53:24 -04:00
David Ormsbee
a3d48cf22c Merge pull request #207 from MITx/mm-remove-preferred-language 
Mm remove preferred language
 2012-07-18 12:24:36 -07:00
David Ormsbee
4ef84cb910 Merge pull request #206 from MITx/custom_404 
Custom 404
 2012-07-18 12:06:48 -07:00
Bridger Maxwell
0fab4cdd93 Added a method to render 404 and 500 pages. Added a reference to these views in urls.py. 2012-07-18 14:55:12 -04:00
David Ormsbee
7453af5a41 Add course number to register links on Course About page 2012-07-18 14:33:12 -04:00
kimth
cc9f9a9df8 queuekey generated from LoncapaProblem seed + system time 2012-07-18 14:10:41 -04:00
David Ormsbee
753181642e Merge pull request #205 from MITx/course_images 
Course images
 2012-07-18 11:08:20 -07:00
Bridger Maxwell
158bb69979 Merge branch 'release/1.0' of github.com:MITx/mitx into release/1.0 2012-07-18 13:53:08 -04:00
Bridger Maxwell
7d148d35fe Removed application.css 2012-07-18 13:52:41 -04:00
John Jarvis
5ffafbe190 moving chown after pip install 2012-07-18 13:50:52 -04:00
Bridger Maxwell
f25dbc0854 Added {COURSE_STATIC_URL} format key for about section html. Changed get_about_section to be get_course_about_section in courseware.courses. 2012-07-18 13:48:20 -04:00
Matthew Mongeau
519a744f22 Fix message and notice styles. 2012-07-18 13:40:16 -04:00
Matthew Mongeau
73df314159 wip 2012-07-18 13:40:16 -04:00
bridger
dbf0bf34d8 Merge pull request #204 from MITx/dormsbee/at_a_glance 
Add some more info the the "About" Course page "at a glance" section
 2012-07-18 10:39:34 -07:00
Bridger Maxwell
14dc52f66d Merge remote-tracking branch 'origin/dormsbee/at_a_glance' into release/1.0 2012-07-18 13:25:59 -04:00
David Ormsbee
2f96527f1b Merge pull request #203 from MITx/multicourse-countries-and-other-demographics 
Multicourse countries and other demographics
 2012-07-18 10:21:33 -07:00
David Ormsbee
588f115b33 Add support for optional end_date, effort, and prerequisites info on course_about 2012-07-18 13:17:31 -04:00
Galen Frechette
98ee9fb447 adds styles to new inputs on signup form 2012-07-18 13:04:27 -04:00
Matthew Mongeau
dd0cd57ead Add date_of_birth 2012-07-18 13:02:56 -04:00
Matthew Mongeau
456054a261 Cleanup. 2012-07-18 13:02:31 -04:00
Matthew Mongeau
67221b0725 Added countries and other demographics to be stored in db. 2012-07-18 13:02:07 -04:00
Matthew Mongeau
7e25f39f62 Change stored gender value for students.models.UserProfile 
* Changed from 'male', 'female', and 'other' to 'm', 'f', and 'o'
 2012-07-18 13:00:40 -04:00
David Ormsbee
23460730fc Merge pull request #201 from MITx/mm-registered 
Display registered when already registered for a course.
 2012-07-18 09:02:23 -07:00
Rocky Duan
f7c51870f3 initial setup for the discussion module 2012-07-18 12:00:42 -04:00
Matthew Mongeau
44e8d7474c Move logic into view.py for whether user is enrolled. 2012-07-18 11:54:36 -04:00
Matthew Mongeau
5824b2ebe2 Display registered when already registered for a course. 2012-07-18 11:48:02 -04:00
Bridger Maxwell
f007a8ff92 The about image is now pulled from the course data directory and shown on the homepage, about course, and dashboard. Working on a way to show other, arbitrary course images. 2012-07-18 11:44:19 -04:00
David Ormsbee
cae5c99e10 Merge pull request #202 from MITx/mm-force-json-encoding 
Force dataType to 'text json'
 2012-07-18 08:37:26 -07:00
Matthew Mongeau
7d3c778268 Force dataType to 'text json' 2012-07-18 11:36:20 -04:00
kimth
84eb3efa8a Implemented 'initial_display' for CodeResponse 2012-07-18 11:08:17 -04:00
David Ormsbee
0c5395a5dc Merge pull request #200 from MITx/dormsbee/unknown_courses 
Ignore registrations for Courses that can't be found
 2012-07-18 08:00:48 -07:00
Galen Frechette
72f772d6ff adds styles to reset password page 2012-07-18 10:56:59 -04:00
David Ormsbee
7acfdcd16d Ignore registrations for Courses that can't be found 2012-07-18 10:49:45 -04:00
David Ormsbee
1979f3a33b Remove Contact link from top nav (got moved into the About section) 2012-07-18 10:38:58 -04:00
Bridger Maxwell
0b097f470d Merge branch 'release/1.0' of github.com:MITx/mitx into release/1.0 2012-07-18 10:37:07 -04:00
Bridger Maxwell
c24c88022b Changed wording in emails to remove any 6.002x or MITx reference. 2012-07-18 10:36:55 -04:00
David Ormsbee
824ea6f72e Merge pull request #199 from MITx/dormsbee/course_images 
Dormsbee/course images
 2012-07-18 07:24:23 -07:00
Matthew Mongeau
63fd5b57dd Fix _modal.scss merge conflicts. 2012-07-18 10:23:44 -04:00
Matthew Mongeau
9bf4b11ae9 Style notice. 2012-07-18 10:11:06 -04:00
Matthew Mongeau
c5d3efdf60 Show sign up form if not signed in. 2012-07-18 10:10:37 -04:00
kimth
bb0601ff7a Further tests of CorrectMap in CodeResponse unit testing 2012-07-18 08:54:54 -04:00
David Ormsbee
8768189db1 Video slot only appears in course about page if there is a video (note: url is still fixed). 2012-07-18 01:29:00 -04:00
David Ormsbee
6eccf99aca Add course start dates to course boxes in courses list view. 2012-07-17 23:50:18 -04:00
Galen Frechette
ba8eb93b43 adds styles to password reset modal 2012-07-17 22:53:03 -04:00
David Ormsbee
a12e628fb1 Display real course start date in course about page 2012-07-17 22:52:19 -04:00
Galen Frechette
7af062ea33 updates UC Berkeley logo 2012-07-17 22:15:28 -04:00