Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,653 Commits 1 Branch 0 Tags
75aaf0d4a7e98115f4800deb455deb2dbeec2af2
Commit Graph

2703 Commits

Author SHA1 Message Date
Will Daly
ad1cf355e9 Merge pull request #7007 from edx/will/ecom-859-take-three 
ECOM-859: Add support for an input image capture.
 2015-02-18 12:59:26 -05:00
Will Daly
a29662cdbc ECOM-859: Add support for an input image capture. 
Add support for HTML Media Capture (file input)
so that iOS users can use the camera.
 2015-02-18 11:10:41 -05:00
Will Daly
a5f173dfcc ECOM-1060: Logistration third-party auth improvements 
When the user returns to the registration page with a current
third party auth provider, hide the third party auth buttons
are hidden, including the
"or create a new one here" text that does not make sense
when the buttons are hidden.
 2015-02-17 14:48:53 -05:00
Chris
48b50fa097 Merge pull request #6971 from edx/clrux/rtl-1630-fix 
RTLifying the forgot password link
 2015-02-13 15:15:24 -05:00
Will Daly
62b91d6fcc Merge pull request #6982 from edx/will/update-linkedin-field-name 
LinkedIn Add to Profile source parameter
 2015-02-13 14:03:10 -05:00
Chris Rodriguez
a1143d45ba RTLifying the forgot password link 2015-02-13 13:25:20 -05:00
Will Daly
a18e0c6bc7 Rename LinkedIn configuration field to "company_identifier" 
Add "source" parameter to LinkedIn add-to-profile URL.

Add platform name to certification name.

Style changes for linked in sharing on dashboard
 2015-02-13 12:23:51 -05:00
Chris
2c8698c087 Merge pull request #6970 from edx/clrux/rtl-1629-fix 
Adding new logistration Sass partial to RTL compiled
 2015-02-13 10:46:54 -05:00
Chris Rodriguez
23557b9800 RTL-ifying footer 2015-02-13 09:44:17 -05:00
Chris Rodriguez
be7b3f2949 Adjusting RTL styles for UX-1628 2015-02-13 09:44:17 -05:00
Chris Rodriguez
bed9d2f5da Adjusting line height and labels 2015-02-12 18:53:20 -05:00
Chris Rodriguez
7c02782f90 Adding new logistration Sass partial to RTL compiled 2015-02-12 18:53:20 -05:00
Chris Rodriguez
23e2b8b702 Adjusting RTL styles for UX-1628 2015-02-12 11:29:59 -05:00
Will Daly
70ec4c5f66 Merge pull request #6948 from edx/will/country-access-part-2 
Finish Country Access (Part 2 of 3)
 2015-02-11 13:15:38 -05:00
Waqas Khalid
4f326a8ca3 Merge pull request #6832 from edx/waqas/tnl1149-discussion-mathjax-solution 
Discussion forum should be independent of mathjax
 2015-02-11 20:27:45 +05:00
Will Daly
e609f982d7 Country Access: block enrollment 
Block users from enrolling in a course if the user
is blocked by country access rules.

1) Enrollment via the login/registration page.
2) Enrollment from the marketing iframe (via student.views.change_enrollment)
3) Enrollment using 100% redeem codes.
4) Enrollment via upgrade.

This does NOT cover enrollment through third party authentication,
which is sufficiently complex to deserve its own commit.
 2015-02-10 13:07:51 -05:00
Martyn James
c668be3133 Merge pull request #6855 from edx/dsego/SOL-260 
Courseware search: Change name of results page from "Searching [course n...
 2015-02-10 11:02:27 -05:00
Waqas Khalid
11159ba71e Discussion forum doesn't work when mathjax is down 
When mathjax is down discussion forum doesn't work
as we were using markdown.js with processor as
mathjax. Unavailability of mathjax raise error in
js which stops discussion to render. So I made
markdown independent of mathjax. Markdown now will
use mathjax when it is available otherwise ignore it.

TNL-1149
 2015-02-10 13:12:41 +05:00
Waheed Ahmed
1e824a2d46 Fixed close button for help feedback menu. 
TNL-1336
 2015-02-07 01:38:09 +05:00
Martyn James
e760d2d2d2 Update styles 2015-02-06 11:11:37 -05:00
Martyn James
63e9bd55ba Added confirmation that 'Search Results' appears 2015-02-05 13:24:03 -05:00
polesye
c88aad557a TNL-1353: Fix annotator dependency. 2015-02-05 15:51:30 +02:00
Akiva Leffert
50730da1b6 Merge branch 'release' 2015-02-04 13:14:29 -05:00
Awais Qureshi
22af2b75af ECOM-890: Update invoice data model. 
ECOM-891: Allow tracking of invoice transactions.

Authors: Awais Qureshi and Aamir Khan
 2015-02-03 13:27:40 -05:00
