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
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
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
Galen Frechette
72f772d6ff adds styles to reset password page 2012-07-18 10:56:59 -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
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
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
David Ormsbee
da31f76dfb Merge pull request #196 from MITx/mm-signup-errors 
Fix sign up styles.
 2012-07-17 15:38:36 -07:00
Matthew Mongeau
c0fffa451b Fix sign up styles. 2012-07-17 18:09:48 -04:00
Galen Frechette
14b6ad25a7 changes about page layout to longform blog style layout to accomodate large amounts of copy 2012-07-17 17:49:44 -04:00
Matthew Mongeau
f630446de3 Remove password_reset_form 2012-07-17 16:27:32 -04:00
Matthew Mongeau
9c672f7bd0 Hook up forms for forgot password functionality. 2012-07-17 16:27:30 -04:00
Bridger Maxwell
9def7ae6b0 Fixed help link in nav bar. Removed account settings link. 2012-07-17 15:32:22 -04:00
Bridger Maxwell
6ed9f71608 Merge remote-tracking branch 'origin/master' into release/1.0 
Conflicts:
	lms/templates/index.html
 2012-07-17 15:24:25 -04:00
Galen Frechette
ba6346cb22 adds one image to about page 2012-07-17 14:54:35 -04:00
Galen Frechette
e65895459a improves course about page header, adds blog post images, works on static page layouts 2012-07-17 14:29:20 -04:00
David Ormsbee
8bd0f0183b Merge pull request #193 from MITx/mm-rss-parser-fixes 
Store rss instead of parser in memcache.
 2012-07-17 11:27:58 -07:00
Matthew Mongeau
384f24064e Store rss instead of parser in memcache. 2012-07-17 14:26:20 -04:00
Matthew Mongeau
ba959152b6 Login errors should display on first failure. 2012-07-17 13:09:14 -04:00
Galen Frechette
c5ce0bdfea updates copy on about contact and faq, tweeks home page header 2012-07-17 13:02:46 -04:00
Matthew Mongeau
171e16f177 Use local feed as default 2012-07-17 12:56:30 -04:00
Galen Frechette
d55cd78c73 updates and imporves design of the home page header 2012-07-17 12:56:29 -04:00
Matthew Mongeau
2bfe0cb92d Add parsed rss entries to home page with caching 2012-07-17 12:56:28 -04:00
Bridger Maxwell
615f11e27b Merge remote-tracking branch 'origin/master' into template_caching 2012-07-17 12:47:53 -04:00
David Ormsbee
b4a8417e70 Use Course.number, remove final exam and content length from the course sidebar (do we have that data yet?) 2012-07-17 11:03:49 -04:00
David Ormsbee
28fc3ec18a Add overview.html, a simple one page place where course staff can control a course about page. 2012-07-17 10:54:21 -04:00
David Ormsbee
c0e8dc1b69 Remove duplicate entries of courses. 2012-07-17 08:25:17 -04:00
David Ormsbee
373db8704d Add number property to CourseDescriptor and switch templates to use it. 2012-07-17 08:22:15 -04:00
David Ormsbee
27ec1b4dcf Change course listing to show course numbers + title 2012-07-17 08:22:15 -04:00
Bridger Maxwell
d38903ac35 Merge remote-tracking branch 'origin/master' into template_caching 
Conflicts:
	lms/static/sass/application.css
 2012-07-16 23:33:40 -04:00
Galen Frechette
767469381b renames some scss files for better orginization, sets fixed widths on main containers to avoid akward scaling issues untill media queries can be added for more responsive scaling 2012-07-16 22:23:43 -04:00
Galen Frechette
600aff59a6 imporves course object header typography 2012-07-16 19:29:02 -04:00
Bridger Maxwell
36408a8d5a Removing lms/static/sass/application.css again. 2012-07-16 17:33:51 -04:00
Galen Frechette
96361c3fd5 adds icons to course about page, user nav and dashboard, adds styles to activation pages 2012-07-16 17:29:28 -04:00
Bridger Maxwell
bde93aea99 Merge remote-tracking branch 'origin/master' into template_caching 
Conflicts:
	lms/templates/footer.html
	lms/templates/signup_modal.html
 2012-07-16 16:19:26 -04:00
Bridger Maxwell
70e2f7c0d5 Merged with master. Moved a bunch of static template files to their own urls (without /t/template). 2012-07-16 15:32:22 -04:00
Galen Frechette
2d3bab4188 styles activation message 2012-07-16 13:34:12 -04:00
Galen Frechette
5033ec656c changes home page header design to accomodate new tagline, adds copy to about page and 1 blog post 2012-07-16 13:11:47 -04:00
Calen Pennington
4489a04586 Merge pull request #178 from MITx/victor/cms_auth 
Victor/cms auth
 2012-07-16 07:33:45 -07:00
Galen Frechette
1c027c43d2 hooks up links from login modal to signup modal and signup modal to login modal 2012-07-16 10:27:55 -04:00
Galen Frechette
15b544c50b makes logo bigger, imporves footer layout with additin of new links 2012-07-15 23:11:16 -04:00