Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
32,789 Commits 1 Branch 0 Tags
394c2906e53abc9b3efdcce135abe0afe0fe3a12
Commit Graph

32789 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Clinton Blackburn
394c2906e5 Updated edx-proctoring to 0.9.6b 
PHX-154
 2015-09-16 21:36:20 -04:00
Clinton Blackburn
d0536c50a5 Updated credit provider logo styling on receipt page 
ECOM-2172
 2015-09-16 21:36:19 -04:00
Clinton Blackburn
12a4e85d94 Fixed payment page bug 
Using SKU to choose course mode when creating an order.

ECOM-2172
 2015-09-16 21:36:19 -04:00
Kevin Falcone
7ee03f336e Merge pull request #9799 from edx/hotfix-2015-09-16b 
Allow .html files in the static pipeline
 2015-09-16 17:51:11 -04:00
Andy Armstrong
a1f0f12d03 Allow .html files in the static pipeline 
TNL-3296
 2015-09-16 16:54:30 -04:00
Kevin Falcone
2b24d3dfb2 Merge pull request #9789 from edx/hotfix/2015-09-16 
Hotfix/2015 09 16
 2015-09-16 16:18:01 -04:00
Andy Armstrong
536783e6c9 hotfix/2015-09-16-3: Re-enable uglification of JavaScript in production. 2015-09-16 14:27:09 -04:00
Clinton Blackburn
011062e570 hotfix/2015-09-16-2: Credit Fixes 
- Updated checkout page to disallow purchase of credit seats (the credit payment page is hosted in ecommerce)
- Corrected path to providers endpoint
- Cleaned receipt page styling
- Updated receipt page copy
- Added provider thumbnail to receipt page

ECOM-2172
 2015-09-16 14:26:59 -04:00
Matt Drayer
05a2b54b5a hotfix/2015-09-16-1: Removed signatory org char limit 2015-09-16 14:24:57 -04:00
John Eskew
fa39016dfe Merge pull request #9729 from edx/rc/2015-09-15 
Rc/2015 09 15
 2015-09-16 14:01:18 -04:00
Adam
7f8b77cccb Merge pull request #9778 from edx/adam/patch-rc-with-fix-to-fix-not-found 
Adam/patch rc with fix to fix not found
 2015-09-15 18:04:40 -04:00
Adam Palay
8dd95a8825 add test for fix_not_found 
(PLAT-835)
(TNL-844)
 2015-09-15 18:03:53 -04:00
Adam Palay
cf71f48589 update_course_index should be passed a course key as a kwarg 2015-09-15 17:16:51 -04:00
John Eskew
8a9291029d Merge pull request #9766 from edx/mattdrayer/signatory-title-textarea 
mattdrayer/signatory-title-textarea: Increase form input limit to 106…
 2015-09-15 12:41:52 -04:00
Matt Drayer
3adb26d95b mattdrayer/signatory-title-textarea: Increase form input limit to 106 characters 2015-09-15 11:55:08 -04:00
Matt Drayer
bedcf81418 Merge pull request #9757 from edx/mattdrayer/signatory-title-length 
mattdrayer/signatory-title-length: Bump to 106 characters
 2015-09-14 23:22:46 -04:00
Matt Drayer
60a8531348 mattdrayer/signatory-title-length: Bump to 106 characters 
* Fix typo
* Fix odd test inputs
 2015-09-14 17:19:02 -04:00
Peter Fogg
e38fc82650 Merge pull request #9752 from edx/peter-fogg/handle-elasticsearch-errors 
Add error handling for elastic search.
 2015-09-14 17:01:10 -04:00
Peter Fogg
ca124354ba Add error handling for elastic search. 2015-09-14 16:15:17 -04:00
Andy Armstrong
74757ed7af Merge pull request #9745 from edx/andya/fix-duplicate-search-request 
Fix duplicate calls to search API
 2015-09-14 16:13:04 -04:00
Daniel Friedman
50bcc49619 Merge pull request #9751 from edx/dan-f/make-teams-tabs-accessible 
Dan f/make teams tabs accessible
 2015-09-14 16:10:04 -04:00
Frances Botsford
77384f1a75 update styling for tabs as buttons 2015-09-14 14:34:10 -04:00
Daniel Friedman
e7bfd2d62e Make tabbed view accessible 
TNL-3150
 2015-09-14 14:34:05 -04:00
Eric Fischer
4d0a12755b Merge pull request #9747 from edx/efischer/rc-style-fix 
Fixing bad button style
 2015-09-14 13:43:15 -04:00
Andy Armstrong
f80b6221d9 Fix duplicate calls to search API 
TNL-3198

