Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

6923 Commits

Author SHA1 Message Date
Sarina Canelake
6f5134f711 Move edx branding into edx-theme directory 
OPEN-307
 2015-01-09 10:48:20 -05:00
Sarina Canelake
314c935369 Remove edX branding from default Open edX LMS 
OPEN-307
 2015-01-09 10:48:20 -05:00
Muhammad Shoaib
10f8d8c097 WL-135 added the migration for the expiration_date field in the coupons model 
added the functionality of adding the expiration date, and also handled in the shopping cart when the user try to add the expired coupon code in the shopping cart

added expiration date in the coupons list in the ecommerce page

added the unit tests and jasmine tests

fix the quality issues and rebased with master

regenerated the migration file with a different number

i18n and verified te course mode

changes suggested by  stephan
 2015-01-09 19:14:48 +08:00
David Baumgold
30b572b1b1 Merge pull request #6489 from edx/replace-edx-platform-name 
Replace "edX" with {platform_name}
 2015-01-08 16:36:54 -05:00
Dennis Jen
d2660e530f Merge branch 'release' 
Conflicts:
	lms/templates/verify_student/make_payment_step.underscore
 2015-01-08 15:02:26 -05:00
Adam Palay
8fa00ea54c update studio footer copyright date 2015-01-08 14:45:53 -05:00
David Baumgold
44b792ab26 Replace "edX" with {platform_name} 2015-01-08 11:32:26 -05:00
David Baumgold
a54bff2992 Merge pull request #6487 from edx/remove-linkedin-integration 
Remove LinkedIn integration
 2015-01-08 10:18:25 -05:00
David Baumgold
ed2afa8aaf Merge pull request #6486 from edx/emails-remove-edx 
clean up reject_name_change email template a bit
 2015-01-08 09:59:49 -05:00
David Baumgold
e95f2aeeed Remove LinkedIn integration 2015-01-07 14:38:48 -05:00
David Baumgold
0ec4855909 clean up reject_name_change email template a bit 2015-01-07 13:38:38 -05:00
David Baumgold
a750e43828 Use {platform_name} in discussions header 2015-01-07 13:32:28 -05:00
Sarina Canelake
8af54943e1 Merge pull request #6243 from edx/sarina/default-edx-UI 
Clean up front page UI and video elements, remove cruft [OPEN-407, OPEN-358]
 2015-01-06 21:58:56 -05:00
Brian Talbot
9dd22206ae Merge pull request #6055 from edx/clrux/update-font-awesome-4.2.0-v2 
Upgrade: Font Awesome 4.2.0 - Take #2
 2015-01-06 18:36:44 -05:00
Sarina Canelake
4fcbcaa09b Clean up default Open edX pages 2015-01-06 18:27:16 -05:00
Sarina Canelake
61e02fab87 Hide Honor Code mentions if site does not have an Honor Code 2015-01-06 18:26:19 -05:00
Sarina Canelake
682d3d0eae Organize logic on Find Courses view. 2015-01-06 18:26:19 -05:00
Sarina Canelake
b7a1de1ab0 Abstract references to social media accounts 2015-01-06 18:26:19 -05:00
Sarina Canelake
4a2253a07a Remove no-longer-used template 2015-01-06 18:26:18 -05:00
Sarina Canelake
d6741c7700 Clean up default pages for Open edX instances 
Remove Jobs, News
Change "Vision" to "About"
 2015-01-06 18:26:12 -05:00
Sarina Canelake
aa8b895aea Remove "legacy" footer now that new edx footer in place 2015-01-06 17:20:39 -05:00
Sarina Canelake
6c5542cd24 Change default welcome from mktg text to Open edX text 2015-01-06 17:20:39 -05:00
Sarina Canelake
ec87a14a8d Turn off welcome video by default on Open edX LMS index page 2015-01-06 17:20:39 -05:00
Sarina Canelake
05afa2da17 Variablize copyright year for LMS footer 2015-01-06 15:35:54 -05:00
Chris
c5d2dd7536 Upgrading Font Awesome vendor files from 3.2.1 to 4.2.0 
* updating vendor files
* updating class syntax (to new FA-based classes) for all UI elements
* correcting broken tests
 2015-01-06 15:24:12 -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
Renzo Lucioni
fe691b051b Apply most important copy changes from docs 2015-01-06 11:31:12 -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
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
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
Syed Hassan Raza
1e11baede4 Add aria-disabled attribute 
TNL-997
 2015-01-06 17:21:49 +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
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
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
Julien Romagnoli
a80c09a9f2 Fix edX name hardcoded in password reset email 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
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
David Baumgold
25bdf70e78 Better i18n on the password reset page 2015-01-05 10:08:43 -05: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
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
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
AlasdairSwan
686905d9a2 ECOM-811 design and layout changes 
Copy clean up
 2014-12-31 12:07:35 -05:00
David Baumgold
92622f12a7 Merge pull request #6373 from edx/improve-i18n-receipt-page 
Improve i18n on shoppingcart
 2014-12-31 09:42:05 -05:00
Muhammad Shoaib
5a437b396e WL-168 When redeeming a Registration Code in the shopping cart, the user should be redirect to the Registration Code Redemption page 
improvements suggested by william
 2014-12-31 17:45:31 +05:00
David Baumgold
19c43725dd Merge pull request #6393 from edx/remove-useless-gettext 
HTML should not be i18ned
 2014-12-30 21:25:17 -05:00