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

9929 Commits

Author SHA1 Message Date
Sarina Canelake
9142268614 Merge pull request #6603 from edx/sarina/fix-i18n 
Fix i18n from Destination team pages
 2015-01-14 10:16:29 -05:00
AlasdairSwan
4052c729be Merge pull request #6600 from edx/alasdair/register-form-submit-fix 
ECOM-412 Set buttons types so enter now triggers register button
 2015-01-14 08:12:26 -05:00
Sarina Canelake
e88c298a94 Fix i18n from Destination team pages 2015-01-13 16:14:53 -05:00
AlasdairSwan
9046001130 ECOM-412 Set buttons types so enter now triggers register button 2015-01-13 14:28:34 -05:00
Braden MacDonald
6be35e0fc1 Merge pull request #6459 from edx/content-libraries 
Content libraries MVP
 2015-01-13 11:20:20 -08:00
Braden MacDonald
bce8ee692f Fix bug when deleting first of two recently added blocks 2015-01-13 10:11:59 -08:00
Stephen Sanchez
158a0a0e2e Merge pull request #6374 from edx/sanchez/enable_redeem_codes 
Enable redeem codes for Verified Cert Courses
 2015-01-13 13:06:55 -05:00
stephensanchez
b188430679 Enable redeem codes. 
Update the redeem code schema

Updating the redeem code schema.

Adding migration file.

Adding course mode support when redeeming a code.

Conflicts:
	lms/djangoapps/shoppingcart/views.py

Add sales admin privileges for redeem code generation.

Making sure redeem code URLs work for verified courses.

pep8 violations

Code Review and Test Cleanup changes

Added tests, fixed tests.

Updating the boolean checks in ecommerce template
 2015-01-13 15:21:24 +00:00
AlasdairSwan
d706f4de32 ECOM-880 added mobile app links to footer enabled by feature flag ENABLE_FOOTER_MOBILE_APP_LINKS 
Allow configuration to override links to mobile app stores
 2015-01-13 10:12:54 -05:00
Nimisha Asthagiri
e57f3e3b03 Merge pull request #6572 from edx/mobile/fix-decorator-api 
Fix Mobile API decorators
 2015-01-13 06:20:10 -05:00
Nimisha Asthagiri
9566a46a4d Fix Mobile API decorators. 2015-01-13 02:29:53 -05:00
AlasdairSwan
1e051e5ef8 Merge pull request #6555 from edx/alasdair/decoupled-verification-a11y 
Alasdair/decoupled verification a11y
 2015-01-12 18:52:28 -05:00
Brian Talbot
10168b6908 ECOM-873 accessability updates for decoupled verification 2015-01-12 16:21:34 -05:00
Christopher Lee
0625b84d12 Merge pull request #6557 from edx/clee-MA-187-value-error 
Clee ma 187 value error
 2015-01-12 16:18:20 -05:00
Brian Talbot
471f9e179e fix: adjusting vertical alignment on shopping cart action icons 2015-01-12 15:54:52 -05:00
christopher lee
3e5f7bacdd MA-187 ValueError fix 
Fix for MA-187 where a value error was thrown when
a course has a video directly under a section. This
PR handles the situations where a chapter or section
can be none, and then returns the appropriate url
if available.
 2015-01-12 14:15:18 -05:00
Braden MacDonald
10fe9c0180 pylint fixes 2015-01-12 11:00:51 -08:00
Braden MacDonald
9a116529ce Add module key and library source info to problem events 2015-01-12 10:39:13 -08:00
Braden MacDonald
3973317aa9 Report the original LibraryUsageLocator in LMS analytics 2015-01-12 10:39:12 -08:00
Adam
8dd7b78065 Merge pull request #6501 from edx/adam/update-copy-date 
update copyright dates
 2015-01-12 10:59:11 -05:00
Braden MacDonald
5f5b41d03f Remove state summary from the unit author page until SOL-192 2015-01-12 13:37:58 +03:00
Braden MacDonald
cdf7c6545a ungettext fix 2015-01-12 13:37:57 +03:00
Braden MacDonald
e498872ab1 Move update link to the validation area 2015-01-12 13:37:57 +03:00
Jonathan Piacenti
80ea764c9d Made errors on Library blocks use validate functionality. 2015-01-12 13:37:56 +03:00
Jonathan Piacenti
9f85c0f0aa Added explanation to container view of Library Block. 2015-01-12 13:37:56 +03:00
Braden MacDonald
eddf44d853 Library Content XModule 2015-01-12 13:37:56 +03:00
E. Kolpakov
ff1a08cbd5 Paging for LibraryView added with JS tests. 2015-01-12 13:37:55 +03:00
Renzo Lucioni
8ef0e77e46 Prevent Jasmine tests from redirecting in dev mode 
Also prevent Jasmine from attempting to load deleted templates
 2015-01-11 16:08:29 -05:00
Renzo Lucioni
cc306843bc Merge pull request #6508 from edx/renzo/split-payment-verification-fixes 
Fix cosmetic issues with the split payment and verification flow
 2015-01-09 17:42:48 -05:00
David Baumgold
a6f3edcad5 Translate link titles 2015-01-09 15:10:44 -05:00
David Baumgold
7fe267b261 Make all the social links show icons 2015-01-09 14:27:59 -05:00
Renzo Lucioni
10cb7f10fa Fix cosmetic issues with the split payment and verification flow 
Use honor code ribbon if verification status is not missing, submitted, or approved; title column on payment confirmation page holding dollar amounts more appropriately
 2015-01-09 13:13:00 -05:00
Brian Talbot
c93817962e Merge pull request #6515 from edx/talbs/fix-update-font-awesome 
FIX: Upgrade Font Awesome - Part III: Revenge of the Glyph
 2015-01-09 12:50:14 -05:00
Brian Talbot
f128629f48 fixing styling and class syntax (to new FA-based classes) for missing UI elements 2015-01-09 12:01:26 -05:00
Sarina Canelake
cae70d9966 Move default Open edX branding into default-theme directory 
OPEN-307
 2015-01-09 10:49:17 -05:00
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
Nimisha Asthagiri
fe40fa6deb Merge pull request #6495 from edx/mobile/MA-212 
MA-212 Mobile API support for backward compatibility of course updates.
 2015-01-09 10:05:59 -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
4a37648f36 Merge pull request #6504 from edx/release-merge-test 
Merge release (2015-01-08) into master
 2015-01-08 16:16:03 -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
Christine Lytwynec
66228224c0 Merge pull request #6403 from edx/clytwynec/remove_lynx_from_bulk_email 
Mock html_to_text.py for unit tests
 2015-01-08 14:10:12 -05:00
David Baumgold
1b02ed5d95 Merge pull request #6252 from edx/studio-move-branded 
Placeholder image for Open edX Studio logo, when not running on edx.org
 2015-01-08 12:42:40 -05:00
David Baumgold
96d86e4e17 Placeholder image for Open edX Studio logo, when not running on edx.org 2015-01-08 12:42:26 -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
Nimisha Asthagiri
3498eeb1f6 MA-212 Mobile API support for backward compatibility of course updates. 2015-01-08 10:05:29 -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