Commit Graph

4131 Commits

Author SHA1 Message Date
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
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
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
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
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
chrisndodge
c79a68486e Merge pull request #5306 from edx/cdodge/fix-delete-item-with-coupon
be sure to constrain the select to the course_id that is being delete
2014-09-23 13:46:14 -04:00
Jim Abramson
ad002f526b Merge pull request #5323 from edx/jsa/tnl444
fix 404s when students access group-less threads in cohorted topics
2014-09-23 13:10:17 -04:00
David Ormsbee
4f5d8b30de Basic Mobile API (v0.5) and Video Abstraction Layer integration.
Note that the features in this release are opt-in, and course and video
behavior will remain the same unless a course explicitly opts in.

Major pieces of functionality with this commit:

Allows the listing of a user's enrollments, course videos, and updates. In
order to make a course available for mobile use, course staff must explicitly
set the Course Advanced Setting "Mobile Course Available" to true. Course staff
will always see their own courses through the Mobile API regardless of this
setting, but students will only be allowed to see a course through the Mobile
API if this setting is set to "true". By default, a Course will *not* be
available for mobile use.

This is a Django app for video resource management. It is completely optional,
and is intended to allow video and operations teams to create new encodings of
videos (e.g. low res for mobile) and change CDNs without having to edit course
data directly. Course teams can now use a "EdX Video ID" setting for Videos,
which will leverage VAL. Video units that do not fill in an "EdX Video ID" will
behave exactly as they always have.

* The Mobile API is enabled with the ENABLE_MOBILE_REST_API feature flag.
* VAL is enabled with the ENABLE_VIDEO_ABSTRACTION_LAYER_API feature flag.
* VAL and the Mobile API both require ENABLE_OAUTH2_PROVIDER).
* The Mobile API is a read-only API, but VAL requires database migrations.
* Applications that make use of either the Mobile API or VAL must be registered
  with the OAuth2 provider app in Django Admin.
2014-09-23 12:31:46 -04:00
Piotr Mitros
19356ffd4b Puts course listings in a sane order 2014-09-23 12:02:30 -04:00
Chris Dodge
60de9ba20a be sure to constrain the select to the course_id that is being delete
wip
2014-09-22 21:46:11 -04:00
jsa
e00d3330fe fix 404s when students access group-less threads in cohorted topics
TNL-444
2014-09-22 15:22:10 -04:00
Carlos Andrés Rocha
5500cc6816 Use default locale to OpenID profile claims.
If the user has not selected a default locale, then return the default one.
2014-09-22 15:19:40 -04:00
Carlos Andrés Rocha
19f95f0053 Return OpenID Connect user name from user profile. 2014-09-22 11:34:10 -04:00
zubair-arbi
bdf2c28641 update video module to always set download_video field on export 2014-09-22 13:15:40 +05:00
zubair-arbi
3f026c1e90 Don't set 'download_video' field on importing video from xml until explicitly set
TNL-324
2014-09-22 13:15:40 +05:00
Waheed Ahmed
3c8eacd440 Disabled student view if course is not yet released for students.
LMS-6617
2014-09-22 12:50:46 +05:00
John Eskew
4aa2dc5289 Merge pull request #5302 from edx/release
Release merge - post hotfix-2014-09-19-1
2014-09-19 14:31:16 -04:00
Clinton Blackburn
8705694743 Hiding Insights link for non-staff users 2014-09-19 10:47:54 -04:00
Adam Palay
ac862b7a97 only load tabs if user is enrolled in course (TNL-286)
add tests for static tabs
2014-09-19 10:19:23 -04:00
Ned Batchelder
10bd2b003f Merge pull request #5129 from edx/ned/python-zip-assets
Python zip file importable from an asset
2014-09-18 19:31:47 -04:00
Ned Batchelder
616bbbab4e Importable python_lib.zip assets
Lots of plumbing to allow an asset named python_lib.zip to be imported
by jailed Python code.

