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

Commit Graph

  • 45ed4a410c resolving merge conflict around test_center_register.html template Brian Talbot 2012-12-21 13:22:31 -05:00
  • 3bd8f408b5 test center registration - added final styling and label focus JS Brian Talbot 2012-12-21 13:16:39 -05:00
  • 8bb9156389 Merge branch 'master' into feature/diana/rubric-input Diana Huang 2012-12-21 13:08:41 -05:00
  • 3987120496 test center registration - further UI design and styling on form and dashboard tweaks Brian Talbot 2012-12-21 13:04:22 -05:00
  • 02151d39e8 Merge pull request #1200 from MITx/content/rocha/job-page-update David Ormsbee 2012-12-21 10:01:55 -08:00
  • 4959dc6005 Add Instructional Designer Job Post Carlos Andrés Rocha 2012-12-21 11:44:45 -05:00
  • f43c93e1d8 Merge pull request #1189 from MITx/fix/rocha/login-redirect David Ormsbee 2012-12-21 08:20:18 -08:00
  • 8ac89c39a7 Use course metadata instead of setting attributes to display new course overlay Carlos Andrés Rocha 2012-12-21 11:12:21 -05:00
  • 3bbfb4851b Remove logger setting override from test settings configuration file. Jay Zoldak 2012-12-21 10:25:14 -05:00
  • 320f1b4141 update schema for tracking sql logs - larger fields; add hostname ichuang 2012-12-21 13:23:22 +00:00
  • 2788ad8629 switch back to returning json to test_center_register template, and enable jquery handling in template. Brian Wilson 2012-12-21 01:39:18 -05:00
  • 22de7cbb4e Add logic to display courses by start date and show the new overlay Carlos Andrés Rocha 2012-12-20 19:59:19 -05:00
  • a0d1d98c92 Merge branch 'style/btalbot/homepage-courselistings' into feature/rocha/change-courses-layout Carlos Andrés Rocha 2012-12-20 17:45:19 -05:00
  • b65775c300 Merge pull request #1195 from MITx/feature/christina/misc Don Mitchell 2012-12-20 14:15:01 -08:00
  • 37b83c1ecf Fix typo in Formula Response name (Studio #101). cahrens 2012-12-20 17:06:12 -05:00
  • 866ce8d2ae Merge pull request #1194 from MITx/feature/christina/misc Don Mitchell 2012-12-20 13:45:27 -08:00
  • ecc4d79f55 Merge pull request #1193 from MITx/content/rocha/new-courses-2013 David Ormsbee 2012-12-20 12:39:32 -08:00
  • 91ce214964 Fix for Studio #96. cahrens 2012-12-20 14:59:21 -05:00
  • 90ce6967aa Fix for Studio #96. cahrens 2012-12-20 14:58:02 -05:00
  • 90e12ff46b Merge pull request #1192 from MITx/feature/cdodge/clone-course Don Mitchell 2012-12-20 11:29:49 -08:00
  • 3a4b626e62 Remove unused code from accounts login page Carlos Andrés Rocha 2012-12-20 14:19:06 -05:00
  • b40a8a3e9e implement course clone and delete functionality from the command line Chris Dodge 2012-12-20 13:55:15 -05:00
  • 43d1542977 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into bug/dhm/dec12 Don Mitchell 2012-12-20 13:43:09 -05:00
  • 17a1e281b1 Unit tests now work!!! Don Mitchell 2012-12-20 13:42:57 -05:00
  • 6ad6d348e6 Correct some spring courses announcement information Carlos Andrés Rocha 2012-12-20 13:23:57 -05:00
  • 76f6ee1877 test center - reorg of HTML - wip Brian Talbot 2012-12-20 13:00:08 -05:00
  • 5119257f3e test center - fixed dashboard link font issue and started cleaning up markup in reg form - wip Brian Talbot 2012-12-20 12:24:31 -05:00
  • a82113dc7e Merge pull request #1191 from MITx/bug/dhm/dec12 chrisndodge 2012-12-20 08:51:42 -08:00
  • 683535d913 Another bug for when the content for an update is more than one element. Don Mitchell 2012-12-20 11:09:10 -05:00
  • cc76e0518d fix Alexander Kryklia 2012-12-20 17:28:53 +02:00
  • 4811e73645 enabled rake docs for ubuntu Alexander Kryklia 2012-12-20 17:25:43 +02:00
  • 6ec046cefc Merge pull request #1188 from MITx/bug/dhm/dec12 chrisndodge 2012-12-20 06:58:42 -08:00
  • f92266d659 course listings - new html and css for ordering - finished sass changes and static markup example Brian Talbot 2012-12-20 09:55:52 -05:00
  • b98743eb8d Merge branch 'master' into feature/diana/rubric-input Diana Huang 2012-12-20 09:38:05 -05:00
  • 37e0d98fec course listings - new html and css for ordering - wip Brian Talbot 2012-12-20 09:32:15 -05:00
  • d5bd2313c1 fix migrations, removing one field and making another nullable. Update registration page to allow for editing only demographics. Brian Wilson 2012-12-20 04:16:00 -05:00
  • 0bf79eb587 append some character, in this case a '_', if the course number is really a full-on number. The Wiki library interprets this incorrectly - to date we've always used non-numerical values. Chris Dodge 2012-12-19 20:54:43 -05:00
  • 5d85fab283 Fix django auth login redirection Carlos Andrés Rocha 2012-12-19 18:48:30 -05:00
  • d66f33956e Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into bug/dhm/dec12 Don Mitchell 2012-12-19 17:31:30 -05:00
  • e37180e074 Generalized the grader drop down and applied to edit_subsection Don Mitchell 2012-12-19 17:31:06 -05:00
  • 14330ebc4a Merge pull request #1187 from MITx/feature/christina/misc Don Mitchell 2012-12-19 14:03:05 -08:00
  • 4d13744622 added new visual status to course listings on edx.org Brian Talbot 2012-12-19 16:21:37 -05:00
  • 61c19dbc70 Fix for Studio #87, plus some cleanup. cahrens 2012-12-19 16:55:39 -05:00
  • ee99080687 add additional fields to testcenter user and update test center registration. Brian Wilson 2012-12-19 16:53:13 -05:00
  • 89527281e8 Merge pull request #1186 from MITx/content/rocha/new-courses-2013 David Ormsbee 2012-12-19 13:16:27 -08:00
  • 65ec8ae056 Merge pull request #1185 from MITx/style/btalbot/edxsupportlogo David Ormsbee 2012-12-19 13:15:26 -08:00
  • b334394473 Fix links for Software as a Service courses Carlos Andrés Rocha 2012-12-19 16:13:17 -05:00
  • fa97a6a528 Fix the font size Diana Huang 2012-12-19 16:04:47 -05:00
  • 6905f7dfd1 Merge pull request #1183 from MITx/bug/dhm/ie7 Calen Pennington 2012-12-19 12:58:07 -08:00
  • 4bcfa84519 adding zendesk logo for styling purposes Brian Talbot 2012-12-19 14:25:59 -05:00
  • fbabbcdbf2 Merge pull request #1184 from MITx/fix/cdodge/user-tab-crash Christina Roberts 2012-12-19 10:52:34 -08:00
  • 91b0fddfce malformed url generation for User's tab Chris Dodge 2012-12-19 13:49:47 -05:00
  • ce9229fac6 Merge branch 'master' into feature/diana/rubric-input Diana Huang 2012-12-19 13:17:10 -05:00
  • 728103056d Move rubric into a subset of problem in CSS. Diana Huang 2012-12-19 13:16:35 -05:00
  • d911297670 The progress page now checks course.metadata.get(no_grade, False) to see if the course has a grade. Bridger Maxwell 2012-12-19 12:47:43 -05:00
  • 5a65c24507 Added parameters to hide grade totals and grade cutoffs in progress graph. Bridger Maxwell 2012-12-19 12:37:02 -05:00
  • a53959a770 Merge pull request #1181 from MITx/content/rocha/new-courses-2013 David Ormsbee 2012-12-19 09:36:10 -08:00
  • ed051a50a2 Merge pull request #1180 from MITx/feature/rocha/google-analytics-on-registration David Ormsbee 2012-12-19 09:12:50 -08:00
  • 4a283218ca Merge pull request #1179 from MITx/content/rocha/job-and-faq-update David Ormsbee 2012-12-19 09:12:02 -08:00
  • a239fe2ee7 Add google analytics to model signup and login panels Carlos Andrés Rocha 2012-12-19 12:07:34 -05:00
  • 11d5eea2b9 Add in CSS updates and fixes to the template so that it will work. Diana Huang 2012-12-19 11:52:37 -05:00
  • 6d85accad8 Add news announcement for spring 2013 courses Carlos Andrés Rocha 2012-12-18 18:03:34 -05:00
  • f23bf85199 Added config to grader to hide averages of pset scores. Bridger Maxwell 2012-12-19 11:44:32 -05:00
  • 3ae08d101c Merge pull request #1178 from MITx/fix/zoldak/cms-jasmine chrisndodge 2012-12-19 08:42:08 -08:00
  • 42857796c0 Update jobs and faq page Carlos Andrés Rocha 2012-12-19 11:39:44 -05:00
  • 8d15860c66 Merge pull request #1177 from MITx/bug/dhm/dec12 chrisndodge 2012-12-19 08:33:17 -08:00
  • e21c17ffeb Fail the Jenkins build when CMS Jasmine tests fail. Jay Zoldak 2012-12-19 11:32:55 -05:00
  • b19aa06540 Fix broken jasmine tests for CMS. All (11) specs are now passing. Jay Zoldak 2012-12-19 11:26:36 -05:00
  • 08d5ab0a3b Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into bug/dhm/dec12 Don Mitchell 2012-12-19 11:11:24 -05:00
  • b689d19bec Ensure empty video string deletes the video record and doesn't create a partial descriptor. Use 400 not the contrived 515 for malformed html. Don Mitchell 2012-12-19 11:11:14 -05:00
  • 4a953d4949 Merge branch 'master' of github.com:MITx/mitx Don Mitchell 2012-12-19 10:51:58 -05:00
  • 326d21d143 ie7 fixes: define indexOf, use charAt rather than [] to access string, put try/catch around fn that was throwing errors. Don Mitchell 2012-12-19 10:48:03 -05:00
  • c1c88a207d Merge pull request #1172 from MITx/bug/dhm/dec12 chrisndodge 2012-12-19 06:33:02 -08:00
  • 0c4ced6361 Merge pull request #1176 from MITx/feature/dave/freeform_advertised_start David Ormsbee 2012-12-19 01:14:29 -08:00
  • 8373ee4bf6 Basic support for freeform advertised_start dates like 'Spring' David Ormsbee 2012-12-19 04:01:37 -05:00
  • f472ac60f5 minor tweaks to test center registration Brian Wilson 2012-12-19 00:21:49 -05:00
  • f912ffe8a2 add persistence of testcenter_user registration Brian Wilson 2012-12-18 18:31:41 -05:00
  • bc40a7f127 make test-reg dialog non-modal, and pass course_id in URL. Add to course info. Brian Wilson 2012-12-18 16:16:55 -05:00
  • b5fd6c9012 Send back error to client if failed to save malformed update and have it show an alert. Don Mitchell 2012-12-18 15:22:07 -05:00
  • 8a0dae01f0 Add in some sorting and validation of the options list Diana Huang 2012-12-18 14:32:10 -05:00
  • fc2b6f034b Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into bug/dhm/dec12 Don Mitchell 2012-12-18 14:29:10 -05:00
  • 0192a04b20 Fixed course_info parsing bug. Addressed some of Christina's review comments. Don Mitchell 2012-12-18 14:28:53 -05:00
  • a34b42b8d2 Merge pull request #1174 from MITx/bug/btalbot/cms-userstab chrisndodge 2012-12-18 10:19:30 -08:00
  • dd758c06f7 Merge pull request #1175 from MITx/fix/cdodge/initializing-tabs Don Mitchell 2012-12-18 10:13:35 -08:00
  • 2ae2e46880 initialize the tabs metadata on course if we go to the edit-tabs page. This will prevent the author from getting into a bad state in the LMS Chris Dodge 2012-12-18 13:08:21 -05:00
  • dfe438dc73 Initial work on the rubric input type including the most basic parsing without error handling Diana Huang 2012-12-18 13:02:17 -05:00
  • af5d007a8f cms - added users tab back into course navigation Brian Talbot 2012-12-18 12:50:04 -05:00
  • 5709ff34f5 Refactored videos to a much simpler impl b/c about videos don't have speeds and don't use the video/default.yaml format. Don Mitchell 2012-12-18 12:46:54 -05:00
  • 1b8dfadc8e Merge pull request #1173 from MITx/feature/jarv/pin-mitx-versions David Ormsbee 2012-12-18 08:01:51 -08:00
  • c7d379beb6 add first pass at wiring test registration dialog Brian Wilson 2012-12-18 03:20:02 -05:00
  • c7a00cd2ba pinning versions to what is currently on stage John Jarvis 2012-12-17 19:07:23 -05:00
  • b2117c1194 first dialogs Brian Wilson 2012-12-17 17:59:44 -05:00
  • b74c542902 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into bug/dhm/dec12 Don Mitchell 2012-12-17 17:22:26 -05:00
  • 598922b4cb Dont' warn about name change on initial creation. Fixed overview to save correctly (not overwrite w/ old value) Don Mitchell 2012-12-17 17:22:08 -05:00
  • f7703dadee Alert for assignment type name change referential integrity. Fixed orphaned graders (manifested as url not defined) To keep assignment type blur from spamming warnings, I made all blurs check whether the data changed before doing any other behaviors. Don Mitchell 2012-12-17 17:10:56 -05:00
  • 0ddea6d0ae Merge pull request #1114 from MITx/feature/alex/video-timeframe-mitx David Ormsbee 2012-12-17 13:20:47 -08:00
  • 8b3c408d14 Merge pull request #1171 from MITx/fix/zoldak/common-coveragerc Calen Pennington 2012-12-17 12:09:29 -08:00
  • cc54c37359 Exclude settings.py files from coverage reports and configure titles for the reports. Jay Zoldak 2012-12-17 15:00:11 -05:00
  • 91c73fc034 Merge pull request #1170 from MITx/bugfix/dave/requests_version David Ormsbee 2012-12-17 10:44:36 -08:00
  • eba4629f59 Our code breaks on requests >= 1.0, so locking in a version for dev David Ormsbee 2012-12-17 13:35:33 -05:00