Commit Graph

  • bda16e2f00 Merge pull request #5043 from edx/christina/cohort-selector Christina Roberts 2014-09-03 10:35:19 -04:00
  • a81ff98455 Merge pull request #5047 from edx/renzo/third-party-auth-copy Renzo Lucioni 2014-09-03 10:02:49 -04:00
  • 93a263b92f Correct 3rd party auth login page message and styling Renzo Lucioni 2014-09-02 18:06:50 -04:00
  • f70e702503 Add specific bulk-operation test for LMS-11332, and a fix Calen Pennington 2014-09-03 09:50:41 -04:00
  • bd54cd8c57 LMS-11332 Unit test Nimisha Asthagiri 2014-09-03 09:15:01 -04:00
  • 96bc5cc83a Merge pull request #5001 from edx/split/edit_info Don Mitchell 2014-09-03 08:28:31 -04:00
  • a65771df93 Implement edit info as mixin on base mongo LMS-11183, LMS-11184 Don Mitchell 2014-08-27 16:36:32 -04:00
  • a96b2bd734 Move tests into appropriate directory structure. cahrens 2014-09-02 16:36:08 -04:00
  • c5fc9b2fc8 Merge pull request #4771 from edx/cdodge/ecommerce-invoicing chrisndodge 2014-09-02 15:32:41 -04:00
  • 1e2d5ffe03 Merge pull request #5031 from edx/andya/merge-hotfix-2014-08-29 Calen Pennington 2014-09-02 15:32:05 -04:00
  • 85fa712fdf Change published_date to published_on to make consistent with other edit info timestamps LMS-11184 Don Mitchell 2014-08-27 16:12:44 -04:00
  • 2cc0433833 Implement mediated bulk purchase epic Muhammad Shoaib 2014-08-06 11:33:11 +05:00
  • 27c83d51df Merge pull request #5040 from edx/revert-5039-pmitros/aws-djpyfs Ben Patterson 2014-09-02 11:36:37 -04:00
  • fe85223f73 Revert "AWS settings for XBlocks to have filesystem-like storage" Ben Patterson 2014-09-02 11:29:59 -04:00
  • 1abb8de2ba Merge pull request #5037 from edx/ammar-ben/bok-choy-shard-3 Ben Patterson 2014-09-02 11:01:49 -04:00
  • e5286a14cc Merge pull request #5039 from edx/pmitros/aws-djpyfs Piotr Mitros 2014-09-02 10:58:58 -04:00
  • 91cbc19279 Merge pull request #4988 from edx/benp/all-tests-update Ben Patterson 2014-09-02 10:53:49 -04:00
  • 8eeb091de8 Merge pull request #5036 from edx/sanchez/fix_django_header_tests Stephen Sanchez 2014-09-02 10:44:16 -04:00
  • ce2e51384f AWS settings for XBlocks to have filesystem-like storage Piotr Mitros 2014-09-02 09:57:08 -04:00
  • fb56588090 Tweak mongo count numbers Calen Pennington 2014-09-02 10:20:47 -04:00
  • 9a0d9f70c4 Merge pull request #4501 from htareque/lti_revision_3 Alexander Kryklia 2014-09-02 17:11:24 +03:00
  • 4878f6e83c Implement edit info as mixin for split LMS-11183, LMS-11184 Don Mitchell 2014-08-27 16:03:49 -04:00
  • d11aaec3a1 Handle the indexerror exception on create_order LMS-2646 Waqas Khalid 2014-08-18 20:39:51 +05:00
  • 7b52d45aa6 Move edit info into xblock and runtime mixins LMS-11183, LMS-11184 Don Mitchell 2014-08-27 16:03:09 -04:00
  • df5802224f Update pavelib.rst and run_devstack.rst for changes to default settings clytwynec 2014-09-02 09:28:10 -04:00
  • 4270d8f01b change default settings for servers/assets paver tasks from "dev" to "devstack" Christine Lytwynec 2014-08-29 15:54:27 -04:00
  • 880673b97f Merge remote-tracking branch 'edx/master' into andya/merge-hotfix-2014-08-29 Calen Pennington 2014-09-02 09:38:25 -04:00
  • 2f4fb30592 Cleaning up ddt syntax for new footer test. Stephen Sanchez 2014-09-02 12:23:09 +00:00
  • 94c90556c2 Split Bok-Choy Tests into 3 shards TE-447 muhammad-ammar 2014-08-27 11:49:41 +00:00
  • e3b40a8c46 Create shard 3 for bok-choy; handle unknown shards. Ben Patterson 2014-08-26 09:01:09 -04:00
  • 3f159ea52b username and email request for lti module htareque 2014-06-24 15:30:04 -04:00
  • 75d6f99fed The main django template needs header and footer feature flags. Stephen Sanchez 2014-08-29 13:09:20 +00:00
  • c7d4183310 Merge pull request #4915 from edx/flowerhack/redo-third-party Julia Hansbrough 2014-08-30 02:50:57 -04:00
  • b8049c01ef Merge pull request #4957 from edx/forums/new-post-type Greg Price 2014-08-29 17:15:07 -04:00
  • b89dccdc27 Merge pull request #5028 from edx/pmitros/update-xblock Ned Batchelder 2014-08-29 16:58:18 -04:00
  • 4fcc59b318 Merge branch 'release' into andya/merge-hotfix-2014-08-29 Andy Armstrong 2014-08-29 16:50:40 -04:00
  • 7b26e85478 Merge branch 'release' into andya/merge-hotfix-2014-08-29 Andy Armstrong 2014-08-29 16:50:10 -04:00
  • 765cd93d0b Merge pull request #5030 from edx/revert-5024-sanchez/ECOM-216-django-template-settings Jesse Zoldak 2014-08-29 16:45:47 -04:00
  • 96153ceed0 Revert "The main django template needs header and footer feature flags." Jesse Zoldak 2014-08-29 16:43:30 -04:00
  • 5cc6455fe3 Merge pull request #5006 from edx/will/ecom-199 Will Daly 2014-08-29 16:33:20 -04:00
  • 1838d9d432 Merge pull request #5020 from edx/hotfix/reduce-studio-mongo-calls Andy Armstrong 2014-08-29 16:20:55 -04:00
  • c9bf9ada7f New UI for discussions Alison Hodges 2014-08-28 16:56:42 -04:00
  • 02b42d5cb3 Added endorsement and thread_type fields Alison Hodges 2014-08-05 13:11:04 -04:00
  • 520fc2b09d New XBlock with final/tested/non-prototype scope_key Piotr Mitros 2014-08-29 16:00:10 -04:00
  • fe9763ab61 Adding question and discussion categories for posts Alison Hodges 2014-07-29 13:54:32 -04:00
  • 988e4e6da5 Update UI for forum actions Greg Price 2014-08-15 15:34:56 -04:00
  • a99196a164 Clear search alerts when a forum topic is selected Greg Price 2014-08-04 13:10:40 -04:00
  • 748d76600f Remove "flagged discussions" from forum topic menu Greg Price 2014-07-30 14:59:24 -04:00
  • 80d1cae6a0 Add filter menu to forum nav sidebar Greg Price 2014-07-30 14:34:11 -04:00
  • eaa93bf615 Hide comments in marked answers in forum questions Greg Price 2014-07-28 15:06:56 -04:00
  • ec482c0dc2 Allow authors of forum questions to mark answers Greg Price 2014-07-25 17:40:34 -04:00
  • a3703fbf79 Refactor a small amount of forum permission code Greg Price 2014-07-24 18:32:56 -04:00
  • c23a27bac4 Add post type control to forum new post form Greg Price 2014-07-24 13:22:39 -04:00
  • 2e30874180 Add post type indicators to forum sidebar nav Greg Price 2014-07-22 16:35:39 -04:00
  • dd05423732 Re-render forum responses when marked as answer Greg Price 2014-07-21 17:58:32 -04:00
  • aaa2f35336 Change endorsement UI for forum question threads Greg Price 2014-07-21 17:35:03 -04:00
  • 182ae7aeb0 Add endorsement info to marked answers in forum Greg Price 2014-07-21 15:54:32 -04:00
  • 10063a3120 Distinguish forum thread types in rendering Greg Price 2014-07-11 11:36:46 -04:00
  • 7470e60004 Unify forum thread views (and templates) Greg Price 2014-07-09 18:07:25 -04:00
  • ab2b7f344d Clean up dead forums front-end code Greg Price 2014-07-09 14:44:38 -04:00
  • 8d2211a698 Handle question posts from comments service Greg Price 2014-07-08 14:48:31 -04:00
  • 854621be60 Update forum new post form Greg Price 2014-07-21 10:43:45 -04:00
  • fd925e8970 Add server-side analytics logging for login Julia Hansbrough 2014-08-25 07:20:37 +00:00
  • e33d9b7367 Merge pull request #5025 from edx/ora2/release-2014-08-29T17.33 Stephen Sanchez 2014-08-29 15:16:48 -04:00
  • 1f4eb739f3 Merge pull request #5024 from edx/sanchez/ECOM-216-django-template-settings Stephen Sanchez 2014-08-29 15:16:12 -04:00
  • cd683cecd2 Updated ORA2 tag for release for August 29th, 2014 Stephen Sanchez 2014-08-29 17:42:37 +00:00
  • c14891e920 Pre-cache has_changes when computing ancestors Andy Armstrong 2014-08-28 20:03:31 -04:00
  • 1db107c2ce Add memoization for has_changes Don Mitchell 2014-08-28 14:40:21 -04:00
  • 3afc125ecb Add test to verify bad query behavior of xblock_handler Calen Pennington 2014-08-28 14:31:46 -04:00
  • 8dc7f34295 Improve debuggability when call-count numbers don't match up Calen Pennington 2014-08-11 13:43:22 -04:00
  • 20a66ee2ef The main django template needs header and footer feature flags. Stephen Sanchez 2014-08-29 13:09:20 +00:00
  • 118baafb1f Merge pull request #4943 from edx/mvo/bumping_bok_choy_version clytwynec 2014-08-29 10:08:51 -04:00
  • 9d4bf89058 Exclude courses from the auto-registration A/B test Will Daly 2014-08-28 15:18:27 -04:00
  • 539dd0c46b Merge pull request #5010 from edx/waheed/refactor-verify-course-id-decorator Waheed Ahmed 2014-08-29 17:07:26 +05:00
  • 2e88e33847 Refactor verify course id decorator and fixed tests. Waheed Ahmed 2014-08-28 18:20:45 +05:00
  • dbe1ba095a Merge pull request #4805 from edx/zub/bugfix/std2007-jumptoid zubair-arbi 2014-08-29 16:01:14 +05:00
  • cb826dd465 Merge pull request #4985 from edx/waheed/lms11132-fix-invalid-key-error-change-enrollment Waheed Ahmed 2014-08-29 15:46:26 +05:00
  • 89e03d5225 update get_parent_location method to select non-orphan parents from multiple parents STUD-2007 zubair-arbi 2014-08-29 12:59:45 +05:00
  • 048984ba1d Fixed InvalidKeyError on change enrollment. LMS-11132 Waheed Ahmed 2014-08-27 15:05:15 +05:00
  • 8a7fef072d Merge pull request #4937 from edx/dan-f/improve-course-group-coverage Daniel Friedman 2014-08-28 19:08:56 -04:00
  • 87068c41ae Merge pull request #5012 from edx/jbau/fix-contained-in-order Jason Bau 2014-08-28 15:05:42 -07:00
  • 64c94cf3cf Merge pull request #4686 from Stanford-Online/stv/i18n/gettext Sarina Canelake 2014-08-28 17:39:51 -04:00
  • a01e57ee71 Improve test coverage for course groups Daniel Friedman 2014-08-20 13:05:42 -04:00
  • 688909eb76 bumping bok choy version Minh Tue Vo 2014-08-22 13:24:52 -04:00
  • d9c7a42e07 Merge pull request #4950 from edx/sarina/fix-18n Sarina Canelake 2014-08-28 16:31:14 -04:00
  • 335298c8e3 Studio: adding in usage note to UX reference templates Brian Talbot 2014-08-28 11:59:17 -04:00
  • d233570c48 Remove i18n from ux reference templates Sarina Canelake 2014-08-22 17:04:25 -04:00
  • fe3472cb7c Merge pull request #5013 from edx/will/ecom-113 Will Daly 2014-08-28 15:19:11 -04:00
  • 978ed1064c Removed spacebar event handler, because it did more harm than good. Dave St.Germain 2014-08-28 15:11:47 -04:00
  • 63cfcd3de4 change PaidCourseRegistration.contained_in_order Jason Bau 2014-08-28 10:08:00 -07:00
  • 83bfb17807 Use new-style course locators consistently when setting the donation amount in the session Update devstack settings to use new CyberSource API Will Daly 2014-08-28 12:39:18 -04:00
  • 173952481f Merge pull request #4984 from edx/cdodge/fix-white-label-footers chrisndodge 2014-08-28 13:38:38 -04:00
  • 3af9943de8 Bugfix for ECOM-199: Visitors removed from auto-enroll pool if they need to authenticate while attempting to enroll Sets a session variable as soon as a user enters the experimental condition to ensure that they stay in that condition, even if they later access the control URL (e.g. from a redirect on the login page) Will Daly 2014-08-28 07:03:51 -04:00
  • 9a554ec39b Merge pull request #5008 from edx/will/style-fixups-in-student-tests Will Daly 2014-08-28 12:14:28 -04:00
  • 7d6c466c52 Merge pull request #4612 from edx/dcs/matlab-api-tweak Dave St.Germain 2014-08-28 12:07:12 -04:00
  • 739ee04fad Merge pull request #4979 from edx/sanchez/update-login-button-styles Stephen Sanchez 2014-08-28 10:50:54 -04:00
  • 2efee4eb88 Merge pull request #4939 from edx/ammar/bok-choy-transcript-tests-batch3 muhammad-ammar 2014-08-28 19:44:24 +05:00
  • 50535ac8a8 Merge pull request #5004 from edx/waheed/lms11249-fix-typo-on-id-verfication Waheed Ahmed 2014-08-28 19:31:24 +05:00
  • d39da7fd27 Merge pull request #4780 from cpennington/split-bulk-operations Calen Pennington 2014-08-28 09:58:20 -04:00
  • bedb8830f6 Fixed typo on student id verification. LMS-11249 Waheed Ahmed 2014-08-28 14:29:54 +05:00