Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
44,235 Commits 1 Branch 0 Tags
67fe47713bf9dc286cd49bdb4f0cbfaac3df009f
Commit Graph

4596 Commits

Author SHA1 Message Date
Waheed Ahmed
67752c39cc Merge pull request #16305 from edx/waheed/LEARNER-2730-text-me-the-app 
Create custom Text Me The App landing page.
 2017-12-14 12:50:00 +05:00
Harry Rein
310279c704 Merge pull request #16905 from edx/HarryRein/reenabling-jasmine-tests-entitlements 
Reenabling Entitlement Jasmine tests.
 2017-12-13 15:33:42 -05:00
Harry Rein
7380bcd70c Reenabling Entitlement Jasmine tests. 
LEARNER-3483
 2017-12-13 13:31:30 -05:00
Harry Rein
a0df76e19e Merge pull request #16903 from edx/HarryRein/entitlements-jasmine-tests-requireJS 
Remove dependency on Popper.js
 2017-12-13 13:04:52 -05:00
Harry Rein
54734841a2 Remove dependency on Popper.js 2017-12-13 12:45:08 -05:00
Bill Filler
dd4d13af5f Merge pull request #16611 from edx/afzaledx/WL-1219 
Added extended profile fields to the Account settings page.
 2017-12-13 08:48:06 -05:00
Waheed Ahmed
efe4120b8f Create custom Text Me the App landing page. 
Rebrand the branch.io text me the app landing page to reflect edX's style.

LEARNER-2730
 2017-12-13 17:10:32 +05:00
Brittney Exline
c0ce7cf69a Merge pull request #16880 from edx/bexline/registration_fix_ie11 
ENT-800 Fix IE11 Broken Submit button on Registration Page
 2017-12-12 16:25:01 -05:00
Brittney Exline
c110a9ac21 ENT-800 Fix IE11 Broken Submit button on Registration Page 2017-12-12 11:58:00 -05:00
Harry Rein
19406fa48f Removing RequireJS imports of bootstrap and popper. 2017-12-12 11:07:11 -05:00
Harry Rein
2711fb521a Allowing a user to fulfill their entitlement on the programs dashboard. 
LEARNER-3438

The user can now enroll in a session, unenroll from a session or change session
from a new course enrollment card on the programs dashboard.
 2017-12-12 10:35:26 -05:00
Douglas Hall
cd70023141 Merge pull request #16861 from edx/douglashall/ENT-796 
Fix optional registration fields toggle.
 2017-12-11 20:10:19 -05:00
Douglas Hall
ede8ee4a5b Fix optional registration fields toggle. 
We need to account for optional fields that may get rendered
as hidden input elements due to the configuration of the
registration form when deciding whether or not to display
the optional registration fields toggle checkbox.

ENT-796
 2017-12-11 16:14:18 -05:00
Harry Rein
a9a255e3c8 Load popper and bootstrap through a script tag to reduce flakiness on stage. 2017-12-11 13:23:29 -05:00
Afzal Wali
f589dc9d29 WL-1219 
Added extended profile fields to the Account settings page.
 2017-12-11 18:42:59 +05:00
Eric Fischer
f63cf61a9d cleanup regex 2017-12-08 14:39:02 -05:00
Eric Fischer
5bc6b31e29 eslint --fix 2017-12-08 14:38:41 -05:00
Michael Frey
e0112d18e3 Merge pull request #16842 from edx/HarryRein/popover-styling 
Fix styling on the popover.
 2017-12-08 14:18:28 -05:00
Sofiya Semenova
b4a4318d1a Merge pull request #16705 from edx/sofiya/1552 
Educator 1552 Implement roving tabindex for WYSIWYG editor for discussions
 2017-12-08 13:24:07 -05:00
Diana Huang
8752480aac Merge pull request #16829 from edx/diana/registration-form-improvements 
LEARNER-3469 - More registration form cleanup.
 2017-12-08 13:00:20 -05:00
Harry Rein
2162b966d0 Fix styling on the popover. 2017-12-08 12:28:06 -05:00
Sofiya Semenova
a1f0679f3a Educator 1552 - Implement roving tabindex for WYSIWYG editor for discussions 2017-12-08 11:18:11 -05:00
Diana Huang
0ecc0558a3 More registration form cleanup. 2017-12-08 09:39:01 -05:00
zubair-arbi
2ac544caeb Update account settings page for enterprise learners 
ENT-762
 2017-12-08 15:40:18 +05:00
Albert St. Aubin
28837c020f Allowing a user to fulfill their entitlement on the course dashboard. 
The user can now enroll in a session, unenroll from a session or change session
from a new course enrollment card on the course dashboard.
 2017-12-07 12:41:12 -05:00
