Commit Graph

325 Commits

Author SHA1 Message Date
Eugeny Kolpakov
dadc78aabd Merge pull request #7336 from open-craft/eugeny/course-team-to-backbone
Unified Course Team and Library Users page. Converted both to Backbone.
2015-03-24 17:06:38 +03:00
E. Kolpakov
9a56b800ee Unified Course Team and Library Users page. Converted both to Backbone.
Converted lettuce Course Team page tests to bok choy
2015-03-24 12:09:19 +03:00
muzaffaryousaf
e6c75529c0 Cohort discussion topics via UI in instructor dashboard.
TNL-1256
2015-03-23 14:28:22 +05:00
Usman Khalid
e07f45b5dd Removed cohort_config from advanced settings page.
TNL-1258
2015-03-23 09:58:25 +05:00
Muhammad Ammar
3ce494f5c5 Enable/disable cohorts from the instructor dashboard and move cohorts management to its own tab
TNL-1268
2015-03-23 09:21:15 +05:00
muzaffaryousaf
d839692437 Added get_cohort_associated_assignment_type method. 2015-03-23 09:10:59 +05:00
muhammad-ammar
0ebd8c29b0 Allow Instructor To Rename Cohorts And Set Cohort Assignment Method
TNL-181
2015-03-23 09:10:59 +05:00
Ahsan Ulhaq
60cb7cf33a Merge pull request #7325 from edx/ahsan/tnl-1693-standarize-button-on-assessment-types
Standrize buttons in assessment problems
2015-03-20 18:50:27 +05:00
Chris Rodriguez
5ae7cc7ee1 UX-1642 Making visual tweaks and enhancements to the logistration form 2015-03-18 12:14:31 -04:00
Jonathan Piacenti
568acb56b0 Library setting for show/hide children previews + client-side code to toggle it. 2015-03-18 08:59:58 -05:00
Matt Drayer
16e63c9e1e Added Certficates Web/HTML View 2015-03-13 12:16:13 -04:00
Ahsan Ulhaq
a715bd7053 Standrize buttons in assessment problems
Assessment problems was having input type="button" which cause accessibility issues.
changed them to <button> and added span with class sr.

TNL-1693
2015-03-13 21:09:04 +05:00
Kelketek
a7e1f9caf3 Merge pull request #7301 from open-craft/course-import-page-fix
Replace broken logic in import template with working logic in view.
2015-03-12 18:15:32 -05:00
Jonathan Piacenti
8c920b469c Replace broken logic in import template with working logic in view. 2015-03-12 20:13:47 +00:00
Nimisha Asthagiri
8e5563d467 Do not show video_upload_pipeline advanced setting if the feature is disabled. 2015-03-11 17:58:32 -04:00
Greg Price
f0322b9662 Merge branch 'release' 2015-03-11 11:14:48 -04:00
Kelketek
91642dce33 Merge pull request #7245 from open-craft/studio-home-test
Exfoliate flaky studio home test. (SOL-430)
2015-03-11 09:33:21 -05:00
Jonathan Piacenti
8ad4d081fb Added library import and export via .tar.gz'd XML files. 2015-03-10 21:29:29 +00:00
Daniel Friedman
934abf3c19 Check access for discussion modules in forums
TNL-650

Conflicts:
	lms/djangoapps/django_comment_client/base/views.py
	lms/djangoapps/django_comment_client/tests/test_utils.py
	lms/djangoapps/django_comment_client/tests/utils.py
	lms/djangoapps/django_comment_client/utils.py
2015-03-09 15:02:48 -04:00
Jonathan Piacenti
5aba2f0e6c Exfoliate flaky studio home test. 2015-03-09 16:27:00 +00:00
David Baumgold
dca05a6095 Merge branch 'release' 2015-03-06 08:54:22 -05:00
Xavier Antoviaque
7338cc1286 Merge pull request #7148 from open-craft/library-selector
Show a select box when editing a library content block (SOL-123)
2015-03-06 09:16:02 +01:00
jsa
13ba2c4a57 Revert "Merge pull request #6771 from edx/dan-f/forums-filter-discussion-modules"
This reverts commit 086a2ba783, reversing
changes made to a44132ec18.  Some minor
code quality issues were addressed as part of this change.

Conflicts:
	lms/djangoapps/django_comment_client/base/views.py
	lms/djangoapps/django_comment_client/utils.py
2015-03-05 16:57:46 -05:00
David Baumgold
a37a50cf3b Merge branch 'release' 2015-03-05 12:10:27 -05:00
Braden MacDonald
93e5a56d79 Show a select box when editing a library content block 2015-03-04 13:32:15 -08:00
Zia Fazal
e21ff20375 backend changes based on feedback
Conflicts:
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/instructor_task/api.py

refined entrance exam student attempts reset

Quality improvements 1/16

added rescore, delete state and task history functionality

added unit tests for entrance exam reset attempts

added unit tests for re scoring of entrance exam and task history

improved test coverage

Got rid of pep violation

feedback changes and added jasmine test

