Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
40,254 Commits 1 Branch 0 Tags
091fd734150e84fdbfe2dfd996d6d16ad5259b3a
Commit Graph

14402 Commits

Author SHA1 Message Date
Awais Jibran
091fd73415 posts are not automatically followed. TNL-6582 2017-02-23 17:38:15 +05:00
raeeschachar
61a12b4b0d Merge pull request #14558 from edx/raees/LT54-page-object-to-platform_part1 
Moving upgraded e2e page objects to platform
 2017-02-23 16:52:57 +05:00
raeeschachar
ea3797c365 Moving upgraded e2e page objects to platform 2017-02-23 10:58:28 +00:00
Matt Drayer
685524bb70 Merge pull request #14541 from edx/mattdrayer/direct-idp-login 
ENT-228: Allow tpa_hint to match hidden providers
 2017-02-22 17:10:54 -05:00
edx-pipeline-bot
95aa2b61ba Merge pull request #14549 from edx/release-mergeback-to-master 
Merge release back to master
 2017-02-22 10:08:23 -05:00
Hasnain
2f1d405146 Set 'created_on_site' UserAttribute on account creation. 
We need to be able to track which site a given user account was created on. This
change will create a UserAttribute model with a key of 'created_on_site' and a value
containing the domain of the site on which the user accounted was created.

WL-977
 2017-02-22 05:12:21 -05:00
Matt Drayer
6e661404a4 mattdrayer/direct-idp-login: Allow tpa_hint to match hidden providers 2017-02-21 14:57:43 -05:00
Simon Chen
f62b66022c Merge pull request #14525 from edx/schen/ECOM-7119 
Update embargo message with better language ECOM-7119
 2017-02-21 12:24:49 -05:00
Ben Patterson
c0dd2b878f Lettuce-on-Xenial CMS fix. Iterate through a list to avoid quotation string confusion. 
Also change some selenium settings (they were not necessary at this time).
 2017-02-20 17:22:36 -05:00
Ben Patterson
0e596dd517 Multi-thread stub servers. 2017-02-20 17:22:23 -05:00
Ben Patterson
e7b0c28d57 Fixes for chrome reliability in selenium. 
Fix for rendering timing issue. See https://bugs.chromium.org/p/chromedriver/issues/detail?id=1552
 2017-02-20 17:22:02 -05:00
Ben Patterson
452a1f1fbb Refactor click since it was resulting in timeout errors; use correct id for one of the LTI stub's buttons. 2017-02-20 17:21:42 -05:00
Ben Patterson
c58e514231 Properly wait for LTI stub's buttons to render 2017-02-20 17:21:41 -05:00
Ben Patterson
c3887b0b6b Fix lettuce tests for Xenial compatibility and newer Chrome version. 2017-02-20 17:21:29 -05:00
Albert St. Aubin
8e1fc5f5d3 Updated the focus order for the action bar 2017-02-17 22:46:17 -05:00
Simon Chen
c38de9638c Revert "edx.org/login?next= should not be able to point to an asset" 
This reverts commit bc418c47c5.
 2017-02-17 14:53:57 -05:00
Ned Batchelder
833f82dce9 Merge pull request #14519 from edx/nedbat/idempotent-email-uniqueness-constraint 
An idempotent migration to add an email uniqueness constraint
 2017-02-16 09:58:07 -05:00
Ahsan Ulhaq
bc418c47c5 edx.org/login?next= should not be able to point to an asset 
ECOM-6463
 2017-02-16 14:44:01 +05:00
Simon Chen
5ca0ebcc56 Update embargo message with better language ECOM-7119 2017-02-15 12:51:17 -05:00
cahrens
76ee612862 Update flaky decorators related to file upload. 
PLAT-1186
 2017-02-15 12:04:03 -05:00
Ned Batchelder
98b250b66e A new django app for unicorn migrations 2017-02-15 11:40:05 -05:00
Stu Young
1bd30cffb8 Merge pull request #14492 from edx/estute/mark-flaky-bokchoy-tests 
Estute/mark flaky bokchoy tests
 2017-02-15 09:08:27 -05:00
Ned Batchelder
04557bbff3 Make this no-op migration be a true no-op. 2017-02-15 07:16:10 -05:00
Ned Batchelder
169414b734 An idempotent migration to add an email uniqueness constraint 2017-02-15 07:16:10 -05:00
noraiz-anwar
38a6e8b0d0 Merge pull request #14494 from edx/noraiz/TNL-6470 
TNL-6470-Hide Add a post during discussion blackout period
 2017-02-15 10:24:44 +05:00
