Commit Graph

432 Commits

Author SHA1 Message Date
Eric Fischer
0cf3e39c31 Replace bulk email settings with admin config models
Moves ENABLE_INSTRUCTOR_EMAIL and REQUIRE_COURSE_EMAIL_AUTH from settings files
to admin-accessible configuration models. This allows for the bulk email settings
to be modified without a new AMI deploy. See TNL-4504.

Also updates tests:
    -python tests mock out the new configurations in place of the old settings
    -lettuce test has been moved to bokchoy
        (note that there was some loss of coverage here - the lettuce tests had
        been doing some voodoo to allow for cross-process inspection of emails
        messages being "sent" by the server, from the client! In discussion with
        testeng, this seems outside the realm of a visual acceptance test. So,
        the bokchoy test simply confirm the successful queueing of the message,
        and leaves the validation of sending messages to the relevant unit tests.)
    -bok choy fixture has been added, to replace the settings in acceptance.py
    -lettuce and bok choy databases have been updated to reflect the backend changes

The new default is to have bulk_email disabled, we'll need to call this out in the
next OpenEdx release to ensure administrators enable this feature if needed.
2016-05-16 11:09:39 -04:00
AlasdairSwan
bc5daffc96 ECOM-4215 adding setup for new program details page 2016-05-12 16:39:23 -04:00
Brian Jacobel
d88aad7d79 Merge branch 'release' into bjacobel/fix-release-2016-05-10-merge-conflicts-with-master 2016-05-10 12:15:42 -04:00
Ben Patterson
c00355ae51 Fix linting issue. 2016-05-09 13:26:34 -04:00
Diana Huang
07573c5141 Replace old conditional lettuce test with bok choy version. 2016-05-06 09:38:36 -04:00
Sanford Student
d4146e7a1d accordion emits event 2016-05-05 11:48:09 -04:00
Eric Fischer
ea77c3ec42 Hide After Due setting for Timed Exams
TNL-4366
Changes in studio to allow the hide_after_due setting to be utilized.

Includes:
    -python changes to contentstore, where the data is stored.
    -refactoring of timed-examination-preference-editor.underscore, to add this
        setting and make the editor more accessible.
    -javascript changes to link the new setting to the correct data model.
    -sass updates to fix a11y issues on the editor modal.
    -addition of post-due visibility information to course outline in studio.
    -new tests: python, js, acceptance, and a11y
2016-04-28 13:27:19 -04:00
Nimisha Asthagiri
036537f174 Merge pull request #12263 from edx/tnl/next-button-fix
Fix Next Button's 404 error
2016-04-27 13:18:39 -04:00
Nimisha Asthagiri
2396cc493d Fix Next Button's 404 error
MA-2305
2016-04-26 20:21:08 -04:00
Muddasser
2857e66239 Changed screenshots to incorporate firefox and chrome 2016-04-26 18:11:52 +05:00
Muddasser
216c83197a assertScreenshot for firefox 42 2016-04-24 08:32:34 -04:00
J. Clifford Dyer
001874c42e Update seq_* to edx.ui.lms.sequence.* format
seq_next, seq_prev, and seq_goto events are all renamed, and maintain
legacy compatibility.

This PR also introduces new EventTransformer framework to shim events
based on name prefix.

MA-2221
2016-04-22 13:38:41 -04:00
Ben Patterson
0c319efbae Merge pull request #12222 from edx/benp/flaky-notes-condition-ff42
wait needed for notes pages.
2016-04-22 08:43:51 -04:00
M. Rehan
d659dd9f6d Merge pull request #12068 from edx/mrehan/sust-40-reduce-peroblem-get-ajax
SUST-40 – Eliminate unwanted problem_get ajax requests flooding the LMS.
2016-04-22 14:59:22 +05:00
Qubad786
dd8ab6eede Keep track of updated problem states.
An event is being fired on actions (Check/Save/Reset) to keep track of updated problems. On coming back to already visited sequence position, while putting sequence contents in container, only those problems that are found outdated, are going to be updated from earlier tracked problems.

[SUST-40]
2016-04-22 11:35:21 +05:00
Ben Patterson
d94fe718a8 wait needed for notes pages.
The page visit requires an ajax request to get the notes. Without
waiting for that to complete, additional navigation results in a
socket error.

