Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
65,817 Commits 1 Branch 0 Tags
624bef547c66da17048e29ff5d80126a665f1a0d
Commit Graph

14096 Commits

Author SHA1 Message Date
David Baumgold
03aeae4bd7 Merge pull request #8271 from edx/sass-theming 
Comprehensive Theming
 2015-09-21 10:55:18 -04:00
Awais Jibran
13e8761aa4 In cohort courses, student progress pages differ from the grade report. 
TNL-3204
 2015-09-18 23:43:26 +05:00
Muhammad Ammar
edf88962b5 Merge pull request #9534 from edx/ammar/update-factory-boy 
Update factory_boy
 2015-09-18 19:04:48 +05:00
Christina Roberts
56fd445f5c Merge pull request #9798 from edx/christina/teams-dashboard 
Emit event when last_activity_at is updated.
 2015-09-18 09:54:36 -04:00
Peter Pinch
01aea1a494 Merge pull request #9335 from mitocw/error_message_student_notfound_ccx_coach_dashboard 
Added error message in enrollment tab inside CCX coach dashboard
 2015-09-18 09:33:02 -04:00
muhammad-ammar
6a5ce5d544 Upgrade factory_boy 
TNL-3179
 2015-09-18 18:02:38 +05:00
Kevin Falcone
81abdbe81b Merge pull request #9819 from edx/release 
Release
 2015-09-17 21:30:48 -04:00
cahrens
0d99449899 Emit event when last_activity_at is updated. 
TNL-3303
 2015-09-17 17:19:17 -04:00
Peter Fogg
0f78989220 Escape team name in screenreader text. 2015-09-17 16:15:50 -04:00
David Baumgold
6ebf2515f4 Comprehensive theming 
This is a squash of 38 commits ending with
5b080f979d692804452400ac5bed9b17c50b001e
 2015-09-17 15:39:03 -04:00
Christopher Lee
655b02a581 Merge pull request #9739 from edx/clee/dapi-vote-bug-2 
fixed vote bug in discussion api
 2015-09-17 14:46:46 -04:00
Daniel Friedman
4fc3593c1f Document child order in course structure api docs 2015-09-17 18:42:45 +00:00
Dennis Jen
305f88f646 Merge pull request #9488 from edx/dsjen/courses-via-overview 
Optimize OpenID Course Claims for users.
 2015-09-17 13:35:49 -04:00
Dennis Jen
844edac443 Optimize OpenID Course Claims for users. 
- Course overviews will cache courses upon publish.
- Added management command to warm up cache.
- OAuth2 handler returns courses via course overviews.
 2015-09-17 11:29:28 -04:00
Zia Fazal
14c14b07db moved SOCIAL_SHARING_SETTINGS out of FEATURES 
fixed object has no attribute 'get'

fixed 'LazySettings' object has no attribute

add social settings to cms/env/aws
 2015-09-17 19:24:09 +05:00
christopher lee
ccc921bce8 MA-1149 fixed vote bug in discussion api 
An incorrect response was being returned when voting for a comment
or thread.
 2015-09-17 09:55:03 -04:00
amir-qayyum-arbisoft
4ab368720e Added error message in enrollment tab ccx coach dashboard 2015-09-17 14:49:55 +05: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
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
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
Peter Fogg
33f559b04a Remove membership field from teams when serializing memberships. 
TNL-3281
 2015-09-15 13:05:10 -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
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
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