Commit Graph

  • 68b18a20b2 Merge pull request #6624 from mitocw/bdero/sysadmin-dashboard-link Sarina Canelake 2015-01-15 16:08:25 -05:00
  • b9bd659861 Merge pull request #6654 from edx/merge-release-into-master Adam 2015-01-15 16:00:38 -05:00
  • ca3d84a5d4 New pre-requisite course feature via milestones app Zia Fazal 2014-11-21 16:38:13 +05:00
  • c4cd94d756 Merge pull request #6583 from edx/muhhshoaib/shoppingcart-redemption-page-cross-browser-compatibility-fix chrisndodge 2015-01-15 14:57:05 -05:00
  • 4381ccd463 Merge remote-tracking branch 'origin/release' into merge-release-into-master Adam Palay 2015-01-15 14:51:34 -05:00
  • b390e18d34 Improve i18n on course about page David Baumgold 2015-01-09 14:06:56 -05:00
  • c281096f68 Merge pull request #6648 from edx/hotfix/2015-01-15 Adam 2015-01-15 14:28:48 -05:00
  • adc64122ae Merge pull request #6649 from jzoldak/zoldak/fix-yt-stub Jesse Zoldak 2015-01-15 13:25:52 -05:00
  • fc74af6772 Remove tddium-only scripts. Ben Patterson 2015-01-15 13:15:18 -05:00
  • 5959edb493 Merge pull request #6645 from edx/aamir-khan/ECOM-887-post-payment-message Awais Qureshi 2015-01-15 23:12:58 +05:00
  • 3bdee98f4c Request the iframe API from youtube in tests every time it is needed TNL-454 Jesse Zoldak 2015-01-15 10:12:26 -05:00
  • c95d90a328 Merge pull request #6604 from edx/markhoeber-developer-guide-move Mark Hoeber 2015-01-15 11:58:29 -05:00
  • b3fda9c561 Merge pull request #6646 from edx/missed-an-ellipses David Baumgold 2015-01-15 11:56:03 -05:00
  • 1fcca3a942 add back inclusion of the receipt_custom_pane.html at the bottom of the receipt page Chris Dodge 2015-01-15 11:50:15 -05:00
  • 2897a8efb3 Merge pull request #6299 from edx/cohorted-courseware Christina Roberts 2015-01-15 11:50:13 -05:00
  • 373f8e82f3 Fixed unicode error in CSV grade report generation. TNL-1196 Waheed Ahmed 2015-01-15 18:00:12 +05:00
  • 9e20057da1 Merge pull request #6478 from edx/jeskew/change_handled_exception_for_assets John Eskew 2015-01-15 10:44:01 -05:00
  • 0049c97d8f use bulk_ops on course_about jsa 2015-01-11 14:47:12 -05:00
  • 9607aa233c Remove unnecessary pylint suppression. cahrens 2015-01-14 16:54:11 -05:00
  • 69ed266f7e Studio: removing left whitespace from icons in unit visibility controls Brian Talbot 2015-01-14 16:22:50 -05:00
  • 6398af715a Make group config styles generic Frances Botsford 2015-01-09 23:30:33 -05:00
  • 39acbdcb2b End-to-end bok choy test for cohorted courseware. cahrens 2015-01-09 16:42:05 -05:00
  • 8abec98c3d fixed group config sidebar spacing, icon cleanup Frances Botsford 2015-01-09 20:48:09 -05:00
  • 66375b8541 Bok choy test for editing of content groups on Group Configuration page. cahrens 2015-01-08 13:58:18 -05:00
  • ebeb9a9948 added cohort group editing styles Frances Botsford 2014-12-31 15:13:33 -05:00
  • fff84928fa Create and edit content groups in Studio Daniel Friedman 2014-12-23 16:36:54 -05:00
  • e44ca91b2a Small accessibility fixes for cohorts Chris Rodriguez 2015-01-09 14:36:56 -05:00
  • 4f99657b6d first pass at adding cohort groups to group configuration page Frances Botsford 2014-12-23 11:33:06 -05:00
  • 21a9873757 Don't allow visibility editing in content libraries Andy Armstrong 2015-01-13 18:11:06 -05:00
  • bca6274eb5 Miscellaneous text updates Andy Armstrong 2015-01-08 15:26:10 -05:00
  • 798342e177 Rename 'cohorted content group' to 'content group' Andy Armstrong 2015-01-08 15:05:13 -05:00
  • ac58ebf7da Rename 'cohort groups' to just 'cohorts' Andy Armstrong 2015-01-08 12:08:38 -05:00
  • 1897fb65f9 Update for paged container not having a visibility editor. cahrens 2015-01-13 16:18:59 -05:00
  • 4b00566e4d Update course access check. cahrens 2015-01-13 16:09:57 -05:00
  • c86f235275 Test xml get_parent for a non-tree course TNL-1012 Don Mitchell 2015-01-05 13:02:25 -05:00
  • 5de170ff59 Short-circuit group_access check if only user_partitions are split_test partitions. cahrens 2015-01-12 14:52:46 -05:00
  • e2f7f343bd Fixing padding issues Chris Rodriguez 2015-01-12 09:23:53 -05:00
  • 8928f85fbf Cohorted Courseware: resolving missing icon from add group button in 'nohorts' scenario Brian Talbot 2015-01-11 12:32:16 -05:00
  • d556cdd586 syncing icon class syntax + semantically hiding changed icons from assistive tech Brian Talbot 2015-01-09 11:41:16 -05:00
  • f58e96a2fa Fix quality failures Andy Armstrong 2015-01-09 15:27:17 -05:00
  • 22d65acdbf Add back missing 'New Post" button Andy Armstrong 2015-01-08 00:31:57 -05:00
  • 39d9fdee34 Stop using to_deprecated_string. cahrens 2014-12-31 16:11:41 -05:00
  • 42c4071869 Implement better select handling and tests Andy Armstrong 2015-01-06 18:20:13 -05:00
  • 54a8a4fccb Addressing items in the latest PR; includes RTL-ifying all SCSS Chris Rodriguez 2015-01-06 16:23:00 -05:00
  • 79cd321028 Bok choy test improvements. cahrens 2015-01-06 11:31:57 -05:00
  • fc5b94eeeb Address most of Christina's code review comments Andy Armstrong 2015-01-05 10:38:52 -05:00
  • 8e787b4f03 New bok choy tests for content group linking. cahrens 2014-12-31 13:52:57 -05:00
  • b77e65cdc2 Assign cohorts to groups in the instructor dashboard Andy Armstrong 2014-12-18 17:23:58 -05:00
  • 674bfc4fcb Use edx namespace for Backbone classes Andy Armstrong 2014-12-18 22:23:34 -05:00
  • 5ea7ced900 Create a RESTful handle_cohort view method for GET and PUT/POST. cahrens 2014-12-18 17:09:16 -05:00
  • 9b85ac1f12 UX for associating content groups with cohorts in the instructor dashboard. Chris 2014-12-12 15:46:18 -05:00
  • ce71a940d9 Test for get_parent across branches Don Mitchell 2014-12-23 15:36:33 -05:00
  • 6fb45ef95c Studio: resolving scroll/overflow UI in component visibility settings Brian Talbot 2014-12-29 10:39:06 -05:00
  • 95ee72607d Studio: resolving visual spacing of hide from students checkboxes Brian Talbot 2014-12-29 11:11:23 -05:00
  • 4fa33e25ed Studio support for cohorted courseware Andy Armstrong 2014-12-11 10:05:00 -05:00
  • 206ea8caeb Studio: adding UI and styling for component-level access modal Brian Talbot 2014-12-01 09:32:29 -05:00
  • 561c57dbe9 Extend preview to support cohorted courseware Andy Armstrong 2014-12-01 16:34:11 -05:00
  • c4e8673db0 creation of a courseware preview menu to contain staff view toggle. Marco Morales 2014-11-12 11:06:27 -05:00
  • 55d2f1d547 test that students are auto-assigned to cohorts in partition scheme jsa 2014-12-16 12:17:22 -05:00
  • 6fb3daa772 support group_access. JIRA: TNL-649 jsa 2014-12-15 08:36:05 -05:00
  • 17d892c521 make block.get_parent() work. jsa 2014-12-08 10:11:39 -05:00
  • 36c445ba17 Notice on Developer's Guide move Mark Hoeber 2015-01-13 16:51:08 -05:00
  • dffd8648b3 Missed an ellipsis David Baumgold 2015-01-15 10:19:58 -05:00
  • 37d965d6a7 Merge pull request #6629 from edx/remove-ellipses David Baumgold 2015-01-15 10:05:16 -05:00
  • df5ba26ac6 Handle the correct exception to cause a 404 error upon asset not found instead of a 500 error. Add 404 test. John Eskew 2015-01-07 09:47:18 -05:00
  • 542509358e Merge pull request #6632 from edx/renzo/fix-logistration-icons Renzo Lucioni 2015-01-15 09:30:29 -05:00
  • 66cdb71a74 Merge pull request #6609 from mitocw/bdero/fix-detailed-gitlogs Sarina Canelake 2015-01-15 09:20:44 -05:00
  • a6fc9ab641 Merge pull request #6429 from edx/afzaledx/WL-173 chrisndodge 2015-01-15 09:14:43 -05:00
  • c4a7d770cc Remove all ellipses Bertrand Marron 2014-10-29 19:43:23 +01:00
  • ab87cd746d Merge pull request #6630 from edx/no-i18n-mock David Baumgold 2015-01-15 09:01:07 -05:00
  • f85207d8c6 Merge pull request #6387 from Shrhawk/shr/bug/TNL-1026-Advanced-Blank-Problem-text-box-hiding-text Shrhawk 2015-01-15 16:06:33 +05:00
  • 5b175cc0ca ECOM-887 Removed the "We have successfully verified your identity" line. Awais 2015-01-15 14:52:14 +05:00
  • 5bcd506e4a Fix codemirror css for long text Syed Hassan Raza 2015-01-02 20:02:49 +05:00
  • d8e076566d Improve JS course key validation to not allow special chars. Matjaz Gregoric 2015-01-08 10:38:40 +01:00
  • a6dc7061cd Collapsible import logs Brandon DeRosier 2015-01-15 02:21:33 -05:00
  • a8ebf6da7f Added the reportlab requirement to base.txt Afzal Wali 2014-12-19 16:15:34 +05:00
  • 477031e171 Merge pull request #6356 from edx/anton/logger Anton Stupak 2015-01-15 07:16:23 +02:00
  • 9d9c2af858 Merge pull request #6633 from edx/carol/docs/helptokens Mark Hoeber 2015-01-14 21:00:54 -05:00
  • 9ee2d05888 Add help tokens: cohort courses & content libraries Carol Tong 2015-01-14 20:02:28 -05:00
  • 84d7650aa1 Fix detailed gitlog Brandon DeRosier 2015-01-10 10:35:03 -05:00
  • fc0f6e9878 Logger: Add possibility to send sync requests. polesye 2014-12-23 11:52:48 +02:00
  • dbfc12ce01 Merge pull request #6321 from edx/feature/edxnotes Tim Babych 2015-01-15 02:02:13 +02:00
  • 83a5a24dce Fix broken Font Awesome icons Renzo Lucioni 2015-01-14 18:42:46 -05:00
  • 660f6cf6a5 Merge pull request #6577 from edx/tim/django-1.4.17 Tim Babych 2015-01-15 00:55:12 +02:00
  • 0ba1828f93 Fix shib code to handle course.enrollment_domain=None Jason Bau 2014-12-05 19:31:44 -08:00
  • 6453d03b80 Don't internationalize mock templates David Baumgold 2015-01-14 17:35:20 -05:00
  • a96ca40239 update django to release 1.4.18 Tim Babych 2015-01-13 00:00:31 +02:00
  • c7153be040 TNL-213: Let Students Add Personal Notes to Course Content. polesye 2014-10-23 13:06:24 +03:00
  • fd0754b4df Merge pull request #6626 from edx/clytwynec/fix-failing-login-tests Christine Lytwynec 2015-01-14 15:46:20 -05:00
  • f9d8198ef3 Merge pull request #6576 from edx/db/configure-tender-domain David Baumgold 2015-01-14 15:02:09 -05:00
  • abcf2bcad5 add test security settings to bokchoy envs Christine Lytwynec 2015-01-14 14:49:41 -05:00
  • 32bc4ff058 Merge pull request #6620 from open-craft/kelketek/library-content-plurality chrisndodge 2015-01-14 14:16:49 -05:00
  • fcab47b1e8 Add link to sysadmin dashboard on core theme Brandon DeRosier 2015-01-14 13:33:56 -05:00
  • f9115b6316 Merge pull request #6621 from edx/zoldak/fix-pep8 Jesse Zoldak 2015-01-14 12:30:20 -05:00
  • 920dfb5270 MA-216 Mobile API: display unreleased courses in enrollment list. Nimisha Asthagiri 2015-01-13 19:55:32 -05:00
  • 8316fe8560 Merge pull request #6607 from edx/talbs/fix-studio-xblockwarnings-fontawesome Brian Talbot 2015-01-14 12:13:35 -05:00
  • 8a29280cbe Fix pep8 violations in common.py Jesse Zoldak 2015-01-14 12:12:15 -05:00
  • 4d323271ee Make Tender optional and configurable David Baumgold 2015-01-12 15:44:21 -05:00
  • 18e211ff1b Merge pull request #6615 from edx/sanchez/add_enrollment_as_app Stephen Sanchez 2015-01-14 11:20:18 -05:00
  • a4ed13231c Merge pull request #5410 from edx/mjames/MoreSecureByDefault Martyn James 2015-01-14 10:58:43 -05:00