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

40203 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
19d6e21a13 Merge pull request #14419 from edx/ahsan/ECOM-6463-login-should-not-point-asset 
edx.org/login?next= should not be able to point to an asset
 2017-02-16 15:56:58 +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
Christina Roberts
81ab0d81b9 Merge pull request #14524 from edx/christina/flaky-import-tests 
Update flaky decorators related to file upload.
 2017-02-15 13:24:58 -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
Gregory Martin
be0e2d0a11 Merge pull request #14517 from edx/yro_ora2-release 
bump ora2 version
 2017-02-14 14:52:38 -05:00
Nimisha Asthagiri
a4f70ba4da Merge pull request #14505 from edx/beryl/cbs_tranformer_version_hash 
Block Transformers: Version Hash
 2017-02-14 14:44:35 -05:00
Gregory Martin
8c9918da23 bump ora2 version 2017-02-14 14:05:20 -05:00
Ned Batchelder
52ca02fdc4 model_name can be non-None, and model is still None 2017-02-14 12:50:12 -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
Nimisha Asthagiri
b99e9ae252 Block Transformers: Transformers Version Hash 
TNL-6519
 2017-02-14 11:34:29 -05:00
Ned Batchelder
583cd26f11 Merge pull request #14515 from edx/nedbat/neuter-email-constraint-migration 
No-op a migration that needs to be more clever
 2017-02-14 10:50:29 -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
Douglas Hall
9dcc6ddcd8 Merge pull request #14471 from edx/douglashall/WL-962 
WL-926 Add support for multi-org sites
 2017-02-14 04:53:13 -05:00
noraiz-anwar
6f447d0b51 Hide Add a post during discussion blackout period 2017-02-14 11:18:12 +05:00
Jillian Vogel
1ee166ea8a Merge pull request #14509 from open-craft/jill/bump-edx-enterprise 
Bump edx-enterprise tag to 0.21.2
 2017-02-14 12:55:30 +10:30
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
Nimisha Asthagiri
6626725781 Merge pull request #14504 from edx/beryl/cbs_transformer_versions 
Block Transformers: distinguish between READ and WRITE versions
 2017-02-13 13:32:05 -05:00
Nimisha Asthagiri
71cce9bb73 Block Transformers: distinguish between READ and WRITE versions 
TNL-6522
 2017-02-13 12:20:22 -05:00
Jillian Vogel
7597bcbe5b Bump edx-enterprise tag to 0.21.2 2017-02-13 22:59:57 +10:30
ayesha-baig
fd00d29db7 Merge pull request #14452 from edx/ayeshabaig/YONK-513 
[YONK-513]: Add feature flag which allows for disabling of account cr…
 2017-02-13 14:37:15 +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
Cliff Dyer
881970a253 Merge pull request #14458 from edx/beryl/celeryutils 
Use celeryutils in edx-platform
 2017-02-10 17:01:43 -05:00
J. Cliff Dyer
be8a898e68 Add logging to recalculate grades base task. 
TNL-6294

* Use external celery_utils in edx-platform (TNL-6454)
* Remove old openedx.core celery_utils implementation.
 2017-02-10 16:07:51 -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
syed-awais-ali
31f178ea59 Merge pull request #14498 from edx/aali/OPS-1407_celery_max_ttl 
added ttl setting
 2017-02-10 23:38:11 +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
sanfordstudent
fd7de0cab5 Merge pull request #14477 from edx/sstudent/TNL-6349 
only show nav utils if populated
 2017-02-10 09:09:12 -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
George Song
c0e452494e Merge pull request #14363 from open-craft/mtyaka/bump-xblock-vectordraw 
Bump xblock-vectordraw to 0.2.1.
 2017-02-09 07:16:03 -08:00
syed-awais-ali
65d4b76d9b ttl removed from yaml config and default value addedto aws 2017-02-09 16:47:48 +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
syed-awais-ali
95c6edd187 added ttl setting 2017-02-09 00:39:45 +05:00