Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,662 Commits 1 Branch 0 Tags
2ff8f2faea52f7c01b2cff80ce19fe77687d0051
Commit Graph

27662 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dennis Jen
2ff8f2faea Merge branch 'release' into rc/2015-01-07 2015-01-06 16:30:11 -05:00
Jim Abramson
7e506d421f Merge pull request #6457 from edx/jsa/bulk-ops-forums 
use modulestore bulk ops in forum views.
 2015-01-06 15:56:54 -05:00
AlasdairSwan
9d7c90bee8 Merge pull request #6466 from edx/alasdair/logistration-history-query-params-fix 
Updated after Will's comments
 2015-01-06 13:01:23 -05:00
AlasdairSwan
a8a8cfd534 Updated after Will's comments 2015-01-06 11:48:05 -05:00
Renzo Lucioni
93a2e080e8 Merge pull request #6465 from edx/renzo/update-split-payment-verification-copy 
Apply most important copy changes from docs
 2015-01-06 11:46:14 -05:00
AlasdairSwan
a1104ceb6b Merge pull request #6464 from edx/alasdair/logistration-history-query-params-fix 
Updated history.push to include any query params
 2015-01-06 11:40:18 -05:00
AlasdairSwan
1d928379a1 Updated history.push to include any query params 2015-01-06 11:39:14 -05:00
Renzo Lucioni
fe691b051b Apply most important copy changes from docs 2015-01-06 11:31:12 -05:00
jsa
ce3c650cf9 use modulestore bulk ops in forum views. 
JIRA: PLAT-348
 2015-01-06 09:59:20 -05:00
chrisndodge
72bdd48fa5 Merge pull request #6460 from edx/muhhshoaib/rc-hotfix-redemption-page-css 
fixed the redemption page broken Css.
 2015-01-06 09:48:16 -05:00
Will Daly
adcfaaefd1 Merge pull request #6463 from edx/hotfix/ecom-872 
Fix ECOM-872
 2015-01-06 09:25:27 -05:00
Renzo Lucioni
af7620a1c3 Merge pull request #6454 from edx/alasdair/not-activated-decoupled-verification-update 
ECOM-869 Update copy and hide supplementary content wrapper and requirem...
 2015-01-06 08:30:02 -05:00
Will Daly
6f593222c4 Fix ECOM-872 2015-01-06 08:17:06 -05:00
Muhammad Shoaib
96d782f2d0 fix the redemption page css. 
div selector is not closed properly in the redemption page html
 2015-01-06 13:59:26 +05:00
Renzo Lucioni
fb013272b8 Wrap full name placeholder in quotes to deal with spaces 
Also fix failing JS test which was looking for a removed button.
 2015-01-05 16:31:55 -05:00
Adam
cdf346ecfa Merge pull request #6453 from edx/adam/fix-delete-orphans-handler 
only recusively delete modules if all their parents are marked for delet...
 2015-01-05 15:34:58 -05:00
Renzo Lucioni
e9e1d35060 ECOM-869 Update copy and hide supplementary content wrapper and requirement blocks if user is inactive 2015-01-05 15:31:36 -05:00
Adam Palay
7837607ca9 only recusively delete modules if all their parents are marked for deletion (PLAT-333) 
update '_delete_item' method for draft only modules and update delete_orphans management command

fix test_courseware which fails due to invalid future date
 2015-01-05 14:54:17 -05:00
Ned Batchelder
90e0a2d1c0 Merge pull request #6448 from edx/ned/update-codejail 
Update CodeJail to get better status code when CPU limit is exceeded.
 2015-01-05 13:13:40 -05:00
Sarina Canelake
fdc5f2433d Merge pull request #6278 from edx/sarina/finish-pr-5863 
Fix edX name hardcoded in password reset email
 2015-01-05 12:49:28 -05:00
AlasdairSwan
0be8ab3aab Merge pull request #6406 from edx/alasdair/logistration-2.0 
ECOM-783 updated logistration in light of redesign
 2015-01-05 12:48:32 -05:00
Ned Batchelder
a2c7b03cb9 Update CodeJail to get better status code when CPU limit is exceeded. 2015-01-05 12:32:11 -05:00
Waqas Khalid
c55e64603e Merge pull request #6440 from mlkwaqas/waqas/tnl1016-dual-vote-count-forum 
Discussion thread response show dual vote count
 2015-01-05 22:08:23 +05:00
