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

Commit Graph

  • 7f1c89b492 Merge branch 'master' into feature/btalbot/studio-alerts cahrens 2013-04-08 10:28:52 -04:00
  • 4b925520b8 Merge pull request #1818 from MITx/feature/ichuang/dump-grading-config-fix chrisndodge 2013-04-08 07:28:22 -07:00
  • c6bec6bcad Merge pull request #1812 from MITx/feature/christina/gmt Don Mitchell 2013-04-08 07:00:08 -07:00
  • 6e45db65c2 Merge pull request #1820 from MITx/fix/cdodge/draft-metadata-inheritance Don Mitchell 2013-04-08 06:51:54 -07:00
  • c0bb3c962d studio - adding in ux-alerts view comment Brian Talbot 2013-04-08 09:41:50 -04:00
  • a6c35fb2ce studio - addressing pull request to merge to master feedback Brian Talbot 2013-04-08 09:30:09 -04:00
  • c4befa136f pep8 cahrens 2013-04-08 09:15:07 -04:00
  • f0d2ff7ba4 Change display_timezone to show_timezone. cahrens 2013-04-08 09:11:10 -04:00
  • 93e27c5f0c remove unsed import Chris Dodge 2013-04-08 09:09:51 -04:00
  • 9e2409743f remove unsed import Chris Dodge 2013-04-08 09:09:35 -04:00
  • 052fc5ad11 revert changes to editable_metadata_fields(), so that we can't leave behavior 'as-is' for Christina's work Chris Dodge 2013-04-08 09:08:51 -04:00
  • 2631452b9c Add display_timezone so course authors can choose not to display timezones in LMS. cahrens 2013-04-08 08:46:07 -04:00
  • e4dac6e310 Add display_timezone so course authors can choose not to display timezones in LMS. cahrens 2013-04-08 08:38:52 -04:00
  • 288620592a get metadata inheritance to work with draft stores. Fix bug on .publish() method whereby inherited metadata got written to the DB as 'own-metadata'. Change filter in mako_module.py to return list of own-metadata and inherited-metadata as 'editable-metadata'. Also, add unit test for draft metadata-inheritance and publish Chris Dodge 2013-04-07 19:33:04 -04:00
  • f88b5794e4 fix default giturl link ichuang 2013-04-07 00:48:32 +00:00
  • d2768c644e not all modules have xml_attributes ; be careful about this in xmodule_modifier ichuang 2013-04-07 00:18:53 +00:00
  • 8cafadc03b make "edit" links work - fixes giturl (was broken by xblocks migration) ichuang 2013-04-06 23:59:51 +00:00
  • 51d882b7b0 fix typo in instructor dashboard dump grading config ichuang 2013-04-06 18:30:27 +00:00
  • 5b7d882e3e Merge branch 'feature/cdodge/auto-forum-provision' into fix/cdodge/studio-forum-improvements Chris Dodge 2013-04-06 11:02:21 -04:00
  • b78eed3c22 Merge branch 'master' of github.com:MITx/mitx into feature/cdodge/auto-forum-provision Chris Dodge 2013-04-06 10:58:26 -04:00
  • 7c48f9a5ed add unit test to verify that the store updated signal actually fired. Also fix bug where cloning item doesn't update the inherited metadata caches Chris Dodge 2013-04-06 10:43:40 -04:00
  • 24095679a6 add back comment response flagging Kevin Chugh 2013-04-05 19:04:18 -04:00
  • f31588c81b studio - resolving section release date form issues (labels, saving, updating) Brian Talbot 2013-04-05 16:44:09 -04:00
  • de7c511328 flagging working again Kevin Chugh 2013-04-05 16:39:22 -04:00
  • d41f5042a5 studio - resolving margin-top issue with views that don't have a masthead Brian Talbot 2013-04-05 16:30:51 -04:00
  • a3de4ff625 add unit test to confirm 'id' generation Chris Dodge 2013-04-05 15:59:01 -04:00
  • 0781f3e166 add new file Chris Dodge 2013-04-05 15:28:19 -04:00
  • e717244611 remove discussion cache, which isn't used Chris Dodge 2013-04-05 15:27:50 -04:00
  • 1a68d516fb resolving local merge with master Brian Talbot 2013-04-05 15:27:08 -04:00
  • 386f57ea6e Merge branch 'master' into feature/btalbot/studio-alerts Brian Talbot 2013-04-05 15:18:05 -04:00
  • 512e4fe3bd resolving local merge with master and sprucing style and templates for merge with master Brian Talbot 2013-04-05 15:13:21 -04:00
  • f7094803c1 Merge pull request #1811 from MITx/fix/diana/press-page Diana Huang 2013-04-05 11:52:26 -07:00
  • 33d39a85a9 Merge pull request #1809 from MITx/feature/btalbot/studio-helpsock Christina Roberts 2013-04-05 11:37:57 -07:00
  • 7a334c6789 go back to exporting draft/private verticals, but also set additional xml attributes so that we can re-tie in the draft stuff into the sequence's children Chris Dodge 2013-04-05 14:34:44 -04:00
  • 0e8ef28347 flagging almost done Kevin Chugh 2013-04-05 13:23:09 -04:00
  • f84eaf01b8 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements Chris Dodge 2013-04-05 13:20:02 -04:00
  • 3d7f893259 Merge branch 'master' of github.com:MITx/mitx into feature/cdodge/auto-forum-provision Chris Dodge 2013-04-05 13:19:10 -04:00
  • 5bbfe87005 fix various pop8/pylint violations. switch hasattr() to getattr() Chris Dodge 2013-04-05 13:18:48 -04:00
  • dbf58c0d54 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules Chris Dodge 2013-04-05 12:53:24 -04:00
  • aca6cdbade Merge pull request #1813 from MITx/fix/vik/pg-progress Sarina 2013-04-05 09:51:13 -07:00
  • 6aada791d8 Fix pg progress vik 2013-04-05 11:58:16 -04:00
  • 4c95294ba7 Merge pull request #1810 from MITx/feature/cdodge/integrity-check-mongo-course chrisndodge 2013-04-05 08:45:12 -07:00
  • 275826d4ff studio - resolving help sock PR comments Brian Talbot 2013-04-05 11:29:46 -04:00
  • 4e8f01b88c studio - adjusted abbr cursor displays Brian Talbot 2013-04-05 11:18:16 -04:00
  • 6937f24cbb Remove duplicate entries from the press page. Diana Huang 2013-04-05 11:10:08 -04:00
  • 7ff975e0b6 studio - removing default styling for abbreviation elements, fixing typo in title attribute for timepickers Brian Talbot 2013-04-05 11:06:34 -04:00
  • 02dfa09c70 pylint/pep8 fixes Chris Dodge 2013-04-05 10:53:18 -04:00
  • fa31953924 Update tests for GMT, get Advanced Settings test to pass reliably. cahrens 2013-04-05 10:47:58 -04:00
  • f467d93f97 Merge pull request #1806 from MITx/feature/cdodge/integrity-check-mongo-course chrisndodge 2013-04-05 06:52:42 -07:00
  • aba17a54a3 Merge pull request #1802 from MITx/feature/markchang/studio-analytics chrisndodge 2013-04-05 06:50:46 -07:00
  • 8e36197cc2 tweeks per Cale's feedback Chris Dodge 2013-04-05 09:30:49 -04:00
  • 262050e4ff Merge pull request #1778 from MITx/feature/ichuang/add-dump-grades-config-to-instructor-dashboard Calen Pennington 2013-04-05 06:30:43 -07:00
  • 1ce362de7d Merge pull request #1807 from MITx/hotfix/gprice/marketing-changes-20120404 Calen Pennington 2013-04-05 06:27:52 -07:00
  • 2ad3fce27a Show UTC at end of string. cahrens 2013-04-05 09:13:17 -04:00
  • 32bc462038 Merge remote-tracking branch 'origin/master' into feature/markchang/studio-analytics Mark L. Chang 2013-04-04 23:45:06 -04:00
  • 2852256898 added dummy analytics object Mark L. Chang 2013-04-04 23:44:40 -04:00
  • 3b371c17e1 fix syntax error in lms/djangoapps/instructor/views.py ichuang 2013-04-05 02:58:39 +00:00
  • 8d770c1c04 use isinstance for grader check in lms/djangoapps/instructor/views.py ichuang 2013-04-05 02:54:05 +00:00
  • c26593df5b studio - added in labels and UTC reference for subsection release date UI Brian Talbot 2013-04-04 18:27:19 -04:00
  • da6ac54d1a studio - added in labels and UTC reference for section release date modal forms Brian Talbot 2013-04-04 18:00:08 -04:00
  • 52a2fc7114 changing timeFormat for settings views Brian Talbot 2013-04-04 17:45:40 -04:00
  • ceb4c719f7 changing default timeFormat within datepair.js for instances where the plugin is called by default HTML classes Brian Talbot 2013-04-04 17:38:14 -04:00
  • cc6baf9dd4 Show GMT time, 24-hour. cahrens 2013-04-04 17:12:09 -04:00
  • 0c31cac3de Remove Project Manager job listing Greg Price 2013-04-04 16:58:48 -04:00
  • 49e0753ef5 Show GMT time, 24-hour. cahrens 2013-04-04 16:56:10 -04:00
  • 5f316b58ec Merge branch 'master' into feature/btalbot/studio-alerts Brian Talbot 2013-04-04 16:55:57 -04:00
  • 530f9a87bb studio - minor design tweaks to alert/notification chrome Brian Talbot 2013-04-04 16:53:16 -04:00
  • 3c3a6e7503 studio - adding in view-based banners UI tweaks and removing global banner UI for now Brian Talbot 2013-04-04 16:46:38 -04:00
  • 9075e84430 Merge pull request #1774 from MITx/feature/ichuang/conditional-def-msg Calen Pennington 2013-04-04 13:39:19 -07:00
  • de44813732 Merge pull request #1808 from MITx/bug/christina/studio Christina Roberts 2013-04-04 13:34:00 -07:00
  • 2e9bf4ac0e Merge remote-tracking branch 'origin/master' into feature/markchang/studio-analytics Mark L. Chang 2013-04-04 16:11:22 -04:00
  • 10377bc41c added a dummy key for segment.io so it doesn't ever fail Mark L. Chang 2013-04-04 16:08:10 -04:00
  • 57343c7d9e On course about page, display course end date if no about page HTML blog (end_date.html) exists. #224 cahrens 2013-04-04 15:35:07 -04:00
  • 9ab5710a2a studio - removing unused footer-height variable Brian Talbot 2013-04-04 15:32:42 -04:00
  • bd055ddc22 On course about page, display course end date if no about page HTML blog (end_date.html) exists. #224 cahrens 2013-04-04 15:30:34 -04:00
  • 6d4966745e Merge branch 'feature/btalbot/studio-helpsock' of github.com:MITx/mitx into feature/btalbot/studio-helpsock Brian Talbot 2013-04-04 15:27:53 -04:00
  • 8e67f63eb6 studio - syncing up hover color of sock control with other buttons Brian Talbot 2013-04-04 15:27:02 -04:00
  • d02dc37d9f On course about page, display course end date if no about page HTML blog (end_date.html) exists. #224 cahrens 2013-04-04 15:22:56 -04:00
  • 5873721e1b Merge pull request #1800 from MITx/hotfix/stanford-press-release Calen Pennington 2013-04-04 11:59:05 -07:00
  • 99424a9716 Merge pull request #1792 from MITx/fix/ichuang/duplicate-entry-error Calen Pennington 2013-04-04 11:57:59 -07:00
  • e97e8ce5b6 Merge pull request #1781 from MITx/feature/ichuang/xqueue-callback-url-cleanup Calen Pennington 2013-04-04 11:54:13 -07:00
  • d9d151b35e Merge pull request #1768 from MITx/fix/diana/input-state-tests Diana Huang 2013-04-04 11:39:34 -07:00
  • ff8dca943c Merge pull request #1775 from MITx/feature/ichuang/gitreload-fix Calen Pennington 2013-04-04 11:17:38 -07:00
  • 42614c69b4 Add space after comma. Diana Huang 2013-04-04 14:16:27 -04:00
  • d498694659 Fix date on Stanford press release Greg Price 2013-04-04 13:46:46 -04:00
  • 32b8c59320 Update jobs page Greg Price 2013-04-04 11:08:44 -04:00
  • ffc1259496 Apply text and image changes reqeusted by UTAustinX Greg Price 2013-04-04 10:21:40 -04:00
  • 02b7ab4fa0 Tests to make sure that input_states have the correct keys and are not cross-pollinating Diana Huang 2013-03-29 12:49:24 -04:00
  • 79677e92ca Merge pull request #1780 from MITx/feature/ichuang/staff-email-for-course-creation chrisndodge 2013-04-04 10:40:51 -07:00
  • 73113eddc7 fix xml_attributes inspection Chris Dodge 2013-04-04 13:38:30 -04:00
  • 2e852d16ac Merge remote-tracking branch 'edx-mitx/master' into feature/ichuang/staff-email-for-course-creation ichuang 2013-04-04 17:34:52 +00:00
  • 72ce1af982 Merge pull request #1424 from MITx/feature/ichuang/fix-forum-management-commands Calen Pennington 2013-04-04 10:14:31 -07:00
  • 7f19d48985 Merge pull request #1795 from MITx/feature/cale/use-open-source-xblock Calen Pennington 2013-04-04 10:12:00 -07:00
  • b7c8a6977e Merge pull request #1805 from MITx/fix/brian/user-on-progress brianhw 2013-04-04 10:09:52 -07:00
  • 0ff31adf74 Merge pull request #1779 from MITx/feature/ichuang/studio-sort-my-courses chrisndodge 2013-04-04 09:30:16 -07:00
  • 00abaffe1d Merge remote-tracking branch 'origin/master' into feature/markchang/studio-analytics Mark L. Chang 2013-04-04 12:17:58 -04:00
  • db1c0bf081 added dev key so tests run Mark L. Chang 2013-04-04 12:14:34 -04:00
  • d3e7739b3b add user name and email to progress page Brian Wilson 2013-04-04 12:03:08 -04:00
  • 1c7e13e1e8 copy change Mark L. Chang 2013-04-04 11:54:37 -04:00
  • ea6174af28 fixing image resolution for the stanford-university image John Jarvis 2013-04-04 11:40:44 -04:00