Commit Graph

  • 1ee1eb6946 Fix comments. polesye 2013-10-18 11:59:25 +03:00
  • 547dc11c99 Revert "Fix a malformed custom_parameter bug." polesye 2013-10-16 08:38:03 +03:00
  • a6a5300b90 Fix custom parameter. polesye 2013-10-15 10:00:08 +03:00
  • e62c047fdf Fix a malformed custom_parameter bug. polesye 2013-10-10 11:34:34 +03:00
  • c4bb2ac757 Remove adding prefix to custom parameters. polesye 2013-10-10 10:35:32 +03:00
  • eaf5eb2945 Enable acceptance test. polesye 2013-10-18 19:58:18 +03:00
  • 9f1c5dd1ce Merge pull request #1400 from edx/will/fix-grading-test Will Daly 2013-10-18 09:15:00 -07:00
  • aa172272f3 Update master with hotfixes from release-2013-10-17. Brian Wilson 2013-10-18 11:50:42 -04:00
  • 32ca988760 Fix video voulme test. polesye 2013-10-16 16:15:09 +03:00
  • 322b17ee0b Uncomment acceptance tests. polesye 2013-10-16 15:30:52 +03:00
  • c85bbabb93 Fix timeout. polesye 2013-10-10 08:55:49 +03:00
  • e95ee9948b Add acceptance test instead of broken js unit test. polesye 2013-10-09 16:53:26 +03:00
  • 7121db0a09 BLD-353: Fix js unit tests. polesye 2013-10-09 15:12:57 +03:00
  • 3a639ece1f updating Neat generated utility files Brian Talbot 2013-10-10 07:15:32 -04:00
  • 5bbe330c0c updating to Sass 3.2.12 and Neat 1.4.0 Brian Talbot 2013-10-09 12:23:40 -04:00
  • 79f11de6de Merge pull request #1342 from edx/anton/fix-video-multi-speed-bug polesye 2013-10-18 08:09:42 -07:00
  • 14b5f42c7c Added explicit wait to avoid reading default grading value Will Daly 2013-10-18 09:54:49 -04:00
  • 494a618c1a Change logic for section selection in navigation tests. Jay Zoldak 2013-10-18 09:38:14 -04:00
  • 9df7236065 Merge pull request #1307 from edx/dhm/datastore_config Don Mitchell 2013-10-18 06:27:08 -07:00
  • 8fe99a6be2 Revert "Revert "Merge pull request #1240 from edx/dhm/config_separation"" Don Mitchell 2013-10-10 13:43:18 -04:00
  • d3c7c0834d Simple cleanups of DictFieldData Ned Batchelder 2013-10-18 04:51:42 -04:00
  • 70cea99856 Merge pull request #1394 from edx/zoldak/fix-cms-problem-acceptance Jay Zoldak 2013-10-18 05:36:48 -07:00
  • 7aff8a7791 Merge pull request #1362 from edx/will/acceptance-test-logs Will Daly 2013-10-18 05:07:53 -07:00
  • 613e7f5772 Merge pull request #1336 from edx/anton/fix-video-display-issue polesye 2013-10-18 01:21:20 -07:00
  • df091e5023 Remove $.cookie. polesye 2013-10-14 21:57:06 +03:00
  • dda6fbd45c Fix typo. polesye 2013-10-18 08:51:46 +03:00
  • 730113837b Add js unit tests. polesye 2013-10-14 13:32:10 +03:00
  • eeab7847b4 Add resizing. polesye 2013-10-13 22:08:52 +03:00
  • cca057df56 Merge pull request #1395 from edx/giulio/ICE-confirm-reset Giulio Gratta 2013-10-17 17:23:22 -07:00
  • c1450c8375 Merge pull request #1349 from mulby/gabe/course-id-context Gabe Mulley 2013-10-17 15:45:37 -07:00
  • e5cda013a2 Merge pull request #1357 from edx/jbau/shoppingcart-user-middleware Jason Bau 2013-10-17 15:41:11 -07:00
  • d2b03e28fb add course_id to event context Gabe Mulley 2013-10-15 13:32:24 -04:00
  • 0138322c2b Merge pull request #1371 from edx/gprice/cs-request-logging Greg Price 2013-10-17 14:32:04 -07:00
  • 7223bb125e make condition inline Jason Bau 2013-10-17 14:21:44 -07:00
  • 0c5b511c57 Include tail from header tag in course update. cahrens 2013-10-17 16:27:08 -04:00
  • af0239ab0b add confirm dialog to ICE reset changes Giulio Gratta 2013-10-17 14:11:05 -07:00
  • 0b8058d8c0 Merge pull request #1377 from edx/giulio/ICE-undo Giulio Gratta 2013-10-17 13:58:45 -07:00
  • 5d84cd0627 Add synchronization logic for waiting after adding components in acceptance tests Jay Zoldak 2013-10-17 16:48:40 -04:00
  • e53c1f5f32 Merge pull request #1186 from edx/will/js-test-xunit Will Daly 2013-10-17 13:37:53 -07:00
  • 6accfcd567 change various text items to be more clear for users, as well as some grammar Giulio Gratta 2013-10-11 13:20:13 -07:00
  • aba8fa6870 Merge pull request #1391 from edx/talbs/fix-lms-carouselcss Brian Talbot 2013-10-17 13:00:34 -07:00
  • 58548af9c7 LMS - revises pipeline vendor file references Brian Talbot 2013-10-17 15:55:37 -04:00
  • b3faf5c476 Merge pull request #1390 from edx/sarina/disable-student-email-settings-with-auth Sarina Canelake 2013-10-17 12:17:58 -07:00
  • 9fb1d9ecf2 Remove 'Email Settings' link on student dashboard for unauth courses Sarina Canelake 2013-10-17 14:39:20 -04:00
  • db802fb543 update code to reflect comment Giulio Gratta 2013-10-17 11:30:54 -07:00
  • ff7d906d07 Merge pull request #1388 from edx/brian/fix-email-subtask-dupes brianhw 2013-10-17 11:22:21 -07:00
  • 7316a3dc3b js-test-tool generates xunit reports. Will Daly 2013-10-01 10:25:39 -04:00
  • 2678f2a148 Merge pull request #1386 from edx/dhm/bug-courseid Don Mitchell 2013-10-17 11:21:21 -07:00
  • c1a5f18e9b Updated testing docs Will Daly 2013-10-17 14:17:48 -04:00
  • bec6be1b9b Merge pull request #1389 from edx/sarina/error-catch Sarina Canelake 2013-10-17 11:03:57 -07:00
  • 582e21b92d Course Auth tests for legacy dash Sarina Canelake 2013-10-17 13:49:42 -04:00
  • 951837f7c9 Catch email exceptions on the legacy dash Sarina Canelake 2013-10-17 13:39:13 -04:00
  • d0fe1d69a0 Merge pull request #1385 from edx/talbs/fix-lms-css Brian Talbot 2013-10-17 10:38:05 -07:00
  • 25b24bef2b LMS: revises IE banner logic to show for IE9 as well Brian Talbot 2013-10-17 13:07:50 -04:00
  • 73f2cdf670 LMS: syncs up IE warning banner UI with new IE detection technique Brian Talbot 2013-10-17 12:53:16 -04:00
  • 1c7882a6bb LMS: syncs up edge-based view with new pipeline CSS assets Brian Talbot 2013-10-17 12:52:42 -04:00
  • 309d7d99ad LMS: removes overkill/turbo :invalid pseudo class style for form inputs Brian Talbot 2013-10-17 11:52:45 -04:00
  • f83fb88099 Merge pull request #1382 from edx/talbs/fix-css-vendor Brian Talbot 2013-10-17 10:37:15 -07:00
  • 1db0c1dc74 LMS: resolves incorrectly named vendor CSS files Brian Talbot 2013-10-17 11:10:19 -04:00
  • d871d97112 Merge pull request #1383 from edx/talbs/fix-wiki-css Brian Talbot 2013-10-17 10:36:28 -07:00
  • a699674015 Check that a subtask has not already completed before running. Brian Wilson 2013-10-17 13:32:44 -04:00
  • 9fc5a8a4d6 Allow - ~ and . in course, branch, & block ids Don Mitchell 2013-10-17 13:19:23 -04:00
  • 4b225de3a0 Merge pull request #1381 from edx/bug/clear_assets Don Mitchell 2013-10-17 10:25:37 -07:00
  • 5e45861dfb Merge pull request #1374 from edx/giulio/video-help-text Giulio Gratta 2013-10-17 09:46:07 -07:00
  • d82fa03884 Merge pull request #1380 from edx/flowerhack/fix/certDollarValueConfirm Julia Hansbrough 2013-10-17 09:04:48 -07:00
  • 5e46796e90 LMS: updates wiki templates to reference new pipeline assets Brian Talbot 2013-10-17 11:46:22 -04:00
  • 2b99947241 Merge pull request #1309 from edx/dhm/mongo_migrate Don Mitchell 2013-10-17 08:32:55 -07:00
  • fe438bec27 Ensure contentstore has no assets before generating test set Don Mitchell 2013-10-17 11:08:25 -04:00
  • 87d0ab91d5 Removed unused template Julia Hansbrough 2013-10-17 14:58:57 +00:00
  • 04bc669d09 Fixed bug LMS-1117 Julia Hansbrough 2013-10-17 14:46:07 +00:00
  • dda08930cd Compute ObjectId locally rather than delegating to Mongo db Was following a std sql pattern, but non-sql db's are slow write and pymongo's ObjectId() is supposed to generate a true GUID equivalent to waiting for the db to do so. Don Mitchell 2013-10-10 15:53:47 -04:00
  • 9f5bd4e65b Merge pull request #1373 from edx/frances/fix/studio-grading-helptext frances botsford 2013-10-17 07:42:16 -07:00
  • 978c19dd2c Merge pull request #1325 from edx/dhm/paginate_assets Don Mitchell 2013-10-17 07:16:09 -07:00
  • 214a3bd251 pylint/pep8 cleanups Don Mitchell 2013-10-17 09:52:13 -04:00
  • ee2a3750ac Test leaving /start out of url. Don Mitchell 2013-10-17 09:51:56 -04:00
  • b0689a4ed5 Merge pull request #1375 from edx/db/requirejs-load-tender David Baumgold 2013-10-17 06:29:15 -07:00
  • a6ad531d50 Merge pull request #1287 from edx/dhm/restful_crud Don Mitchell 2013-10-17 05:50:05 -07:00
  • 17d8bd219a Merge pull request #1319 from edx/will/enable-bulk-email-tests Will Daly 2013-10-17 05:44:48 -07:00
  • fc320ffef0 Merge pull request #1334 from edx/fix/ichuang/instructor-dashboard-grades-for-assignment David Ormsbee 2013-10-17 03:43:17 -07:00
  • 757ce61d3e Merge branch 'master' of github.com:edx/edx-platform into bugfix/ichuang/make-edit-link-use-static-asset-path ichuang 2013-10-16 22:00:13 -04:00
  • 1fad68b5ca Adding ICE undo feature Giulio Gratta 2013-09-25 11:25:43 -07:00
  • 12d98daecf Merge pull request #1376 from edx/adam/disable-accounts-2 brianhw 2013-10-16 15:01:46 -07:00
  • 085d679abe add to changelog Adam Palay 2013-10-16 17:48:35 -04:00
  • dbfc38dfa9 Merge pull request #1370 from edx/zoldak/refactor-cms-acceptance-js Jay Zoldak 2013-10-16 14:47:29 -07:00
  • a4009d7834 Merge pull request #1372 from edx/talbs/fix-css-vendor Brian Talbot 2013-10-16 14:41:45 -07:00
  • 76e6f8bc0d Fix up Tender load order David Baumgold 2013-10-16 16:41:49 -04:00
  • 33f6d3b819 Address code review comments Jay Zoldak 2013-10-16 17:07:35 -04:00
  • 1fc993ce18 add functionality to disable users Adam Palay 2013-10-07 13:32:25 -04:00
  • 421174980a add UserStanding model Adam Palay 2013-10-09 13:55:28 -04:00
  • d45beaebfa Test the new RESTful course index and outline views. Don Mitchell 2013-10-16 13:45:48 -04:00
  • 095a4e3d93 Remove IDE-specific placeholder from before we had manage.pyUse manage.py instead (with cms --settings dev runserver --noreload --traceback 8001) Don Mitchell 2013-10-15 16:52:07 -04:00
  • fbc68df88b Ensure bootstrapping tests start w/ clean slate. Don Mitchell 2013-10-09 15:45:04 -04:00
  • 95ea4dc9cc Tests for Locator <-> Location help functions Don Mitchell 2013-10-09 13:48:02 -04:00
  • 010905eb99 RESTful api for getting course listing and opening course in studio. Don Mitchell 2013-10-03 12:06:26 -04:00
  • 5de21ae541 adds/relocates shared vendor css (and assets) to static directories Brian Talbot 2013-10-16 15:39:55 -04:00
  • 23bd9f5012 added help text to multiple speed video fields Giulio Gratta 2013-10-16 10:38:45 -07:00
  • bd477581b6 Log all comments service requests Greg Price 2013-10-16 15:09:10 -04:00
  • ff52afbd79 i18n the tip text on studio grading page, and adding a missing space on the 'New Assignment' button Frances Botsford 2013-10-16 16:26:09 -04:00
  • 4d7606f024 Merge pull request #1369 from edx/talbs/fix-a11y-modals Brian Talbot 2013-10-16 13:18:25 -07:00
  • 96cd85d824 LMS: converts close modal controls to use HTML <button> element Brian Talbot 2013-10-16 13:42:19 -04:00