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

Commit Graph

  • 92cc103930 Merge pull request #1088 from cpennington/pseudo-merge-descriptors-and-modules Calen Pennington 2013-10-08 13:29:30 -07:00
  • 658810a94f Use xblock render shortcuts Calen Pennington 2013-10-04 16:47:03 -04:00
  • d785b1e213 Convert due_date_display_format tests to use factories Calen Pennington 2013-10-03 16:18:35 -04:00
  • 6b474724ac Make XModuleDescriptor and XModule act as a single class Calen Pennington 2013-09-19 13:11:17 -04:00
  • 3cebb4eae2 Merge pull request #1264 from edx/gprice/fix-release-email-script Greg Price 2013-10-08 12:23:29 -07:00
  • 6b7749f25e Fix bug that omits commits in release email script Greg Price 2013-10-08 14:59:14 -04:00
  • 44d0494d33 Segregate the mongo db config from the modulestore config as a first step to separating db connection from modeling and to support location mapper and contentstore using same db config as modulestore Don Mitchell 2013-10-07 16:09:55 -04:00
  • f2bf95b205 Add variable to set location of config files on aws Carlos Andrés Rocha 2013-10-08 14:46:18 -04:00
  • 64e3624e16 Merge pull request #1262 from edx/will/disable-caption-test-2 Will Daly 2013-10-08 11:33:01 -07:00
  • 774dd03668 Disable another video caption test Will Daly 2013-10-08 14:07:35 -04:00
  • 7749bbbe51 Add module grade to problem_check tracking log event Carlos Andrés Rocha 2013-10-07 18:06:52 -04:00
  • b2cd0d28d1 Merge pull request #1229 from rocha/cleanup-eventtracking-mongo-authentication Carlos Andrés Rocha 2013-10-08 10:46:33 -07:00
  • 7a214344e5 Merge pull request #1261 from edx/will/disable-caption-tests Will Daly 2013-10-08 10:36:40 -07:00
  • 7eb4522b32 Disabled video caption acceptance tests Will Daly 2013-10-08 13:28:45 -04:00
  • 1200703076 Merge pull request #1258 from edx/flowerhack/fix/htmleditor Julia Hansbrough 2013-10-08 10:15:46 -07:00
  • d93e96cbc3 Defined baseUrl in the LMS template, fixing a bug where HTML editors called within LMS would fail to load Julia Hansbrough 2013-10-08 17:03:29 +00:00
  • c484dc6cbb Merge pull request #1255 from edx/db/requirejs-load-jquery Christina Roberts 2013-10-08 09:28:50 -07:00
  • eb07e0bd58 Remove unused setup_require.coffee file David Baumgold 2013-10-08 12:06:18 -04:00
  • 0e9c15bf7f Merge pull request #1256 from edx/db/fix-footer-image David Baumgold 2013-10-08 09:02:21 -07:00
  • 814a218bfb Merge pull request #1254 from edx/christina/enable-overview-tests Christina Roberts 2013-10-08 08:46:09 -07:00
  • f1a104754e load jquery in requirejs deps David Baumgold 2013-10-08 11:40:42 -04:00
  • 15b65fbecc Fix static links for footer images David Baumgold 2013-10-08 11:37:22 -04:00
  • e0fb94cc55 Cleanup mongodb authentication Carlos Andrés Rocha 2013-10-04 16:44:13 -04:00
  • a03a11e0e7 Merge pull request #1253 from edx/ned/use-assertisinstance Ned Batchelder 2013-10-08 07:47:21 -07:00
  • 560dac6ac5 Merge pull request #1242 from edx/will/disable-broken-tests Will Daly 2013-10-08 07:43:35 -07:00
  • 7f29ac56fe Merge pull request #1244 from edx/will/fix-wordcloud Will Daly 2013-10-08 07:40:55 -07:00
  • c3bd7d3db8 Merge pull request #1243 from edx/will/fix-course-image-test Will Daly 2013-10-08 07:40:07 -07:00
  • e3c0bb839b Merge pull request #1183 from edx/valera/add_option_transcripts_remove_onhover Valera Rozuvan 2013-10-08 07:37:02 -07:00
  • 9d31924793 Re-enable tests that were failing on Jenkins. cahrens 2013-10-08 10:23:47 -04:00
  • 009deb7da8 Merge pull request #1236 from edx/christina/course-updates-bug Christina Roberts 2013-10-08 07:20:10 -07:00
  • c5733015fd Merge pull request #611 from edx/peter-fogg/draggabilly Christina Roberts 2013-10-08 07:14:34 -07:00
  • 6418175a56 Merge pull request #1251 from edx/adam/remove-instr-dash-buttons Adam 2013-10-08 07:04:25 -07:00
  • 1de194aaa4 Use RequireJS for test dependencies, and use domReady. cahrens 2013-10-07 17:17:31 -04:00
  • 2cc25873e9 Fixing Jean Michel access. bug. Valera Rozuvan 2013-10-08 16:52:21 +03:00
  • deb0ad492a Enabling showing of captions always when mouse is over CC. Valera Rozuvan 2013-10-07 16:50:00 +03:00
  • 20c2b3dc71 Clean up the code. polesye 2013-10-04 16:38:16 +03:00
  • a667349d85 Fix acceptance tests. polesye 2013-10-04 16:09:02 +03:00
  • f57d5a61d3 Tidy up the code. polesye 2013-10-04 15:31:08 +03:00
  • 92494ccdd4 Fixing minor typo. Valera Rozuvan 2013-10-03 17:03:03 +03:00
  • 60c528a9be Minor tweak. Valera Rozuvan 2013-10-03 16:57:00 +03:00
  • b3a9f63de6 Furthe addressing comments on PR. Valera Rozuvan 2013-10-03 16:50:23 +03:00
  • 95b74930f6 Fixing JS. Valera Rozuvan 2013-10-03 16:42:19 +03:00
  • 968215dd9f Updated acceptance tests. Valera Rozuvan 2013-10-02 17:26:56 +03:00
  • b7e82ed15e Updated acceptance tests. Valera Rozuvan 2013-10-02 15:50:21 +03:00
  • de1381dbfc Added acceptance tests. Valera Rozuvan 2013-10-02 15:41:23 +03:00
  • fc43a81dbe Updated fixtures for Jasmine tests. Valera Rozuvan 2013-10-01 11:44:43 +03:00
  • 74cbe11934 Added functionality to show captions on "CC" button mousemove. Valera Rozuvan 2013-10-01 11:28:13 +03:00
  • 812b085b84 Added hard-coded flag to video.html that turns on/off autohiding of captions. Valera Rozuvan 2013-09-30 17:53:32 +03:00
  • 62c445d001 Updated code fomat in test Jasmine. Valera Rozuvan 2013-09-30 14:13:34 +03:00
  • 38dfde1296 Work in progress. Valera Rozuvan 2013-09-27 16:36:08 +03:00
  • 62e113e9fc Merge branch 'master' of github.com:edx/edx-platform into bugfix/ichuang/make-edit-link-use-static-asset-path ichuang 2013-10-07 21:23:05 -04:00
  • a4bf549af4 Use assertIsInstance instead of assertTrue(type(x) == y) Ned Batchelder 2013-10-07 18:20:31 -04:00
  • 9103fa393c Use assertIsInstance. Ned Batchelder 2013-10-07 18:17:40 -04:00
  • c64399424e re-enable some buttons on instr dash Adam Palay 2013-10-07 18:13:21 -04:00
  • 4effdbb4b2 Remove unnecessary call from wordcloud test Will Daly 2013-10-07 18:09:54 -04:00
  • 9a6f976d69 Disable non-deterministic video caption test to get stability on master Will Daly 2013-10-07 17:15:01 -04:00
  • b7856d96bf Use wait_for to allow course image time to update Will Daly 2013-10-07 17:44:16 -04:00
  • 3af6b90b8a Merge pull request #1239 from edx/will/fix-expand-section-test Will Daly 2013-10-07 14:20:38 -07:00
  • 328640452f Comment out tests that fail in Jenkins. cahrens 2013-10-07 11:23:12 -04:00
  • 61cfb91218 Cleanup to drag and drop implementation. cahrens 2013-09-12 12:33:40 -04:00
  • 14b4b6a24e Adds in minimally revised drag and drop styling. Brian Talbot 2013-08-22 22:38:59 -04:00
  • 85be9b4265 Jasmine tests for drag/drop. Peter Fogg 2013-08-12 11:16:10 -04:00
  • 7640ade481 Fix not being able to expand an empty subsection. Peter Fogg 2013-08-09 17:03:50 -04:00
  • cbd066da04 Address PR comments. Peter Fogg 2013-08-08 16:24:37 -04:00
  • 1c9fbec94b CSS classes for drop targets. Peter Fogg 2013-08-07 13:04:21 -04:00
  • a0deac0399 Make all of section/subsection/unit draggable. Peter Fogg 2013-08-06 14:32:26 -04:00
  • fd2f720adb Add auto-expand to overview lists. Peter Fogg 2013-08-05 09:58:05 -04:00
  • 2d3cba06d2 Rework course overview drag and drop. Peter Fogg 2013-08-02 09:01:57 -04:00
  • 8b03c4abae Merge pull request #1241 from edx/db/base-js-smoothscroll David Baumgold 2013-10-07 13:48:16 -07:00
  • d29cc4776e base.js requires jquery.smoothScroll David Baumgold 2013-10-07 16:37:05 -04:00
  • b749300d43 Use css_has_value() to fix failure in course-overview.feature Will Daly 2013-10-07 16:08:39 -04:00
  • c820ca4888 Merge pull request #1200 from edx/will/efficient-diff-quality Will Daly 2013-10-07 13:05:47 -07:00
  • 3f7fbfa5b2 Merge pull request #1238 from edx/db/update-docs-readme David Baumgold 2013-10-07 13:03:31 -07:00
  • 8ea3e2047c Merge pull request #1231 from edx/ormsbee/verify_tests3 David Ormsbee 2013-10-07 12:57:24 -07:00
  • 02fc6a40db Add model tests to verify_student flow. David Ormsbee 2013-10-06 23:58:42 -04:00
  • 6bd015d321 Update docs readme David Baumgold 2013-10-07 15:40:36 -04:00
  • aa6022d505 Don't remove course update when clicking outside modal. cahrens 2013-10-07 15:25:16 -04:00
  • 31980150f0 Merge pull request #1043 from edx/jkarni/feature/import-feedback jkarni 2013-10-07 12:13:07 -07:00
  • fd7e8baccb Tie the USE_I18N setting to DEBUG setting David Baumgold 2013-10-07 15:04:13 -04:00
  • bb00924917 Use requirejs for import.js Julian Arni 2013-10-07 13:40:48 -04:00
  • faf796b574 Merge pull request #1125 from edx/adam/remove-instr-dash-buttons Adam 2013-10-07 10:36:51 -07:00
  • a617988cf7 Merge pull request #1232 from edx/will/navigation-grading-test-fixes Will Daly 2013-10-07 08:34:48 -07:00
  • e37584619b add entry to changelog Adam Palay 2013-10-03 12:59:06 -04:00
  • 8ec583c355 LMS: abstracts consistent message/copy color styling from Instructor Dashboard view Brian Talbot 2013-10-01 11:26:48 -04:00
  • 197f9015aa disable buttons for large courses on legacy and beta instr dash Adam Palay 2013-09-24 17:21:27 -04:00
  • 5cfec75ece Studio: adds in instructional copy to user on when it is safe to leave the import view without harming an import process Brian Talbot 2013-10-01 15:48:24 -04:00
  • 777144111a Update changelog Julian Arni 2013-10-01 15:22:30 -04:00
  • 57b38969e5 Move import-related js to import.js Julian Arni 2013-10-01 13:56:44 -04:00
  • 7b3c4945cf Review fixes Julian Arni 2013-10-01 10:51:25 -04:00
  • 642bf0e6e6 Clear import status on retry Julian Arni 2013-09-30 17:52:34 -04:00
  • 1735a0f41f Studio: copy and styling changes to import view to support new status UI Brian Talbot 2013-09-30 15:20:42 -04:00
  • 89bba535e1 Studio: adds in action-related elements to the status display UI of the Import view Brian Talbot 2013-09-30 15:11:16 -04:00
  • 4bbacb02db Re-add bar references Julian Arni 2013-09-30 14:55:56 -04:00
  • cab7c4ff74 Remove references to old upload progress bar Julian Arni 2013-09-30 13:15:35 -04:00
  • 76ee27c22a Studio: revises import view Sass extends to use placeholder syntax Brian Talbot 2013-09-30 12:56:10 -04:00
  • 45ce8d30d9 Use swanky error css for error messages Julian Arni 2013-09-30 12:22:40 -04:00
  • abdaeef9d8 Hook up js to css classes Julian Arni 2013-09-30 10:41:38 -04:00
  • 59af44574c Studio: revises general layout/styling of import view and adds in detail progress feedback after import (WIP) Brian Talbot 2013-09-23 15:36:48 -04:00
  • a108827564 Route ajax request to appropriate view, and show feedback only then Julian Arni 2013-08-29 15:36:08 -04:00
  • c62691e9fc Scaffolding for import progress reporting Julian Arni 2013-08-27 09:55:02 -04:00