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

437 Commits

Author SHA1 Message Date
Bridger Maxwell
e4a3b261d4 Moved enroll and course_about to courseware, because they depend on lms. 2012-07-17 17:09:20 -04:00
Bridger Maxwell
aaa31594b1 Forgot to add changes to this scss file in last commit. 2012-07-17 16:54:13 -04:00
Bridger Maxwell
224ce121e7 Merge branch 'release/1.0' of github.com:MITx/mitx into release/1.0 2012-07-17 16:38:57 -04:00
Bridger Maxwell
b8317619f2 Changed urls for the portal-icons to be relative, which makes them work. 2012-07-17 16:38:48 -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
Bridger Maxwell
30d0a9bd7f Moved lms/static/images/portal-icons/ to lms/static/portal-icons/, because collecstatic wants it there. We should figure out why, but it was blocking the build. 2012-07-17 15:12:58 -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
Bridger Maxwell
9f84d9b6fd Merge remote-tracking branch 'origin/master' into release/1.0 2012-07-17 13:56:44 -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
2f4cf23b73 Merge remote-tracking branch 'origin/master' into course_start 
Conflicts:
	common/djangoapps/student/views.py
 2012-07-17 12:53:27 -04:00
Bridger Maxwell
615f11e27b Merge remote-tracking branch 'origin/master' into template_caching 2012-07-17 12:47:53 -04:00
Bridger Maxwell
938f0d1995 Changed check_course from a decorator to a regular function that throws exceptions. Much easier to understand now. 2012-07-17 11:12:42 -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
Bridger Maxwell
8ebaf8a761 Merge remote-tracking branch 'origin/master' into course_start 
Conflicts:
	common/lib/xmodule/xmodule/course_module.py
	lms/urls.py
 2012-07-17 10:52:39 -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
David Ormsbee
e8516c5a3e Shorten course about link 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
e7fa42261d Ignoring +lms/static/sass/application.css 2012-07-16 17:11:27 -04:00
Bridger Maxwell
d690a0de24 Removing compiles application.css file. 2012-07-16 17:03:31 -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
Bridger Maxwell
960c8619e5 Added a cache_if_anonymous decorator. 2012-07-16 13:40:17 -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
Bridger Maxwell
ed624d0b72 Cleaned up check_course decorator a bit. 2012-07-16 12:54:24 -04:00
Bridger Maxwell
4f4e751321 Merge 2012-07-16 12:42:49 -04:00
Calen Pennington
f889c9a099 Actually exclude things outside of the mitx repo, rather than only including those things 2012-07-16 12:36:52 -04:00
Calen Pennington
04469a4e8e Strip out STATICFILES_DIRS that aren't in the mitx repo when running unit tests 2012-07-16 12:13:19 -04:00
Bridger Maxwell
0c41576e1e Some changes from code review. 2012-07-16 12:06:17 -04:00
Calen Pennington
8ef8162963 Fix courseware problem display 2012-07-16 11:41:51 -04:00
Calen Pennington
ab2995fc85 Remove compiled css files 2012-07-16 11:41:18 -04:00
Bridger Maxwell
264e324c50 Changed format of start date parsing to ISO 8601 2012-07-16 11:27:13 -04:00
Calen Pennington
fabe1d41d1 Merge pull request #180 from MITx/kimth/lms-coderesponse 
CodeResponse for external/queued grading of student code
 2012-07-16 07:55:54 -07:00