Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,731 Commits 1 Branch 0 Tags
435c3c633811ea5164311caefc7d94de1595c435
Commit Graph

4736 Commits

Author SHA1 Message Date
Andy Armstrong
b77e65cdc2 Assign cohorts to groups in the instructor dashboard 
TNL-653
 2015-01-15 10:33:46 -05:00
Andy Armstrong
674bfc4fcb Use edx namespace for Backbone classes 2015-01-15 10:33:46 -05:00
cahrens
5ea7ced900 Create a RESTful handle_cohort view method for GET and PUT/POST. 2015-01-15 10:33:46 -05:00
Chris
9b85ac1f12 UX for associating content groups with cohorts in the instructor dashboard. 2015-01-15 10:33:46 -05:00
Marco Morales
c4e8673db0 creation of a courseware preview menu to contain staff view toggle. 2015-01-15 10:33:44 -05:00
Bertrand Marron
c4a7d770cc Remove all ellipses 
It's a problem for accessibility
 2015-01-15 09:03:12 -05:00
Tim Babych
dbfc12ce01 Merge pull request #6321 from edx/feature/edxnotes 
TNL-213: Student Notes
 2015-01-15 02:02:13 +02:00
polesye
c7153be040 TNL-213: Let Students Add Personal Notes to Course Content. 
Co-Authored-By: Jean-Michel Claus <jmc@edx.org>
Co-Authored-By: Brian Talbot <btalbot@edx.org>
Co-Authored-By: Tim Babych <tim@edx.org>
Co-Authored-By: Oleg Marshev <oleg@edx.org>
Co-Authored-By: Chris Rodriguez <crodriguez@edx.org>
 2015-01-14 23:34:11 +02:00
David Baumgold
f9d8198ef3 Merge pull request #6576 from edx/db/configure-tender-domain 
Make Tender optional and configurable
 2015-01-14 15:02:09 -05:00
David Baumgold
4d323271ee Make Tender optional and configurable 2015-01-14 11:25:55 -05: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
Muhammad Shoaib
4d52ba3a12 fix the redemption page cross browser issue on safari 2015-01-13 16:28:09 +05:00
Brian Talbot
10168b6908 ECOM-873 accessability updates for decoupled verification 2015-01-12 16:21:34 -05:00
Brian Talbot
471f9e179e fix: adjusting vertical alignment on shopping cart action icons 2015-01-12 15:54:52 -05: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
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
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
Dennis Jen
d2660e530f Merge branch 'release' 
Conflicts:
	lms/templates/verify_student/make_payment_step.underscore
 2015-01-08 15:02:26 -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
a750e43828 Use {platform_name} in discussions header 2015-01-07 13:32:28 -05:00
Will Daly
bea5a3ce64 Fix for ECOM-876 2015-01-07 12:06:36 -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
Sarina Canelake
3a3ab76261 Change Open edX index page bright blue to grey 2015-01-06 18:26:19 -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
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
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
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
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
Syed Hassan Raza
1e11baede4 Add aria-disabled attribute 
TNL-997
 2015-01-06 17:21:49 +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
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
AlasdairSwan
a434207076 ECOM-783 updated logistration in light of redesign 2015-01-05 11:09:37 -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
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
686905d9a2 ECOM-811 design and layout changes 
Copy clean up
 2014-12-31 12:07:35 -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
AlasdairSwan
8eb484c109 ECOM-811 design and layout changes 2014-12-30 06:53:59 -08:00