Sarina Canelake
4fc4b2f3de LMS: correcting poorly scoped font-family rule for footer links inside of p, ul, ol elements. 
Fix link stylings in LMS and CMS footers
 2015-02-02 16:42:08 -05:00
Davorin Sego
71d66316fc Courseware search: Change name of results page from "Searching [course name]" 
and patch up some style issues
 2015-02-02 14:44:15 +01:00
polesye
bf3740696e TNL-1298: Flaky Jasmine test for Student Notes. 2015-02-02 09:53:24 +02:00
Renzo Lucioni
8f974ea901 Merge pull request #6815 from edx/renzo/enable-logistration 
Make logistration generally available if feature flag is enabled
 2015-01-30 15:15:56 -05:00
Renzo Lucioni
a8bed5ce98 Make logistration generally available if feature flag is active 
Makes logistration available at /login and /register as well as /accounts/login/ and /accounts/register/. In addition:

- Adds support for redirect URLs in third party auth for combined login/registration page
- Adds support for external auth on the combined login/registration page
- Removes old login and registration acceptance tests
- Adds deprecation warnings to old login and register views
- Moves third party auth util to student_account
- Adds exception for microsites (theming)
 2015-01-30 13:28:30 -05:00
AlasdairSwan
1562fdbbb4 ECOM-1002 fixed issue of grey background for logistration page. Also fixed focus issue when toggling between forms - as raised by @cptvitamin 2015-01-29 15:29:49 -05:00
srpearce
30966eb618 Merge pull request #6772 from edx/sylvia/docs/EnrollCodesUI 
Update UI text for enrollment codes
 2015-01-29 10:01:42 -05:00
Davorin Sego
e09d47b122 Courseware Search integration 2015-01-28 21:34:58 -05:00
Will Daly
b467ae8cde Revert "Add RequireJS and RequireJS Optimizer configuration to the LMS" 
This reverts commit b8184d188f.
 2015-01-28 17:26:46 -05:00
Anton Stupak
f1fbd0f969 Merge pull request #6789 from edx/anton/edxnotes-fix-tests 
Fix unit tests.
 2015-01-28 16:32:10 +02:00
polesye
689d7bc8a1 Fix unit tests. 2015-01-28 09:29:02 +02:00
Andy Armstrong
6201af652b Merge pull request #6765 from edx/andya/requirejs-in-lms 
Add RequireJS to the LMS
 2015-01-27 17:57:33 -05:00
Will Daly
b8184d188f Add RequireJS and RequireJS Optimizer configuration to the LMS 
[second attempt which addresses bug building Studio]
 2015-01-27 17:56:29 -05:00
stephensanchez
fbbe307f17 Small css changes to the ecommerce tab 2015-01-27 18:47:16 +00:00
polesye
bd42a39468 TNL-1078: Lines don't break correctly in Student Notes. 2015-01-27 18:09:11 +02:00
polesye
a2a28880c5 TNL-1116: Fix clicking bug. 2015-01-27 11:22:46 +02:00
polesye
df86a3312f TNL-1132: Fix viewer behaviour on hover. 2015-01-26 10:53:44 +02:00
Sarina Canelake
fdb490d121 Merge pull request #6728 from OmarIthawi/edraak/omarithawi/social-login-icons-rtl 
RTL margins for 3rd-party auth button icons
 2015-01-25 09:19:18 -05:00
Carlos Andrés Rocha
78375b797b Merge pull request #6738 from edx/rc/2015-01-20 
Rc/2015 01 20
 2015-01-23 16:10:28 -05:00
Omar Al-Ithawi
a5c0b6e29a RTL margins for 3rd-party auth button icons 2015-01-22 17:49:47 +02:00
Will Daly
1f2b155746 Revert "Add RequireJS and RequireJS Optimizer configuration to the LMS" 
This reverts commit 1d6fceda50.
 2015-01-21 17:13:27 -05:00
Will Daly
1eaf84a443 Merge pull request #6544 from edx/will/requirejs-optimizer-lms 
Add RequireJS and RequireJS Optimizer configuration to the LMS
 2015-01-21 15:23:35 -05:00
Brian Talbot
9d2ede98a4 LMS: resolving incorrect icon on Instructor Dashboard admin list mgmt 
UX-1466
 2015-01-21 13:47:12 -05:00
AlasdairSwan
04fc722e1c ECOM-958 fixed font awesome issues with old verification flow 2015-01-20 16:05:55 -05:00
Will Daly
1d6fceda50 Add RequireJS and RequireJS Optimizer configuration to the LMS 
Respond to review comments:

- Rename build and config files for consistency between lms/studio.
- Fix merge conflicts with lms require config.
- Devstack uses optimized pipeline to skip require JS optimizer step
- Add tests for render_require_js_path_overrides
 2015-01-20 14:27:23 -05:00
Adam
11428fa632 Merge pull request #5237 from mtyaka/mathjax-upgrade 
Upgrade MathJax to 2.4
 2015-01-20 12:26:38 -05:00