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

3272 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kyle Fiedler
2b61eebf51 Added some style for the university blurbs and made the course boxes a little higher 2012-07-19 15:20:32 -04:00
David Ormsbee
af4813a78b Merge pull request #227 from MITx/mm-copy 
Mm copy
 2012-07-19 10:53:53 -07:00
Matthew Mongeau
21bc4a432f Fix email addresses on help page. 2012-07-19 13:45:29 -04:00
Matthew Mongeau
90d27751c4 Fix copy on contact page. 2012-07-19 13:45:16 -04:00
Matthew Mongeau
1b4460360d Update harvard image. 2012-07-19 13:34:38 -04:00
Matthew Mongeau
e9d8cbb80b Updated jobs copy 2012-07-19 13:34:38 -04:00
Matthew Mongeau
ab910c048e Fix mispellings and alternate spellings on inquiries. 2012-07-19 13:34:38 -04:00
Matthew Mongeau
e32f322aac Point blog to http://edxonline.tumblr.com/ 2012-07-19 13:34:38 -04:00
Matthew Mongeau
13e8e99273 Lowercase "the" in The Massachusetts Institute of Technology in about section 2012-07-19 13:34:38 -04:00
Kyle Fiedler
2eba466d62 Added style for 404 and other error pages 2012-07-19 12:12:06 -04:00
Kyle Fiedler
88444939b1 Change email to edx.org 2012-07-19 11:57:17 -04:00
Kyle Fiedler
a8377922a4 Added .env to ignore 2012-07-19 11:57:17 -04:00
David Ormsbee
f542bf4d9e Merge pull request #223 from MITx/release_fixes 
Release fixes
 2012-07-19 08:19:21 -07:00
Bridger Maxwell
9fd99016a9 Removed duplicate index on simplewiki_namespace. Re-added migration that was exposing South 0.7.4 bug. 2012-07-19 11:12:10 -04:00
Bridger Maxwell
58348a98da Revert "Kill simplewiki migration (there was already a unique index, adding another causes errors)" 
This reverts commit 7273868eb2.
 2012-07-19 11:00:39 -04:00
David Ormsbee
db5c187a3c Merge pull request #220 from MITx/mm-university-profile-courses-display 
Fix display of courses on university profile pages.
 2012-07-19 07:56:23 -07:00
Matthew Mongeau
a8e7f12b9f Fix display of courses on university profile pages. 2012-07-19 10:48:35 -04:00
David Ormsbee
2d71a71657 Merge pull request #219 from MITx/mm-course-page-ordering 
Order courses according to univesity on courses page.
 2012-07-19 07:41:07 -07:00
Matthew Mongeau
1f595ef401 Order courses according to univesity on courses page. 2012-07-19 10:26:39 -04:00
Calen Pennington
1c88c5a1bd Merge pull request #218 from MITx/jarv/edx-email-update 
Created email forwards to jobs@mitx.mit.edu for
 2012-07-19 06:30:56 -07:00
John Jarvis
8cd9dd3161 Created email forwards to jobs@mitx.mit.edu for 
* careers
* content-engineer
* fellow-jobs
* jobs
 2012-07-19 09:08:16 -04:00
Galen Frechette
c6c3d76950 fixes title of course in dashboard to accept very long course names, improves various other UI elemnts in the dashboard 2012-07-19 02:39:31 -04:00
Galen Frechette
00e366e9f8 improves the already registed message on the course about page 2012-07-19 02:36:42 -04:00
Galen Frechette
8e1e58a85d imporves layout of course prequisites in course about page sidebar 2012-07-19 02:34:47 -04:00
Galen Frechette
c25306f378 fixes header on course object to accept very long course titles 2012-07-19 02:33:58 -04:00
Galen Frechette
48d39ee7d2 fixes coursse about header to accept very long course names, fixes icons on course about sidebar 2012-07-19 02:33:58 -04:00
David Ormsbee
7a332d7b7e Merge pull request #217 from MITx/dormsbee/anant_fixes 
Dormsbee/anant fixes
 2012-07-18 17:03:16 -07:00
David Ormsbee
20b5edb898 Spelling fix 2012-07-18 19:59:46 -04:00
David Ormsbee
74b00bc05b Swap out the homepage and courses banner image for something school-neutral (this is temporary) 2012-07-18 19:58:38 -04:00
David Ormsbee
8bba4abc43 Change citizenship to country in signup 2012-07-18 19:44:03 -04:00
David Ormsbee
3302d1644b Merge pull request #215 from MITx/dormsbee/email_messages 
Changing email messages to be edX, even the ones I don't think will be sent
 2012-07-18 15:50:03 -07:00
David Ormsbee
48e0e222d9 Changing email messages to be edX, even the ones I don't think will be sent. 2012-07-18 18:43:48 -04:00
David Ormsbee
61fea82de0 Merge pull request #214 from MITx/mm-course-columns 
Display courses in university related columns.
 2012-07-18 14:40:02 -07:00
Matthew Mongeau
a64ddc771a Display courses in university related columns. 2012-07-18 17:36:12 -04:00
David Ormsbee
48ff2c9cf5 Merge pull request #213 from MITx/dormsbee/simplewiki_migration 
Kill simplewiki migration (there was already a unique index, adding anot...
 2012-07-18 14:19:44 -07:00
David Ormsbee
7273868eb2 Kill simplewiki migration (there was already a unique index, adding another causes errors) 2012-07-18 17:15:51 -04:00
John Jarvis
34a6aa8729 temporary workaround due to root owned files 2012-07-18 17:14:13 -04:00
David Ormsbee
98a0351433 Merge pull request #211 from MITx/mm-course-registration-copy 
Change copy for needed to sign up to register.
 2012-07-18 13:46:16 -07:00
David Ormsbee
da7a7d2dae Merge pull request #212 from MITx/mm-sign-up-links 
Hook up tos and honor links.
 2012-07-18 13:45:42 -07:00
David Ormsbee
9ec8c9934e Merge pull request #209 from MITx/dormsbee/uni_profile 
Dormsbee/uni profile
 2012-07-18 13:39:43 -07:00
Matthew Mongeau
a4afa689e6 Hook up tos and honor links. 2012-07-18 16:36:37 -04:00
Matthew Mongeau
78bee3a71e Change copy for needed to sign up to register. 2012-07-18 16:33:15 -04:00
bridger
c5d23b27ee Removed out of date comment. 2012-07-18 17:32:30 -03:00
David Ormsbee
a70e026e63 Merge pull request #210 from MITx/release_fixes 
Added the course image to the about page, even if the video doesn't exis...
 2012-07-18 13:22:37 -07:00
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