Commit Graph

12297 Commits

Author SHA1 Message Date
Renzo Lucioni
1cee9a0dcd Merge pull request #10714 from edx/renzo/programs-authoring-page
Add a Studio view and template to host the Programs authoring app
2015-12-03 12:12:23 -05:00
Renzo Lucioni
e2833d8fc6 Add a Studio view and template to host the Programs authoring app
The Programs authoring app is a Backbone SPA maintained in a separate repository. The app handles its own routing and provides a UI which can be used to create and publish new Programs (e.g, XSeries). ECOM-2598.
2015-12-03 10:47:12 -05:00
David Baumgold
3b5d9fe95a Merge pull request #10761 from jbzdak/tnl-363
Fixes TNL-363: EdX OpenID provider doesn't handle unicode e-mails
2015-12-03 10:17:58 -05:00
Ben Patterson
613c39b00f Merge pull request #10803 from edx/benp/fix-flaky-teams-events
Enforce order on these events to solve flaky condition.
2015-12-03 09:31:14 -05:00
Jacek Bzdak
3506d962f8 Fix for error in TNL-363
Audit logs were causing open_id provider logins to fail when
username or e-mail address contained unicode data.
2015-12-03 11:27:20 +01:00
raeeschachar
f2c4a3de14 Merge pull request #10719 from edx/raees/chrome-bok-choy-test-page-scroll-on-thread-change-view
Fixes test_page_scroll_on_thread_change_view failing on chrome
2015-12-03 11:06:37 +05:00
Ben Patterson
134a3134df Reset mongo events store for each test. 2015-12-02 21:05:46 -05:00
Ben Patterson
1d6c61c356 Enforce order on these events to solve flaky condition. 2015-12-02 20:13:01 -05:00
raeeschachar
1de57ed56b Merge pull request #10776 from edx/raees/chrome-bok-choy-test-split-test-lms-staff-view
Fixed test studio split test failing on chrome
2015-12-02 17:29:58 +05:00
raeeschachar
b3271e3be1 Fixes test_page_scroll_on_thread_change_view failing on chrome 2015-12-02 15:01:02 +05:00
raeeschachar
93173622c0 Merge pull request #10783 from edx/raees/chrome-bok-choy-video-test-test-arr-license
Fixed test cc and test arr license that were failing on Chrome
2015-12-02 12:17:52 +05:00
Braden MacDonald
4645c6ecdd Allow using a custom login/register form with third_party_auth 2015-12-01 15:43:34 -08:00
Matt Drayer
f6872a0fa4 Merge pull request #10750 from edx/asadiqbal08/SOL-1417-CSV
SOL-1417 Certs: Allow CSV upload for Cert Exceptions
2015-12-01 10:36:32 -05:00
raeeschachar
c167ad5eb0 Fixed test studio split test failing on chrome 2015-12-01 18:59:50 +05:00
raeeschachar
f87236b9ff Fixed test cc and test arr license in Video Tests that were failing on Chrome 2015-12-01 18:30:09 +05:00
Matt Drayer
2320d4220c Merge pull request #10748 from edx/saleem-latif/SOL-1389
SOL-1389: Cert Exception: Add error states and messages
2015-12-01 08:23:24 -05:00
Ben Patterson
abcf33aba4 Merge pull request #10757 from edx/benp/mp-support-discussion-tab
Support multiprocess bok-choy testing for discussion
2015-12-01 08:23:02 -05:00
Saleem Latif
a8e44b3097 Cert Exception: Add error states and messages 2015-12-01 12:46:04 +05:00
Bill DeRusha
78896c60b5 Initial migrations for verified deadlines for self paced 2015-11-30 10:30:23 -05:00
asadiqbal
7c68d80c67 SOL-1417 2015-11-30 14:40:08 +05:00
Ben Patterson
a066856824 Merge pull request #10702 from edx/benp/ownlearner-mp-support
OwnLearnerProfile multiprocessing support
2015-11-28 14:27:05 -05:00
Ben Patterson
4349f931aa Merge pull request #10700 from edx/benp/cohort-mp-fixes
Make cohort management tests multiprocess capable.
2015-11-28 14:26:08 -05:00
Ben Patterson
64234c3ae0 Support multiprocess testing.
This fixes a flaky condition that is only exposed when
tests are run in multiprocessing mode.
2015-11-28 10:40:13 -05:00
Ben Patterson
0071c9d322 OwnLearnerProfile tests multiprocessing support.
Fix a flaky test condition that only occurs in
multiprocessing mode. Make the page definition more
specific; the previous implementation would not fully
render all objects in time.

Avoid race condition related to events order (in faster,
multiprocess testing, the order is not exactly the same since
some events arrive at once).
2015-11-28 10:08:49 -05:00
Ben Patterson
2b61cfb1a2 Use unicodecsv.
Add scenario for testing unicode cohort.