ayub-khan
96984aa3a4 updated translations 7 dec 2017-12-07 17:17:16 +05:00
edx-pipeline-bot
740268c668 Merge pull request #16792 from edx/release-mergeback-to-master 
Merge release back to master
 2017-12-05 17:02:08 -05:00
Diana Huang
366d0e1400 Fix more registration form bugs. 2017-12-05 11:10:35 -05:00
Ayub khan
3fc45dcdba Merge pull request #16718 from edx/Update_translations_30_Nov 
updated translations
 2017-12-05 12:29:39 +05:00
Diana Huang
141bee3290 Merge pull request #16761 from edx/diana/hide-optional-fields-checkbox 
LEARNER-3406: Fix registration fields bugs.
 2017-12-04 13:14:15 -05:00
Diana Huang
daeb2cc1b9 Fix registration fields bugs. 2017-12-04 10:30:46 -05:00
ayub-khan
b9acdbb284 updated translations 2017-12-04 17:21:48 +05:00
Waheed Ahmed
d7d310bc4f Course dates mobile fragment improvments. 
Added new mobile css entry in css pipline and removed
dates heading for mobile view.

LEARNER-3206
 2017-12-04 15:16:06 +05:00
Matt Tuchfarber
c25e4ba045 Merge pull request #16648 from edx/tuchfarber/add_price_to_marketing_button 
Add pricing data to program purchase button
 2017-11-30 13:11:06 -05:00
Diana Huang
8693f2fd38 UX updates to registration form. 
- hide optional fields by default.
- instructions only shown when focused in.
- removed header
- Terms of service link and checkbox on same line.
 2017-11-29 09:46:54 -05:00
Tasawer Nawaz
8a78daa8c8 update design of support form + form will be shown only to logged in users 
LEARNER-3288
 2017-11-29 10:20:01 +05:00
Calen Pennington
64dd633fc9 Merge pull request #15846 from edx/ormsbee/decaffeinate_tests_2 
WIP: Decaffeinate Test Files (Part 2)
 2017-11-28 13:34:26 -05:00
Sven Marnach
b77bff4d96 Small fixes to support Okta SSO. 2017-11-28 16:50:53 +01:00
Sofiya Semenova
ea488f84ed Merge pull request #16633 from edx/sofiya/ed-1560 
Educator 1560 - Clean up labelling in the Discussion Add Post form
 2017-11-27 13:47:54 -05:00
Michael Terry
ffc838250d Merge pull request #16605 from mikix/mikix/border-a11y 
Show current tab even in high contrast mode
 2017-11-27 12:14:29 -05:00
Sofiya Semenova
3244fc0d67 Educator 1560 - Clean up labelling in the Discussion Add Post form 2017-11-27 11:12:05 -05:00
ayub-khan
9e619e4244 Updated Translations 2017-11-23 16:02:47 +05:00
David Ormsbee
94614db46e CoffeeScript tests migration: Remove implicit returns 2017-11-22 15:39:50 -05:00
David Ormsbee
0880502f26 CoffeeScript tests migration: Decaffeinate files 
This is running decaffeinate, with no additional cleanup.
 2017-11-22 15:39:50 -05:00
David Ormsbee
5c64da2f63 CoffeeScript tests migration: Rename files 
Step 1 in our migration steps is to rename the CoffeeScript files to
the JS files they will be replaced with, so that we can preserve file
history.
 2017-11-22 15:39:50 -05:00
Matt Tuchfarber
26144b4a66 Add pricing data to program purchase button 2017-11-21 14:53:11 -05:00
Farhanah Sheets
7c7a147e8d Merge pull request #16628 from edx/fsheets/EDUCATOR-1561 
Discussion Add Post - Update sr Label to Match Visual Label
 2017-11-20 16:02:42 -05:00
Troy Sankey
1e09a548b1 Merge pull request #16568 from edx/pwnage101/set_language_shim_PLAT-1353 
Avoid a django breaking change: set_language response code
 2017-11-20 15:08:11 -05:00
Troy Sankey
bff8c08245 Avoid a django breaking change: set_language response code 
In Django 1.10+, the set_language view (/i18n/setlang) will respond to
Ajax requests which do not contain a "next" parameter with status 204 No
Content instead of 304.  This commit adds the "next" parameter to the
request in order to ensure that upgrading to Django 1.10+ will not cause
the set_language view to change behavior.

PLAT-1353
 2017-11-20 15:02:13 -05:00
Farhanah Sheets
c8c3b55390 Update sr label to match visual label 2017-11-20 13:55:59 -05:00