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

Commit Graph

  • fb8352e2cc Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged Calen Pennington 2013-03-15 10:33:54 -04:00
  • 8531d56268 Merge pull request #1665 from MITx/jmpm-analytics Calen Pennington 2013-03-15 07:06:02 -07:00
  • 029d8c8085 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged Calen Pennington 2013-03-15 09:46:47 -04:00
  • 116ecf2a50 Disable sequence nav buttons when the sequence is empty Calen Pennington 2013-03-15 08:39:24 -04:00
  • 44e6572e12 Make StringyInteger and StringyFloat return None when they can't parse the string from json, and don't try to overwrite max_attempts if it's '' Calen Pennington 2013-03-15 08:25:27 -04:00
  • 1aa8786b53 studio - checklists: added in smoothscrolling to in-page links across Studio but used only on checklists currently Brian Talbot 2013-03-14 19:07:03 -04:00
  • 97b44446a0 studio - checklists: added animation to collapse/expand toggle Brian Talbot 2013-03-14 16:30:48 -04:00
  • 13c38fa173 studio - checklists: revised input/label HTML and adjusted styling for each Brian Talbot 2013-03-14 16:17:47 -04:00
  • 7eb4970f6b Merge pull request #1671 from MITx/fix/will/save_button_regression Victor Shnayder 2013-03-14 11:54:10 -07:00
  • ce5e86895a Fixed pep8 Will Daly 2013-03-14 14:45:08 -04:00
  • 5e433cda2e Clarified comments about the logic of showing the save button Will Daly 2013-03-14 14:43:04 -04:00
  • 4dabb4ceb6 Save button no longer appears for non-randomized problems unlimited attempts Will Daly 2013-03-14 14:34:36 -04:00
  • 5070e5b209 Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged Chris Dodge 2013-03-14 14:01:07 -04:00
  • d2f216615f move the instantiation of the metadata cache out of modulestore.py as it was causing a circular import dependency when running on AWS. Put instantiation into one_time_startup.py which I believe is run before any Django requests are handled Chris Dodge 2013-03-14 13:57:48 -04:00
  • ac25b02ce6 Minor updates. cahrens 2013-03-14 13:48:17 -04:00
  • 9a7b0fb563 Merge branch 'feature/btalbot/studio-checklists' of github.com:MITx/mitx into feature/btalbot/studio-checklists cahrens 2013-03-14 13:47:55 -04:00
  • c54ad38fef Better positioning of elements draggables with labels in slider. Valera Rozuvan 2013-03-14 19:42:55 +02:00
  • 10eb7e45ea Add in some docs Vik Paruchuri 2013-03-14 13:42:41 -04:00
  • 017fd06bfc Pre-merge. cahrens 2013-03-14 13:37:22 -04:00
  • a717dffd48 Remove debug statements Vik Paruchuri 2013-03-14 13:31:30 -04:00
  • 4c8a45f85e Code to add in an open ended tab automatically Vik Paruchuri 2013-03-14 13:29:26 -04:00
  • 0aea85a4d9 studio - checklists: moved content to yaml file, cleaned up new checklists production view, added in page-level nav, and collapse/expand indicators Brian Talbot 2013-03-14 12:55:44 -04:00
  • 4b5837ffa6 Merge pull request #1668 from MITx/bugfix/dave/bad_route_in_rss brianhw 2013-03-14 08:22:14 -07:00
  • e818efb098 Removed reverse() call that was breaking in RSS feed. David Ormsbee 2013-03-14 11:19:07 -04:00
  • 5576c549b3 Merge pull request #1667 from MITx/content/rocha/2.01x-announcement David Ormsbee 2013-03-14 07:31:22 -07:00
  • 80d809a86a Add location note to jobs page Carlos Andrés Rocha 2013-03-14 06:52:28 -07:00
  • b4d83a5f44 Add 2.01x announcement to news feed Carlos Andrés Rocha 2013-03-14 06:49:00 -07:00
  • 15d8727fce Fix ids in feed.rss Carlos Andrés Rocha 2013-03-14 06:38:55 -07:00
  • 564374048e A little cleanup. cahrens 2013-03-14 09:35:26 -04:00
  • 065e850449 Merge with Brian's changes. cahrens 2013-03-14 09:32:54 -04:00
  • e0207432ca Merge branch 'feature/btalbot/studio-checklists' of github.com:MITx/mitx into feature/btalbot/studio-checklists cahrens 2013-03-14 09:23:05 -04:00
  • 54156b7ac1 Saving work. cahrens 2013-03-14 09:22:58 -04:00
  • bac9f1f571 Merge branch 'master' into peter/symbolic Peter Baratta 2013-03-14 06:31:17 -06:00
  • 75b561267c Script feature fix Peter Baratta 2013-03-14 05:09:15 -06:00
  • 753cc9ec2a Merge pull request #1666 from MITx/feature/kevin/pinning David Ormsbee 2013-03-13 18:05:24 -07:00
  • 8d766c4b51 fix conflict Kevin Chugh 2013-03-13 21:01:37 -04:00
  • 3211221f98 Merge pull request #1664 from MITx/feature/cdodge/cache-metadata-inheritence-in-django-cache Calen Pennington 2013-03-13 17:13:02 -07:00
  • 7f877344d6 added comment to explain sorting Your Name 2013-03-13 19:47:19 -04:00
  • 896ee094c6 added comment to explain sorting Your Name 2013-03-13 19:44:41 -04:00
  • 55a9bba166 Merge pull request #1663 from MITx/jmclaus/genex-problem5-fix jkarni 2013-03-13 16:29:03 -07:00
  • 1fce77d8b2 Merge branch 'master' into feature/btalbot/studio-checklists Brian Talbot 2013-03-13 19:19:38 -04:00
  • 7b74d972a1 studio - checklists: defaulting checklist visual progress to 0% Brian Talbot 2013-03-13 19:18:47 -04:00
  • 16f6744aef studio - checklists: revised task completion styles, added in checklist visual progress UI and demo/PoC JS and cleaned up some content/status states Brian Talbot 2013-03-13 19:13:26 -04:00
  • 97eb7eb58b remove whitespace Your Name 2013-03-13 19:07:46 -04:00
  • 6ee14ec34a candidate without inline Your Name 2013-03-13 18:51:40 -04:00
  • fc907fe055 candidate without inline Your Name 2013-03-13 18:50:00 -04:00
  • 117be695cb candidate without inline Your Name 2013-03-13 18:40:10 -04:00
  • c0efb0136e Merge branch 'master' into jmpm-analytics David Ormsbee 2013-03-13 16:55:54 -04:00
  • 8d4e0f8386 Add ANALYTICS_API_KEY to config files and dashboard analytics call David Ormsbee 2013-03-13 16:55:40 -04:00
  • 08bc073fa5 updates Your Name 2013-03-13 16:40:04 -04:00
  • 131e3120b9 Try to make psychometrics work with new storage model code Calen Pennington 2013-03-13 16:35:50 -04:00
  • c67f1677fd remove imports of Mongo.py from modules. They shouldn't need them. Also, video captions shouldn't need special logic to compute the url rewrites as the main get_html() should do this. Chris Dodge 2013-03-13 15:57:38 -04:00
  • 413aeed1b3 use django caching to hold computed metadata inheritence. Also invalidate the cache entries on writes (insert, updates) Chris Dodge 2013-03-13 15:33:15 -04:00
  • a2f9e4d565 almost there Your Name 2013-03-13 15:29:57 -04:00
  • 33c2507abc Guard against connection errors to the Analytics service. David Ormsbee 2013-03-13 15:27:33 -04:00
  • e135a4052b Better error checking with Analytics are unavailable. David Ormsbee 2013-03-13 15:16:36 -04:00
  • a9c5a6388c Update to version of xblock that supports full inheritance of field attributes Calen Pennington 2013-03-13 14:51:10 -04:00
  • 1d1a2c8d62 Disable a few more unneeded pylint alarms Calen Pennington 2013-03-13 14:33:58 -04:00
  • bf71f099d4 studio - checklists: finished static styling, initial checklist content import, and some basic JS Brian Talbot 2013-03-13 14:09:18 -04:00
  • a1c375b499 Run pylint on lms/*.py and cms/*.py Calen Pennington 2013-03-13 13:30:49 -04:00
  • 47ebd2b661 Set pythonpath when running pylint via rake to avoid import errors Calen Pennington 2013-03-13 13:20:11 -04:00
  • 7450128064 update coffeescript Your Name 2013-03-13 12:52:07 -04:00
  • 324d286f9b Don't reference .metadata for data_dir Calen Pennington 2013-03-13 12:47:05 -04:00
  • 531eb80eb2 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged Calen Pennington 2013-03-13 12:17:33 -04:00
  • 5379a9fd2b Make the id property available on both modules and descriptors, and make it a property, so that we aren't duplicating the location data Calen Pennington 2013-03-13 11:56:53 -04:00
  • 92e99d7a8b Move field definitions for XModules into mixin classes, so that descriptors and modules always have the same set of fields Calen Pennington 2013-03-13 11:35:32 -04:00
  • db282d891c Problem 5 grades correctly. Also added missing images jmclaus 2013-03-13 16:27:56 +01:00
  • 66a8735a58 studio - Checklists: initial design and front end proofing/firming up - WIP Brian Talbot 2013-03-13 10:50:34 -04:00
  • f01c7f9469 Merge pull request #1649 from MITx/feature/jkarni/folditxblockupdate Calen Pennington 2013-03-13 07:07:25 -07:00
  • cf4ea53d01 Small fixes to mongo metadata translations Calen Pennington 2013-03-13 09:34:27 -04:00
  • 07534a7231 fix thread/thread id issue Kevin Chugh 2013-03-13 09:02:57 -04:00
  • 7aa97d2999 Do metadata name translation in the mongo modulestore (because it isn't using from_json) Calen Pennington 2013-03-12 16:06:40 -04:00
  • dc2dbb3412 Do metadata name translation in json import as well as xml import Calen Pennington 2013-03-12 15:51:21 -04:00
  • 8ace7eeb2d Translate metadata names that are coming in from the policy file as well as from xml attributes Calen Pennington 2013-03-12 15:33:18 -04:00
  • e786ed2f51 re-add lost xml_importer.py code Chris Dodge 2013-03-13 00:19:48 -04:00
  • 1b5f040021 studio - checklists: roughed out initial static design, HTML, and most CSS for checklists v0 UI Brian Talbot 2013-03-12 21:57:40 -04:00
  • 0b2226b051 Merge pull request #1660 from MITx/hotfix/jkarni/folditorder John Hess 2013-03-12 16:17:08 -07:00
  • 8280c55992 pinning .1 Your Name 2013-03-12 17:40:26 -04:00
  • bf6ca1b0e7 use document to get scrollTop for firefox Arthur Barrett 2013-03-12 17:32:00 -04:00
  • 8f1e49ec88 Merge branch 'master' into feature/abarrett/annotation-styling-fixes Arthur Barrett 2013-03-12 16:56:31 -04:00
  • faab0ac139 Merge pull request #1657 from MITx/fix/brian/regrade-partial Diana Huang 2013-03-12 13:40:15 -07:00
  • 349348fcd3 Merge pull request #1661 from MITx/fix/cdodge/dont-clobber-on-delete-draft Christina Roberts 2013-03-12 13:21:42 -07:00
  • 47420fe7c5 Make sure that test-requirements.txt doesn't install versions of libraries that requirements.txt has pinned, and cache pip downloads Calen Pennington 2013-03-12 12:41:04 -04:00
  • b05b627c23 Reduce some more pylint noise Ned Batchelder 2013-03-12 16:10:37 -04:00
  • 046e0fd75e Merge remote-tracking branch 'origin/master' into fix/brian/regrade-partial Brian Wilson 2013-03-12 16:09:10 -04:00
  • 36746fb729 Merge branch 'master' into feature/btalbot/studio-alerts Brian Talbot 2013-03-12 16:05:54 -04:00
  • 13a7e905f3 Merge branch 'master' into fix/btalbot/studio-sasscleanup Brian Talbot 2013-03-12 16:02:42 -04:00
  • 174ba0039d Make sure that test-requirements.txt doesn't install versions of libraries that requirements.txt has pinned, and cache pip downloads Calen Pennington 2013-03-12 12:41:04 -04:00
  • 47e708e713 fix pylint and pep8 warnings Brian Wilson 2013-03-12 15:49:48 -04:00
  • e5ee0a77ed hot fix for delete_item. The 'delete_all_versions' is useful in that it is set to true when doing explicit deletes as opposed to 'delete draft'. If delete_all_versions=False, then don't remove the deleted item from the parent children collection Chris Dodge 2013-03-12 15:24:10 -04:00
  • d23679ea4e edx.org redesign - revised temporary login/register views to fit with design requirements/fixes from marketing team's overall design changes to site's visual theme Brian Talbot 2013-03-12 15:04:00 -04:00
  • 6aed059d5f Change date and remove filtering by grade. Add check for student_answers. Brian Wilson 2013-03-12 14:55:27 -04:00
  • bc854ef068 Merge branch 'master' of github.com:MITx/mitx Ned Batchelder 2013-03-12 14:34:54 -04:00
  • 70af75e852 Don't run pylint on migrations, and it's ok to have a global name 'log' Ned Batchelder 2013-03-12 14:34:39 -04:00
  • 830e08db1c Have definition_from_xml return (definition, children) Julian Arni 2013-03-12 14:34:34 -04:00
  • 0ee656316b Merge pull request #1659 from MITx/fix/vik/oe-pep8 Jay Zoldak 2013-03-12 11:34:26 -07:00
  • c40ab310c3 Blank line fixes Vik Paruchuri 2013-03-12 14:24:42 -04:00
  • d860b167d6 fixed tooltip positioning for non-overlapping spans in studio Arthur Barrett 2013-03-12 14:09:56 -04:00
  • 1379ba9c58 Merge pull request #1658 from MITx/fix/zoldak/poll-merged-fix-factory Christina Roberts 2013-03-12 11:09:51 -07:00
  • f9f0bd0deb Update course factory to reflect XBlock changes Jay Zoldak 2013-03-12 14:04:56 -04:00