Also fixed a regression with the search breadcrumbs
where it wasn't possible to navigate back to the
full list.
 2015-09-14 13:32:45 -04:00
Eric Fischer
abb44ce61e Fixing bad button style 
Removing unneeded styling on confirmation button; making the
appearance and hover/focus behavior of the button match that
of the confirmation dialog in studio.

TNL-3189
 2015-09-14 12:56:47 -04:00
Chris Dodge
410d692090 fix error where users who received a no-id-professional certificate did not get a link on his/her dashboard to download the PDF 2015-09-14 11:49:35 -04:00
Braden MacDonald
f24e09fcf5 Merge pull request #9732 from open-craft/fix-add-component 
Fix add component buttons to be backward compatible
 2015-09-14 08:48:26 -07:00
aamir-khan
0a434e4388 ECOM-2150: Added the ga client fetching as a customer header in middleware 2015-09-11 17:28:41 -04:00
Waheed Ahmed
0c0dff8655 Merge pull request #9731 from edx/waheed/fix-discusion-get-course 
Fixed discussion module get_course.
 2015-09-12 01:29:56 +05:00
Bill DeRusha
4edb46468e Merge pull request #9730 from edx/bderusha/update-requirements 
Update edx-search release & a11y for teams
 2015-09-11 16:19:33 -04:00
Braden MacDonald
7647fd9ff1 Fix add component buttons to be backward compatible 2015-09-11 13:18:19 -07:00
Waheed Ahmed
18411cd480 Fixed discussion module get_course. 
TNL-3237
 2015-09-12 00:27:18 +05:00
Peter Fogg
0612e914dc Various accessibility fixes for Teams. 
Update teams breadcrumb aria-label, make team membership display as a
<ul>, fix contrast issues, and remove an extraneous angle bracket.
 2015-09-11 15:25:30 -04:00
Bill DeRusha
2b6781e7a1 Update edx-search release 2015-09-11 15:11:48 -04:00
Bill DeRusha
4234ff5959 Merge pull request #9707 from edx/bderusha/edx-search-config 
Add edx-search configuration to lms
 2015-09-11 14:45:23 -04:00
Brian Beggs
60e4a9f31f Merge pull request #9653 from edx/ammar/remove-django-threaded-multihost 
remove django-threaded-multihost
 2015-09-11 14:08:30 -04:00
Bill DeRusha
eec2bed0c7 Add edx-search configuration to lms 
remove "defensive code" until we can figure out how to actually
catch the errors,
 2015-09-11 13:55:39 -04:00
Peter Fogg
12c9d6b52f Merge pull request #9714 from edx/peter-fogg/fix-slow-memberships 
Prevent over-expansion of team memberships.
 2015-09-11 13:37:50 -04:00
Matt Drayer
5241b04b03 Merge pull request #9689 from edx/ziafazal/SOL-1187 
SOL-1187: missing is_active attribute fix
 2015-09-11 13:35:27 -04:00
Daniel Friedman
87fcdb8088 Merge pull request #9723 from edx/dan-f/fix-teams-tab-spec-syntax-error 
Fix syntax error in teams_tab_spec.js
 2015-09-11 13:05:32 -04:00
Peter Fogg
48f72612c3 Prevent over-expansion of team memberships. 
TNL-3202
 2015-09-11 12:55:39 -04:00
Mark Hoeber
1aa73aa639 Merge pull request #9712 from edx/markhoeber-apidocfix 
Fix and cleanup of API doc
 2015-09-11 12:34:51 -04:00
chrisndodge
987808261d Merge pull request #9699 from edx/cdodge/0.9-proctoring 
update edx-proctoring to 0.9.x
 2015-09-11 12:29:07 -04:00
Zia Fazal
dd48bb0f4a missing is_active attribute fix 2015-09-11 11:46:32 -04:00
Daniel Friedman
44fd787a98 Fix syntax error in teams_tab_spec.js 2015-09-11 11:43:20 -04:00
Sarina Canelake
40976cef76 Merge pull request #9720 from edx/sarina/flaky-cert-test 
Mark test as flaky (SOL-1199)
 2015-09-11 11:31:59 -04:00
Matt Drayer
034a7261e8 Merge pull request #9715 from edx/ziafazal/SOL-1192 
SOL-1192: include Null in filters while making a decision to pick right custom template
 2015-09-11 11:22:47 -04:00
Sarina Canelake
39bfe27191 Merge pull request #9718 from edx/sarina/20150911-translations-update 
Update translations (autogenerated message)
 2015-09-11 10:36:57 -04:00
Sarina Canelake
463d425c7a Mark test as flaky (SOL-1199) 2015-09-11 10:30:42 -04:00