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

4167 Commits

Author SHA1 Message Date
Dave St.Germain
b7429cddde Merge pull request #5429 from edx/dcs/mobile-delint 
Cleaning up pylint and pep8 errors in mobile API.
 2014-09-30 11:10:43 -04:00
Greg Price
115c3543e3 Merge pull request #5347 from edx/gprice/notifier-api-cohorts 
Add a new user API for the notifier
 2014-09-29 17:04:45 -04:00
Greg Price
887bcb5578 Add a new user API for the notifier 
This new endpoint is designed specifically to fill the needs of the
notifier and should not be used by other clients.
 2014-09-29 17:04:23 -04:00
Dave St.Germain
bd581fdbb5 Cleaning up pylint and pep8 errors. 2014-09-29 16:39:32 -04:00
Will Daly
9b4c59cdfc Merge pull request #5417 from edx/will/profile-feature-flag-third-party-auth 
Put student profile third party auth behind a feature flag
 2014-09-29 15:00:55 -04:00
Dave St.Germain
f1d08b3b62 Merge pull request #5406 from edx/dcs/mobile-api-tests 
Added tests for mobile API
 2014-09-29 14:45:41 -04:00
Dave St.Germain
575a8123bd Tests for mobile api 2014-09-29 13:37:36 -04:00
Don Mitchell
dc9654283e Fix unit tests for generated 
course ids.
 2014-09-29 11:25:56 -04:00
Don Mitchell
8fe55c9aee Fix acceptance tests to work w/ split 
11300
 2014-09-29 11:25:55 -04:00
Don Mitchell
4ca5012f3c Use split to test views 2014-09-29 11:25:55 -04:00
Will Daly
9083c49f07 Put student profile third party auth behind a feature flag 2014-09-29 11:05:53 -04:00
zubair-arbi
570a922661 Merge pull request #5362 from edx/zub/bugfix/plat-88-importstatusinvalidkeyerror 
add couse key verification decorator in common for use in both studio an...
 2014-09-29 15:44:02 +05:00
zubair-arbi
40f270c945 add couse key verification decorator in common for use in both studio and lms 
PLAT-88
 2014-09-29 13:26:43 +05:00
Waheed Ahmed
29aa933140 Converted annotation lettuce test into bok-choy test. 
TNL-353
 2014-09-29 13:12:06 +05:00
Sarina Canelake
c57f1c818b Merge pull request #5290 from mitocw/bdero/fix-grade-summary-opaque-keys 
Remove unimplemented legacy dashboard grade_summary feature
 2014-09-28 16:02:49 -04:00
Clinton Blackburn
a616decf29 Merge pull request #5401 from edx/insights-for-all 
Displaying Insights Link for All Instructors
 2014-09-26 18:08:43 -04:00
Brandon DeRosier
5bfa313dcb Remove unimplemented grade_summary feature. 2014-09-26 12:53:53 -04:00
Stephen Sanchez
c88e914077 Merge pull request #5398 from edx/sanchez/fix_about_page_header 
Allowing new styles on White Label about pages.
 2014-09-26 08:18:08 -04:00
Clinton Blackburn
4f9725a0c0 Displaying Insights Link for All Instructors 2014-09-25 17:58:38 -04:00
Stephen Sanchez
3fd3bd4e43 Crude solution to allowing new styles on White Label about pages. 2014-09-25 20:31:18 +00:00
Andy Armstrong
0ed3a95d3a Merge branch 'release' 
Conflicts:
	AUTHORS
	common/static/js/vendor/ova/OpenSeaDragonAnnotation.js
	common/test/acceptance/pages/lms/dashboard.py
 2014-09-25 16:25:45 -04:00
Will Daly
daeddf3eaf Merge pull request #5387 from edx/will/account-and-profile-more-tests 
Added test for email activation and confirmation
 2014-09-25 12:18:58 -04:00
Julia Hansbrough
c5ae921dea Merge pull request #5328 from edx/flowerhack/auto-login 
Automatically log in users who access third party login after trying to register for a course
 2014-09-25 10:40:33 -04:00
Will Daly
84463ef1a5 Added test for email activation and confirmation 2014-09-25 09:46:02 -04:00
Will Daly
afa39a862e Merge pull request #5383 from edx/will/account-and-profile-rebase 
Add Django apps for student account and profile
 2014-09-25 09:34:10 -04:00
Will Daly
7f8c6bb058 Add Django apps for student account and profile. 
Add Python APIs for account/profile information to user_api
Updating profile page to have social linking

Authors: Renzo Lucioni, Alasdair Swan, Stephen Sanchez, Will Daly
 2014-09-25 08:36:22 -04:00
Anton Stupak
85af48a31c Merge pull request #5276 from edx/anton/forums-topic 
Change the topic of a previously posted post.
 2014-09-25 10:58:09 +03:00
