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

12307 Commits

Author SHA1 Message Date
John Eskew
6b12ec97cc Merge remote-tracking branch 'origin/release' into jeskew/resolve_issues_with_release 2015-09-16 16:23:52 -04:00
John Eskew
7c0663f25e Merge remote-tracking branch 'origin/release' into jeskew/resolve_issues_with_release 2015-09-16 15:58:08 -04:00
Matt Drayer
ac0d926492 Merge pull request #9717 from edx/ziafazal/SOL-1193 
SOL-1193: moved variables from template to view
 2015-09-16 15:06:57 -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
Zia Fazal
cf80c07c14 moved variables from template to view 
fixed broken tests and quality violations

moved twitter_url to view also

escaped string for js
 2015-09-16 20:42:04 +05:00
Ned Batchelder
764cd862bd Mako comments have to be double-hash, or they are included on the page. 2015-09-16 11:24:18 -04:00
Sarina Canelake
07664389b7 Fix Translator comment syntax in Mako templates [TNL-3277] 2015-09-15 21:16:16 -04:00
Peter Fogg
33f559b04a Remove membership field from teams when serializing memberships. 
TNL-3281
 2015-09-15 13:05:10 -04:00
Eric Fischer
c82e928bd6 Merge pull request #9749 from edx/efischer/teams-iesearch-clear 
Removing extraneous IE search clear button
 2015-09-15 11:04:14 -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
Bill DeRusha
f3f7ef5a6d Merge pull request #9750 from edx/bderusha/align-team-links 
Right align text above action buttons
 2015-09-14 16:47:05 -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
Eric Fischer
8285c9d829 Removing extraneous IE search clear button 
Taken from http://stackoverflow.com/questions/14007655/remove-ie10s-clear-field-x-button-on-certain-inputs.
Not yet tested, but will be soon.
 2015-09-14 15:32:44 -04:00
David Baumgold
1c21a0d250 Remove trailing whitespace from Sass files 2015-09-14 15:17:10 -04:00
Bill DeRusha
21b143e40a Right align text above action buttons 
TNL-3234
 2015-09-14 15:10:52 -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
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
Eric Fischer
4fe575d8c5 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:32:44 -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
Muhammad Shoaib
e6d8841bac Merge pull request #9678 from edx/muhhshoaib/css-issue-for-allowances-in-instructor-dashboard 
fixed the allowances table css issue in instructor dashboard
 2015-09-14 19:15:22 +05:00
wajeeha-khalid
e492aa2367 Merge pull request #9737 from edx/jia/MA-1182_feedback 
MA-1182 - updated
 2015-09-14 19:13:21 +05:00
Peter Pinch
01eb2dffaf Merge pull request #9635 from mitocw/fix/bdero/dump-grades-command 
CRI-40 Don't assume user in request context when grading
 2015-09-14 09:05:56 -04:00
wajeeha-khalid
bbad9ae772 MA-1182 - added test for not enrolled in course, removed commented out nose test code, formatted import statements according to edx standards 2015-09-14 11:43:21 +05: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
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
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
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
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
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
Daniel Friedman
44fd787a98 Fix syntax error in teams_tab_spec.js 2015-09-11 11:43:20 -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
Chris Dodge
68ee28f8b0 update edx-proctoring to 0.9.x 2015-09-11 10:00:05 -04:00
Peter Pinch
fe1c44afaf Merge pull request #9637 from edx/shr/bug/ccx_plat-795 
save_cxx slow transaction
 2015-09-11 09:56:51 -04:00
Diana Huang
222c3ba01e Merge pull request #9713 from edx/diana/eventing-updates 
Add course id contexts to teams events
 2015-09-11 09:16:06 -04:00
Syed Hassan Raza
49dfee0e44 save_cxx slow transaction 2015-09-11 06:06:42 -07:00
Andy Armstrong
5f5310446f Remove unnecessary breadcrumbs for Teams tab 
TNL-3249
 2015-09-10 21:48:44 -04:00
Diana Huang
f37ffc2f03 Add the course as part of the context for teams events. 
TNL-3248
 2015-09-10 17:24:54 -04:00
Eric Fischer
17e6453546 Merge pull request #9520 from edx/efischer/teams-instructor-toolbar 
Teams Instructor Tools bar
 2015-09-10 17:24:39 -04:00
Eric Fischer
65cbab739a Team deleted and learner removed events 
Now emitting `edx.team.deleted` event where relevant. Includes tests.
Also includes tests to cover learner_removed events that are fired
as part of the deletion process, as well as learner_removed events
fired from the edit membership view.

Adding these deleted events has brought about a change in the teams
API - the DELETE membership endpoint now takes an optional `admin`
query parameter to differentiate between admin removal and self
removal for analytics purposes.

Also includes some changes needed to get page viewed events working
with admin tools changes made in this PR.
 2015-09-10 16:37:04 -04:00
Eric Fischer
6edadc2acc Developer-quality css 
Adding my humble attempts at making the tools match the wireframes
given in invision. Only done via changes in _developer.scss, the
real rules will be made by UX team elsewhere.

Includes preliminary accessibility feedback, and basic RTL.
 2015-09-10 16:37:03 -04:00
cahrens
3662fbc133 Edit Membership functionality and tests 
TNL-1913
 2015-09-10 16:36:55 -04:00
Andy Armstrong
55b2ea374f Merge pull request #9684 from edx/andya/fix-teams-i18n 
Fix i18n for last activity date on team cards
 2015-09-10 16:27:00 -04:00
clrux
f8bbbc8729 Merge pull request #9698 from edx/clrux/lms-global-sr-contrast 
LMS: setting fore/background colors for all sr elements
 2015-09-10 14:32:04 -04:00