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

Commit Graph

  • fe2f0347b0 Fix typo Calen Pennington 2012-07-10 10:15:57 -04:00
  • ad08df7abd Add logging when info and about sections are missing Calen Pennington 2012-07-10 09:32:18 -04:00
  • 3011f3f336 Expect the proper error type when about or info sections aren't found Calen Pennington 2012-07-10 09:30:14 -04:00
  • 332ccb0bef Use course 'display_name' from metadata, and fall back to course id name if display_name is not set Calen Pennington 2012-07-10 09:27:05 -04:00
  • 115a572fd0 Set defaults for org and course, and log error messages when they are used Calen Pennington 2012-07-10 09:23:40 -04:00
  • 6965e00639 Merge pull request #152 from MITx/ps-cms-backbone Calen Pennington 2012-07-10 06:09:39 -07:00
  • 6d246f0685 Merge remote-tracking branch 'origin/master' into ps-cms-backbone Calen Pennington 2012-07-10 08:55:45 -04:00
  • ed0053ef7c Merge pull request #157 from MITx/cpennington/cms-github Calen Pennington 2012-07-10 05:51:31 -07:00
  • cfd6890d68 Merge remote-tracking branch 'origin/master' into cpennington/cms-github Calen Pennington 2012-07-10 08:50:54 -04:00
  • 024789dabf Made data identifiers consistent with master branch of 'content-mit-6002x' kimth 2012-07-09 19:01:25 -04:00
  • cfa389e357 Change url to use args instead of kwargs. Matthew Mongeau 2012-07-09 18:33:51 -04:00
  • ff74bc79d4 Undo forced CourseDescriptor Matthew Mongeau 2012-07-09 18:21:06 -04:00
  • 1fcc02579d Pass a course to get_section Matthew Mongeau 2012-07-09 17:49:49 -04:00
  • 640a71bb21 Merge branch 'dormsbee/multicourse' into multicourse_wiki Bridger Maxwell 2012-07-09 15:54:50 -04:00
  • 4aacace056 Fixed exception type when about or info section missing. Bridger Maxwell 2012-07-09 15:54:36 -04:00
  • 08f5fe7fc9 Fixed wiki urls for new course ids. Bridger Maxwell 2012-07-09 15:51:39 -04:00
  • 51c65e214a Get initial courseware page displaying. Matthew Mongeau 2012-07-09 15:01:10 -04:00
  • 631cc8e874 Merge branch 'dormsbee/multicourse' into multicourse_wiki Bridger Maxwell 2012-07-09 14:28:43 -04:00
  • fe5fa7334b Get textbook page rendering. Matthew Mongeau 2012-07-09 14:23:45 -04:00
  • 43e6bbb29f Added info page content Matthew Mongeau 2012-07-09 14:16:17 -04:00
  • c47cdc7f87 Fix some path problems. Matthew Mongeau 2012-07-09 14:06:44 -04:00
  • 3053caec7e Get course about page working. Matthew Mongeau 2012-07-09 13:48:18 -04:00
  • 72a3c0f708 Merge pull request #161 from MITx/kf-cms-style kylefiedler 2012-07-09 09:03:17 -07:00
  • 6f40b46415 Fixed overflow and fixed hover on new module Kyle Fiedler 2012-07-09 12:02:38 -04:00
  • 949efb62e9 Got courses page working... mostly. Matthew Mongeau 2012-07-09 11:27:45 -04:00
  • 8a4d860a1e put normalize in vendor folder Kyle Fiedler 2012-07-09 11:26:46 -04:00
  • 389fd7111a Get rid of comments Kyle Fiedler 2012-07-09 11:08:07 -04:00
  • 93f8f7685a Added more wip and fixed issue with after Kyle Fiedler 2012-07-09 10:37:37 -04:00
  • 19bd613f6d Readd the wip class Kyle Fiedler 2012-07-09 10:25:52 -04:00
  • dbcad03ddd Added some fixes for some small things adn reset the js Kyle Fiedler 2012-07-09 10:22:55 -04:00
  • c8da987436 Added new icons for all of the content Kyle Fiedler 2012-07-06 17:12:35 -04:00
  • 0cb4781e43 Rearranged the filter and sort bar and made it consistant Kyle Fiedler 2012-07-06 15:01:59 -04:00
  • cb2a6f9d02 Played with the layout a bit and some other small changes Kyle Fiedler 2012-07-06 11:39:17 -04:00
  • 7aad8f04bb Added better styles for draggable Kyle Fiedler 2012-07-06 10:49:40 -04:00
  • 4b43e3474f More tweeks for visual style for the filter bar and settings Kyle Fiedler 2012-07-05 17:40:31 -04:00
  • f1623ec605 Added more tweeks to the calendar and unit pages Kyle Fiedler 2012-07-05 15:53:52 -04:00
  • 94fccb0017 Added fixes for the sidebar, made better base style for inputs and brightened colors a bit Kyle Fiedler 2012-07-05 14:26:40 -04:00
  • 985a5323f4 Added some hovers fo the caledar Kyle Fiedler 2012-07-05 09:59:53 -04:00
  • 5ee2980708 Merge branch 'kf-inline-inputs' of github.com:MITx/mitx into ichuang/stable_edx4edx_merge ichuang 2012-07-08 22:26:58 -04:00
  • 3a664753b4 minor changes - test this branch with more courses (8.01x, 6.00x) ichuang 2012-07-08 22:05:21 -04:00
  • aedcd9a4c4 change "type" to "category" in xml_module.py ichuang 2012-07-08 22:04:54 -04:00
  • 0daf7b0497 merging of stable-edx4edx into master - bugfixes and debugging ichuang 2012-07-08 19:03:29 -04:00
  • 4356ec5c45 default course to settings.COURSE_DEFAULT ichuang 2012-07-08 17:00:08 -04:00
  • 9b90068e03 Merge branch 'stable-edx4edx' of github.com:MITx/mitx ichuang 2012-07-08 16:52:36 -04:00
  • be3539f1b2 Use CourseDescriptor instead of HiddenDescriptor. Matthew Mongeau 2012-07-08 14:46:05 -04:00
  • 213d64c159 Append courses Matthew Mongeau 2012-07-06 18:43:30 -04:00
  • 83fdeea2bc Hookup the CourseDescriptor stuff by fixing a fewt push -f dorm issues. Matthew Mongeau 2012-07-06 18:22:29 -04:00
  • 291ec2cfc6 Allowing dots in wiki namespaces. Bridger Maxwell 2012-07-06 17:49:26 -04:00
  • 4d349fbd9d Fixed wiki error page again. Bridger Maxwell 2012-07-06 17:42:01 -04:00
  • 5109253378 Revert "workarounds for get_about_section" Matthew Mongeau 2012-07-06 17:23:56 -04:00
  • 05e1bcf4f1 workarounds for get_about_section Matthew Mongeau 2012-07-06 17:13:53 -04:00
  • c0bba714a7 Added a migration to unique article slugs. Bridger Maxwell 2012-07-06 16:17:15 -04:00
  • 5489819fc7 Started writing slug uniquifying data migration. Doesn't work yet. Bridger Maxwell 2012-07-06 16:10:12 -04:00
  • 9801ce5d3b Add documentation for running JavaScript test Prem Sichanugrist 2012-07-06 14:19:32 -04:00
  • 6d7b477982 Fixed wiki revision feed. Bridger Maxwell 2012-07-06 12:55:05 -04:00
  • 58fc2000c7 Use static.url for static assets Prem Sichanugrist 2012-07-06 12:13:32 -04:00
  • 9dc5cddeb7 Move vendored js files into js/vendor/ Prem Sichanugrist 2012-07-06 12:07:21 -04:00
  • 07aae06d30 Remove unnecessary fat arrow Prem Sichanugrist 2012-07-06 11:52:10 -04:00
  • b8fd728e06 Pass in element in CMS.start() instead Prem Sichanugrist 2012-07-06 11:33:37 -04:00
  • 289599733d Make it more obvious that the function is no-op Prem Sichanugrist 2012-07-06 11:33:00 -04:00
  • f71e54cc9b Removed unused Week Model Prem Sichanugrist 2012-07-06 10:53:08 -04:00
  • 7979248b4a Courses on homepage and courses page should iterate over the context courses. Matthew Mongeau 2012-07-06 10:57:30 -04:00
  • 74e01bb07a fixed two bugs in inputtypes: textline with quotes crashed problems, and choice without text caused error ichuang 2012-07-06 09:49:08 -04:00
  • 2a36fee493 Prevent default click event on links Prem Sichanugrist 2012-07-06 00:38:26 -04:00
  • 95cf25c1dc Fix quote convention in tests Prem Sichanugrist 2012-07-06 00:34:54 -04:00
  • 9ba624683d Update Views.ModuleEdit, also added test Prem Sichanugrist 2012-07-06 00:32:50 -04:00
  • dd3ddeb946 CMS.Views.Week is tested Prem Sichanugrist 2012-07-06 00:05:08 -04:00
  • b11b916906 CMS.Views.Course fixed and tested Prem Sichanugrist 2012-07-05 23:31:50 -04:00
  • a77e7fe57b Update jasmine-jquery for newer features Prem Sichanugrist 2012-07-05 23:31:21 -04:00
  • 4d4a856c4b CMS.Views.Module tested Prem Sichanugrist 2012-07-05 22:50:46 -04:00
  • 4d29c311c7 CMS.Views.WeekEdit tested Prem Sichanugrist 2012-07-05 22:50:23 -04:00
  • a1f98e76cd WIP: Merging multicourse and xmodule descriptor changes Calen Pennington 2012-07-05 21:56:52 -04:00
  • 8979b993ef Add blank spec for CMS.Models.Week Prem Sichanugrist 2012-07-05 21:33:02 -04:00
  • fe17c37783 CMS.Models.Module tested Prem Sichanugrist 2012-07-05 21:31:32 -04:00
  • ac0a776818 First pass at getting both independent and in-course wiki viewing. Bridger Maxwell 2012-07-05 21:20:35 -04:00
  • 68bb8d5874 Patch window.it to raise error on pending tests Prem Sichanugrist 2012-07-05 21:08:09 -04:00
  • d6c033d675 main.coffee/CMS module tested Prem Sichanugrist 2012-07-05 19:42:10 -04:00
  • f60af340ea Add Jasmine suite to CMS Prem Sichanugrist 2012-07-05 18:44:56 -04:00
  • 42c1695382 refines some visual design to course objects, changes university logos on homepage, starts adding about pages and layout Galen Frechette 2012-07-05 17:58:38 -04:00
  • c94d6d1602 No need to append text key on HTML module save Prem Sichanugrist 2012-07-05 17:22:18 -04:00
  • a86c84a4c5 Use Backbone's render convention instead Prem Sichanugrist 2012-07-05 17:21:27 -04:00
  • e729cc321a Fix url confusion for course/info and course/about Matthew Mongeau 2012-07-05 17:10:52 -04:00
  • 9cb24ccc77 Remove unneeded trigger Prem Sichanugrist 2012-07-05 16:23:04 -04:00
  • 9d1dc37b44 Merge remote-tracking branch 'origin/master' into dormsbee/multicourse Calen Pennington 2012-07-05 16:22:50 -04:00
  • 8cef4f4221 Pass in the model into the view when create it Prem Sichanugrist 2012-07-05 15:25:37 -04:00
  • a9aa5d9ea0 Update code base on changes in master Prem Sichanugrist 2012-07-05 14:44:01 -04:00
  • dbd82c4bc8 Install numpy before trying to install scipy from requirements.txt Calen Pennington 2012-07-05 13:07:54 -04:00
  • ce4cea0e3e Don't fail if no NOSE_COVER_HTML_DIR is set Calen Pennington 2012-07-05 13:07:29 -04:00
  • e9ee1566d6 Modularize capa and mitxmako so that xmodule can properly depend on them Calen Pennington 2012-07-05 12:48:18 -04:00
  • 386acbe1ff Add tests of the github_sync service hook view Calen Pennington 2012-07-05 12:15:49 -04:00
  • 953cab047a Added check that namespace for a new course is created. Bridger Maxwell 2012-07-05 08:55:35 -07:00
  • 6f250fc0d3 Added unique and index on namespace model. Bridger Maxwell 2012-07-05 08:55:03 -07:00
  • ab851c0b1a Add tests for the core github_sync functionality Calen Pennington 2012-07-05 11:54:43 -04:00
  • 072de594ff Fixed wiki error pages a bit. Bridger Maxwell 2012-07-05 08:14:41 -07:00
  • 83da714a50 Add more docstring to import_from_github Calen Pennington 2012-07-05 10:30:04 -04:00
  • 82c68dd845 Removed table borders and declared inputs as inline instead of inline-block Kyle Fiedler 2012-07-05 10:00:54 -04:00
  • b533ab481a Remove old JavaScript files Prem Sichanugrist 2012-06-29 14:39:30 -04:00
  • 29e69db0dc Implement HTML module save Prem Sichanugrist 2012-06-28 18:10:22 -04:00
  • 0f60459709 Add @expect_json to help with parsing JSON request Prem Sichanugrist 2012-06-18 14:15:23 -04:00
  • 5c85412dfa Nested subview is working Prem Sichanugrist 2012-06-28 17:30:54 -04:00