This function can find the "python_lib.zip" asset, and is passed down
through ModuleSystem and LoncapaSystem so that capa problems have access
to the zipfile.
2014-09-18 17:59:12 -04:00
John Eskew
9e830d08c4 Merge branch 'release' into 'master' after successful rc/2014-09-17 deploy. 2014-09-18 12:27:32 -04:00
Adam Palay
1b06edb6ff display banner on course info page if user is not enrolled (TNL-286)
write failing tests for info page banner
2014-09-18 11:35:18 -04:00
Adam Palay
e569e090c2 redirect users from about page to info page when there is a marketing site (TNL-286) 2014-09-18 11:35:17 -04:00
Adam Palay
7f4da14185 Add middleware optionally to catch unenrolled students who fail has_access (TNL-286) 2014-09-18 11:35:17 -04:00
Usman Khalid
7bb0d5f5d8 Merge pull request #5174 from edx/usman/tnl-208-instructor-permissions
Added instructor persmission checking to _has_access_error_desc() in courseware.access
2014-09-18 15:43:58 +05:00
Sarina Canelake
1152555614 Merge pull request #5253 from mitocw/bdero/fix-psychometrics-opaque-keys
Fixed problems with psychometrics (Opaque Keys)
2014-09-17 12:50:43 -04:00
Carlos Andrés Rocha
8857509b2d Add edX OAuth2 provider with OpenID Connect support 2014-09-17 11:36:06 -04:00
Brandon DeRosier
efa4400342 Fixed problems with psychometrics
- Update key comparisons for Opaque Keys
- Search for 'problem_check' instead of 'save_problem_check' when
  filtering TrackingLogs.
2014-09-17 11:25:00 -04:00
Carlos Andrés Rocha
72651e64ad Modify notification_pref tests to avoid changes to module store
Calling the client root was causing the module store to be modified,
affecting test in other Django applications that rely on the default
state of the module store.
2014-09-17 11:16:55 -04:00
Carlos Andrés Rocha
276ea2fe84 Fix tests not using ModuleStoreTestCase
Some tests test were using `CourseFactory` buy not deriving from
`ModuleStoreTestCase`, introducing a course leaks that broke other
unrelated tests.
2014-09-17 11:16:55 -04:00
Ned Batchelder
2d05ffacdf Revert "username and email request for lti module"
This reverts commit 3f159ea52b.
2014-09-17 07:24:52 -04:00
Ned Batchelder
1a7009ec1f Merge pull request #5251 from edx/ned/revert-lti-username-email
Revert "username and email request for lti module"
2014-09-17 06:59:42 -04:00
Ned Batchelder
4edeeb72c2 Revert "username and email request for lti module"
This reverts commit 3f159ea52b.
2014-09-16 16:13:41 -04:00
chrisndodge
7593ad3a01 Merge pull request #5050 from edx/muhhshoaib/Ex-74-registration-code-redemption
Ex-74 Registration Code redemption
2014-09-16 11:58:42 -04:00
chrisndodge
9d683ed171 Merge pull request #5245 from edx/asadiqbal08/Fix_production_issue
EX-81 / Ex-84 changes
2014-09-16 11:17:40 -04:00
asadiqbal08
47cd0f3e62 EX-81 / Ex-84 changes 2014-09-16 18:43:48 +05:00
Muhammad Shoaib
739d2f0906 Ex-74 Registration Code redemption
fix the translation issues

added a check if a user is already registered in a course. Changed the messages

added course depth=0 and removed pep8 violations
2014-09-16 07:48:21 +00:00
chrisndodge
23531e8966 Merge pull request #5220 from edx/cdodge/dont-redirect-to-dashboard-when-having-and-empty-dashboard
only redirect to dashboard if user has course enrollments, otherwise rem...
2014-09-15 22:06:13 -04:00
Chris Dodge
50cdd2b087 only redirect to dashboard if user has course enrollments, otherwise remain on the course catalog page (aka homepage or root)
update lettuce test to match new expected behavior

add Jason's feedback

only apply new redirect logic for microsites

switch to use a feature flag to determine whether to support redirect behavior
2014-09-15 20:52:44 -04:00