Commit Graph

520 Commits

Author SHA1 Message Date
Jesse Zoldak
ab63243d01 Decorate flaky test SOL-618 2015-04-02 14:26:46 -04:00
Christine Lytwynec
0370e90611 skip acid block tests 2015-04-01 12:23:31 -04:00
Matt Drayer
cbf336e8e0 Merge pull request #7293 from edx/ziafazal/access-gating-for-entrance-exam
Entrance exam gating
2015-03-31 13:38:00 -04:00
Zia Fazal
cc04bb990e Add new gating logic to restrict users from accessing courseware when an entrance exam is required
- added entrance exam check on course info
- staff can by pass gating and added tests
- refined gating logic
- changes after rebasing with Asad's branch
- check ENTRANCE_EXAMS feature is enabled
- updated test to reflect new logic
- catering anonymous user in entrance exam permission
- fixed broken tests
- change after feedback on 16/3
- fix for a broken test
- created new entrance_exams module
- fixed quality error and improved test coverage
- put get_required_content back in milestones helper
- Refactored entrance exams logic
- Refactored tabs logic
- Fixed broken unit test
- changes after feedback from dan-f on 3/27
- removed unnecessary user.is_anonymous check
- Addressed PR feedback
- Addressed commit-specific feedback
- Rework guard clauses
- Add coverage for course info case
2015-03-31 12:12:04 -04:00
Matt Drayer
d9611dcd9f Merge pull request #7382 from edx/mattdrayer/SOL-461
mattdrayer/SOL-461: Student dashboard clean-up
2015-03-31 10:53:45 -04:00
Marco Morales
bd5b0b31a0 Matt - javascript and test changes, Marco - styling feedback from initial reviews 2015-03-31 08:47:17 -04:00
Martyn James
70819203f8 Merge pull request #7443 from edx/mjevtic/SOL-336
Fixed flaky test(s) - SOL-336 - merging updates
2015-03-27 14:58:25 -04:00
marjev
29bceffcea Fixed flaky test(s) - (SOL-336) 2015-03-27 14:48:36 +01:00
Braden MacDonald
19bd7005e6 Consistently use display_name_with_default in Studio 2015-03-26 13:24:11 -07:00
Ben Patterson
5615f0bfed Merge pull request #7494 from edx/benp/flag-cohort-test-flaky
Fix empty promise. It was always evaluating to true.
2015-03-26 13:55:04 -04:00
Ben Patterson
dae5cdfceb Fix empty promise. It was always evaluating to true.
This addresses TNL-1808 (and likely other flaky tests
in this area).
2015-03-26 12:27:30 -04:00
Ben Patterson
b03c4eca63 Opening wiki editor should be extracted into a method. 2015-03-26 11:05:55 -04:00
Ben Patterson
6e2e40cc14 Add course wiki acceptance tests. 2015-03-26 11:05:55 -04:00
Matt Drayer
8107f803f5 Merge branch 'release' 2015-03-25 13:38:43 -04:00
Marco Morales
dfcb3f2b6e Dashboard styling cleanup/changes, including:
- reversing the positions of the sidebar and course listing
- html for new social icons (not currently wired up)
- new actions dropdown for unenrollment and email settings
- partial reorganization of dashboard.scss styles
- text fix for unenrollment
- added missing endif, p/hgroup closures
- reverted la.course-item
- removed extra operator
- fixed broken bok choy test
2015-03-25 10:51:45 -04:00
Mark Sadecki
e1251bfecd Merge pull request #7416 from edx/cptvitamin/UX-1838-dashboard-heading-structure-n-context
adds additional context for SR users and corrects heading order
2015-03-24 13:51:33 -04:00
Christine Lytwynec
5204fd6519 wait for both window.MathJax and window.MathJax.onReady 2015-03-24 11:03:09 -04:00
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
Greg Price
0f0ee6a394 Merge pull request #7455 from edx/aleffert/video_web_only
Add web-only setting to video module
2015-03-23 15:38:18 -04:00
Greg Price
438ce5f7a4 Add web-only setting to video module
This is needed for courses that license video content where the license
allows only for viewing on the web, not on mobile apps.

JIRA: MA-307
2015-03-23 14:45:17 -04: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
Usman Khalid
d59be9949e Use cohort settings from CourseCohortSettings.
TNL-1258
2015-03-23 09:43:00 +05:00
Muhammad Ammar
70efd28483 Changes after Andy's Review 2015-03-23 09:21:21 +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
Jesse Zoldak
bb4e57762f Decorate flaky test SOL-336 2015-03-20 10:13:11 -04: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
Mark Sadecki
1cf7ccc334 dropped element selector in CSS and test file 2015-03-19 15:31:30 -04: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
Christine Lytwynec
8ff4886888 Merge pull request #7337 from edx/clytwynec/flaky-tests-test_password_reset_success
decorate flaky test
2015-03-13 13:21:55 -04: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
Jesse Zoldak
766663eefa Merge pull request #7217 from edx/ziafazal/fix-studio-settings-flaky-test
fixed a flaky test (acceptance.tests.studio.test_studio_settings_details.SettingsMilestonesTest.test_prerequisite_course_save_successfully)
2015-03-13 11:19:50 -04:00
Christine Lytwynec
fd6d135052 decorate flaky test 2015-03-13 10:53:09 -04: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
Zia Fazal
0b28c3fdfb trying to fix a flaky test
removed flaky decorator

added promise to make sure value is selected

refined promise callback

return False if option has not value
2015-03-10 18:59:49 +05:00
asadiqbal
5a7ac441e5 Entrance Exam authoring and messaging updates
Multi-commit history:
- hide drag functionality for entrance exam section.
- hide entrance exam subsection elements e.g. delete, drag, name etc.
- show unit/verticals expanded in case of entrance exam
- modify code in order to allow user to update entrance exam score from UI.
- write down unit tests.
- write down Jasmine tests.
- add bok-choy test
- updated bok-choy test
- internationalize string
- repositioned sequential block creatori
- SOL-221 (entrance exam message)
- SOL-199 LMS Part (show entrance exam content) and hide the course navigation bar.
- redirect the view in case of entrance exam.
- update code structure as per suggestions
- write down unit tests
- fix pep8
- instead of hiding the exam requirement message, now also showing the exam the completion message (success state).
- write down unit test to show exam completion message.
- Update code as per review suggestions
- update doc string
- addressed review suggestions
- change sequential message text
- css adjustments
- added new css class for entrance exam score in studio
- added Jasmine test for remaning coverage
- sequential message should appear under the context of entrance exam subsection.
- updated text in CMS and LMS as per suggestions.
- added unit text to insure sequential message should not be present in other chapters rather then entrance exam.
- skip setter if empty prerequisite course list
- exclude logic from xblock_info.js that is specifically related to entrance exam.
- added js tests and updated code as per suggestions
- added tests
- addressed several PR issues
- Several small fixes (style, refactoring)
- Fixed score update issue
- added some more unit tests.
- code suggested changes.
- addressed PR feedback
2015-03-10 09:24:43 -04: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
cahrens
3e7488f52c Add flaky decorator.
Related to TNL-1642.
2015-03-06 13:04:42 -05:00
cahrens
758d2f4e3b Add flaky decorator.
Related to TNL-1619.
2015-03-06 13:04:42 -05:00