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

Commit Graph

  • 987fe17358 Load js fragments in order, so that Subview is loaded before the classes that use it Calen Pennington 2012-07-18 09:00:44 -04:00
  • 5026d6e9fb Give all XModuleDescriptors a module_class, and make it inheritance of js_module_names work Calen Pennington 2012-07-18 08:59:51 -04:00
  • 3cdceab16c Uniquify js fragments pulled from XModules, and load both XModuleDescriptor and XModule js into the cms Calen Pennington 2012-07-18 08:08:36 -04:00
  • 3ba03d79aa Remove old generated static content that was accidentally checked in Calen Pennington 2012-07-18 07:40:22 -04:00
  • 3fa636e060 Move module javascript into common/lib/xmodule. Still TODO: run jasmine tests in that directory Calen Pennington 2012-07-17 16:46:36 -04:00
  • 1395e5d55c Empty Locations are now legal Calen Pennington 2012-07-17 14:52:26 -04:00
  • 6bcc78f767 Make lms jasmine tests mostly pass Calen Pennington 2012-07-17 14:27:54 -04:00
  • 9458e53988 Adding stripped down 6002x course for testing, along with CMS test for edit pages for same Calen Pennington 2012-07-17 10:42:47 -04:00
  • 703293f785 adding enabled features to aws.py John Jarvis 2012-07-24 15:56:42 -04:00
  • a06cc229a0 watch/unwatch threads; display current vote Rocky Duan 2012-07-24 15:34:17 -04:00
  • 6bf0e093bc Add tests for the edit page for the toy course, and make sure that exporting to github sets up the git repo properly Calen Pennington 2012-07-16 15:55:10 -04:00
  • 39b59484a6 Re-add login requirement to save_item Calen Pennington 2012-07-16 14:35:57 -04:00
  • 6b28786784 Use the new name for item_id in contentstore.views.save_item Calen Pennington 2012-07-16 14:23:22 -04:00
  • 45144ec4ce Remove the live preview code from the html and raw modules, in preparation for updating the preview on save Calen Pennington 2012-07-16 12:41:39 -04:00
  • 1aba46de55 Be consistent with the metadata key name for the data directory Calen Pennington 2012-07-15 15:33:01 -04:00
  • 15ac476781 Display preview html on the module edit page. Javascript for previews doesn't yet function Calen Pennington 2012-07-15 14:59:32 -04:00
  • a81015a91b Move I4xSystem into xmodule so that the definition is available to the CMS Calen Pennington 2012-07-12 20:13:02 -04:00
  • 97cdb67b49 Log error messages when failing to parse xml from a string that contain context of where the error occurred in the string (in definition_to_xml) Calen Pennington 2012-07-12 19:31:13 -04:00
  • 57d8361acb Escape characters from raw xml data going into the text box so that the round-trip doesn't get rid of neccessary xml escaping Calen Pennington 2012-07-12 19:30:25 -04:00
  • 4aab04e4ab Merge pull request #290 from MITx/feature/cpennington/disable-start-date-flag Calen Pennington 2012-07-24 11:46:58 -07:00
  • 98910a2d49 Address review comments Calen Pennington 2012-07-24 14:46:46 -04:00
  • 66f79251dc Add feature flag for disabling course start dates Calen Pennington 2012-07-24 13:22:50 -04:00
  • d8f8d8c656 Merge branch 'release/1.0' Calen Pennington 2012-07-24 08:52:50 -04:00
  • 1d5e42f175 Remove very large, no longer used images David Ormsbee 2012-07-24 00:05:13 -04:00
  • cf549df5e4 Merge pull request #289 from MITx/dormsbee/hack_fix_pwd_reset David Ormsbee 2012-07-23 20:55:57 -07:00
  • f22810524d Use settings.SITE_NAME instead of hardcoded edx.org David Ormsbee 2012-07-23 23:54:35 -04:00
  • d688b7d249 Merge branch 'release/1.0' into dormsbee/hack_fix_pwd_reset David Ormsbee 2012-07-23 23:43:48 -04:00
  • 729070763f Convert @mitx.mit.edu emails to @edx.org emails David Ormsbee 2012-07-23 23:43:34 -04:00
  • 614f4540d0 Place a domain_override to force Django to use edx.org instead of example.com. David Ormsbee 2012-07-23 23:41:45 -04:00
  • 749740eb07 Actually, the bg play YT bug was there because of the lack of a class on the section. Re-removing the YouTube title. David Ormsbee 2012-07-23 23:05:06 -04:00
  • 75ba3ebbd4 Reverting the YouTube title hiding commit because it brings back the 'video playing in the background when you hit back' bug David Ormsbee 2012-07-23 23:02:04 -04:00
  • 8b503eb1ef Remove YouTube title from showing in homepage video (thanks, Arjun). David Ormsbee 2012-07-23 22:59:27 -04:00
  • 2a37f7a921 Merge pull request #288 from MITx/dormsbee/hack_fix_pwd_reset David Ormsbee 2012-07-23 19:31:02 -07:00
  • 8db59825f1 Bad hardcoded hack fix to password reset. David Ormsbee 2012-07-23 22:27:33 -04:00
  • 7e8986fce9 Merge pull request #287 from MITx/release_fixes David Ormsbee 2012-07-23 18:03:21 -07:00
  • e7bb31af5b Changed unenroll to unregister on dashboard. Bridger Maxwell 2012-07-23 20:46:39 -04:00
  • 48d69faf4e Merge pull request #286 from MITx/dormsbee/help David Ormsbee 2012-07-23 17:40:58 -07:00
  • e53ea2f81d Add common tech problems to help page David Ormsbee 2012-07-23 20:39:26 -04:00
  • 38d54f42ca Let people know courses are free. <sigh> David Ormsbee 2012-07-23 20:38:09 -04:00
  • cfe1255432 Updated error messages for missing signup fields. Bridger Maxwell 2012-07-23 20:03:38 -04:00
  • 80f46c216b Capitalized facebook on contact page. Bridger Maxwell 2012-07-23 19:56:10 -04:00
  • 45bdcbdcae Unecessary capitalized letter on contact page. Bridger Maxwell 2012-07-23 19:55:07 -04:00
  • e3b023b0ac Removed unecessary quotation mark from contact page. Bridger Maxwell 2012-07-23 19:54:03 -04:00
  • 7c48ab2509 Changed press dates to international format. Bridger Maxwell 2012-07-23 19:53:08 -04:00
  • 6666c2fe8a Merge pull request #285 from MITx/release_fixes jarv 2012-07-23 16:25:03 -07:00
  • 8c3931ba0a removed unnecessary args Rocky Duan 2012-07-23 19:24:28 -04:00
  • 157af877cb Merge branch 'kf-multicourse-design' into release/1.0 Kyle Fiedler 2012-07-23 19:20:49 -04:00
  • 3008c17730 Added bottom margin for articles in help Kyle Fiedler 2012-07-23 19:19:50 -04:00
  • 1e1e777e04 Fixed bugs caused by modal cloning. Now, only video modals are cloned. Bridger Maxwell 2012-07-23 19:19:27 -04:00
  • 18ec7ca8e8 Added social links to the footer of the press release Kyle Fiedler 2012-07-23 19:17:22 -04:00
  • d6be47d942 refactored out thread rendering; vote Rocky Duan 2012-07-23 19:03:36 -04:00
  • 8b94318b33 Merge pull request #284 from MITx/dormsbee/jobs_desc David Ormsbee 2012-07-23 15:59:26 -07:00
  • 503a7b5d12 Finish a pass at the tech sections of the job page, add new edX fellow description David Ormsbee 2012-07-23 18:56:46 -04:00
  • ee7caad181 Change jobs contact to be jobs@edx.org for all David Ormsbee 2012-07-23 10:47:15 -04:00
  • 799da8de3c Merge pull request #283 from MITx/release_fixes David Ormsbee 2012-07-23 15:49:57 -07:00
  • 973e474a9c Fix for appending course enroll to login/register form, now that the form is being cloned. Bridger Maxwell 2012-07-23 18:46:02 -04:00
  • 2fb5bb6e86 Merge pull request #282 from MITx/kf-multicourse-design David Ormsbee 2012-07-23 15:45:48 -07:00
  • 6aac776a33 Added styles for help page Kyle Fiedler 2012-07-23 18:40:58 -04:00
  • 0832373859 Merge pull request #281 from MITx/kf-multicourse-design David Ormsbee 2012-07-23 15:24:27 -07:00
  • 2cb9e2997e Move the shiv back to the header Kyle Fiedler 2012-07-23 18:22:21 -04:00
  • 63faa76e2a More small ie fixes Kyle Fiedler 2012-07-23 17:49:48 -04:00
  • a0aa2ab2b8 Merge pull request #280 from MITx/release_fixes David Ormsbee 2012-07-23 14:14:47 -07:00
  • 8c88ee5706 Added small thumbnails for articles in the rss feed. Bridger Maxwell 2012-07-23 17:06:22 -04:00
  • 756ecc8fec Merge pull request #279 from MITx/release_fixes David Ormsbee 2012-07-23 13:59:38 -07:00
  • 443f9f5908 Comma for the press release. Bridger Maxwell 2012-07-23 16:54:35 -04:00
  • 0f4976e069 Added some small IE fixes Kyle Fiedler 2012-07-23 16:53:39 -04:00
  • f1936af9ef edX press release in feed now references png logo instead of jpg with artifacts. Bridger Maxwell 2012-07-23 16:44:11 -04:00
  • 0d80a938ad Merge pull request #278 from MITx/mm-modal-clone David Ormsbee 2012-07-23 13:37:30 -07:00
  • bfdd9bacbb Merge pull request #274 from MITx/mm-update-index-video David Ormsbee 2012-07-23 13:35:56 -07:00
  • 6962735b19 Clone and remove modal Matthew Mongeau 2012-07-23 16:35:19 -04:00
  • 4d1c046a7f Merge pull request #277 from MITx/cpennington/pipelining-course-data Calen Pennington 2012-07-23 13:34:25 -07:00
  • b8b133d30c Replace /static urls in all course snippets Calen Pennington 2012-07-23 16:31:52 -04:00
  • 4984f9d804 Use django-pipeline to read course static files. Calen Pennington 2012-07-23 16:22:39 -04:00
  • fdab215eb4 moved django_comment_client into edx Rocky Duan 2012-07-23 16:20:45 -04:00
  • c6f0c57b5e Fixed typo where favicon was references as image/image/x-icon Bridger Maxwell 2012-07-23 16:19:41 -04:00
  • 95f7e99d36 Changed press release to say UC Berkeley. Bridger Maxwell 2012-07-23 16:18:57 -04:00
  • abd1900ac1 Fixed principle/principal typo in press release. Bridger Maxwell 2012-07-23 16:15:08 -04:00
  • 64ecd3a211 Merge pull request #275 from MITx/uc_berkeley_press David Ormsbee 2012-07-23 12:52:16 -07:00
  • 616eaf2500 integrated search; refactored some frontend code Rocky Duan 2012-07-23 15:41:09 -04:00
  • e1ad3539b6 Updated contact information on press release. Bridger Maxwell 2012-07-23 15:40:10 -04:00
  • 6b13bd52ec Merge pull request #276 from MITx/kf-multicourse-design David Ormsbee 2012-07-23 12:39:11 -07:00
  • b4d08f820e Chage placement of the read more link Kyle Fiedler 2012-07-23 15:28:24 -04:00
  • f6b4475309 Added contact info on Berkeley press release. Bridger Maxwell 2012-07-23 15:22:06 -04:00
  • c2b426afeb prereqs float right Kyle Fiedler 2012-07-23 15:13:32 -04:00
  • 2524e6313a Update index video. Matthew Mongeau 2012-07-23 15:08:19 -04:00
  • 8613555ccf Merge pull request #272 from MITx/release_fixes David Ormsbee 2012-07-23 11:52:51 -07:00
  • 458abbad9f Removed copyright page, until it can be updated for edX. Bridger Maxwell 2012-07-23 14:48:19 -04:00
  • 40aaaeda25 Merge pull request #254 from MITx/uc_berkeley_press David Ormsbee 2012-07-23 11:46:44 -07:00
  • 268ab28692 Merge pull request #271 from MITx/mm-login-form-fixes David Ormsbee 2012-07-23 11:45:17 -07:00
  • 1d1a9173a4 Cleaning up pep8 violations Calen Pennington 2012-07-23 14:44:40 -04:00
  • abf491ffe8 Merge pull request #269 from MITx/kf-multicourse-design Calen Pennington 2012-07-23 11:34:17 -07:00
  • 7ef8b6ac1e Merge remote-tracking branch 'origin/release/1.0' Calen Pennington 2012-07-23 14:27:29 -04:00
  • 46e33392d6 Use 'true' for remember value. Matthew Mongeau 2012-07-23 14:26:28 -04:00
  • 30452d3202 Get pylint running on all modules again Calen Pennington 2012-07-23 14:26:16 -04:00
  • 0b3da68fac Merge pull request #270 from MITx/dormsbee/course_img_jpg bridger 2012-07-23 11:24:45 -07:00
  • 80c04e1414 Use JPGs instead of PNG for course images David Ormsbee 2012-07-23 14:16:54 -04:00
  • 5150c993fe Run all images through compression Kyle Fiedler 2012-07-23 14:07:28 -04:00
  • c41433f618 Updated UC Berkeley press release to latest from word doc. Bridger Maxwell 2012-07-23 14:09:41 -04:00
  • 8be3f4f9c9 Merge pull request #268 from MITx/kf-multicourse-design David Ormsbee 2012-07-23 10:59:16 -07:00
  • ae879e86b2 Merge pull request #267 from MITx/dormsbee/copy_edits_5 David Ormsbee 2012-07-23 10:58:53 -07:00