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

27657 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marco Morales
f91c5ffd1f Merge pull request #6099 from edx/marco/sass-variable-patterns-cleanup 
SASS compilation variable conventions update
 2015-01-06 14:47:24 -05:00
Awais Qureshi
cb6a4db1d0 Merge pull request #6430 from edx/awais786/ECOM-662-decline-error 
Awais786/ecom 662 decline error
 2015-01-06 19:31:05 +05:00
Shrhawk
f6186aeda4 Merge pull request #6357 from Shrhawk/shr/bug/TNL-997-aria-disabled-need-to-added 
Add aria-disabled attribute
 2015-01-06 19:07:46 +05:00
Awais
dfb366afb9 ECOM-662 Raise exception in case of DECLINE response. 
Adding decline button in fake payment page.
In of case ERROR, CANCEL, and DECLINE removing auth_amount from test cybersource2 and payment fake.
 2015-01-06 18:21:25 +05:00
Ben Patterson
3fafc65c33 Merge pull request #5278 from edx/benp/improve-paver-bokchoy-modulestore 
Refactor default_store logic in paver test_bokchoy
 2015-01-06 07:38:34 -05:00
Syed Hassan Raza
1e11baede4 Add aria-disabled attribute 
TNL-997
 2015-01-06 17:21:49 +05:00
Mark Hoeber
a129c4d2da Merge pull request #6435 from edx/markhoeber-remove-unused-files 
Delete unused problem doc files
 2015-01-05 20:35:25 -05:00
Marco Morales
7d110a86d4 cleanup to PR feedback for shoppingcart and instructor2 scss partials 2015-01-05 18:57:58 -05:00
Marco Morales
38b7e4cc50 SASS compilation variable conventions update, focusing on basic colors, baseline variable usage for padding and margins, ui-depth extends, along with other small fixes. The intent with this is to not have any user-facing impact, and instead move us closer toward having files that use our newer sass conventions. 2015-01-05 17:30:13 -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
Mark Hoeber
9a3bee90b1 Delete unused problem doc files 
These are used only in edx-documentation repo now
 2015-01-04 20:17:46 -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
Ben Patterson
f6b2b52c6d Add docstring info for test suite properties. 2014-12-31 15:39:23 -05:00
Ben Patterson
f1f7125d66 rename test method. 2014-12-31 15:39:23 -05:00
Ben Patterson
a01fbefcf2 Refactor default_store logic in paver test_bokchoy 2014-12-31 15:39:23 -05: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
Will Daly
c15adf9cd9 Set attempting_upgrade session flag in the new payment flow 2014-12-31 13:11:34 -05:00
Will Daly
01814c3983 Hide verification messaging if the user has an active verification 2014-12-31 13:01:56 -05:00
Jesse Zoldak
854c28f779 Merge pull request #6422 from edx/revert-6419-testeng/jenkins_revisited 
Revert "Testeng/jenkins revisited"
 2014-12-31 12:26:15 -05:00
Jesse Zoldak
519d55585c Revert "Testeng/jenkins revisited" 2014-12-31 12:25:54 -05:00
AlasdairSwan
686905d9a2 ECOM-811 design and layout changes 
Copy clean up
 2014-12-31 12:07:35 -05:00