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

12337 Commits

Author SHA1 Message Date
Peter Fogg
f975ae038b Add migrations due to field default changes from #10802. 
Django 1.8 is more sensitive to model changes, and wants to create
migrations in situations that Django 1.4 would not. Changing field
defaults is an example of these situations.
 2015-12-08 10:54:49 -05:00
Syed Hasan raza
9fc7c73bf0 Merge pull request #10854 from edx/shr/impr/TNL-3076-Tests-improvement 
Course_key naming convention
 2015-12-08 12:50:30 +05:00
Braden MacDonald
dbb1887c42 Merge pull request #10839 from open-craft/custom-entry-points-provider-id 
Add additional data to custom SSO auth form extension points
 2015-12-07 20:58:24 -08:00
Christine Lytwynec
b490bd168a Merge pull request #10832 from edx/clytwynec/auto-auth-redirect 
Clytwynec/auto auth redirect
 2015-12-07 15:56:23 -05:00
Christine Lytwynec
df638088ca pr fixes 2015-12-07 14:21:00 -05:00
Chris Rodriguez
4161ae9980 Tests 2015-12-07 14:05:07 -05:00
Chris Rodriguez
bb3ac95f24 Fix: correcting play/skip icon for bumper 2015-12-07 14:05:07 -05:00
Chris Rodriguez
c7ade04090 Xmodule: darkening 'correct' green color for WCAG AA requirements 2015-12-07 11:59:57 -05:00
Christine Lytwynec
9f5273a7d1 pr fixes 2015-12-07 11:50:41 -05:00
Syed Hassan Raza
9ff080f650 Course_key naming convention 2015-12-07 21:24:50 +05:00
clrux
62039f70e3 Merge pull request #10798 from edx/clrux/ac-256 
Xmodule: syncing link color with LMS
 2015-12-07 11:16:15 -05:00
clrux
5cf41a0586 Merge pull request #10800 from edx/clrux/ac-261 
Xmodule: darkening gray text for WCAG AA requirements
 2015-12-07 11:15:42 -05:00
Sarina Canelake
337eabbb00 Merge pull request #10836 from edx/kill-foldit 
Remove 'FoldIt' XModule
 2015-12-07 10:18:40 -05:00
Syed Hasan raza
4f131fec9c Merge pull request #10806 from edx/shr/bug/TNL-3076-Handout-links-not-updated-at-import 
Update handout link with current course_id
 2015-12-07 14:13:47 +05:00
Syed Hassan Raza
706716694a Update handout link with current course_id 2015-12-07 13:21:10 +05:00
Sarina Canelake
84a96e40c4 Remove 'Fold It' XModule 2015-12-06 11:38:05 -05:00
Sarina Canelake
af8a0bb676 Remove "Licenses" djangoapp 2015-12-06 10:55:15 -05:00
Braden MacDonald
a654d5e7ac Add additional data to custom SSO auth form extension points 2015-12-04 15:38:18 -08:00
Sarina Canelake
2cfeb34f45 Merge pull request #10825 from edx/kill-psycho 
Remove psychometrics app
 2015-12-04 17:23:20 -05:00
Sarina Canelake
e932632b49 Remove psychometrics app 2015-12-04 16:37:34 -05:00
Nimisha Asthagiri
d6ced072c4 Refactor CourseDetails 2015-12-04 16:03:05 -05:00
Christine Lytwynec
3b217df917 add new tests for auto_auth redirecting 2015-12-04 15:04:42 -05:00
Nimisha Asthagiri
d170c92f3b Refactor course_image_url 2015-12-04 11:25:40 -05:00
Mark Sadecki
e10614e75a adds support to auth_auth for redirecting 2015-12-04 09:45:09 -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
Chris Rodriguez
b69787481f Xmodule: darkening gray text for WCAG AA requirements 2015-12-02 15:09:46 -05:00
Chris Rodriguez
07944b0852 Xmodule: syncing link color with LMS 2015-12-02 14:29:06 -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