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

10107 Commits

Author SHA1 Message Date
Ben Patterson
c83ea18d91 Fix test failing under one shard. 
This test consistently fails when combining
lms acceptance onto one shard. (TE-737)
 2015-02-02 16:05:55 -05:00
Will Daly
82d7e25f3e Add views to the embargo app to render messages explaining why students are blocked. 2015-02-02 14:04:29 -05:00
Martyn James
98e92bfb12 Merge pull request #6847 from edx/mjames/search_setting 
Default search engine to None
 2015-02-02 08:31:06 -05:00
Anton Stupak
64b3768d6b Merge pull request #6837 from edx/anton/fix-flaky-unit-test 
TNL-1298: Flaky Jasmine test for Student Notes.
 2015-02-02 14:23:41 +02:00
Chris
2967f18d3f Merge pull request #6739 from edx/clrux/lms-navigation-accessibility-update 
Accessibility fixes for UX-1572
 2015-02-02 07:05:00 -05:00
polesye
bf3740696e TNL-1298: Flaky Jasmine test for Student Notes. 2015-02-02 09:53:24 +02:00
Will Daly
79ffa0f57f Merge pull request #6838 from edx/will/fix-translator-comments-in-email 
ECOM-1018: Fix translator comments showing up in redeem code email.
 2015-01-30 17:47:16 -05:00
Martyn James
1b769b53cd Default search engine to None, so that all search/indexing operations are disabled until enabled 2015-01-30 16:40:03 -05:00
Will Daly
bf68daa46b Fix translator comments showing up in redeem code email. 
Fix newlines in redeem code email.

Update copy to make sense for edx.org as well as white label.
 2015-01-30 15:28:47 -05: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
Chris Rodriguez
3acb5c53f0 Accessibility issues addressing UX-1572 2015-01-30 14:16:59 -05:00
Sarina Canelake
ef8b95b98e Merge pull request #6805 from edx/sarina/legal-update-footer-text 
Update Footer Copyright Notice as per Legal OPEN-444
 2015-01-30 14:09:38 -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
Chris
0a0d306b6a Merge pull request #6750 from edx/clrux/lms-navigation-content-focus-update 
Accessibility issues addressing UX-1573
 2015-01-30 12:26:23 -05:00
Sarina Canelake
2fd7657e0f Update text in LMS footer as per legal 
[OPEN-444]
 2015-01-30 11:33:46 -05:00
Adam Palay
bfcfbfab2f Merge remote-tracking branch 'origin/release' into merge-release-into-master 
Conflicts:
	requirements/edx/github.txt
 2015-01-30 09:44:42 -05:00
Stephen Sanchez
869b407e1f Merge pull request #6818 from edx/sanchez/allow_redeem_code_upgrades 
ECOM-990: Fix the redemption codes to allow upgrading course modes.
 2015-01-30 09:36:43 -05:00
Muzaffar yousaf
ae102de3be Merge pull request #6777 from edx/muzaffar/student-info-tnl836 
Get user anonymous id via xblock user service.
 2015-01-30 19:35:26 +05:00
AlasdairSwan
a001737d8c Merge pull request #6827 from edx/alasdair/logistration-field-focus-fix 
ECOM-1002 fixed issue of grey background for logistration page. Also fix...
 2015-01-30 08:52:53 -05:00
stephensanchez
b4c66f57d2 Fix the redemption codes to allow upgrading course modes. 2015-01-29 22:05:26 +00:00
Renzo Lucioni
e24d4d96ad Merge pull request #6720 from edx/renzo/remove-split-verification-session-flag 
Remove old payment and verification flow
 2015-01-29 16:57:40 -05:00
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
Ben Patterson
2dd3cd8659 Fix pep8 violation. 2015-01-29 12:20:23 -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
Mark Hoeber
dd857fb464 Merge pull request #6760 from edx/markhoeber-doc1510 
Platform API Doc Update
 2015-01-29 11:34:03 -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
Mark Hoeber
1d738527b6 Platform/Mobile API doc updates 2015-01-29 10:19:35 -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
muzaffaryousaf
c461541d35 Refactoring tests. 
TNL-1185
 2015-01-29 13:33:28 +05:00
Matt Drayer
495583ac7d Merge pull request #6782 from edx/mattdrayer/generalize-entrance-exam-scoring 
Decoupled entrance exam scoring from milestone fulfillment
 2015-01-28 23:15:58 -05:00
Matt Drayer
8b03ad3906 Decoupled entrance exam scoring from milestone fulfillment 2015-01-28 22:00:25 -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
Anton Stupak
f1fbd0f969 Merge pull request #6789 from edx/anton/edxnotes-fix-tests 
Fix unit tests.
 2015-01-28 16:32:10 +02: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
muzaffaryousaf
4d72910060 Adding get_anonymous_user_id in Xblock 'user' service. 
TNL-836
 2015-01-28 12:47:49 +05:00
polesye
689d7bc8a1 Fix unit tests. 2015-01-28 09:29:02 +02:00
chrisndodge
5364ccf1c5 Merge pull request #6755 from edx/muhhshoaib/removing-extra-condition-from-pdf-file 
removed the is_invoice condition from the pdf file
 2015-01-28 00:06:14 -05: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
Anton Stupak
838569d19b Merge pull request #6692 from edx/anton/edxnotes-fix-text-line-breaks 
TNL-1078: Lines don't break correctly in Student Notes.
 2015-01-27 20:49:23 +02:00
stephensanchez
fbbe307f17 Small css changes to the ecommerce tab 2015-01-27 18:47:16 +00:00