Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

6923 Commits

Author SHA1 Message Date
Chris Rodriguez
370eb970b1 Accessibility issues addressing UX-1573 
Conflicts:
	common/lib/xmodule/xmodule/css/sequence/display.scss
 2015-01-29 16:39:27 -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
Diana Huang
c71a183316 Update embargo copy. 
ECOM-963

update copy in tests
 2015-01-29 15:10:35 -05:00
David Baumgold
6134bedfca Merge pull request #6443 from open-craft/kelketek/hide-irrelevant-cohort-menu 
Add classes to cohort selector element group
 2015-01-29 11:49:33 -05:00
Renzo Lucioni
80589eab36 Remove old payment and verification flow 
Removes old payment and verification endpoints, views, templates, and tests, making the new split flow the default. The SEPARATE_VERIFICATION_FROM_PAYMENT feature flag is also removed.
 2015-01-29 10:56:25 -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
Syed Hassan Raza
a1ffcc5259 Disable referrer (TNL-1144) 2015-01-29 09:53:55 -05:00
Ahsan Ulhaq
1d85598336 Change name and email modal couple of accessibilty issues 
fieldset element was unnecessary and input fields were not
associated with their parent label

TNL-1076
 2015-01-29 15:00:54 +05:00
Davorin Sego
e09d47b122 Courseware Search integration 2015-01-28 21:34:58 -05:00
Jonathan Piacenti
bd57d56bdd Add classes to group of elements for cohort selector. 
Retriggring Jenkins build
 2015-01-28 22:51:46 +00: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
Matt Drayer
dc0816669d Merge pull request #6792 from edx/ziafazal/make-course-requirements-links 
make course requirement as link
 2015-01-28 16:56:35 -05:00
Renzo Lucioni
3f8ca96f02 Change instances of 'register' to 'enroll' 2015-01-28 14:37:26 -05:00
Mark Sadecki
8cffa152d8 changes the skip link text to the industry standard Skip to main content 2015-01-28 11:07:10 -05:00
Chris Rodriguez
9e2494b21d Video player branding addition for XuetangX 2015-01-28 06:39:21 -05:00
Zia Fazal
ba5fd98aaf make course requirement as link 2015-01-28 14:26:27 +05:00
Giulio Gratta
c18ee8cc09 Add cosmetic price field to studio & logic 
- Price field added to Advanced Settings
- Function that decides which price to display
- Test added to check that the function outputs correct price
- Added feature flag and conditional to decide whether to display course price or not
- Feature Flag to show or hide course price on Course About page sidebar when not using shopping cart
 2015-01-27 15:15:43 -08: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
Sylvia Pearce
0f9b501d0b Update UI text for enrollment codes 2015-01-26 22:31:08 -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
Carlos Andrés Rocha
6db7a7e688 Merge pull request #6751 from edx/release 
Release
 2015-01-23 16:10:00 -05:00
Chris Dodge
6bfe20b9a9 When changing quantities, be sure to return the new CyberSource submit form html. Also, to ensure that any browser content is fully refreshed when clicking the back button, force a page refresh to reset client state 2015-01-22 13:33:23 -05: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
David Baumgold
a72e129da5 Merge pull request #6532 from edx/course-about-i18n 
Improve i18n on course about page
 2015-01-21 10:23:59 -05:00
Chris Dodge
7faf5cc0f3 When changing quantities, be sure to return the new CyberSource submit form html. Also, to ensure that any browser content is fully refreshed when clicking the back button, force a page refresh to reset client state 2015-01-21 09:12:06 -05:00
Brandon DeRosier
24862edf1c Add gitlogs link to instructor dashboard 2015-01-20 18:55:42 -05:00
stephensanchez
3b5bd4e777 Making verification msg strings unicode friendly. 2015-01-20 21:41:57 +00:00
stephensanchez
891b952c99 Making verification msg strings unicode friendly. 2015-01-20 21:39:36 +00:00
AlasdairSwan
04fc722e1c ECOM-958 fixed font awesome issues with old verification flow 2015-01-20 16:05:55 -05:00
Diana Huang
134d2f57b2 Show an error when a student needs to reverify 
due to expiration.
 2015-01-20 14:51:08 -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
Will Daly
0a9f9130b0 Inline the user api form description calls 2015-01-19 16:01:11 -05:00
polesye
1d9b5a9736 TNL-1220: Fix Harvard Text Annotation UI. 2015-01-16 22:45:07 +02:00
chrisndodge
dde097c926 Merge pull request #6676 from edx/release 
Release
 2015-01-16 14:07:44 -05:00
Matt Drayer
3c669e3838 New feature contribution: Entrance Exams 2015-01-15 20:35:24 -05:00
Chris Dodge
5880401d9d add a missing check for an undefined object 2015-01-15 18:58:11 -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
Sarina Canelake
68b18a20b2 Merge pull request #6624 from mitocw/bdero/sysadmin-dashboard-link 
Add link to sysadmin dashboard on core theme
 2015-01-15 16:08:25 -05:00
Zia Fazal
ca3d84a5d4 New pre-requisite course feature via milestones app 2015-01-15 15:17:38 -05:00
Adam Palay
4381ccd463 Merge remote-tracking branch 'origin/release' into merge-release-into-master 2015-01-15 14:51:34 -05:00
David Baumgold
b390e18d34 Improve i18n on course about page 2015-01-15 14:38:17 -05:00
Awais Qureshi
5959edb493 Merge pull request #6645 from edx/aamir-khan/ECOM-887-post-payment-message 
ECOM-887 Removed the "We have successfully verified your identity" line.
 2015-01-15 23:12:58 +05:00
David Baumgold
b3fda9c561 Merge pull request #6646 from edx/missed-an-ellipses 
Missed an ellipsis
 2015-01-15 11:56:03 -05:00
Chris Dodge
1fcca3a942 add back inclusion of the receipt_custom_pane.html at the bottom of the receipt page 2015-01-15 11:50:15 -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