stu
cb7e260c97 fix flaky progress page and note tests 2017-02-14 21:20:28 -05:00
Jesse Shapiro
5d068cec1f Merge pull request #14496 from open-craft/haikuginger/remove-consent-from-logistration 
[ENT-173] Remove data sharing consent from logistration
 2017-02-14 11:51:53 -05:00
Ned Batchelder
1e6a74e777 No-op a migration that needs to be more clever 2017-02-14 10:01:03 -05:00
Douglas Hall
3055f9b259 Merge pull request #14339 from edx/hasnain-naveed/program-backend/WL-912 
WL-766 Program marketing page data layer
 2017-02-14 04:53:53 -05:00
noraiz-anwar
6f447d0b51 Hide Add a post during discussion blackout period 2017-02-14 11:18:12 +05:00
Hasnain
41f3bba058 Backend code for program detail page. 
This adds functions to the catalog utils which munge data
collected from the program endpoint and LMS database to construct
data structures that are ready for use by view and templates
related to the Open EdX marketing pages that live in LMS.

WL-766
 2017-02-13 20:37:56 -05:00
Douglas Hall
58f0154ee2 Add support for multi-org sites 
WL-926
 2017-02-13 19:33:47 -05:00
stu
2014f4502f mark test_content_changes_do_not_change_score_2__change_subsection_structure as flaky 2017-02-13 17:07:55 -05:00
stu
292b425cb2 mark test_navigation_buttons as flaky 2017-02-13 17:05:54 -05:00
Ayesha Baig
61f2067935 [YONK-513]: Add feature flag which allows for disabling of account creation 2017-02-13 12:28:57 +05:00
Ahsan Ulhaq
4926a6b263 Merge pull request #14481 from edx/ahsan/ECOM-7085-Create-migration-unique-email 
Added unique constraint on email
 2017-02-10 23:53:39 +05:00
Christina Roberts
62cb3ad50e Merge pull request #14486 from edx/christina/wiki-round-2 
Fix more wiki a11y issues
 2017-02-10 13:08:11 -05:00
Ahsan Ulhaq
d141eb15b1 Added unique constraint on email 
ECOM-7085
 2017-02-10 21:24:15 +05:00
cahrens
a15d89c8bf Fix a11y issues. 
TNL-6440, TNL-6439
 2017-02-10 09:43:26 -05:00
Albert (AJ) St. Aubin
c1e2d39b38 Merge pull request #14444 from edx/aj/TNL-6381_upsell_msg 
Aj/tnl 6381 upsell msg
 2017-02-10 07:25:23 -05:00
Albert St. Aubin
97d7633774 Added upgrade upsell to course info banner and url parameter 
TNL-6381
 2017-02-09 20:21:39 -05:00
Jesse Shapiro
424b4356a5 Merge pull request #14400 from open-craft/haikuginger/enterprise-course-consent 
[ENT-101] Add course-specific data sharing consent hooks for Enterprise app
 2017-02-09 18:37:55 -05:00
Renzo Lucioni
dda0e03f65 Merge pull request #14488 from edx/renzo/finish-catalog-transition 
Finish transition to catalog for program data
 2017-02-09 16:10:44 -05:00
Renzo Lucioni
0e06e90599 Finish transition to catalog for program data 
Updates Mako and Underscore templates as well as Backbone models and views so they work with catalog programs. Removes all remaining response munging from the back end.

ECOM-4422
 2017-02-09 14:51:26 -05:00
Jesse Shapiro
9a573de533 Add consent check to course access prerequisites; add utility functions to provide interface to course-specific consent in Enterprise app 2017-02-09 13:49:57 -05:00
Muzaffar yousaf
ff66781a7e Merge pull request #14316 from edx/mzfr/video-bokchoy 
un-skip video tests.
 2017-02-09 15:46:04 +05:00
alisan617
85ff8a62a2 Merge pull request #14476 from edx/alisan/post-add-response-focus-TNL-6170 
Discussion thread bring focus to response list after submitting a response or comment
 2017-02-08 14:06:32 -05:00
Jesse Shapiro
358e73c082 Remove data sharing consent from logistration 2017-02-08 13:04:54 -05:00
alisan617
813e86041c Bring focus to response list after submitting a response or comment 2017-02-08 13:02:04 -05:00
muzaffaryousaf
d73d2f5889 Increase the yttimeout to un-skip the video tests. 2017-02-08 20:30:54 +05:00