Commit Graph

  • b9d79aea60 A bunch of pylint fixes and explicit use case for uploads/test JonahStanley 2013-06-20 15:55:53 -04:00
  • 281f900389 Changed format of docstring JonahStanley 2013-06-20 15:40:58 -04:00
  • 0ef4390aff Merge pull request #132 from edx/peter-fogg/remove-video-xml Peter Fogg 2013-06-20 12:40:13 -07:00
  • eec095a195 Changed naming of attempts to max_attempts and changed css_selector JonahStanley 2013-06-20 15:38:56 -04:00
  • 96c4d2877f Navigation now has a click success condition JonahStanley 2013-06-20 14:05:00 -04:00
  • fc6422641a Merge pull request #229 from edx/christina/activation_email Christina Roberts 2013-06-20 11:02:46 -07:00
  • 5f0a89bc27 Don't mention edge in the e-mail; same text used for edge and edx. cahrens 2013-06-20 13:16:13 -04:00
  • 0c75f427b1 Merge pull request #226 from edx/talbs/studio-uiwell Brian Talbot 2013-06-20 09:46:06 -07:00
  • 2ee2729652 Added baseline Sphinx-generated documentation Toddi Norum 2013-06-20 12:43:53 -04:00
  • 83d84e2b65 Actually fix merge conflicts. Peter Fogg 2013-06-20 12:26:01 -04:00
  • b7b2f91e79 studio - revising the visual design of UI well pattern Brian Talbot 2013-06-20 12:30:25 -04:00
  • 1d8d507f49 Merge in master (again). Peter Fogg 2013-06-20 12:21:16 -04:00
  • 1a5b58acd6 Merge pull request #210 from edx/christina/course-settings-drupal Christina Roberts 2013-06-20 09:15:18 -07:00
  • 9a753f1cc5 Studio feature to disable course settings on Drupal site. cahrens 2013-06-20 12:03:59 -04:00
  • ea56a0cd4a Make sure we can handle empty youtube attributes. Peter Fogg 2013-06-20 11:58:01 -04:00
  • 13b53a7a69 Merge pull request #206 from edx/rc/2013-06-18 Will Daly 2013-06-20 08:53:41 -07:00
  • f623e42983 Fix formatting of docstrings; add more docstrings Peter Baratta 2013-06-18 15:48:55 -04:00
  • b68e1e207e Fix some line lengths to make pylint happy Peter Baratta 2013-06-18 13:24:22 -04:00
  • 401dd550e4 Convert many byte strings to unicode; change string formatting Peter Baratta 2013-06-18 13:14:52 -04:00
  • 4f78c1977f Allow error messages with non-ascii characters to be handled correctly Peter Baratta 2013-06-19 10:59:24 -04:00
  • 9b478ff3e3 Merge pull request #115 from edx/jonahstanley/add-gradingsettings-tests Jonah Stanley 2013-06-20 08:31:31 -07:00
  • a498fa52ba Modify after UX text changes. cahrens 2013-06-20 11:29:31 -04:00
  • e1d4c69365 Merge branch 'master' into jonahstanley/fix-flakey-tests JonahStanley 2013-06-20 11:17:15 -04:00
  • c77eb4fd4c Fix VideoAlpha acceptance test step definitions to not clash with Video module. Peter Fogg 2013-06-20 11:14:33 -04:00
  • a8789dced9 Fixed flakey check box by making a css_check function that behaves like css_click JonahStanley 2013-06-20 11:14:17 -04:00
  • ef06932df0 Merge pull request #197 from edx/will/fix-video-acceptance-tests Will Daly 2013-06-20 08:07:28 -07:00
  • d601cee8e5 Merge branch 'master' into christina/course-settings-drupal cahrens 2013-06-20 11:00:12 -04:00
  • 1e51bd7314 Fixed flakey navigation tests by changing css JonahStanley 2013-06-20 10:58:11 -04:00
  • 033b974047 Fixed flakey show answer test JonahStanley 2013-06-20 10:54:43 -04:00
  • 0d3b7edde3 Merge pull request #223 from edx/christina/pep8 Christina Roberts 2013-06-20 07:54:15 -07:00
  • a6f697cc47 Merge pull request #222 from edx/felix/prefsscopefix3 Felix Sun 2013-06-20 07:53:57 -07:00
  • 485b5b2d6d studio - unconditionalizes course summary info in settings Brian Talbot 2013-06-20 10:50:15 -04:00
  • 9e69586bb3 pep8 fixes. cahrens 2013-06-20 10:31:44 -04:00
  • c00721bbe6 Fixed the preferences scope of xblock. Felix Sun 2013-06-18 13:10:47 -04:00
  • 501830c982 Merge pull request #174 from edx/cale/stabilize-dev-env Calen Pennington 2013-06-20 07:09:35 -07:00
  • 9c7be8b1dc Fix merge conflict in CHANGELOG.rst. Peter Fogg 2013-06-20 09:58:22 -04:00
  • cd972d6427 Merge branch 'cale/standard-coffee-watch' into cale/stabilize-dev-env Calen Pennington 2013-06-20 09:23:57 -04:00
  • 604e820211 studio - revises styling of in-context notices UI Brian Talbot 2013-06-20 09:23:56 -04:00
  • f11900a85c Merge branch 'cale/singleton-watchers' into cale/stabilize-dev-env Calen Pennington 2013-06-20 09:23:18 -04:00
  • 419c5e7a5c studio - removes course settings promo link and notice icons Brian Talbot 2013-06-20 09:23:16 -04:00
  • 64912a7741 Make assets watchers run as singletons Calen Pennington 2013-06-14 21:17:08 -04:00
  • cd57e281f5 Only write to xmodule asset files that have changed Calen Pennington 2013-06-14 22:27:24 -04:00
  • eb3e94660b Don't delete generated files from xmodule-assets Calen Pennington 2013-06-14 21:47:22 -04:00
  • f4200127bc Make coffee watch message more informative Calen Pennington 2013-06-14 21:46:27 -04:00
  • 2e480f6404 Switch to standard coffee watcher Calen Pennington 2013-06-17 15:00:55 -04:00
  • d99ad53ae9 Add system and env arguments to asset tasks Calen Pennington 2013-06-19 15:30:47 -04:00
  • d9268acd6b Provide instructions of ruby imports fail in rake Calen Pennington 2013-06-17 13:52:00 -04:00
  • 83af3e594f Use built-in rakelibdir feature Calen Pennington 2013-06-17 13:49:40 -04:00
  • 308fe26b65 Clean up pep8 E128 issues Calen Pennington 2013-06-20 09:08:25 -04:00
  • 448ca26cdf Remove simplewiki from the codebase Calen Pennington 2013-06-20 09:06:29 -04:00
  • 6fe56ac9f7 Merge pull request #205 from edx/christina/advanced-settings-test Christina Roberts 2013-06-20 05:48:13 -07:00
  • a76b91b55c Merge pull request #42 from edx/alex/fix_is_completed Alexander Kryklia 2013-06-20 05:37:44 -07:00
  • 23d4a2b3db renames is_completed to is_submitted, fixes docstrings and rst docs Alexander Kryklia 2013-06-20 15:09:05 +03:00
  • a7cf9d186d adds doc about correct Alexander Kryklia 2013-05-16 13:19:04 +03:00
  • 6f964acec5 added docs and added is_correct to conditional Alexander Kryklia 2013-05-16 12:35:58 +03:00
  • dbd2716e29 Updated video alpha template name to reflect recent changes in master. Will Daly 2013-06-20 07:44:33 -04:00
  • b1c963ab5e Changed stubbing behavior in video templates to exclude only the sources (not the player) Will Daly 2013-06-18 09:02:21 -04:00
  • 6ab5bb2f20 Changed videoalpha stub to exclude video sources, but include the rest of the player. Will Daly 2013-06-18 08:47:00 -04:00
  • 3b37e0c19f Fixed incorrect videoalpha template name Will Daly 2013-06-18 08:35:56 -04:00
  • e76ef3aa31 Combined video and videoalpha acceptance tests. Resolved conflict between two steps with the same name. Will Daly 2013-06-18 08:06:42 -04:00
  • 6f95d21ef8 Merge pull request #163 from edx/alex/fix_rake_doc Alexander Kryklia 2013-06-20 04:21:51 -07:00
  • d57fb77765 removes reference to removed module in docs Alexander Kryklia 2013-06-20 13:18:04 +03:00
  • 0af88b70a3 makes tests for sphynx doc generation not to run browser Alexander Kryklia 2013-06-20 13:09:29 +03:00
  • 26565f565e adds changes to changelog Alexander Kryklia 2013-06-20 13:07:41 +03:00
  • 0eaa7cccb5 adds test for doc generation Alexander Kryklia 2013-06-14 12:49:44 +03:00
  • 1da7bcf8b7 Fixes bugs in documentation (rst format) Alexander Kryklia 2013-06-13 19:12:46 +03:00
  • a3a2412c88 fixes pep8 and pylint errors Alexander Kryklia 2013-06-13 13:13:26 +03:00
  • f152668e12 Fixes bugs in documentation and improves it. Alexander Kryklia 2013-06-13 12:57:31 +03:00
  • 37cad5dc0c fixes launcy not working with Dir.chdir Alexander Kryklia 2013-06-12 14:49:01 +03:00
  • e7f1baad62 Fixes broken imports in checker.py Alexander Kryklia 2013-06-12 14:09:06 +03:00
  • 5d0f905961 fixes pep8 and pylint errors and rename mitx->edx Alexander Kryklia 2013-06-11 18:04:35 +03:00
  • e775852ee4 Make lms and cms more similar. Ned Batchelder 2013-06-19 22:44:55 -04:00
  • bc2f7b96ec Remove a redundant pylint suppression. Ned Batchelder 2013-06-19 22:31:05 -04:00
  • 4ddca36bbe Studio - adds minor UI/content changes to settings notices Brian Talbot 2013-06-19 18:13:54 -04:00
  • 7904464975 studio - revises notice headings to use icons Brian Talbot 2013-06-19 17:42:36 -04:00
  • d2f0d85085 studio - adds in basic rules for notices UI Brian Talbot 2013-06-19 17:42:05 -04:00
  • 2c72fa9e8b studio - revises markup/content for course about mgmt notices Brian Talbot 2013-06-19 15:11:43 -04:00
  • 49fba9e84d Remove obnoxious pip file Julian Arni 2013-06-19 17:54:28 -04:00
  • 3c55a1e95d Add sphinx documentation for jsinput Julian Arni 2013-06-19 17:35:10 -04:00
  • e08215e62a JSinput input type Julian Arni 2013-05-15 14:05:31 -04:00
  • dc5362e6c0 Merge pull request #215 from edx/renzo/segment-io-acceptance-fix Renzo Lucioni 2013-06-19 14:02:09 -07:00
  • acd6620078 Re-enable the Jasmine test Renzo Lucioni 2013-06-19 17:00:10 -04:00
  • 645d847bb1 Remove unused imports from cms, as detected by pylint. Ned Batchelder 2013-06-19 12:42:13 -04:00
  • 61b53713d2 Remove unused imports from lms, as detected by pylint. Ned Batchelder 2013-06-18 22:29:53 -04:00
  • df6d3f9b2f Fix strings that should be raw. Ned Batchelder 2013-06-17 20:43:18 -04:00
  • 181b1e979b Remove unused imports from common, as reported by pylint. Ned Batchelder 2013-06-14 13:30:47 -04:00
  • c53fff9ff4 Tell pylint to shut up about us telling it to shut up. Ned Batchelder 2013-06-14 15:24:29 -04:00
  • 142762c137 Rearrange pylintrc a little bit. Ned Batchelder 2013-06-14 15:03:57 -04:00
  • 0bf02cabff Fix for the failing acceptance tests Renzo Lucioni 2013-06-19 16:48:25 -04:00
  • b021d9cc12 Merge pull request #209 from edx/cale/pep8-fixes Calen Pennington 2013-06-19 13:36:18 -07:00
  • 29d93aff89 pep8 fixes. cahrens 2013-06-19 16:34:23 -04:00
  • 51fc6280b6 Don't concatenate together multiple strings. cahrens 2013-06-19 16:23:00 -04:00
  • 7b074424b5 Initialize MakoMiddleware manually during certificate grading runs. David Ormsbee 2013-06-19 14:39:02 -04:00
  • dda21b3b17 Merge pull request #213 from edx/dave/fix_inflated_cert_grades David Ormsbee 2013-06-19 12:13:16 -07:00
  • e1b071be30 Initialize MakoMiddleware manually during certificate grading runs. David Ormsbee 2013-06-19 14:39:02 -04:00
  • 6643994348 Add an optional success lambda to css_click. cahrens 2013-06-19 13:51:40 -04:00
  • b1daf0b3a6 Merge pull request #211 from edx/db/fix-assets-page-notifications David Baumgold 2013-06-19 09:04:34 -07:00
  • 687779ba34 Clean up assets page notifications David Baumgold 2013-06-19 11:29:57 -04:00
  • 24bee17da5 Merge pull request #156 from edx/blapenta/fix-test-coverage lapentab 2013-06-19 08:50:54 -07:00
  • 0524ff53cc Merge branch 'master' into jonahstanley/add-courseteam-tests JonahStanley 2013-06-19 11:29:43 -04:00