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

Commit Graph

  • 54516a9560 Fix grid and make sure that everything is fluid Kyle Fiedler 2012-07-23 13:56:11 -04:00
  • 6da83900aa Added min width for container Kyle Fiedler 2012-07-23 13:23:34 -04:00
  • b557363ac2 Added som fixed for fluid design Kyle Fiedler 2012-07-23 13:23:06 -04:00
  • ebe67d2d7d Merge remote-tracking branch 'origin/release/1.0' Calen Pennington 2012-07-23 13:55:20 -04:00
  • b9c6e36616 Merge pull request #266 from MITx/cpennington/fix_tests David Ormsbee 2012-07-23 10:51:31 -07:00
  • 07f246f355 Add new, officially sanctioned final edX honor code. David Ormsbee 2012-07-23 13:49:24 -04:00
  • 7a34a8c342 Fix failing tests Calen Pennington 2012-07-23 13:49:11 -04:00
  • 11eaab2726 Added a filestore pointing at the directory of the file being run for xmodule tests Arjun Singh 2012-07-20 13:31:11 -07:00
  • a0990b6bb5 Added redirect from pressrelease to press/uc-berkeley-joins-edx Bridger Maxwell 2012-07-23 13:46:19 -04:00
  • 863071c9a5 Merge remote-tracking branch 'origin/release/1.0' into uc_berkeley_press Bridger Maxwell 2012-07-23 13:44:04 -04:00
  • 126ff06f3b Typo fixes to UC Berkeley press release. Bridger Maxwell 2012-07-23 13:43:09 -04:00
  • cff42ead22 Add official edX privacy policy. David Ormsbee 2012-07-23 13:41:03 -04:00
  • b7a389dff5 Merge pull request #265 from MITx/mm-dek David Ormsbee 2012-07-23 10:30:56 -07:00
  • 81fdc2d9ab edX Terms of Service added David Ormsbee 2012-07-23 13:30:17 -04:00
  • 343f5a5393 Add dek to berkeley story. Matthew Mongeau 2012-07-23 13:10:05 -04:00
  • f921726b3a Final, blessed FAQ David Ormsbee 2012-07-23 12:48:19 -04:00
  • 652aa52001 Merge pull request #260 from MITx/split-sass Calen Pennington 2012-07-23 09:43:17 -07:00
  • 9286d9f16a Added changes to the way that css is linked Kyle Fiedler 2012-07-23 12:14:32 -04:00
  • b49a6586be Added course stylesheet to courseware template Kyle Fiedler 2012-07-23 12:01:51 -04:00
  • e6465e420a Changed around the css Kyle Fiedler 2012-07-23 11:58:01 -04:00
  • edc02f7cbc Merge branch 'release/1.0' of github.com:MITx/mitx into release/1.0 Piotr Mitros 2012-07-23 12:27:46 -04:00
  • 5db41d0de8 Missing space before DFAQ Piotr Mitros 2012-07-23 12:26:53 -04:00
  • c5849805ed Merge pull request #264 from MITx/mm-video-fixes-for-index David Ormsbee 2012-07-23 09:23:36 -07:00
  • 50e8b0a814 Merge pull request #261 from MITx/kf-multicourse-design Calen Pennington 2012-07-23 09:13:31 -07:00
  • 315063ffed Add rel=0 to all lightbox videos. Matthew Mongeau 2012-07-23 12:09:09 -04:00
  • 8eeeac716b Added some design changes to the homepage header Kyle Fiedler 2012-07-23 10:46:41 -04:00
  • 3087ec6c91 Merge pull request #259 from MITx/feature/cpennington/minimize_js_requests David Ormsbee 2012-07-23 08:41:29 -07:00
  • e68aa55bb0 Merge pull request #258 from MITx/mm-sort-courses-by-course-number David Ormsbee 2012-07-23 08:38:54 -07:00
  • ee72a725bb Sort by course number. Simplify university grouping. Matthew Mongeau 2012-07-23 11:29:53 -04:00
  • d19e50aeb6 Merge remaining js files into django-pipeline groups Calen Pennington 2012-07-23 11:26:54 -04:00
  • d2d29b2cf9 Move most javascript loading to below the body, rather than head Calen Pennington 2012-07-23 11:16:13 -04:00
  • 5915532a57 Consolidate code used for disabling USE_DJANGO_PIPELINE feature Calen Pennington 2012-07-23 10:40:13 -04:00
  • 5dd4e19c0b Move vendor js into a single file Calen Pennington 2012-07-23 10:24:50 -04:00
  • 40dc770a51 Merge pull request #249 from MITx/arjun/tests_filestore Calen Pennington 2012-07-23 06:57:58 -07:00
  • 67a18ec555 Merge pull request #257 from MITx/bridger/js_slim Calen Pennington 2012-07-23 06:56:50 -07:00
  • 098808c9cb Merge pull request #246 from MITx/jarv/create-dev-script-updates Calen Pennington 2012-07-23 06:39:02 -07:00
  • 9ebac1bdd7 Removed a bunch of non-necessary javascript from homepage. Most of it was put back in courseware. A new PIPELINE_JS group 'courseware' was created, for pipeline javascript files that should only be in the courseware. Bridger Maxwell 2012-07-23 08:18:37 -04:00
  • 9d81a8becb Merge pull request #256 from MITx/dormsbee/change_reg_fields David Ormsbee 2012-07-22 16:13:52 -07:00
  • 784bd26510 forum view for discussions Rocky Duan 2012-07-22 19:05:32 -04:00
  • 06c2d1f10e Merge pull request #255 from MITx/release_fixes David Ormsbee 2012-07-22 15:58:02 -07:00
  • 074fc24343 Fix up the signup modal for registration for the new fields. David Ormsbee 2012-07-22 18:53:12 -04:00
  • 0cac360225 Added a favicon. Bridger Maxwell 2012-07-22 18:49:10 -04:00
  • 44f5891fe2 Remove migration that conflicts with smooth_registration David Ormsbee 2012-07-22 18:01:44 -04:00
  • e1ba957959 Added UC Berkeley press release to rss feed at bottom of index. Bridger Maxwell 2012-07-22 17:55:37 -04:00
  • 7192c30985 Move migration for new reg fields so as not to conflict with smooth_registration David Ormsbee 2012-07-22 17:52:55 -04:00
  • 942183d765 Merge branch 'release/1.0' into dormsbee/change_reg_fields David Ormsbee 2012-07-22 17:50:46 -04:00
  • 6caee537a1 Accidentally disabled cache_if_anonymous earlier. Re-enabling. Bridger Maxwell 2012-07-22 17:40:27 -04:00
  • ed10dc43d9 Added UC Berkeley press release. Moved press releases to their own folder. Bridger Maxwell 2012-07-22 17:35:10 -04:00
  • 0103c405fc Tiny spacing issue with dashboard messages. David Ormsbee 2012-07-22 17:16:17 -04:00
  • 607e4859a7 Put course numbers, real start dates on Dashboard David Ormsbee 2012-07-22 17:09:59 -04:00
  • fa51046949 Merge pull request #253 from MITx/smooth_registration David Ormsbee 2012-07-22 13:49:59 -07:00
  • 9afb0f8b78 Disabled student migration 0011, which had not net effect and was causing InnoDB errors. Bridger Maxwell 2012-07-22 16:32:15 -04:00
  • ef32adc1c9 Changed log level to exception. Bridger Maxwell 2012-07-22 16:30:41 -04:00
  • 7f3a443409 Change over to new reg fields (styling still broken) David Ormsbee 2012-07-22 15:35:24 -04:00
  • d798b4ac7f Ignoring ie.css Bridger Maxwell 2012-07-22 15:27:49 -04:00
  • 679b19c94d Merge pull request #240 from MITx/unenroll David Ormsbee 2012-07-22 12:23:02 -07:00
  • b7e00ad1f5 Merge pull request #252 from MITx/dormsbee/copy_edits_3 David Ormsbee 2012-07-22 12:22:26 -07:00
  • 61105134aa Cleaned up activation pages. Added "Log In" link to notice when anonymous user tries to enroll in course. Bridger Maxwell 2012-07-22 14:52:49 -04:00
  • 9bb8537976 Remove student migrations that were in LMS after the move to common. David Ormsbee 2012-07-22 10:02:22 -04:00
  • b67db2bbdb Minor UI tweaks to signup form David Ormsbee 2012-07-22 01:59:57 -04:00
  • 63de542050 Pull edX Fellow job description David Ormsbee 2012-07-22 00:41:25 -04:00
  • edcaa18300 edX capitalization on jobs page David Ormsbee 2012-07-22 00:19:27 -04:00
  • 24235a62c4 Add IEEE Spectrum link to front page, change UC Berkeley title David Ormsbee 2012-07-22 00:16:33 -04:00
  • da2c002abe Make sure homepage news/press links open in a new window. David Ormsbee 2012-07-21 20:34:57 -04:00
  • e21e5284de Remove placeholder background image from courses and course about pages. David Ormsbee 2012-07-21 20:27:04 -04:00
  • f213353613 Change how we display the start date to be internationally unambiguous. David Ormsbee 2012-07-21 20:19:12 -04:00
  • 04d1d0f075 Remove BostInno article reference from front page. David Ormsbee 2012-07-21 19:52:46 -04:00
  • bcb1604526 Make press article links go to a new window. David Ormsbee 2012-07-21 19:51:59 -04:00
  • 2f4aba8042 If a user is anonymous when they click the enroll button, they will automatically be enrolled in the course if they immediately log in our create an account. Bridger Maxwell 2012-07-21 17:52:28 -04:00
  • d7dd64905f Images needed for press page links David Ormsbee 2012-07-21 16:16:31 -04:00
  • c4ee4e051b Ugly listing of articles in Press page. David Ormsbee 2012-07-21 15:40:17 -04:00
  • 60b547273d Registering now temporarily logs you in. A message is displayed on the dashboard, reminding you to activate your account. Logging in shows a reminder about activating. Bridger Maxwell 2012-07-21 15:31:48 -04:00
  • 53698ac2a4 Remove the mission statement until we can work on it a bit more. David Ormsbee 2012-07-21 13:24:03 -04:00
  • 660d11dc16 Merge remote-tracking branch 'origin/release/1.0' into unenroll Bridger Maxwell 2012-07-21 12:49:27 -04:00
  • dcafbca106 Added an index to course enrollment created field. Bridger Maxwell 2012-07-21 12:44:25 -04:00
  • 5330396844 Merge pull request #251 from MITx/kf-multicourse-design David Ormsbee 2012-07-21 09:39:32 -07:00
  • 64b92c35cc Include ie fixes in via django-pipeline Calen Pennington 2012-07-20 19:54:07 -04:00
  • 1b3f03e2e5 Added fixes for ie and an image change Kyle Fiedler 2012-07-20 19:16:10 -04:00
  • d6a67ef94d Merge pull request #250 from MITx/pmitros/release-fixes David Ormsbee 2012-07-20 15:14:41 -07:00
  • 83ea0a8c63 Merge pull request #248 from MITx/release_fixes David Ormsbee 2012-07-20 15:10:33 -07:00
  • e860756555 Changed around the video image Kyle Fiedler 2012-07-20 16:58:26 -04:00
  • 61c4b05e06 Merge remote-tracking branch 'origin/unenroll' into unenroll Bridger Maxwell 2012-07-20 16:56:57 -04:00
  • 764c20eb1b Fixed enrollment issue where submission form was automatically sent when it opened on about page. Bridger Maxwell 2012-07-20 16:56:39 -04:00
  • f337baedb0 Renamed enrollment date to created. Bridger Maxwell 2012-07-20 16:48:04 -04:00
  • 46887cbc7f Added stars for required fields in sign up form Kyle Fiedler 2012-07-20 16:47:24 -04:00
  • b21ea5a8a4 Added import/export scripts Piotr Mitros 2012-07-20 16:39:19 -04:00
  • 0fb8a7b1c8 Middleware password fix. Needs Cale's cleanup Piotr Mitros 2012-07-20 16:38:45 -04:00
  • d446081748 Added a filestore pointing at the directory of the file being run for xmodule tests Arjun Singh 2012-07-20 13:31:11 -07:00
  • a20650b559 Added titles to pages that are currently public-facing. Bridger Maxwell 2012-07-20 16:25:49 -04:00
  • d1b5b4d071 Removed prototype university profile page. Bridger Maxwell 2012-07-20 16:13:34 -04:00
  • f3885f7e59 Merge pull request #243 from MITx/release_fixes David Ormsbee 2012-07-20 13:13:14 -07:00
  • 81e7662afc Added style for the unenroll links Kyle Fiedler 2012-07-20 16:06:13 -04:00
  • 5131d51f92 Removed old 6002x faq and press release. Bridger Maxwell 2012-07-20 15:59:25 -04:00
  • 186e5fc5e1 Cleaned up the urls file a bit, to remove urls that don't work. Also removed some unused stuff from static_template_views. Bridger Maxwell 2012-07-20 15:56:48 -04:00
  • a75ac16da0 error in script for site package handling John Jarvis 2012-07-20 15:51:37 -04:00
  • 7b67e69ebf Merge pull request #245 from MITx/kf-multicourse-design David Ormsbee 2012-07-20 12:48:29 -07:00
  • 164b5b67db Added style and better markup for the quotes on the jobs page Kyle Fiedler 2012-07-20 15:42:22 -04:00
  • 81349ca592 Merge pull request #244 from MITx/kf-multicourse-design David Ormsbee 2012-07-20 12:12:43 -07:00
  • d090506980 switched quotes Kyle Fiedler 2012-07-20 15:10:38 -04:00
  • c499a1a563 Now displaying full name on the dashboard, instead of location. The icon is just a generic info icon, for now. Bridger Maxwell 2012-07-20 14:55:01 -04:00