Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,453 Commits 1 Branch 0 Tags
5c1789006dbdf8a9ff3d01e6fddb4131879f565e
Commit Graph

33453 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Drayer
5c1789006d Merge pull request #10291 from edx/asadiqbal08/SOL-1312-solution 
SOL-1312 changes
 2015-10-23 12:00:35 -04:00
David Baumgold
ab8edc222c Merge pull request #10319 from edx/sarina/20151022-update-translations 
Update translations (autogenerated message)
 2015-10-23 11:47:01 -04:00
frances botsford
f6a1a0df31 Merge pull request #10321 from edx/frances/teams-post-style-fix 
Teams Discussion Post Style Fixes
 2015-10-23 10:07:22 -04:00
Christina Roberts
e3369bebee Merge pull request #10323 from edx/christina/tnl-3679 
Mark as flaky.
 2015-10-23 09:32:21 -04:00
Feanil Patel
61241ae976 Merge pull request #10300 from edx/feanil/circle_ci 
Feanil/circle ci
 2015-10-23 08:24:12 -04:00
Braden MacDonald
2d084f7610 Merge pull request #10320 from open-craft/pb-version-bump 
Bump problem builder XBlock version to include PR 80
 2015-10-22 16:08:20 -07:00
cahrens
bdd30162ed Mark as flaky. 
TNL-3679
 2015-10-22 17:08:06 -04:00
Frances Botsford
feacd0fb9f allow discussion post styles to be used in the teams space 2015-10-22 16:16:46 -04:00
Braden MacDonald
0004df2084 Bump problem builder XBlock version to include PR 80 
See https://github.com/open-craft/problem-builder/pull/80
 2015-10-22 12:01:26 -07:00
Sarina Canelake
7852f76cb7 Update translations (autogenerated message) 2015-10-22 14:50:31 -04:00
Sarina Canelake
9abf255096 Merge pull request #10262 from edx/oppia 
Update Oppia XBlock
 2015-10-22 14:31:37 -04:00
Andy Armstrong
d05b7a21b3 Merge pull request #10312 from edx/andya/dev-xblock-assets 
Allow non-public XBlock assets in debug mode
 2015-10-22 12:56:14 -04:00
Christina Roberts
9cfbbb23e7 Merge pull request #10298 from edx/christina/tnl-2419 
Use waits because MathJax rendering is asynchronous.
 2015-10-22 11:49:25 -04:00
Sarina Canelake
cb252c3123 Merge pull request #10275 from edx/frances/capa-problem-status-fix 
Fix for problem status feedback spacing and partial credit hint
 2015-10-22 11:38:38 -04:00
Ahsan Ulhaq
ce5f79016d Merge pull request #10103 from edx/ahsan/ECOM-2435-Updated-Styling-for-Courses-Existing-Messaging 
Updated Styling for Courses and Existing Messaging
 2015-10-22 20:36:38 +05:00
Andy Armstrong
054aa95b26 Allow non-public XBlock assets in debug mode 2015-10-22 11:09:02 -04:00
Peter Pinch
b87634d8e0 Merge pull request #10268 from mitocw/fix/pdw/download-ccx-csv 
Fix CCX grades csv file download
 2015-10-22 10:58:27 -04:00
cahrens
f7e2830a2a Move waits into the page objects. 2015-10-22 10:56:45 -04:00
Feanil Patel
e8214a1dc8 Wipe existing version when replacing. 
CircleCI re-uses your existing venv cache.  If we don't do this, it will prompt the user for what to do and hang the build on certain kinds of updates.
 2015-10-22 09:21:30 -04:00
cahrens
9968622c58 Use waits because MathJax rendering is asynchronous. 
TNL-2419
 2015-10-22 09:09:46 -04:00
Christina Roberts
d4f2fe1281 Merge pull request #10294 from edx/christina/convert-video-test 
Delete test that is already covered by bok choy.
 2015-10-22 09:08:16 -04:00
tasawernawaz
450e625d97 Merge pull request #10280 from edx/tasawer/story/ecom-2538-fix-for-multiple-providers 
Fix parameter name issue for multiple providers
 2015-10-22 09:48:22 +05:00
Renzo Lucioni
d414d74fab Merge pull request #10260 from edx/renzo/reserve-service-user 
Reserve ecommerce worker username
 2015-10-21 16:21:53 -04:00
Renzo Lucioni
fda61b52aa Reserve ecommerce worker username 
Django's user model allows email addresses to be blank. However, edx-platform includes a migration requiring that email addresses be unique. Someone in our production environment already had a blank email address, so this migration was failing earlier.
 2015-10-21 15:27:50 -04:00
Christina Roberts
a48d3ebe84 Merge pull request #10272 from edx/christina/PLAT-878 
Delete dead reference to modules.css.
 2015-10-21 14:26:07 -04:00