Julia Hansbrough
6b061ad23b Response to CR 2014-09-24 21:20:49 +00:00
Waqas Khalid
52dd273490 Merge pull request #5363 from mlkwaqas/waqas/tnl315-cannot-remove-discussion-admin 
Course admin should be able to de-admin dicussion admins
 2014-09-25 01:15:21 +05:00
Andy Armstrong
74fb8e93ed Merge pull request #5382 from edx/revert-5380-revert-5359-cdodge/add-microsite-tag-to-zendesk 
Revert "Revert "add an additional tag so we can route zendesk tickets be...
 2014-09-24 14:21:41 -04:00
polesye
00c7e60e07 TNL-171: Change topic of a previously posted post. 2014-09-24 20:28:14 +03:00
Waqas Khalid
d0d225d8a9 Course admin should be able to de-admin dicussion admins 
As a global staff or course staff once you added yourself
in the discussion admins you cannot revoke it back unless
you remove yourself as course staff. Any of the course staff
member should be able to remove others from discussion admins
whether they are course staff or not.

TNL-315
 2014-09-24 22:26:31 +05:00
Julia Hansbrough
5b3c69bc87 Tests fixed 2014-09-24 17:24:42 +00:00
chrisndodge
c928252b5a Revert "Revert "add an additional tag so we can route zendesk tickets better for..." 2014-09-24 13:19:51 -04:00
Paul Medlock-Walton
b797c6bd09 username and email request for lti module 
allow username and email can be passed to a lti third party app
ask user permission when lti button is clicked
allow course editor to customize text on lti launch button
 2014-09-24 20:05:42 +03:00
chrisndodge
21933bfbd7 Revert "add an additional tag so we can route zendesk tickets better for white l..." 2014-09-24 12:46:05 -04:00
David Ormsbee
ba76bbe1cf Merge pull request #5365 from edx/ormsbee/mobile_deleted_announcement_fix 
Hide deleted course updates from mobile API.
 2014-09-24 12:26:13 -04:00
David Ormsbee
84f0d8e388 Merge pull request #5364 from edx/ormsbee/mobile_username_url_fix 
Fix to allow usernames with '-', '+', '.' in Mobile API urls.
 2014-09-24 12:25:28 -04:00
chrisndodge
ddb0ab9027 Merge pull request #5361 from edx/cdodge/change-invoice-email-and-attachments 
change registration code email and attachments, per product requirements
 2014-09-24 10:56:41 -04:00
Waqas Khalid
f94c677a79 Merge pull request #5279 from mlkwaqas/waqas/tnl404-new-post-hidden-breadcrumb 
New post should show category/subcategory breadcrumb when created.
 2014-09-24 19:20:46 +05:00
Waqas Khalid
2c3cef75bc New post should show category/subcategory breadcrumb when created. 
When the new post is created under the subcategory and it appear
after the creation, it doesn't have the link of category/subcategory
after thread body. When we reload the page the link appears. Link
should appear after creation.

TNL-404
 2014-09-24 18:19:51 +05:00
Chris Dodge
0c72e37374 change registration code email and attachments, per product requirements 
remove extra lines

conditionalize address line 2
 2014-09-24 09:13:37 -04:00
zubair-arbi
c7418a306c Merge pull request #5240 from edx/zub/bugfix/tnl-324-downloadvideoexportimport 
Don't set 'download_video' field on importing video from xml until expli...
 2014-09-24 18:12:10 +05:00
chrisndodge
7b88863b4d Merge pull request #5359 from edx/cdodge/add-microsite-tag-to-zendesk 
add an additional tag so we can route zendesk tickets better for white l...
 2014-09-24 08:52:43 -04:00
David Ormsbee
9f8cf1c321 Hide deleted course updates from mobile API. 2014-09-24 07:00:36 -04:00
David Ormsbee
eb297d4863 Fix to allow usernames with '-', '+', '.' in Mobile API urls. 2014-09-24 06:45:04 -04:00
chrisndodge
d8e5fca3b3 Merge pull request #5358 from edx/cdodge/add-meta-to-profile-download 
Add the 'meta' column from the UserProfile table to the CSV download
 2014-09-23 21:17:29 -04:00
David Baumgold
9542b0a885 Revert "Puts course listings in a sane order" 
This reverts commit 1955aade36675289bdbc01554b6f74242754a746.
 2014-09-23 18:45:59 -04:00
Andy Armstrong
fe6668a550 Merge branch 'release' 
Conflicts:
	common/lib/xmodule/xmodule/video_module/video_module.py
	requirements/edx/github.txt
 2014-09-23 15:53:10 -04:00
Chris Dodge
e08040aa75 add an additional tag so we can route zendesk tickets better for white label sites 
add tests

fix

use org
 2014-09-23 15:39:21 -04:00