Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,160 Commits 1 Branch 0 Tags
8fcf574029786fc3d4e84dc50af05262bbab5eb9
Commit Graph

12316 Commits

Author SHA1 Message Date
Bill DeRusha
005e07cb95 Remove default course mode setting in enrollment api 2015-12-09 19:46:04 -05:00
Bill DeRusha
cdb3e99f39 Enrollment API determines best default enrollment if none passed 2015-12-09 14:50:49 -05:00
Peter Fogg
a609e074c7 Fix Unicode errors in financial assistance. 2015-12-08 16:35:38 -05:00
Bill DeRusha
692e5d777a Update copy for HCFA 
Update Zendesk ticket to correctly add group.

Add logic to hide new audit certs
 2015-12-07 14:18:55 -05:00
Chris Dodge
1592a32de3 White Labels need to still use the 'honor' course mode even through the default has changed 2015-12-06 20:36:26 -05:00
Ahsan Ulhaq
2e76517ab3 Merge pull request #10820 from edx/ahsan/ECOM-2929-Update-Track-Selection-page 
Update Track Selection page
 2015-12-04 13:03:11 +05:00
David Baumgold
58daa365cd re-enable edx.org comprehensive theme 2015-12-03 17:18:55 -05:00
Andy Armstrong
6fd960c855 Merge pull request #10733 from CredoReference/feature/EDX-21 
Don't render unconfigured marketing links in CMS footer.
 2015-12-03 16:59:47 -05:00
Ned Batchelder
d344d6f80a Merge pull request #10815 from edx/ned/add-translator-comments 
Add translator comments
 2015-12-03 16:46:03 -05:00
Peter Fogg
8b97ca1b24 Merge pull request #10802 from edx/feature/remove-honor-code-certs 
Remove default honor code.
 2015-12-03 14:55:30 -05:00
Ned Batchelder
ed96a9d87a Add translator comments 
There are English words in these strings, but they are actually specific
values that must appear as these English words, and so should not be
translated.
 2015-12-03 14:47:08 -05:00
Ned Batchelder
1ff41eb362 Merge pull request #10819 from edx/ned/fix-missing-translator-comments 
Fix missing translator comments
 2015-12-03 14:28:15 -05:00
Ned Batchelder
67c1cdf5f4 Fix missing translator comments 
Turns out if the string literal starts on the next line after the
translation function, then the translator comment is lost.  So, either
close up short strings, or add a dummy empty string on the first line to
concatenate with the real string.

Ugh.
 2015-12-03 13:45:01 -05:00
Ahsan Ulhaq
fc953a6699 Update Track Selection page 
ECOM-2929
 2015-12-03 23:42:14 +05:00
Dan Powell
31646e4a72 Don't render unconfigured marketing links in CMS footer. 2015-12-03 13:41:53 -05:00
Bill DeRusha
4b94d6367a Update dashboard banners and track selection for audit track 
Remove cert messaging from audit cert/grade info partial

move enrollment display method to helpers
 2015-12-03 13:22:08 -05:00
Syed Hasan raza
86227e7711 Merge pull request #10793 from edx/shr/bug/AN-4509-logging-raise-exception-UnicodeDecodeError 
Raise UnicodeDecodeError exception after logging the exception
 2015-12-03 22:54:24 +05:00
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
Syed Hassan Raza
395db381f6 Raise UnicodeDecodeError exception after logging the exception 2015-12-03 12:49:52 +05: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