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

2682 Commits

Author SHA1 Message Date
Waheed Ahmed
1e824a2d46 Fixed close button for help feedback menu. 
TNL-1336
 2015-02-07 01:38:09 +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
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
Will Daly
0a9f9130b0 Inline the user api form description calls 2015-01-19 16:01:11 -05:00
Matjaz Gregoric
e255f4b021 Upgrade MathJax to 2.4. 
Several IE bugs have been fixed in 2.4.
 2015-01-19 08:10:45 +01:00
polesye
1d9b5a9736 TNL-1220: Fix Harvard Text Annotation UI. 2015-01-16 22:45:07 +02:00
Brian Talbot
26fb3fc557 LMS: student notes - styling links to appear in highlighted text 2015-01-16 11:07:55 -05:00
Renzo Lucioni
c6777a5b25 Bok Choy tests for the split payment and verification flow 
Adds mode creation endpoint to course_modes app and ability to bypass media device access prompt when proceeding through verification flow in a testing environment.
 2015-01-15 17:25:25 -05:00
Matt Drayer
27fee62039 Merge pull request #6126 from edx/ziafazal/add-pre-requisite-course-via-milestones-app 
Ziafazal/add pre requisite course via milestones app
 2015-01-15 14:20:44 -08:00
Zia Fazal
ca3d84a5d4 New pre-requisite course feature via milestones app 2015-01-15 15:17:38 -05:00
chrisndodge
c4cd94d756 Merge pull request #6583 from edx/muhhshoaib/shoppingcart-redemption-page-cross-browser-compatibility-fix 
fix the redemption page cross browser issue on safari
 2015-01-15 14:57:05 -05:00
Chris Rodriguez
e44ca91b2a Small accessibility fixes for cohorts 2015-01-15 10:33:49 -05:00
Andy Armstrong
bca6274eb5 Miscellaneous text updates 2015-01-15 10:33:48 -05:00
Andy Armstrong
798342e177 Rename 'cohorted content group' to 'content group' 2015-01-15 10:33:48 -05:00
Andy Armstrong
ac58ebf7da Rename 'cohort groups' to just 'cohorts' 2015-01-15 10:33:48 -05:00
Chris Rodriguez
e2f7f343bd Fixing padding issues 2015-01-15 10:33:47 -05:00
Brian Talbot
d556cdd586 syncing icon class syntax + semantically hiding changed icons from assistive tech 
TNL-1137
 2015-01-15 10:33:47 -05:00
Andy Armstrong
42c4071869 Implement better select handling and tests 2015-01-15 10:33:47 -05:00
Chris Rodriguez
54a8a4fccb Addressing items in the latest PR; includes RTL-ifying all SCSS 2015-01-15 10:33:47 -05:00
Andy Armstrong
fc5b94eeeb Address most of Christina's code review comments 2015-01-15 10:33:46 -05:00
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