added more jasmine tests for Javascript changes

added bok-choy tests for UI changes

replaced input containing <p> tags with <label>

Removed ee element assertions to avoid js error

Added call to super.setUp()

changes based on feedback on 2/18

Writing tests in JS instead of coffee script

commit related to skip entrance exam 2/13

fixed bad-continuation quality error

fixed broken bok-choy test

changes based on feedback on 2/18

added js tests and removed coffee script tests

fixed broken bok-choy and unit tests

changes left while rebasing

rephrase test titles

do not need these libs

changes based on feedback on 2/24

changes text which was left

Changes based on feedback on 3/3
2015-03-04 15:32:56 +05:00
cahrens
167bd05ac8 Add bok choy coverage for correctly displayed name and email address. 2015-03-03 17:16:47 -05:00
Daniel Friedman
c8434ef9c8 Check access for discussion modules in forums
TNL-650
2015-02-25 11:31:18 -05:00
Ben Patterson
954d8ed9a0 Merge pull request #7070 from edx/benp/fix-tnl1479
Wait for DOM to reflect the selected option.
2015-02-24 10:49:47 -05:00
Ben Patterson
8e7c17d50f Wait for DOM to reflect the selected option.
TNL-1479
2015-02-24 08:24:39 -05:00
Zia Fazal
b3f85e1d4a Instructor Dashboard management tools for Entrance Exams
Conflicts:
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/instructor_task/api.py

refined entrance exam student attempts reset
added rescore, delete state and task history functionality
2015-02-23 15:04:05 -05:00
Ben Patterson
d7cbe46994 Flakiness fix for cohort group selection. 2015-02-23 06:28:25 -05:00
Anton Stupak
ca8bfa84e7 Merge pull request #6941 from edx/anton/fix-flaky-tests
TNL-454: Fix flaky bok-choy tests.
2015-02-20 14:31:42 +02:00
muzaffaryousaf
a31e38416d Adds content group "Delete" and "Usage" functionality to group configurations page on cms.
TNL-1185
2015-02-20 14:56:22 +05:00
polesye
4b551b5357 TNL-454: Fix flaky bok-choy tests. 2015-02-19 14:43:34 +02:00
Sarina Canelake
73c309935b Merge pull request #6679 from open-craft/problem-tooltips
Support for inline explanatory popups in problem XML
2015-02-18 08:37:03 -05:00
Jesse Zoldak
405c92f4f4 Fix flaky library container test TE-745 2015-02-11 12:47:02 -05:00
Jesse Zoldak
07e0eee2bd Fix flaky content library test 2015-02-06 14:59:31 -05:00
Braden MacDonald
3fd9fa6415 Support for inline explanatory popups in problem XML 2015-02-05 16:56:02 -08:00
polesye
d02d3b7926 TNL-1299: Update default video. 2015-02-05 10:55:36 +02:00
Giulio Gratta
560ce55896 Add cosmetic price field to studio & logic
- Price field added to Advanced Settings
- Function that decides which price to display
- Test added to check that the function outputs correct price
- Added feature flag and conditional to decide whether to display course price or not
- Feature Flag to show or hide course price on Course About page sidebar when not using shopping cart
2015-02-03 09:40:00 -08:00
Renzo Lucioni
a8bed5ce98 Make logistration generally available if feature flag is active
Makes logistration available at /login and /register as well as /accounts/login/ and /accounts/register/. In addition:

- Adds support for redirect URLs in third party auth for combined login/registration page
- Adds support for external auth on the combined login/registration page
- Removes old login and registration acceptance tests
- Adds deprecation warnings to old login and register views
- Moves third party auth util to student_account
- Adds exception for microsites (theming)
2015-01-30 13:28:30 -05:00
Renzo Lucioni
e24d4d96ad Merge pull request #6720 from edx/renzo/remove-split-verification-session-flag
Remove old payment and verification flow
2015-01-29 16:57:40 -05:00
Renzo Lucioni
d5fa69ee54 Fix flaky bok-choy tests caused by malformed URL 2015-01-29 11:36:03 -05:00
Renzo Lucioni
80589eab36 Remove old payment and verification flow
Removes old payment and verification endpoints, views, templates, and tests, making the new split flow the default. The SEPARATE_VERIFICATION_FROM_PAYMENT feature flag is also removed.
2015-01-29 10:56:25 -05:00
Davorin Sego
e09d47b122 Courseware Search integration 2015-01-28 21:34:58 -05:00
Matt Drayer
9d2a0a4e9d Merge pull request #6705 from edx/mattdrayer/update-milestones-hash
Bok Choy test now passes
2015-01-28 17:38:18 -05:00
Matt Drayer
e5f00e626a Bok Choy test now passes 2015-01-28 17:37:49 -05:00
Matt Drayer
ce5c7948fa Added field to FILTERED_LIST plus a new bokchoy test 2015-01-28 13:11:36 -05:00
Renzo Lucioni
4f23c31d8b Fix intermittent failures in bok-choy tests of payment and verification 2015-01-26 17:22:21 -05:00