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

34112 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
E. Kolpakov
bed4babb5e Bumped XBlock version 2015-12-04 14:43:42 +07:00
Peter Fogg
068b439ada Merge pull request #10821 from edx/peter-fogg/fix-certs-tests 
Fix broken certificates-related tests.
 2015-12-03 18:00:16 -05:00
David Baumgold
31b6f8cc7f Merge pull request #10090 from edx/db/edx.org-comp-theme 
Re-enable the edx.org comprehensive theme
 2015-12-03 17:28:20 -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
1ba1c213d5 Fix broken certificates-related tests. 2015-12-03 16:30:05 -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
Bill DeRusha
52f1db4334 Merge pull request #10769 from edx/bderusha/hc-dash 
Update dashboard for audit track
 2015-12-03 14:13:39 -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
Dan Powell
696e1962d9 Add Dan Powell <dan@abakas.com> to AUTHORS 2015-12-03 13:42:18 -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
frances botsford
9e1c9ab08c Merge pull request #10605 from edx/frances/reduce-component-padding 
Percent-based padding on course-content
 2015-12-03 12:02:13 -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
Eric Fischer
44eaca08e8 Merge pull request #10772 from edx/efischer/post_rc_fix 
CohortMembership Transaction Fixes
 2015-12-03 10:34:00 -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
wajeeha-khalid
ef383a8902 Merge pull request #10790 from edx/jia/MA-1748 
jia/MA-1748 patch read states for users
 2015-12-03 20:15:00 +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
David Baumgold
c681000975 Merge pull request #10717 from nikolas/patch-2 
Upgrade pip to 7.1.2
 2015-12-03 09:30:18 -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
Jacek Bzdak
451d70a2d1 Added Jacek Bzdak to AUTHORS file. 2015-12-03 11:22:02 +01:00
Syed Hassan Raza
395db381f6 Raise UnicodeDecodeError exception after logging the exception 2015-12-03 12:49:52 +05:00
wajeeha-khalid
c9c1a4bc71 jia/MA-1748 patch read states for users 2015-12-03 12:08:20 +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
Adam
cfa034ba2d Merge pull request #10785 from edx/adam/delete-orphans-in-bulk-op 
do orphan deletion in a bulk operation (SUST-21)
 2015-12-02 15:47:46 -05:00
Eric Fischer
88a389652b CohortMembership Test Fixes 
There are 3 main changes in this commit:
* CohortFactory now sets up memberships properly, so consuming tests do not
need to explicitly touch CourseUserGroup.users to add() users.
* test_get_cohort_sql_queries has been updated to 3 and 9 queries when using
and not using the cache, respectively. This is needed due to each operation
needing an extra queery to get the CourseUserGroup from the CohortMembership.
* Adding remove_user_from_cohort(), the counterpart to add_user_to_cohort().
This is also to keep tests from touching the users field directly, and keep
CohortMembership data in sync.
 2015-12-02 15:03:52 -05:00
Eric Fischer
731d85f771 CohortMembership Transaction Fixes 
An issue arose recently due to ATOMIC_REQUESTS being turned on by default. It
turns out that CohortMemberships had been somewhat relying on the old default
transaction handling in order to keep CohortMemberships and the underlying
CourseUserGroup.users values in-sync.

To fix this, I've made all updates to Cohortmemberships go through an
outer_atomic(read_committed=True) block. This, is conjunction with the already
present select_for_update(), will no longer allow 2 simultaneous requests to
modify objects in memory without sharing them. Only one process will be
touching a given CohortMembership at any given time, and all changes will be
immediately comitted to the database, where the other process will see them.

I've also included some changes to get_cohort(), add_user_to_cohort(), and
remove_user_from_cohort() in order to properly make use of the new
CohortMembership system.
 2015-12-02 15:03:28 -05:00
clrux
06eede5d14 Merge pull request #10796 from edx/clrux/ac-253 
LMS: changing blue to pink, ensuring contrast, for Studio/Staff
 2015-12-02 13:54:37 -05:00
Adam Palay
72e7ac5d4c do orphan deletion in a bulk operation (SUST-21) 2015-12-02 13:33:59 -05:00
Chris Rodriguez
deaa044669 Changing blue to pink as was previously there 2015-12-02 12:14:15 -05:00
wajeeha-khalid
fee7946988 Merge pull request #10758 from edx/jia/MA-1742 
MA-1742; return read status for GET thread details
 2015-12-02 21:13:52 +05:00
Chris Rodriguez
284b1a0fdf LMS: darkening blue on Studio links 2015-12-02 11:09:11 -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
Awais Qureshi
989389e3f2 Merge pull request #10781 from edx/awais786/ECOM-2980-admin-certs-page 
Replacing user dropdown field with user search textbox. On stage due …
 2015-12-02 17:10:45 +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
927e919ec4 Merge pull request #9903 from open-craft/sso-custom-auth-entry-points 
Allow using a custom login/register form with third_party_auth
 2015-12-01 16:41:56 -08:00
Braden MacDonald
4645c6ecdd Allow using a custom login/register form with third_party_auth 2015-12-01 15:43:34 -08:00
Robert Raposa
1371b2e9ee Merge pull request #10786 from edx/release-2015-12-01-conflict 
Release-2015-12-01 conflict resolved
 2015-12-01 17:03:10 -05:00
Robert Raposa
38bee4f794 Merge branch 'rc/2015-11-24' into release-2015-12-01-conflict 
# Conflicts:
#	requirements/edx/github.txt
 2015-12-01 15:38:31 -05:00
Renzo Lucioni
d370b0aa23 Merge pull request #10774 from edx/renzo/fix-programs-migration 
Modify existing Programs migration to account for help_text change
 2015-12-01 11:06:12 -05: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
Nimisha Asthagiri
47b0d492e4 Merge pull request #10727 from edx/cdyer/pagination 
Add pagination support to course catalog API
 2015-12-01 09:09:04 -05:00