Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 7273868eb2 Kill simplewiki migration (there was already a unique index, adding another causes errors) David Ormsbee 2012-07-18 17:15:51 -04:00
  • 34a6aa8729 temporary workaround due to root owned files John Jarvis 2012-07-18 17:14:13 -04:00
  • 98a0351433 Merge pull request #211 from MITx/mm-course-registration-copy David Ormsbee 2012-07-18 13:46:16 -07:00
  • da7a7d2dae Merge pull request #212 from MITx/mm-sign-up-links David Ormsbee 2012-07-18 13:45:42 -07:00
  • 9ec8c9934e Merge pull request #209 from MITx/dormsbee/uni_profile David Ormsbee 2012-07-18 13:39:43 -07:00
  • a4afa689e6 Hook up tos and honor links. Matthew Mongeau 2012-07-18 16:36:37 -04:00
  • 78bee3a71e Change copy for needed to sign up to register. Matthew Mongeau 2012-07-18 16:33:15 -04:00
  • c5d23b27ee Removed out of date comment. bridger 2012-07-18 17:32:30 -03:00
  • a70e026e63 Merge pull request #210 from MITx/release_fixes David Ormsbee 2012-07-18 13:22:37 -07:00
  • 80eb89a23d Added the course image to the about page, even if the video doesn't exist. Bridger Maxwell 2012-07-18 16:20:11 -04:00
  • 16eeb43a04 Add University Profile page with images and text blurbs David Ormsbee 2012-07-18 16:17:12 -04:00
  • bbcc19bf87 Merge pull request #208 from MITx/release_fixes David Ormsbee 2012-07-18 13:08:42 -07:00
  • a9078ac0b0 check_course didn't have the right exception being caught. Bridger Maxwell 2012-07-18 16:00:03 -04:00
  • 75e9ef12b6 The dashboard links to the about page for courses that haven't started yet. Bridger Maxwell 2012-07-18 15:53:24 -04:00
  • a3d48cf22c Merge pull request #207 from MITx/mm-remove-preferred-language David Ormsbee 2012-07-18 12:24:36 -07:00
  • 4ef84cb910 Merge pull request #206 from MITx/custom_404 David Ormsbee 2012-07-18 12:06:48 -07:00
  • 0fab4cdd93 Added a method to render 404 and 500 pages. Added a reference to these views in urls.py. Bridger Maxwell 2012-07-18 14:55:12 -04:00
  • 7453af5a41 Add course number to register links on Course About page David Ormsbee 2012-07-18 14:33:12 -04:00
  • cc9f9a9df8 queuekey generated from LoncapaProblem seed + system time kimth 2012-07-18 14:10:41 -04:00
  • 753181642e Merge pull request #205 from MITx/course_images David Ormsbee 2012-07-18 11:08:20 -07:00
  • 158bb69979 Merge branch 'release/1.0' of github.com:MITx/mitx into release/1.0 Bridger Maxwell 2012-07-18 13:53:08 -04:00
  • 7d148d35fe Removed application.css Bridger Maxwell 2012-07-18 13:52:41 -04:00
  • 5ffafbe190 moving chown after pip install John Jarvis 2012-07-18 13:50:52 -04:00
  • f25dbc0854 Added {COURSE_STATIC_URL} format key for about section html. Changed get_about_section to be get_course_about_section in courseware.courses. Bridger Maxwell 2012-07-18 13:48:20 -04:00
  • 519a744f22 Fix message and notice styles. Matthew Mongeau 2012-07-18 12:57:54 -04:00
  • 73df314159 wip Matthew Mongeau 2012-07-18 11:12:56 -04:00
  • dbf0bf34d8 Merge pull request #204 from MITx/dormsbee/at_a_glance bridger 2012-07-18 10:39:34 -07:00
  • 14dc52f66d Merge remote-tracking branch 'origin/dormsbee/at_a_glance' into release/1.0 Bridger Maxwell 2012-07-18 13:25:59 -04:00
  • 2f96527f1b Merge pull request #203 from MITx/multicourse-countries-and-other-demographics David Ormsbee 2012-07-18 10:21:33 -07:00
  • 588f115b33 Add support for optional end_date, effort, and prerequisites info on course_about David Ormsbee 2012-07-18 13:14:39 -04:00
  • 98ee9fb447 adds styles to new inputs on signup form Galen Frechette 2012-07-18 12:53:24 -04:00
  • dd0cd57ead Add date_of_birth Matthew Mongeau 2012-07-12 15:44:13 -04:00
  • 456054a261 Cleanup. Matthew Mongeau 2012-07-12 15:43:08 -04:00
  • 67221b0725 Added countries and other demographics to be stored in db. Matthew Mongeau 2012-07-11 17:09:35 -04:00
  • 7e25f39f62 Change stored gender value for students.models.UserProfile Matthew Mongeau 2012-07-11 15:17:06 -04:00
  • 23460730fc Merge pull request #201 from MITx/mm-registered David Ormsbee 2012-07-18 09:02:23 -07:00
  • f7c51870f3 initial setup for the discussion module Rocky Duan 2012-07-18 12:00:42 -04:00
  • 44e8d7474c Move logic into view.py for whether user is enrolled. Matthew Mongeau 2012-07-18 11:47:56 -04:00
  • 5824b2ebe2 Display registered when already registered for a course. Matthew Mongeau 2012-07-18 10:53:22 -04:00
  • 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. Bridger Maxwell 2012-07-18 11:44:19 -04:00
  • cae5c99e10 Merge pull request #202 from MITx/mm-force-json-encoding David Ormsbee 2012-07-18 08:37:26 -07:00
  • 7d3c778268 Force dataType to 'text json' Matthew Mongeau 2012-07-18 11:36:20 -04:00
  • 84eb3efa8a Implemented 'initial_display' for CodeResponse kimth 2012-07-18 11:08:17 -04:00
  • 0c5395a5dc Merge pull request #200 from MITx/dormsbee/unknown_courses David Ormsbee 2012-07-18 08:00:48 -07:00
  • 72f772d6ff adds styles to reset password page Galen Frechette 2012-07-18 10:56:33 -04:00
  • 7acfdcd16d Ignore registrations for Courses that can't be found David Ormsbee 2012-07-18 10:49:45 -04:00
  • 1979f3a33b Remove Contact link from top nav (got moved into the About section) David Ormsbee 2012-07-18 10:38:51 -04:00
  • 0b097f470d Merge branch 'release/1.0' of github.com:MITx/mitx into release/1.0 Bridger Maxwell 2012-07-18 10:37:07 -04:00
  • c24c88022b Changed wording in emails to remove any 6.002x or MITx reference. Bridger Maxwell 2012-07-18 10:36:55 -04:00
  • 824ea6f72e Merge pull request #199 from MITx/dormsbee/course_images David Ormsbee 2012-07-18 07:24:23 -07:00
  • 63fd5b57dd Fix _modal.scss merge conflicts. Matthew Mongeau 2012-07-18 10:23:44 -04:00
  • 9bf4b11ae9 Style notice. Matthew Mongeau 2012-07-17 18:15:29 -04:00
  • c5d3efdf60 Show sign up form if not signed in. Matthew Mongeau 2012-07-17 17:36:18 -04:00
  • bb0601ff7a Further tests of CorrectMap in CodeResponse unit testing kimth 2012-07-18 08:54:54 -04:00
  • 8768189db1 Video slot only appears in course about page if there is a video (note: url is still fixed). David Ormsbee 2012-07-18 01:29:00 -04:00
  • 6eccf99aca Add course start dates to course boxes in courses list view. David Ormsbee 2012-07-17 23:50:18 -04:00
  • ba8eb93b43 adds styles to password reset modal Galen Frechette 2012-07-17 22:53:03 -04:00
  • a12e628fb1 Display real course start date in course about page David Ormsbee 2012-07-17 22:52:19 -04:00
  • 7af062ea33 updates UC Berkeley logo Galen Frechette 2012-07-17 22:15:11 -04:00
  • 2eaa6dbc25 Merge pull request #198 from dementrock/master ichuang 2012-07-17 18:41:36 -07:00
  • 7c480dd5b5 only enroll a given course once Rocky Duan 2012-07-17 20:19:34 -04:00
  • da31f76dfb Merge pull request #196 from MITx/mm-signup-errors David Ormsbee 2012-07-17 15:38:36 -07:00
  • 1ddc3b560b Deep copy of CorrectMap was implied by code. Made it actually the case kimth 2012-07-17 18:33:56 -04:00
  • 15b42b68eb Unit tests for CodeResponse update_score kimth 2012-07-17 18:20:03 -04:00
  • c0fffa451b Fix sign up styles. Matthew Mongeau 2012-07-17 18:09:48 -04:00
  • 14b6ad25a7 changes about page layout to longform blog style layout to accomodate large amounts of copy Galen Frechette 2012-07-17 17:49:04 -04:00
  • b0328b245f Merge pull request #195 from dementrock/master pmitros 2012-07-17 14:49:34 -07:00
  • e4a3b261d4 Moved enroll and course_about to courseware, because they depend on lms. Bridger Maxwell 2012-07-17 17:09:20 -04:00
  • aded6a4fce hello sidhanth rao 2012-07-17 17:02:09 -04:00
  • 631517ccdd Queue callback consumes queuekey kimth 2012-07-17 17:01:28 -04:00
  • ef2a8467e8 fix potential <script> tag escape bug Rocky Duan 2012-07-17 17:00:36 -04:00
  • 0b538fdac8 Fixed bug in answer prefetching in LoncapaProblem._preprocess_problem kimth 2012-07-17 16:58:55 -04:00
  • aaa31594b1 Forgot to add changes to this scss file in last commit. Bridger Maxwell 2012-07-17 16:54:13 -04:00
  • 224ce121e7 Merge branch 'release/1.0' of github.com:MITx/mitx into release/1.0 Bridger Maxwell 2012-07-17 16:38:57 -04:00
  • b8317619f2 Changed urls for the portal-icons to be relative, which makes them work. Bridger Maxwell 2012-07-17 16:38:48 -04:00
  • f630446de3 Remove password_reset_form Matthew Mongeau 2012-07-17 16:18:00 -04:00
  • 9c672f7bd0 Hook up forms for forgot password functionality. Matthew Mongeau 2012-07-17 13:47:49 -04:00
  • 9def7ae6b0 Fixed help link in nav bar. Removed account settings link. Bridger Maxwell 2012-07-17 15:32:22 -04:00
  • d9432a15ba Drop immediate seed prior to queuekey generation kimth 2012-07-17 15:26:40 -04:00
  • 6ed9f71608 Merge remote-tracking branch 'origin/master' into release/1.0 Bridger Maxwell 2012-07-17 15:24:25 -04:00
  • 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. Bridger Maxwell 2012-07-17 15:12:58 -04:00
  • 1498e40d87 Dummy commit to force rebuild David Ormsbee 2012-07-17 14:58:09 -04:00
  • ba6346cb22 adds one image to about page Galen Frechette 2012-07-17 14:54:35 -04:00
  • 8c327eb07f Moved imports to top of file kimth 2012-07-17 14:44:20 -04:00
  • 9b0e00efa2 Log both grading and queueing kimth 2012-07-17 14:41:52 -04:00
  • e65895459a improves course about page header, adds blog post images, works on static page layouts Galen Frechette 2012-07-17 14:29:20 -04:00
  • 8bd0f0183b Merge pull request #193 from MITx/mm-rss-parser-fixes David Ormsbee 2012-07-17 11:27:58 -07:00
  • 384f24064e Store rss instead of parser in memcache. Matthew Mongeau 2012-07-17 14:26:20 -04:00
  • 996fec4b63 Added a check that course enrolmments don't already exist before creating them. Bridger Maxwell 2012-07-17 14:01:26 -04:00
  • 9f84d9b6fd Merge remote-tracking branch 'origin/master' into release/1.0 Bridger Maxwell 2012-07-17 13:56:44 -04:00
  • 1a8d999663 Added a migration with indexes on course enrollment and a unique constraint. This involves a migration that first drops the table, because there may be non-unique data there already. Bridger Maxwell 2012-07-17 13:54:54 -04:00
  • 9f17e0b12e Merge pull request #192 from MITx/mm-login-errors-display David Ormsbee 2012-07-17 10:11:14 -07:00
  • ba959152b6 Login errors should display on first failure. Matthew Mongeau 2012-07-17 13:09:14 -04:00
  • c5ce0bdfea updates copy on about contact and faq, tweeks home page header Galen Frechette 2012-07-17 12:54:32 -04:00
  • 171e16f177 Use local feed as default Matthew Mongeau 2012-07-17 11:36:51 -04:00
  • d55cd78c73 updates and imporves design of the home page header Galen Frechette 2012-07-17 02:27:09 -04:00
  • 2bfe0cb92d Add parsed rss entries to home page with caching Matthew Mongeau 2012-07-16 17:19:15 -04:00
  • 04b8dbe0d5 Merge pull request #179 from MITx/course_start bridger 2012-07-17 09:54:17 -07:00
  • 2f4cf23b73 Merge remote-tracking branch 'origin/master' into course_start Bridger Maxwell 2012-07-17 12:53:27 -04:00
  • b4eb9ffd37 Merge pull request #191 from MITx/template_caching bridger 2012-07-17 09:50:50 -07:00