Example failure from the stub service:
```python
Traceback (most recent call last):
  File "/usr/lib/python2.7/SocketServer.py", line 295, in _handle_request_noblock
    self.process_request(request, client_address)
  File "/usr/lib/python2.7/SocketServer.py", line 321, in process_request
    self.finish_request(request, client_address)
  File "/usr/lib/python2.7/SocketServer.py", line 334, in finish_request
    self.RequestHandlerClass(request, client_address, self)
  File "/usr/lib/python2.7/SocketServer.py", line 657, in __init__
    self.finish()
  File "/usr/lib/python2.7/SocketServer.py", line 716, in finish
    self.wfile.close()
  File "/usr/lib/python2.7/socket.py", line 283, in close
    self.flush()
  File "/usr/lib/python2.7/socket.py", line 307, in flush
    self._sock.sendall(view[write_offset:write_offset+buffer_size])
error: [Errno 32] Broken pipe
```
2016-04-21 21:44:17 -04:00
Diana Huang
67c055e23f Merge pull request #12206 from CredoReference/impossible-to-click-check-without-answer
Make it impossible to click "final check" without selecting a choice
2016-04-21 11:00:44 -04:00
Dmitry Viskov
61127b613b Make it impossible to click "final check" without selecting a choice 2016-04-21 00:15:20 +03:00
Ben Patterson
85453fb059 Merge pull request #12175 from edx/benp/sel-253-ff42-fix-edit-test
fix flaky condition in education dropdown.
2016-04-20 08:39:57 -04:00
Adam
95ae255719 fix flaky test for oauth redirects (TNL-4190) (#12187) 2016-04-20 08:39:06 -04:00
sanfordstudent
adcf4a98c7 Merge pull request #12038 from edx/sstudent/seq_item_title_
Displaying title of item in course sequence tooltip instead of list of item's children
2016-04-19 13:32:34 -04:00
Sanford Student
bbcec0cf40 displaying title of sequence item in tooltip instead of children 2016-04-19 10:28:47 -04:00
Adam
e896359846 fix flaky oauth test (#12168) 2016-04-19 09:09:35 -04:00
Ben Patterson
1d57b498be fix flaky condition in education dropdown. 2016-04-15 18:49:44 -04:00
Renzo Lucioni
182e34f893 Acceptance tests for program listing page
Includes a11y coverage. ECOM-3980.
2016-04-15 16:06:41 -04:00
Renzo Lucioni
affee69296 Manually merge release into master 2016-04-14 14:23:06 -04:00
Diana Huang
fa61c04894 Revert "Make it impossible to click "final check" without selecting a choice"
This reverts commit 4c83a2f0de.
2016-04-12 10:11:15 -04:00
Peter Fogg
beb3c19722 Add a11y test for the course home page. 2016-04-11 14:28:06 -04:00
Ned Batchelder
2e1238b83e Remove unused imports 2016-04-08 11:23:05 -04:00
Amir Qayyum Khan
60b368e22b Fixed unable to created ccx even if ccx_conn url is not set 2016-04-07 19:30:17 +05:00
Jacek Bzdak
09f5277f3b Some tests for badges js 2016-04-01 21:06:07 +00:00
Jonathan Piacenti
17ec12c650 Address platform final review notes. 2016-04-01 21:06:07 +00:00
Awais Jibran
75b8eae964 Merge pull request #11973 from edx/aj/ecom-3910-certification-exception-not-loading
Fix certificate exception view.
2016-04-01 14:48:36 +05:00
Omar Khan
793bb0f1e9 Custom icons for third party auth login buttons
- Icon images can be uploaded from the django admin
- Test coverage improved
2016-04-01 08:57:43 +07:00
Diana Huang
70145de7bb Merge pull request #11061 from CredoReference/impossible-to-click-check-without-answer
PR-154 - Make it impossible to click "final check" without selecting a choice
2016-03-30 11:33:11 -04:00
Dmitry Viskov
4c83a2f0de Make it impossible to click "final check" without selecting a choice 2016-03-30 16:50:00 +03:00
J. Cliff Dyer
32729eb838 Added safety to account_settings template 2016-03-29 19:37:15 +00:00
Nimisha Asthagiri
74a9989f04 Merge pull request #11705 from edx/tnl/next_button
Activate LMS Navigation Button across sections
2016-03-29 15:05:59 -04:00
Nimisha Asthagiri
2c90cac962 Accessible Sequence navigation
MA-2190
2016-03-29 12:59:05 -04:00
Nimisha Asthagiri
8cbf99aca4 Activate Next and Previous Buttons across sections
MA-2152
MA-2153
2016-03-29 12:58:08 -04:00
Awais Jibran
9b19ab05e5 Fix certificate exception view.
ECOM-3910
2016-03-29 15:59:13 +05:00
Muddasser
bcb7fe3722 Merge pull request #11872 from edx/muddasser/bokchoy/test_mathjax_in_hint
Extract hint from html instead of text
2016-03-24 16:49:51 +05:00
Eric Fischer
c97a6a5178 Merge pull request #11758 from edx/christina/xss-tests
Bok choy XSS changes
2016-03-22 13:02:47 -04:00
Ben Patterson
c6a2afa037 Wait for numerical selection to load before continuing.
TNL-4272
2016-03-22 11:53:54 -04:00
cahrens
0c9937889b Enabling XSS vulnerability flag for bok choy tests 2016-03-22 10:16:27 -04:00
Eric Fischer
9e71e3f311 Mark test as flaky TNL-4272 2016-03-22 09:56:37 -04:00
Muddasser
6da296e454 Extract hint from html instead of text 2016-03-22 16:28:43 +05:00
Christine Lytwynec
5b5b4eb4fc Merge pull request #11393 from edx/clytwynec/ac-238
Improve accessibility for dashboard course settings dropdown
2016-03-10 12:30:20 -05:00
Eric Fischer
a647169a90 Merge pull request #11167 from edx/christina/ora-data-download
WIP: Asynchronous download button for ORA2 data
2016-03-10 11:09:36 -05:00
dylanrhodes
2b1a7eece2 Asynchronous download button for ORA2 data
Conflicts:
	lms/djangoapps/instructor/tests/test_api.py
	lms/djangoapps/instructor/utils.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/api_urls.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor_task/api.py
	lms/djangoapps/instructor_task/tasks.py
	lms/djangoapps/instructor_task/tasks_helper.py
	lms/djangoapps/instructor_task/tests/test_api.py
	lms/djangoapps/instructor_task/tests/test_tasks.py
	lms/djangoapps/instructor_task/tests/test_tasks_helper.py
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/coffee/src/instructor_dashboard/data_download.coffee
	lms/templates/instructor/instructor_dashboard_2/data_download.html
2016-03-10 09:58:55 -05:00