Julien Romagnoli
a80c09a9f2 Fix edX name hardcoded in password reset email 2015-01-05 11:27:56 -05:00
Julien Romagnoli
a64f375b78 Add Julien Romagnoli to Authors 2015-01-05 11:27:56 -05:00
AlasdairSwan
a434207076 ECOM-783 updated logistration in light of redesign 2015-01-05 11:09:37 -05:00
Waqas Khalid
e7be2f7311 Discussion thread response show dual vote count 
When the responses of the thread is loaded it shows
dual vote count one with simple text and one with
button whereas only text should be shown when thread
is closed and only button when thread is open.

TNL-1016
 2015-01-05 20:55:32 +05:00
Sarina Canelake
8d57756312 Merge pull request #6438 from edx/sarina/20150105-translations-update 
Update translations (autogenerated message)
 2015-01-05 10:39:33 -05:00
David Baumgold
5f17781d39 Merge pull request #6428 from edx/shoppingcart-improve-i18n 
Improve i18n for shopping cart registration code redemption page
 2015-01-05 10:35:38 -05:00
David Baumgold
cd76ac9cf1 Merge pull request #6380 from edx/i18n-password-reset-confirm 
Better i18n on the password reset page
 2015-01-05 10:35:20 -05:00
David Baumgold
39dac9952b Improve i18n for shopping cart registration code redemption page 2015-01-05 10:32:45 -05:00
Sarina Canelake
41c5c3a949 Update translations (autogenerated message) 2015-01-05 10:18:59 -05:00
Usman Khalid
ada4626b4a Merge pull request #6436 from edx/usman/ora-rc-2015-01-05 
Update edx-ora2 to release-2015-01-05T12.24.
 2015-01-05 20:10:30 +05:00
David Baumgold
25bdf70e78 Better i18n on the password reset page 2015-01-05 10:08:43 -05:00
Ned Batchelder
ec6b2b397c Merge pull request #6276 from edx/ned/add-schoolyourself-xblock 
Add the SchoolYourself XBlock
 2015-01-05 10:06:14 -05:00
Ned Batchelder
ef3444be76 Add the SchoolYourself XBlock 2015-01-05 10:03:38 -05:00
David Baumgold
20220dc3eb Merge pull request #6418 from edx/translate-placeholder-text 
Placeholder text should be translated
 2015-01-05 09:21:03 -05:00
John Eskew
0dbfd174e2 Merge pull request #6097 from edx/jeskew/fix_exception_on_fill_run 
When fill_in_run() fails, handle failure instead of exception.
 2015-01-05 09:03:56 -05:00
Usman Khalid
b13eef8859 Update edx-ora2 to release-2015-01-05T12.24. 2015-01-05 17:31:00 +05:00
Jesse Zoldak
279e2e8200 Merge pull request #6432 from open-craft/annual-test-failures 
Fix two tests failing on January 1, 2015
 2015-01-02 17:48:45 -05:00
Braden MacDonald
877e231c7a Fix two tests failing on January 1, 2015 2015-01-02 12:25:26 -08:00
chrisndodge
91a4796216 Merge pull request #6196 from edx/muhhshoaib/WL-168 
WL-168 When redeeming a Registration Code in the shopping cart, the user should be redirect to the Registration Code Redemption page
 2015-01-01 10:00:06 -05:00
Will Daly
4589a97676 Merge pull request #6427 from edx/will/ecom-849 
Use disabled property to prevent IE9 users from clicking disabled buttons
 2014-12-31 13:20:54 -08:00
Will Daly
4203c1e545 Use disabled property to prevent IE9 users from clicking disabled buttons 2014-12-31 15:17:07 -05:00
AlasdairSwan
23da87f078 Merge pull request #6414 from edx/alasdair/decoupled-verified-state-copy-cleanup 
ECOM-811 design and layout changes
 2014-12-31 14:40:15 -05:00
David Baumgold
35ec36116c Merge pull request #6424 from edx/remove-useless-i18n 
Remove useless translation
 2014-12-31 14:25:27 -05:00
Will Daly
400efdf153 Merge pull request #6421 from edx/will/ecom-850 
Set attempting_upgrade session flag in the new payment flow
 2014-12-31 11:04:28 -08:00
Will Daly
c183831b43 Merge pull request #6423 from edx/will/ecom-864 
Hide verification messaging if the user has an active verification
 2014-12-31 11:03:34 -08:00
Will Daly
0ac14dce79 Merge pull request #6410 from edx/will/decouple-verified-ab-test 
Decouple verified/payment A/B test setup
 2014-12-31 10:39:49 -08:00
Ned Batchelder
598dc0ebd6 No point using translation for a string consisting only of a replacement. 2014-12-31 13:19:26 -05:00