Verifying the events is a TODO because the verification method
will need to be refactored to handle an additional cohort
that's not included in setUp. (Or refactor the setup, or refactor
the unicode test, etc.)
2015-11-28 10:07:12 -05:00
Ben Patterson
e512a50649 Use helper method for generating unique user identities. 2015-11-28 10:07:12 -05:00
Ben Patterson
bed5d3e8df Remove unnecessary files, use generic file for unrelated test. 2015-11-28 10:06:10 -05:00
Ben Patterson
484a4f2b66 Make cohort management tests multiprocess-friendly. 2015-11-28 10:05:48 -05:00
Syed Hasan raza
b8477cc77a Merge pull request #9700 from edx/shr/bug/AN-4509-Unicode-Decode-Error
LoggerBackend encoding for json dumps
2015-11-27 14:54:41 +05:00
Syed Hassan Raza
0f67d19a2c Add logging for UnicodeDecodeError excpetion LoggerBackend 2015-11-27 12:07:03 +05:00
raeeschachar
291a5c35ca Fixed test create library failing on chrome 2015-11-26 22:33:29 +05:00
Brian Beggs
89a7e42576 Merge pull request #10742 from edx/bbeggs/acceptance-test-migration-fix
Migrations will now run during Acceptance tests
2015-11-26 09:34:51 -05:00
Jim Abramson
8f4c2264a1 Merge pull request #10701 from edx/renzo/studio-programs-tab
Add Programs tab to Studio
2015-11-25 16:37:34 -05:00
Renzo Lucioni
70d57327eb Add Programs tab to Studio
Extends the Programs ConfigurationModel, cleans up Programs-related utilities and corresponding tests, and corrects caching. Uses the Programs API to list programs within Studio. ECOM-2769.
2015-11-25 14:56:50 -05:00
Brian Beggs
40af1987aa recreating the lettuce cache database 2015-11-25 14:11:54 -05:00
Saleem Latif
764ceb00c8 Cert Exceptions: View and Edit Exception list 2015-11-25 10:02:52 +05:00
Ahsan Ulhaq
347bfcbb38 Merge pull request #10688 from edx/ahsan/ECOM-2562-Refund-Policy-on-Prof-Ed-Receipts
Refund Policy on Prof Ed Receipts
2015-11-25 00:39:50 +05:00
Michael Frey
29b6ccf5e4 Added new Course List API. 2015-11-24 15:54:03 +00:00
Ahsan Ulhaq
bc64c66835 Refund Policy on Prof Ed Receipts
ECOM-2562
2015-11-24 17:42:09 +05:00
Ned Batchelder
a7e21bf188 Merge pull request #10707 from edx/ned/fix-pylint-c7630-violations
Fix pylint C7630 (literal used as attribute) violations
2015-11-23 16:58:54 -05:00
Ned Batchelder
0872732cf0 Fix pylint C7630 (literal used as attribute) violations
There's no need to use a string literal in setattr, delattr, or the
two-argument form of getattr.
2015-11-23 15:32:54 -05:00
Christine Lytwynec
c6f4afc9c9 Header a.dropdown --> button.dropdown 2015-11-23 13:51:00 -05:00
Ned Batchelder
f5d0f3ff55 Remove useless pylint suppressions 2015-11-22 07:41:19 -05:00
Ben Patterson
8610b6ded6 Events bok-choy multiprocessing support.
Stop clearing the entire mongo collection with every mixin instantiation.
Instead, reset the clock for the particular test.

With this approach, filters must be stricter, for example, according
to username or user id.
2015-11-21 10:42:01 -05:00
Kevin Falcone
80614a2798 Merge branch 'release' into hotfix-2015-11-20-conflict 2015-11-20 13:13:05 -05:00
Kevin Falcone
57a4df73a5 Management commands should no longer access args[]
https://docs.djangoproject.com/en/1.8/howto/custom-management-commands/

Django intercepts the 'pull' argument and says "unrecognized arguments pull"
There were no tests for this command, so it wasn't noticed during the
upgrade testing, only once our integration monitoring noticed.
2015-11-19 16:25:49 -05:00
Sarina Canelake
256dc5b6f8 Reword default about page questions 2015-11-19 15:44:54 -05:00
Brian Beggs
141e0a93c7 Merge branch 'master' into dj18-release-merge 2015-11-19 13:36:13 -05:00
Adam Palay
5b5cf7d3b0 Fix login redirect when user is logged out while answering a question (TNL-3789) 2015-11-19 10:28:58 -05:00
Usman Khalid
bc22f592c6 Merge pull request #10664 from edx/usman/regenerate-db-cache
Recreate db caches for bokchoy and lettuce
2015-11-19 19:20:21 +05:00