Commit Graph

  • 63a49d6d1b Merge pull request #9398 from edx/release Renzo Lucioni 2015-08-20 10:08:52 -04:00
  • 987ca4b4ea Merge pull request #9396 from edx/awais786/ECOM-2106-verificatoin-bug-with-otto Ahsan Ulhaq 2015-08-20 19:08:29 +05:00
  • ad77bc51ec Fixing issue for french language ECOM-1932 Tasawer 2015-08-20 17:49:52 +05:00
  • f17df2d009 Merge pull request #9390 from edx/patch-2015-08-20 Renzo Lucioni 2015-08-20 08:16:54 -04:00
  • 653554fd7a fixing issue with student reverification. ECOM-2106 Awais 2015-08-20 16:25:05 +05:00
  • 74c7c2ad77 Merge pull request #9392 from edx/tasawer/bugfix/ecom-1996-hiding-find-course-button-on-edge tasawernawaz 2015-08-20 14:13:10 +05:00
  • 46f2adf68c Hiding find courses button from dashboard of edge.edx.org ECOM-1996 Tasawer 2015-08-20 11:45:34 +05:00
  • c6bbc7248f Merge pull request #9361 from edx/efischer/bok-choy-flakes Eric Fischer 2015-08-19 21:52:47 -04:00
  • f84243d8dd Merge pull request #9388 from edx/release-2015-08-18-conflict Renzo Lucioni 2015-08-19 18:08:25 -04:00
  • cea22a12ff Allow user partition version >= current version. Will Daly 2015-08-19 11:35:47 -07:00
  • a9fd1da519 Merge branch 'release' into release-2015-08-18-conflict Renzo Lucioni 2015-08-19 16:53:34 -04:00
  • c170ff44e3 Fixing flaky bokchoy TeamPageTests Eric Fischer 2015-08-18 11:19:51 -04:00
  • 2f5193cf18 Merge pull request #9383 from edx/christina/search-sort Christina Roberts 2015-08-19 16:48:10 -04:00
  • a495847b45 Merge pull request #9373 from edx/ahsan/ECOM-2114-Add-USD-to-prices-on-track-selection-pages Ahsan Ulhaq 2015-08-20 00:37:27 +05:00
  • e56c3d91af Merge pull request #9310 from edx/frances/teams-padding-responsive Marco Morales 2015-08-19 15:31:55 -04:00
  • 0fed2f5987 Merge pull request #9364 from edx/ned/django-1-4-22 Ned Batchelder 2015-08-19 15:06:16 -04:00
  • 5ee49351f1 Merge pull request #9346 from edx/efischer/fix_docs_course_id_team_membership Eric Fischer 2015-08-19 14:59:38 -04:00
  • 3d62580fc2 Add USD labels to prices on track selection pages Ahsan Ulhaq 2015-08-19 14:34:08 +05:00
  • 295108c9a4 Add sorting by last_activity_at. cahrens 2015-08-19 12:28:33 -04:00
  • 6f636d7497 Update edx-ora2 to release-2015-08-19T17.17. Usman Khalid 2015-08-19 22:22:16 +05:00
  • 276cba90c6 Merge pull request #9262 from edx/christina/search-sort Christina Roberts 2015-08-19 12:25:07 -04:00
  • 86f4806e84 Updating documentation for team_membership endpoint Eric Fischer 2015-08-17 11:26:27 -04:00
  • a361191e00 Merge pull request #9381 from edx/release-2015-08-18-conflict Renzo Lucioni 2015-08-19 12:02:23 -04:00
  • c5f5a58c28 Allow course staff and privileged users to create multiple teams. cahrens 2015-08-17 10:14:59 -04:00
  • 25a117613d Revert "Merge pull request #8724 from Colin-Fredericks/ColinF-partial-credit" Sarina Canelake 2015-08-17 11:31:51 -04:00
  • 674b92f0b9 Only let global staff (is_staff=True) see the Proctoring tab in the Instructor Dashboard Chris Dodge 2015-08-16 13:55:08 -04:00
  • c08fbd1406 only include JS when feature flag is on and the course has proctoring enabled Chris Dodge 2015-08-14 14:27:55 -04:00
  • da3ac3e65b Validating team size on join, server-side Eric Fischer 2015-08-14 10:41:22 -04:00
  • 08b9b03b9f Merge pull request #9363 from edx/will/credit-request-exception-fix Will Daly 2015-08-19 08:05:59 -07:00
  • 9f92054ca7 Fix tests to work with Django 1.4.22 Ned Batchelder 2015-08-19 10:38:48 -04:00
  • 5ae6beb408 Merge pull request #9379 from edx/ned/i18ntools-013 Ned Batchelder 2015-08-19 11:04:18 -04:00
  • 9fe6dd2791 Call super instead of referencing superclass directly. cahrens 2015-08-18 14:33:48 -04:00
  • 1bd4b1d60c Add sorting by team_count, as well as secondary sort. cahrens 2015-08-10 20:30:29 -04:00
  • 9e31193100 Merge pull request #9295 from edx/bbeggs/ensure-indexes-PLAT-785 Brian Beggs 2015-08-19 10:17:42 -04:00
  • 2cfe2a4697 Use 0.1.3 of i18ntools Ned Batchelder 2015-08-19 10:08:52 -04:00
  • e990da0f77 Merge pull request #9372 from edx/awais786/ECOM-2113-change-donation-value Awais Qureshi 2015-08-19 18:30:03 +05:00
  • d9cc3ed4fe Merge pull request #9371 from edx/tasawer/story/ecom-1956-updte-validation-message-on-registration-page tasawernawaz 2015-08-19 14:42:19 +05:00
  • 05e2cc9402 fetch StudentModule via query-chunking Zia Fazal 2015-08-17 18:21:57 +05:00
  • 4ca44effec Change default donation amount to $10. ECOM-2113 Awais 2015-08-19 12:52:45 +05:00
  • cefe0daa74 Updating validation error message on signup page. ECOM-1956 Tasawer 2015-08-19 12:50:12 +05:00
  • 81af277db1 Merge pull request #8350 from edx/db/clean-up-django-orm-usage David Baumgold 2015-08-18 16:05:05 -04:00
  • 2aa7e266cf Clean up the Django ORM usage a bit David Baumgold 2015-06-03 16:46:30 -04:00
  • c3234c1cfc Upgrade Django to 1.4.22 Ned Batchelder 2015-08-18 14:38:43 -04:00
  • 8e35fc677e Merge pull request #9328 from edx/clintonb/compressed-text-field-fix Clinton Blackburn 2015-08-18 13:58:07 -04:00
  • e4a1ebd11c Specify course key when retrieving credit requirements. Will Daly 2015-08-18 09:15:32 -07:00
  • de15f8ec55 Merge pull request #9360 from edx/diana/add-last-activity Diana Huang 2015-08-18 12:03:48 -04:00
  • c49d51f98b Merge pull request #9359 from edx/ahsan/ECOM-2117-style-issues-on-credit-status-in-dashboard zubair-arbi 2015-08-18 20:42:33 +05:00
  • ce8f311256 Add a new last_activity_at field. Diana Huang 2015-08-14 16:01:36 -04:00
  • 1e6d83b59e Merge pull request #9307 from cpennington/user-state-client-metrics Calen Pennington 2015-08-18 10:43:37 -04:00
  • 207ce4eda5 Resolved decompression errors during tests Clinton Blackburn 2015-08-14 17:25:10 -04:00
  • 13ef9a62d1 Merge pull request #9358 from edx/ziafazal/SOL-1044-fix-org-ddl Matt Drayer 2015-08-18 10:10:36 -04:00
  • 1b66abc50a Merge pull request #9323 from edx/efischer/expand_instructor_definition Eric Fischer 2015-08-18 10:09:32 -04:00
  • ab3b2ebd9a Fixing problematic bok_choy test Eric Fischer 2015-08-17 17:09:25 -04:00
  • 722c5bb90d Style issues on the credit status in the dashboard Ahsan Ulhaq 2015-08-18 17:42:03 +05:00
  • 53f1b2de0c fix for organization id drop down not populating Zia Fazal 2015-08-18 13:37:06 +05:00
  • 8faff973df Quality improvements Marko Jevtic 2015-08-18 08:26:44 +00:00
  • 3bf6b9bd32 Merge pull request #9357 from edx/christina/tnl-3072 Christina Roberts 2015-08-17 20:30:17 -04:00
  • 350d15876a Expand instructor definition Eric Fischer 2015-08-14 14:21:50 -04:00
  • c71d61e533 Adding django command to create mongodb indexes Brian Beggs 2015-08-12 16:57:26 -04:00
  • 41f207dec3 The stale flag needs to take into account its previous state. cahrens 2015-08-17 17:05:27 -04:00
  • df5b2dadda Move functionality for exporting a CSV of all student answers to a given problem from legacy instructor dash to new instructor dash. Tim Krones 2015-07-22 16:14:57 +02:00
  • 19604a4a6e Merge pull request #9038 from mitocw/fix/aq/extended_labels_issues_ccx Mark Sadecki 2015-08-17 14:31:38 -04:00
  • 8b704cc2ec Merge pull request #9351 from edx/release Renzo Lucioni 2015-08-17 13:17:55 -04:00
  • 9cbc8564a1 Merge pull request #9109 from jazkarta/ccx_course_published_signal Calen Pennington 2015-08-17 13:14:00 -04:00
  • 5481a6a1a8 Merge pull request #9146 from open-craft/OC-791-course-timeline Sarina Canelake 2015-08-17 13:10:57 -04:00
  • 5f5daa266e Merge pull request #9342 from edx/christina/privileged-multiple-teams Christina Roberts 2015-08-17 12:33:41 -04:00
  • 7cdfe2ea95 Merge pull request #9350 from edx/jibshet/escape-studio-courses Kevin Falcone 2015-08-17 12:27:43 -04:00
  • 58bc8e4973 Merge pull request #9349 from edx/jibsheet/escape-studio-courses-to-rc Kevin Falcone 2015-08-17 12:27:06 -04:00
  • c13f296103 HTML-escape uses of course display name. Peter Fogg 2015-08-07 11:22:05 -04:00
  • ed9b5c24db Merge pull request #9347 from edx/sarina/revert-pc Sarina Canelake 2015-08-17 12:17:50 -04:00
  • 2c6a9c5ebd HTML-escape uses of course display name. Peter Fogg 2015-08-07 11:22:05 -04:00
  • 3e19ebe9a8 Merge pull request #9348 from edx/will/ecom-2019-to-rc Will Daly 2015-08-17 08:47:28 -07:00
  • 9529359681 Merge pull request #9297 from edx/waheed/tnl3049-fix-admin-course-access-role-required-field-value Waheed Ahmed 2015-08-17 20:41:22 +05:00
  • 85c4c68e18 Merge pull request #9331 from edx/cdodge/only-global-staff-see-proctoring chrisndodge 2015-08-17 11:40:52 -04:00
  • 7ee5d35fbb Fixing minimum grade value error ECOM-2109 Tasawer 2015-08-17 14:40:41 +05:00
  • 425b8c6ba8 Allow course staff and privileged users to create multiple teams. cahrens 2015-08-17 10:14:59 -04:00
  • 2861cbbf35 Revert "Merge pull request #8724 from Colin-Fredericks/ColinF-partial-credit" Sarina Canelake 2015-08-17 11:31:51 -04:00
  • 2dd3f6c60f Merge pull request #9257 from edx/clrux/ux-2515-calc-label clrux 2015-08-17 10:40:19 -04:00
  • 1bd0ce572e Only let global staff (is_staff=True) see the Proctoring tab in the Instructor Dashboard Chris Dodge 2015-08-16 13:55:08 -04:00
  • f1af5b5c29 Fixed admin course access role required field value not populating. TNL-3049 Waheed Ahmed 2015-08-13 19:54:58 +05:00
  • 63edfc6eb4 Applied suggestion from the 1st review Marko Jevtic 2015-08-17 14:14:17 +00:00
  • e57bf4a5d4 Merge pull request #9326 from edx/zoldak/TNL-3069 Jesse Zoldak 2015-08-17 09:29:03 -04:00
  • 1ac701ebed Merge pull request #9338 from edx/muzaffar/revert-master-changes Muzaffar yousaf 2015-08-17 18:16:43 +05:00
  • b9bd9ae3f6 Merge pull request #9336 from edx/tasawer/bugfix/ecom-2019-fixing-mininmum-grade-value-error tasawernawaz 2015-08-17 18:15:32 +05:00
  • 64f5df575a Merge pull request #9329 from edx/renzo/fix-release-script Renzo Lucioni 2015-08-17 08:57:10 -04:00
  • 9e7d278dd0 Revert "Accessibility fixings." muzaffaryousaf 2015-08-17 16:52:01 +05:00
  • e73a855659 Revert "Accessibility fixings for new post button on teams." muzaffaryousaf 2015-08-17 16:51:52 +05:00
  • e133a63a5b Accessibility fixings for new post button on teams. muzaffaryousaf 2015-08-17 16:27:45 +05:00
  • 789732a7c8 Accessibility fixings. muzaffaryousaf 2015-08-17 15:56:58 +05:00
  • 58b088e109 Fixing minimum grade value error ECOM-2109 Tasawer 2015-08-17 14:40:41 +05:00
  • e18fa2f489 Fixed explicit labels related issues on CCX coach dashboard and membershp team management to fix #21 Amir Qayyum Khan 2015-07-23 13:00:21 +05:00
  • c9fe2b9756 Fixing drag and drop labels Jolyon Bloomfield 2015-08-16 19:28:29 -04:00
  • a345edfa1c Merge pull request #9324 from edx/cdodge/dont-load-proctoring-JS-unnecessarily chrisndodge 2015-08-16 08:36:09 -04:00
  • e19fa2c46f only include JS when feature flag is on and the course has proctoring enabled Chris Dodge 2015-08-14 14:27:55 -04:00
  • 03e6a12ede Fix release script typo Renzo Lucioni 2015-08-15 14:31:41 -04:00
  • aa5fed718d Merge pull request #9207 from edx/talbs/remove-mktg-iframe Brian Talbot 2015-08-14 17:42:01 -04:00
  • 5e928417f1 Merge pull request #9325 from edx/christina/more-teams-tests Christina Roberts 2015-08-14 16:36:01 -04:00
  • 944f51a60b LMS: removing old and not needed edx.org MKTG iframe assets Brian Talbot 2015-08-05 13:13:33 -04:00
  • 996ce1d62c Mark TeamPageTest class as flaky TNL-3069 Jesse Zoldak 2015-08-14 15:33:11 -04:00
  • c929cdb54d Add an additional test case related to re-fetching data. cahrens 2015-08-14 14:48:09 -04:00