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

Commit Graph

  • 8838d07fc9 Override COURSE_*_VISIBILITY_PERMISSION from ENV_TOKENS stv 2015-03-19 16:28:27 -07:00
  • ee90c5fe36 SOL-217 Remove Google Analytics calls Dino Cikatic 2015-03-06 13:37:12 +01:00
  • dd34bada71 pylinty minty Martyn James 2015-03-05 12:40:29 -05:00
  • 2117d168a4 SOL-217 Adding basic analytics events logging for courseware search and index Dino Cikatic 2015-02-27 13:24:33 +01:00
  • 989a8a0679 new css to go with DOM changes Mark Sadecki 2015-03-19 17:32:10 -04:00
  • 35e4e9d81f resolve more merge conflicts Adam Palay 2015-03-19 17:22:29 -04:00
  • b5c4b6388c Merge remote-tracking branch 'origin/release' into adam/merge-release-to-master Adam Palay 2015-03-19 16:30:46 -04:00
  • 8a8e1d06e4 this actually drops the element selector from the CSS Mark Sadecki 2015-03-19 15:32:55 -04:00
  • 1cf7ccc334 dropped element selector in CSS and test file Mark Sadecki 2015-03-19 15:31:30 -04:00
  • 7abcfddf51 Merge pull request #7421 from edx/hotfix/2015-03-19 Adam 2015-03-19 14:54:00 -04:00
  • 10ca5affcf Updating edx-search hash to include bugfixes for SOL-289 and SOL-217 Martyn James 2015-03-19 09:59:01 -04:00
  • d182b8db99 Merge pull request #7411 from edx/carol/doc/ContentLibHelpLinks Carol Tong 2015-03-19 11:21:14 -04:00
  • 4e9e11e4c0 Add Help links and targets for import/export libraries Carol Tong 2015-03-18 12:07:11 -04:00
  • 7c942dddb5 Merge pull request #7219 from edx/mjames/SOL-289 Martyn James 2015-03-19 09:51:36 -04:00
  • d413e71b88 Merge pull request #7419 from edx/carol/doc/ContentLibUserAccessHelpLinks Carol Tong 2015-03-19 09:02:05 -04:00
  • 524840aa80 Merge pull request #7394 from edx/clintonb/fix-existing-enrollment Clinton Blackburn 2015-03-19 08:53:46 -04:00
  • 9b79797b28 Created performance logging endpoint, changed CDN experiment to point to it. alawibaba 2015-03-11 16:37:31 -04:00
  • ae2480e038 update instructor grade task state and increase logging zubair-arbi 2015-03-17 18:51:17 +05:00
  • daadfeab66 View discussion of user profile return 404 Waqas Khalid 2015-03-18 16:29:01 +05:00
  • 2e2fb47d59 Bypassing E-Commerce API if user is enrolled in course Clinton Blackburn 2015-03-17 15:50:10 -04:00
  • a64d926845 Merge pull request #7399 from edx/ned/plat-462 Ned Batchelder 2015-03-18 22:47:50 -04:00
  • 6928035cd1 Make sure slashes in JSON content don't end script tags. PLAT-462 Ned Batchelder 2015-03-14 17:32:13 -04:00
  • e03813dabb Merge pull request #7414 from edx/release-merge-20150317 brianhw 2015-03-18 21:39:42 -04:00
  • 243e2660b0 Merge release to master for 20150317 release. Brian Wilson 2015-03-18 13:45:48 -04:00
  • 4860837eae Merge pull request #7418 from edx/sanchez/revert_201_status_for_enrollments Will Daly 2015-03-18 18:30:29 -04:00
  • e749f4500b Update template and config.ini files for library user help Carol Tong 2015-03-18 17:43:54 -04:00
  • 6ac1b82bb2 Merge pull request #7356 from edx/ned/fix-or-remove-teardown Ned Batchelder 2015-03-18 17:36:17 -04:00
  • 4acfbbdf21 Reverting the change to add a 201_CREATED status to the enrollment API. Stephen Sanchez 2015-03-18 20:31:58 +00:00
  • d0624b272f Merge pull request #7298 from edx/mobile/ab-test-support Nimisha Asthagiri 2015-03-18 16:33:01 -04:00
  • 57d7973cb7 adds additional context for screen reader users and correct heading order to be more logical Mark Sadecki 2015-03-18 15:39:45 -04:00
  • 551c382238 Merge pull request #7328 from edx/clrux/ux-1642-logistration-updates Chris 2015-03-18 15:35:02 -04:00
  • ff77505f42 Add caching to partitions_service. David Ormsbee 2015-03-18 06:06:04 -04:00
  • d7386ecc87 Use depth=0 for call to cache_for_descriptor_descendents. Nimisha Asthagiri 2015-03-12 21:33:41 -04:00
  • eca523e01e Mobile API MA-7: Support A/B test and cohorted content Nimisha Asthagiri 2015-03-04 21:36:18 -05:00
  • 091d6aebe9 Mobile API: Modularize VideoOutline code Nimisha Asthagiri 2015-03-04 11:34:44 -05:00
  • 40dd4f1fcb Merge pull request #7408 from edx/max/update-newrelic Max Rothman 2015-03-18 14:52:32 -04:00
  • af4d288f95 Merge pull request #7377 from edx/sanchez/enrollment_api_course_modes Stephen Sanchez 2015-03-18 14:30:55 -04:00
  • f0b4492065 Merge pull request #7381 from edx/will/ecom-601 Will Daly 2015-03-18 14:30:32 -04:00
  • 4d2969b0a8 Merge pull request #7312 from edx/will/quiet-cors-middleware-logging Will Daly 2015-03-18 14:30:05 -04:00
  • 026501aec9 Fix Chris Rodriguez 2015-03-18 14:21:21 -04:00
  • c37dc913a0 Copy changes to the activation email Will Daly 2015-03-16 14:34:41 -04:00
  • 6e3d5568bd Merge pull request #7345 from edx/talbs/certs-webview-uicleanup Brian Talbot 2015-03-18 13:16:24 -04:00
  • 8c9f6370b8 Allow Enrollment API supports creating and upgrade course modes other than honor. Stephen Sanchez 2015-03-16 19:14:27 +00:00
  • ae5cbf8b70 Merge pull request #7347 from edx/clintonb/commerce-events Clinton Blackburn 2015-03-18 12:47:26 -04:00
  • 10e9fed687 Pass required values via context to invalid template Matt Drayer 2015-03-18 12:24:06 -04:00
  • 5ae7cc7ee1 UX-1642 Making visual tweaks and enhancements to the logistration form Chris Rodriguez 2015-02-25 12:31:35 -05:00
  • 3d520f4fa8 Merge pull request #7409 from edx/clintonb/filter-empty-string Clinton Blackburn 2015-03-18 12:00:49 -04:00
  • a76fd944cd Merge pull request #7410 from edx/clintonb/course-mode-admin Clinton Blackburn 2015-03-18 12:00:18 -04:00
  • 321544efe6 Merge pull request #7407 from edx/sanchez/server-to-server-throttling Stephen Sanchez 2015-03-18 11:24:07 -04:00
  • 783fb23fe2 Fixed CourseMode Filtering Bug Clinton Blackburn 2015-03-18 10:59:21 -04:00
  • 9436eacb35 Added SKU column to CourseMode table in Django admin Clinton Blackburn 2015-03-18 11:10:37 -04:00
  • 649e45b40a Merge pull request #7388 from edx/ned/remove-more-test-data-mock-modulestore Ned Batchelder 2015-03-18 11:08:25 -04:00
  • b66a128c05 Merge pull request #6939 from open-craft/content_libraries/previews Kelketek 2015-03-18 10:05:22 -05:00
  • 1f3a4a87ab Update newrelic agent for monitoring celery tasks Max Rothman 2015-03-18 10:52:47 -04:00
  • 568acb56b0 Library setting for show/hide children previews + client-side code to toggle it. Jonathan Piacenti 2014-11-13 17:29:08 +07:00
  • d901b1d3e3 Allow services to ignore user throttling. Stephen Sanchez 2015-03-18 13:44:14 +00:00
  • 263dbdafb3 Merge pull request #7363 from edx/awais786/ECOM-1162-ga-event Awais Qureshi 2015-03-18 17:47:20 +05:00
  • 425b766965 Remove TEST_DATA_MOCK_MODULESTORE Ned Batchelder 2015-03-17 13:54:44 -04:00
  • c8825652b1 Merge pull request #7398 from edx/will/fix-broken-footer-test Will Daly 2015-03-17 16:46:44 -04:00
  • 2bc82367ce Add missing import of override_settings to fix a broken test in courseware Will Daly 2015-03-17 16:43:29 -04:00
  • 76bc375f62 certificates: removing verification view + edx-centric supplemental assets Brian Talbot 2015-03-17 16:10:32 -04:00
  • a0caf13da9 certificates: prepping sass + vendor code to compile LTR/RTL options Brian Talbot 2015-03-16 11:38:22 -04:00
  • 12d1992e66 certificates: revising breakpoint names/definitions to match current FED standards Brian Talbot 2015-03-16 11:25:49 -04:00
  • 8f9b3dad98 certificates: referencing platform-centric copies of imported typefaces Brian Talbot 2015-03-16 11:12:23 -04:00
  • 1ef0751f7a certificates: re-organizing comments/folder structure to match current FED standards Brian Talbot 2015-03-16 10:43:58 -04:00
  • 3590985f47 certificates: manually configuring responsive grid details Brian Talbot 2015-03-16 09:04:02 -04:00
  • e11c853672 certificates: updating app copies of Bourbon and Neat Sass utilities Brian Talbot 2015-03-16 08:59:43 -04:00
  • 31a5fb31fc certificates: removing edX-centric Sass variables from config Brian Talbot 2015-03-16 08:55:07 -04:00
  • 85f1d09d6b certificates: removing edX-centric supplemental content from views Brian Talbot 2015-03-16 08:48:31 -04:00
  • 597af988ae certificates: abstracting out all certificate sass vs. individual views Brian Talbot 2015-03-13 16:53:05 -04:00
  • 71c9a2d490 certificates: moving Sass/UI naming conventions to documented standards Brian Talbot 2015-03-13 16:34:26 -04:00
  • d7a5d24c1a certificates: moving HTML to documented standards Brian Talbot 2015-03-13 14:23:56 -04:00
  • f8b835f232 certificates: pruning default asset references Brian Talbot 2015-03-13 14:17:51 -04:00
  • 5c0d771817 certificates: removing edX-specific content/UI Brian Talbot 2015-03-13 13:37:55 -04:00
  • 50856a0ada certificates: updating and abstracting HTML templates Brian Talbot 2015-03-13 09:25:28 -04:00
  • 3a996155f5 ECOM-1162 Awais 2015-03-13 22:56:25 +05:00
  • 40bb70e9d1 Remove use of to_deprecated_string in sandbox regex check. Jonathan Piacenti 2015-03-17 09:47:27 -05:00
  • 8e4ee78fff Merge pull request #7262 from edx/cale/xblock-filtered-children-tests Calen Pennington 2015-03-17 16:04:54 -04:00
  • 5f6ee428f8 Merge remote-tracking branch 'origin/release' into rc/2015-03-17 Brian Wilson 2015-03-17 15:59:54 -04:00
  • 9b49059e1f Merge pull request #7383 from edx/will/ecom-1134 Will Daly 2015-03-17 15:34:36 -04:00
  • 81d17c516e Fix or remove tearDown methods that don't use super. Ned Batchelder 2015-03-14 21:39:45 -04:00
  • a495bb5f9e Addresses problem with 'up' and 'down' errors within SOL-289 Martyn James 2015-03-03 09:29:20 -05:00
  • bafc7c53d3 Merge pull request #7392 from open-craft/library-capa-problems brianhw 2015-03-17 14:17:19 -04:00
  • 15cc1446e5 Merge pull request #7393 from edx/revert-7387-library-capa-problems brianhw 2015-03-17 14:15:41 -04:00
  • 7f5c54dd31 Revert "Remove use of to_deprecated_string in sandbox regex check." brianhw 2015-03-17 14:09:55 -04:00
  • 8b190da956 Merge pull request #7387 from open-craft/library-capa-problems Kelketek 2015-03-17 12:43:19 -05:00
  • 60bbfc5a9c Add @contract to _load_item Calen Pennington 2015-03-16 10:25:38 -04:00
  • 9e7404cd4a Add test of courseware.views.index rendering with saved student state Calen Pennington 2015-03-12 13:40:14 -04:00
  • fd746b6f13 Clean up import order in test_module_render Calen Pennington 2015-03-04 06:54:30 -05:00
  • 17a6cfee70 Update query counts to new reality Calen Pennington 2015-03-03 16:59:42 -05:00
  • 26df09e404 Add test of iterating over a course tree multiple times in the same request Calen Pennington 2015-03-03 14:30:09 -05:00
  • 11dcf12f14 Make XModule use the same get_children that XModuleDescriptor and XBlock do, and make it returned the same CombinedSystem Calen Pennington 2015-03-03 14:28:51 -05:00
  • 8a73a736e3 Correctly escape backslashes in docstring for get_content_titles Calen Pennington 2015-03-03 14:28:04 -05:00
  • 473420429d Allow MongoModuleStore to use an existing CachingDescriptorSystem. Calen Pennington 2015-03-03 14:24:57 -05:00
  • 4ef53135ae Add and clean up __repr__ and __str__ for XModule-related things Calen Pennington 2015-03-03 14:14:32 -05:00
  • 85c81e4579 Remove use of to_deprecated_string in sandbox regex check. Jonathan Piacenti 2015-03-17 09:47:27 -05:00
  • 40ae5d2e1c Merge pull request #7365 from cpennington/lms-field-data-query-counts Calen Pennington 2015-03-17 11:55:46 -04:00
  • 498e62ef63 Merge pull request #7386 from edx/adam/revert-mathjax-change brianhw 2015-03-17 11:27:54 -04:00
  • 88b9187476 Decrease the number of inserts and updates needed by DjangoKeyValueStore Calen Pennington 2015-03-06 14:58:13 -05:00
  • 8fbb64322b Clarify grading variables in the CourseModule Calen Pennington 2015-03-03 14:13:06 -05:00