Commit Graph

  • c0c895cb47 Merge pull request #1886 from edx/ned/add-tests-for-file-uploads Ned Batchelder 2013-12-20 07:06:04 -08:00
  • 9f1bdc534d Merge pull request #1986 from edx/valera/move_logme_module_separate_file Valera Rozuvan 2013-12-20 06:45:51 -08:00
  • ef51f74a36 Merge pull request #1749 from zubair-arbi/zub/bugfix/std823-addbaseview zubair-arbi 2013-12-20 06:37:58 -08:00
  • 4f0b800d67 added detail about tolerance for numerical problems Mark Hoeber 2013-12-20 09:36:19 -05:00
  • 7f76517ea3 Cleanup courseware acceptance tests Calen Pennington 2013-12-17 11:30:33 -05:00
  • 1542a74d2b Removed logme module. Using console.log() instead. Valera Rozuvan 2013-12-20 12:43:44 +02:00
  • f58e788b83 Merge pull request #1971 from edx/will/selenium-pages Will Daly 2013-12-20 06:05:30 -08:00
  • d23f48f573 Merge pull request #2002 from edx/will/rebalance-shards Will Daly 2013-12-20 05:45:22 -08:00
  • a6fbcbd781 Add baseview(extended from backbone view), which can further extended by other views + Add fucntion to modify iframe and embed tags + add related tests STUD-823 Zubair Afzal 2013-11-22 15:00:45 +05:00
  • 608aaf31e8 Merge pull request #2012 from edx/sarina/grade-download-wording Sarina Canelake 2013-12-19 21:43:25 -08:00
  • 6134bb5384 cr comments e0d 2013-12-19 23:09:23 -05:00
  • f330b1e65f Tweak language surrounding grade download button Sarina Canelake 2013-12-19 18:16:07 -08:00
  • 93b6ca1140 Set review timeframe more appropriately in contributing docs Sarina Canelake 2013-12-19 18:09:18 -08:00
  • e1451ab1c1 Merge pull request #2009 from edx/markhoeber/documentation/release-notes-12-17-13 Mark Hoeber 2013-12-19 16:08:37 -08:00
  • 65756bbf94 Properly format errors/warnings. cahrens 2013-12-19 14:08:11 -05:00
  • 8b929511b5 Merge pull request #2006 from edx/zoldak/update-testing-doc Jay Zoldak 2013-12-19 13:51:46 -08:00
  • b4b611b9ad Update testing doc Jay Zoldak 2013-12-19 14:22:02 -05:00
  • 86e3391b41 fixing merge conflict from release e0d 2013-12-19 16:34:25 -05:00
  • 04e66be705 Added Selenium page objects for LMS and studio Will Daly 2013-11-25 12:25:28 -05:00
  • f1b140ffb5 Merge pull request #2005 from edx/sylvia/documentation/add_image Mark Hoeber 2013-12-19 13:12:15 -08:00
  • af4e3355c6 Merge pull request #1806 from edx/anton/add-zooming-image-template Anton Stupak 2013-12-19 12:28:08 -08:00
  • 042cb5c698 BLD-206: Add template for the zooming image in Studio. polesye 2013-11-29 08:23:24 +02:00
  • 35e30f8cac Add missing image file, correct typos spearce 2013-12-19 14:11:50 -05:00
  • ef7b65d6d3 Update changelog with studio marketing site feature Jay Zoldak 2013-12-16 12:24:54 -05:00
  • 332477b6ef Merge pull request #2003 from edx/sylvia/documentation/bld-474-v2 Mark Hoeber 2013-12-19 09:52:05 -08:00
  • 16adf36463 Fix formatting problem in Working with Video Components spearce 2013-12-19 12:48:20 -05:00
  • 94a792c910 Update Text Input problem type spearce 2013-12-19 11:53:35 -05:00
  • 28e25b75ff Rebalance acceptance test shards Will Daly 2013-12-19 10:41:45 -05:00
  • 75d44039de Merge pull request #1976 from edx/will/jenkins-script-update Will Daly 2013-12-19 06:56:27 -08:00
  • 1081786c6f Merge pull request #1965 from edx/will/fake-server-refactor Will Daly 2013-12-19 06:55:24 -08:00
  • 0fd03cfb02 Moved stub servers to terrain Will Daly 2013-11-23 14:19:56 -05:00
  • 90f56c0063 Merge pull request #1999 from edx/anton/fix-typos-in-announcement Anton Stupak 2013-12-19 04:19:02 -08:00
  • 24106a9203 BLD-590: Fix typos in Announcement template. polesye 2013-12-19 14:14:30 +02:00
  • c5ecbc1d42 script bombs if comments include unicode e0d 2013-12-18 21:47:49 -05:00
  • 91a0a3ffb3 Merge pull request #1994 from edx/db/reformat-importer David Baumgold 2013-12-18 13:49:51 -08:00
  • 36f35ac926 Reformat xml_importer.py to be more readable David Baumgold 2013-12-18 15:12:05 -05:00
  • ebb33be4dc Merge pull request #1991 from edx/jarv/readme-installation John Jarvis 2013-12-18 12:57:23 -08:00
  • ddd8f26af0 Added alt text to image Mark Hoeber 2013-12-18 15:35:31 -05:00
  • b005141d74 Updated Jenkins scripts Will Daly 2013-12-17 08:43:17 -05:00
  • 31ab28ee83 Merge pull request #1993 from edx/markhoeber/documentation/analytics-sprint-12 Mark Hoeber 2013-12-18 11:41:42 -08:00
  • 8c9bd39e68 Update README.md for install instructions John Jarvis 2013-12-18 12:32:10 -05:00
  • 0d91e61e60 Added flag for lms-specific functionality Julia Hansbrough 2013-12-18 18:05:46 +00:00
  • 4b1431bffe Edits to analytics changes Mark Hoeber 2013-12-18 14:14:32 -05:00
  • f351b05031 Fixing email link injection bug Julia Hansbrough 2013-12-03 19:53:48 +00:00
  • 7547c54047 Merge pull request #1990 from edx/sylvia/documentation/video_documentation_updates Mark Hoeber 2013-12-18 08:28:21 -08:00
  • 5b7acdcfd1 Fixed image Mark Hoeber 2013-12-18 11:11:28 -05:00
  • 1e248ae78c Updates to video documentation spearce 2013-12-18 10:58:53 -05:00
  • 7f96d153b4 Removed number from RN TOC Mark Hoeber 2013-12-18 10:54:29 -05:00
  • 94d3a73aed Merge pull request #1982 from edx/dhm/doc_store_config Don Mitchell 2013-12-18 07:33:31 -08:00
  • 7925ca1e96 Merge pull request #1873 from edx/anton/transcripts-start-end-time Anton Stupak 2013-12-18 02:09:54 -08:00
  • 70518a4659 BLD-506: Update behavior of start/end time fields. polesye 2013-12-05 18:28:25 +02:00
  • 4902155e72 Typos Mark Hoeber 2013-12-17 20:07:55 -05:00
  • bc625ab571 Merge pull request #1904 from tusbar/player-size Sarina Canelake 2013-12-17 13:16:05 -08:00
  • 64fc9cdce8 LMS: changing Open Sans font reference * uses Google Web Fonts reference rather than local files * removes unused local font files * adds in semi-bold weight support Brian Talbot 2013-12-16 16:42:54 -05:00
  • 10ca08facb Studio: updating font face imports * since Sass can now process @import rules * to simplify the number of external calls * maintains the http/https agnostic work * removes unused Bree Serif font face Brian Talbot 2013-12-14 08:30:07 -05:00
  • 461b805951 Merge pull request #1951 from edx/christina/fix-xhr Christina Roberts 2013-12-17 12:23:10 -08:00
  • 9e8a24bfc0 Merge pull request #1979 from edx/alex/lti_fixes_to_release e0d 2013-12-17 10:43:36 -08:00
  • 0ef923e043 Add documentation. cahrens 2013-12-17 13:22:32 -05:00
  • c684a66ac3 Add information to xblocks about when they complete initialization that's visible in javascript Calen Pennington 2013-12-17 11:30:15 -05:00
  • 1d0ce64b10 Update to the latest version of lettuce Calen Pennington 2013-12-17 11:29:49 -05:00
  • 5f2517978d Move default DOC_STORE_CONFIG to common Don Mitchell 2013-12-17 13:09:38 -05:00
  • 3f947e8076 Merge pull request #1977 from edx/goncha/sass-cache David Baumgold 2013-12-17 09:52:36 -08:00
  • b776590226 Rename BlockUsageLocator's block_id field from usage_id usage_id implies self-sufficiency. The block_id is relative to its structure. Don Mitchell 2013-12-17 12:15:32 -05:00
  • 6198e1107f Release notes edits Mark Hoeber 2013-12-17 11:55:23 -05:00
  • cc2e4bfeae Fix lis_outcome_service_url sending. Oleg Marshev 2013-12-05 18:11:32 +02:00
  • f6867da502 LTI additional Python tests. LTI must use HTTPS for lis_outcome_service_url. Valera Rozuvan 2013-11-27 17:08:03 +02:00
  • f37f9e0d2e Release notes for 12-18-2013 Mark Hoeber 2013-12-17 11:34:02 -05:00
  • 946c615047 Merge pull request #1859 from edx/oleg/fix_outcome_url_sending Alexander Kryklia 2013-12-17 08:14:42 -08:00
  • 149a188e30 Merge pull request #1547 from carsongee/bugfix/cg/beta_user_none Carson Gee 2013-12-17 07:55:59 -08:00
  • 59d18134b2 Fix lis_outcome_service_url sending. Oleg Marshev 2013-12-05 18:11:32 +02:00
  • 8a23f432c7 Merge pull request #1896 from edx/frances/fix/studio-outline-cleanup frances botsford 2013-12-17 07:27:14 -08:00
  • d7e5a7df49 Move sass cache location out of synced fold Gang Chen 2013-11-22 15:49:49 +08:00
  • 012862bc24 Update AUTHORS Gang Chen 2013-11-24 21:43:29 +08:00
  • 8554c3f0ab Merge pull request #1914 from edx/anton/show-answer-imageresponse Anton Stupak 2013-12-17 07:12:25 -08:00
  • 9c8e90a624 Merge pull request #1931 from zubair-arbi/zub/bugfix/std894-deletingfloatfield zubair-arbi 2013-12-17 06:56:13 -08:00
  • 7add01462d Merge pull request #1969 from edx/zoldak/fix-test-name Jay Zoldak 2013-12-17 05:48:35 -08:00
  • 335a36f17c Address comments. polesye 2013-12-16 14:42:57 +02:00
  • 887eea30c9 Add comments. polesye 2013-12-11 16:44:37 +02:00
  • 6e01ce50c9 Add unit tests. polesye 2013-12-11 13:13:34 +02:00
  • 4e10c72988 BLD-21: Show answer for imageresponse. polesye 2013-12-10 16:30:37 +02:00
  • ae61db9a6d Merge pull request #1811 from edx/valera/lti_graded_additional_tests_2 Oleg Marshev 2013-12-17 03:07:39 -08:00
  • 0079243746 LTI additional Python tests. LTI must use HTTPS for lis_outcome_service_url. Valera Rozuvan 2013-11-27 17:08:03 +02:00
  • 11080f2872 Merge pull request #1947 from edx/valera/visual_ui_image_response Valera Rozuvan 2013-12-17 02:40:22 -08:00
  • f03f3ebf96 Adding Jasmine tests for ImageInput. Valera Rozuvan 2013-12-16 12:32:51 +02:00
  • 06b6535fb1 Using jQuery for all DOM manipulation. Valera Rozuvan 2013-12-13 13:04:18 +02:00
  • 7ebeccd4bf Updating ImageInput JS code base. Valera Rozuvan 2013-12-12 14:20:17 +02:00
  • 8fc0590a12 set default value for empty integer/float fields STUD-894 Zubair Afzal 2013-12-12 17:41:48 +05:00
  • a78400a8d8 Merge pull request #1970 from edx/adam/re-remove-ora-message Adam 2013-12-16 17:24:31 -08:00
  • 9f91935f63 Do not restore sinon global objects in afterEach. cahrens 2013-12-13 11:12:34 -05:00
  • 146562f3f5 re-remove ora message as part of merge conflict resolution Adam Palay 2013-12-16 17:13:11 -05:00
  • 4de51c8fcc Merge pull request #1960 from edx/e0d/release-merge e0d 2013-12-16 14:07:56 -08:00
  • 599388397a Remove dot from a scenario name so the results roll up in Jenkins Jay Zoldak 2013-12-16 17:07:26 -05:00
  • 319091a213 Merge pull request #1966 from edx/db/update-staticfiles-commit David Baumgold 2013-12-16 13:53:59 -08:00
  • 7e88ecc16d Fix for STUD-1011 Mark Hoeber 2013-12-16 16:27:09 -05:00
  • 132313c1bf Update version of django-staticfiles library David Baumgold 2013-12-16 15:18:06 -05:00
  • 1618c916bb fix for duplicate drag and drop indicators on studio outline page Frances Botsford 2013-12-16 15:30:42 -05:00
  • d52b959ff1 fixing merge conflicts e0d 2013-12-16 15:02:14 -05:00
  • 3cf75198c5 Merge pull request #1954 from edx/dhm/loc_mapper_memoize Don Mitchell 2013-12-16 10:34:12 -08:00
  • 9ad7a1c1e0 Document performance optimization and auth generality changes. Don Mitchell 2013-12-16 13:32:44 -05:00
  • 2d678d0c5e Responding to review feedback on studio outline cleanup Frances Botsford 2013-12-10 14:16:12 -05:00