Jim Abramson
88bfeafe4c Merge pull request #10274 from edx/jsa/update-erac 
Update from ecommerce-api-client 1.1 to edx-rest-api-client 1.2
 2015-10-21 14:20:53 -04:00
Christina Roberts
9295b37d28 Merge pull request #10286 from edx/christina/deprecate-survey 
Deprecate end_of_course_survey_url until it can be removed.
 2015-10-21 14:11:20 -04:00
cahrens
cc0d942963 Delete test that is already covered by bok choy. 
TNL-3223
 2015-10-21 13:26:54 -04:00
AlasdairSwan
c622f03a6a Merge pull request #10288 from edx/release 
Release 2015-10-21
 2015-10-21 13:16:35 -04:00
asadiqbal
0f394656c9 SOL-1312 changes 2015-10-21 20:50:28 +05:00
cahrens
05cae8c684 Deprecate end_of_course_survey_url until it can be removed. 2015-10-21 10:36:13 -04:00
Matt Drayer
5ed97e90f3 Merge pull request #10248 from edx/ziafazal/SOL-1319 
SOL-1319: removed  entrance exam dependency on ENABLE_MKTG_SITE
 2015-10-21 10:16:56 -04:00
AlasdairSwan
969b4995e5 Merge pull request #10254 from edx/rc/2015-10-20 
Rc/2015 10 20
 2015-10-21 10:03:27 -04:00
Tasawer
65c93d7ad5 Fix for multiple provider ids 
ECOM-2538
 2015-10-21 13:54:59 +00:00
Christina Roberts
125930cf59 Merge pull request #10223 from edx/christina/upgrade-mathjax 
Upgrade to MathJax 2.5.
 2015-10-21 09:44:44 -04:00
Ned Batchelder
a0c25f88c3 Merge pull request #10279 from edx/ned/cleaner-django-meta 
No need for docstrings on "class Meta"
 2015-10-21 09:35:40 -04:00
Renzo Lucioni
99e6cab282 Merge pull request #10253 from edx/renzo/studio-entity-plugins 
Groundwork for Studio extensibility
 2015-10-21 09:19:17 -04:00
Jesse Zoldak
2e6880f69e Merge pull request #10228 from edx/zoldak/fix-acceptance-select-helpers 
Fix the helpers for Select objects by wrapping them in promises
 2015-10-21 09:14:46 -04:00
wajeeha-khalid
107c49599f Merge pull request #10008 from edx/jia/MA-1281 
MA-1281 User Account: added account_privacy field in GET and PATCH endpoints
 2015-10-21 17:52:59 +05:00
Arbab Nazar
034ac1c808 Merge pull request #10271 from edx/arbab/enrollment-user-list 
take the list of users for enrolment change
 2015-10-21 08:24:48 -04:00
Ned Batchelder
322ca34b20 Remove pylint pragmas from "class Meta" 
Also remove useless docstrings where they were added to keep pylint
quiet.
 2015-10-21 07:37:00 -04:00
Ned Batchelder
1775076500 Update edx-lint to get updated pylintrc for Meta 
It's silly to have to shut up pylint for "class Meta" all the time.
 2015-10-21 07:34:15 -04:00
Ahsan Ulhaq
04de913dbe Updated Styling for Courses and Existing Messaging 
ECOM-2435
 2015-10-21 15:40:44 +05:00
Zia Fazal
80abf159ee removed entrance exam dependency on ENABLE_MKTG_SITE 
changes after feedback from Matt D

set default value of entrance_exams feature flags to false
 2015-10-21 15:21:26 +05:00
wajeeha-khalid
017477a8d7 MA-1281 User Account: added account_privacy field in GET and PATCH 2015-10-21 11:33:38 +05:00
tasawernawaz
b50daf5f12 Merge pull request #10184 from edx/tasawer/story/ecom-2552-turn-off-mail-for-icrv 
New Model added for Configuration of ICRV status emails.
 2015-10-21 10:22:25 +05:00
Sarina Canelake
15d1aa3ad4 Merge pull request #10257 from edx/sarina/update-profile-wording 
Create distinct terms for gender, education sign up terms
 2015-10-20 20:06:14 -04:00
Nimisha Asthagiri
970efb04d9 Merge pull request #10046 from edx/cdyer/MA-1416-image-mimetype-uploads 
MA-1416 image mimetype uploads
 2015-10-20 19:16:24 -04:00
Sarina Canelake
105d611cc9 Create distinct terms for gender, education sign up terms 2015-10-20 18:55:51 -04:00
jsa
56b7b7007e Update from ecommerce-api-client 1.1 to edx-rest-api-client 1.2 2015-10-20 17:44:19 -04:00