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

Commit Graph

  • a998a3f31c Merge pull request #8005 from edx/benp/fix-cohort-mgmt-css Ben Patterson 2015-05-12 14:53:36 -04:00
  • 19c6ae1a81 Update version of bok-choy. cahrens 2015-05-12 14:43:04 -04:00
  • 3887bf419b Update schoolyourself-xblock to the latest version, which contains 1 commit with a cosmetic change: 5e4d37716e John Lee 2015-05-12 14:20:08 -04:00
  • 1f03a4df95 Merge pull request #7966 from edx/gprice/discussion-api-thread-list-more-fields Greg Price 2015-05-12 13:45:18 -04:00
  • 07c5bbd96d Look for a consistent css class. Ben Patterson 2015-05-12 13:38:03 -04:00
  • e60b72cf1b Merge pull request #8000 from edx/talbs/buh-bye-ie9-extends-v2 Brian Talbot 2015-05-12 12:37:41 -04:00
  • 5e27bd229a Studio: removing manual Sass/CSS extend files needed for IE9 and below Brian Talbot 2015-04-29 15:02:49 -04:00
  • 898012518b LMS: removing manual Sass/CSS extend files needed for IE9 and below Brian Talbot 2015-04-29 14:54:09 -04:00
  • 3643036f5c Merge pull request #8001 from cpennington/re-add-metrics-mixin Adam 2015-05-12 10:25:16 -04:00
  • 1eb040f4ff Add MetricsMixin back into DescriptorSystem and ModuleSystem Calen Pennington 2015-05-12 10:23:31 -04:00
  • 513bb5d033 Merge pull request #7780 from edx/clrux/UX-1866-verification-rtl-fixes Chris 2015-05-12 10:13:10 -04:00
  • 15104cee43 Merge pull request #7994 from edx/revert-7990-revert-7862-markhoeber-doc1820 Mark Hoeber 2015-05-12 09:07:20 -04:00
  • 709f86c11b Addressing RTL inconsistencies on Verification process Chris Rodriguez 2015-04-22 13:30:27 -04:00
  • 58b7e7fb33 ECOM-1531 adding the fake-page for softwar secure. Awais 2015-05-07 00:34:00 +05:00
  • f199c305b9 bulk_email fix course_image_unicode name Syed Hassan Raza 2015-05-12 01:46:12 +05:00
  • 6189cf9b41 Fix type field in thread list endpoint Greg Price 2015-05-11 16:07:07 -04:00
  • 7ce579c274 Add group fields to thread list endpoint Greg Price 2015-05-05 16:21:52 -04:00
  • b1a9d33472 Add authorship data to thread list endpoint Greg Price 2015-05-05 11:43:36 -04:00
  • fa6e5338c2 Add fields to discussion thread list endpoint Greg Price 2015-05-04 17:13:55 -04:00
  • 90f7a0103f Merge pull request #7989 from edx/adam/more-grading-logging Adam 2015-05-11 15:36:37 -04:00
  • 9e82d305d2 Adds preferences API and updates users to V1 with PEP8 fixes Mark Hoeber 2015-05-11 15:07:13 -04:00
  • 9e16a80e3b Merge pull request #7978 from edx/benp/wip-fix-edxnotes-flakiness Ben Patterson 2015-05-11 15:02:49 -04:00
  • 31e56e77ae Make edxnotes bok-choy tests chrome-friendly. Ben Patterson 2015-05-08 13:00:43 -04:00
  • b070d4397e Merge pull request #7990 from edx/revert-7862-markhoeber-doc1820 Jesse Zoldak 2015-05-11 14:00:10 -04:00
  • 4a8cd270a1 Merge pull request #7988 from edx/shr/bug/PLAT-612-video-component-missing-tests Adam 2015-05-11 13:25:43 -04:00
  • 48b95cc6b1 Merge pull request #7983 from edx/aj/tnl2098-course-rerun-error-with-split-to-split Adam 2015-05-11 13:25:29 -04:00
  • 937a16e589 Revert "Adds preferences API and updates users to V1" Ben Patterson 2015-05-11 12:31:38 -04:00
  • 801ee67e63 add more logging to grading Adam Palay 2015-05-08 12:55:57 -04:00
  • 69af4113c2 Merge pull request #7979 from edx/ormsbee/new_relic_xb_tx_reporting David Ormsbee 2015-05-11 11:06:47 -04:00
  • 103fa38860 edx-val-Fix VAL error on re-import Syed Hassan Raza 2015-05-04 16:57:18 +05:00
  • 00184b83af Merge pull request #7862 from edx/markhoeber-doc1820 Mark Hoeber 2015-05-11 10:43:10 -04:00
  • 14ea62b3ec User preferences API doc Mark Hoeber 2015-04-28 14:53:49 -04:00
  • 894728d78c Merge pull request #7928 from mcgachey/mcgachey-score-event David Ormsbee 2015-05-11 10:01:45 -04:00
  • 3067e8e9c8 Merge pull request #7976 from edx/update-ease David Baumgold 2015-05-11 09:30:40 -04:00
  • 73b854e4f0 [LTI Provider] Adding signals for scoring events Phil McGachey 2015-04-28 14:44:41 -04:00
  • 5e91c37b4e Configuration error on course re-run Awais Jibran 2015-05-06 15:15:52 +05:00
  • 38b61fd86f Merge pull request #7699 from mitocw/feature/cg/ccx_settings Carson Gee 2015-05-08 18:14:03 -04:00
  • f1f34b5ddf Customize the transaction name sent to New Relic for XBlock handlers. David Ormsbee 2015-05-08 13:04:45 -04:00
  • 0f634bb6a3 Merge pull request #7971 from edx/will/verification-status-admin-updates Will Daly 2015-05-08 16:07:36 -04:00
  • e33d267e0a Update ease to 0.1.3 David Baumgold 2015-05-08 11:24:31 -04:00
  • 58b34e1cc4 Merge pull request #7974 from edx/merge-release-to-master Adam 2015-05-08 14:24:14 -04:00
  • 08993aead6 Merge pull request #7959 from edx/clytwynec/split_lms_unittests_into_shards Christine Lytwynec 2015-05-08 14:19:25 -04:00
  • 435b75b194 Merge pull request #7980 from edx/sarina/20150508-translations-update Sarina Canelake 2015-05-08 13:58:23 -04:00
  • e784a43487 Update translations (autogenerated message) Sarina Canelake 2015-05-08 13:35:50 -04:00
  • 219b9a0cc6 Merge pull request #7842 from edx/feanil/update_celery Feanil Patel 2015-05-08 13:41:18 -04:00
  • fa2b84d95d Merge pull request #7968 from edx/benp/fix-cohort-flakiness Ben Patterson 2015-05-08 13:01:31 -04:00
  • 4f156dc08f Updates to the verify student Django admin. Will Daly 2015-05-08 09:08:34 -04:00
  • 2b6ad20fa6 Merge pull request #7908 from edx/mjames/SOL-833 Martyn James 2015-05-08 12:38:34 -04:00
  • e0acd7151e Update ora2 to the latest release. Feanil Patel 2015-05-08 12:19:40 -04:00
  • 552c0bc734 Move location identifying strings into index Martyn James 2015-05-01 15:58:11 -04:00
  • bd1e7a4167 Merge pull request #7969 from edx/will/update-icrv-sha Will Daly 2015-05-08 10:49:28 -04:00
  • 8243d934e4 Merge remote-tracking branch 'origin/release' into merge-release-to-master Adam Palay 2015-05-08 10:23:04 -04:00
  • e3e2284c94 Merge pull request #7967 from edx/ormsbee/update_djt_mongo David Ormsbee 2015-05-08 10:07:20 -04:00
  • 609feaae71 Ensure cohort management section has loaded. Ben Patterson 2015-05-07 21:50:57 -04:00
  • 6289b190d9 Fix pep8 and pylint. Feanil Patel 2015-05-07 22:52:03 -04:00
  • 4cc39abfa4 Update celery config for config files I missed. Feanil Patel 2015-05-07 17:11:24 -04:00
  • 3d7a6d8b90 Fix for when celery runs in eager mode. Feanil Patel 2015-05-06 09:48:08 -04:00
  • e4aa91d510 Remove the mock, it doesn't seem like it's needed. Feanil Patel 2015-05-06 09:44:14 -04:00
  • 3b2a750d33 Update the cache backend for the new version of celery and djcelery. Feanil Patel 2015-05-04 22:16:18 -04:00
  • 95c240d576 Fix a bug in the failure increment. Feanil Patel 2015-05-04 22:13:45 -04:00
  • 27223ae80f Load celery for CMS as well. Feanil Patel 2015-04-30 17:50:18 -04:00
  • 34df5a32d2 Get LMS tests passing. Feanil Patel 2015-04-30 16:02:10 -04:00
  • dae643bee2 Update ora2 to match the new version of celery. Feanil Patel 2015-04-30 10:21:24 -04:00
  • 4f71158057 Merge pull request #7963 from edx/clytwynec/TE-868 Christine Lytwynec 2015-05-08 08:54:24 -04:00
  • 975f17968d Update to the latest version of celery, and django-celery. Feanil Patel 2015-04-28 09:35:11 -04:00
  • 7b53584653 Merge pull request #7621 from edx/shr/bug/TNL-1858-Unable-to-delete-studio-page Shrhawk 2015-05-08 15:06:03 +05:00
  • 710bb2342e Merge pull request #7960 from edx/waheed/ora-release-tag-updated Waheed Ahmed 2015-05-08 12:56:39 +05:00
  • 4270854ebc Updated ora release tag. Waheed Ahmed 2015-05-07 19:10:52 +05:00
  • 17222bfa7c Merge pull request #7864 from edx/aamir-khan/ECOM-1476-send-email-on-reverification Aamir 2015-05-08 11:22:49 +05:00
  • 06c152c1d8 Merge pull request #7914 from edx/mjames/SOL-825_6 Martyn James 2015-05-07 22:50:10 -04:00
  • 6577bb3bd6 Merge pull request #7950 from edx/clintonb/update-verify-now Clinton Blackburn 2015-05-07 22:46:28 -04:00
  • c86555266c Update in-course reverification XBlock SHA in requirements. Will Daly 2015-05-07 22:02:39 -04:00
  • fb51c6abd3 Exclude filtering for micorosite orgs Martyn James 2015-05-01 15:57:36 -04:00
  • c2b1c95322 Update django-debug-toolbar-mongo to work with DJDT 1.x David Ormsbee 2015-05-07 20:13:50 -04:00
  • fc61c292b9 Updated Take Photo page to include verification requirements Clinton Blackburn 2015-05-06 13:27:47 -04:00
  • 822a2ce8ef Merge pull request #7936 from edx/gprice/discussion-api-thread-list-query-group Greg Price 2015-05-07 18:04:23 -04:00
  • 7c59a3af64 Merge pull request #7964 from edx/hotfix/2015-05-07 Adam 2015-05-07 16:47:38 -04:00
  • 603eae65d8 Add params to CS query in thread list endpoint Greg Price 2015-05-05 17:49:57 -04:00
  • 2842029a7f skip failing test Adam Palay 2015-05-07 14:34:44 -04:00
  • b4ad9b8cd0 Skip intermittently failing test. TE-871 Jesse Zoldak 2015-05-05 16:21:52 -04:00
  • e13d1858a8 skip test that are causing incorrect pep8 reports in jenkins builds Christine Lytwynec 2015-05-07 12:13:50 -04:00
  • 2f398559ae Merge pull request #7845 from edx/mjevtic/SOL-776 Martyn James 2015-05-07 14:05:38 -04:00
  • e7aeb92182 update the attrib using dict-->update() function Syed Hassan Raza 2015-04-30 14:21:01 +05:00
  • afec81b662 prevent overly nesting _field_data (TNL-2050) Adam Palay 2015-05-01 17:09:18 -04:00
  • f51dbc5b60 Merge pull request #7962 from edx/clytwynec/omit-lettuce-features-from-coverage Christine Lytwynec 2015-05-07 13:58:13 -04:00
  • e71ee2b566 Merge pull request #7953 from Stanford-Online/kluo/cleanup-keyword-sub Adam 2015-05-07 13:09:58 -04:00
  • 56580510ea add lettuce features to the omitted directories in coveragerc files Christine Lytwynec 2015-05-07 11:50:02 -04:00
  • a975b8384c ECOM-1476: sending email on software secure response initial work aamir-khan 2015-04-29 22:32:15 +05:00
  • 8d0683e21c leave old "unit" test case for now Christine Lytwynec 2015-05-07 09:12:19 -04:00
  • 9640555d90 skip install_prereqs for the second coverage shard command Christine Lytwynec 2015-05-06 15:54:35 -04:00
  • 1e2184a42b Add a set of equivalent paths for coverage for use with testing jenkins Christine Lytwynec 2015-05-06 14:19:30 -04:00
  • 0874d5943d update all-tests.sh to run cms unit tests as separate shard Christine Lytwynec 2015-04-30 13:54:10 -04:00
  • ddb1ae667e Split lms unittests into multiple shards Christine Lytwynec 2015-04-29 14:21:28 -04:00
  • 411df0ae3a Merge pull request #7802 from edx/gabe/user-track Gabe Mulley 2015-05-07 08:43:21 -04:00
  • 56d380c812 Merge pull request #7954 from edx/jsa/xcom-270 Jim Abramson 2015-05-07 08:15:34 -04:00
  • 19d0eda60c Merge pull request #7952 from edx/clintonb/paypal-receipt Clinton Blackburn 2015-05-07 08:07:09 -04:00
  • 2a449ade58 Merge pull request #7938 from edx/jsa/xcom-287 Jim Abramson 2015-05-07 08:03:39 -04:00
  • 9445534c55 Merge pull request #7955 from edx/problem-builder-bump Eugeny Kolpakov 2015-05-07 13:10:19 +03:00
  • 400d90bc3e Problem builder version bump: includes presentation updates and accessibility improvements [OSPR-575] E. Kolpakov 2015-05-07 11:32:31 +03:00
  • 8107073c58 (SOL-776)(SOL-740)(SOL-532) Added setting flags for COURSE DISCOVERY feature; Exposed course search input as well as the course result page; Added flag for limiting the number of course cards on the homepage; marjev 2015-04-23 13:57:07 +00:00