Commit Graph

9043 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
Stephen Sanchez
c28162b5b4 Merge pull request #5335 from edx/sanchez/add_course_info_to_wiki
Making the django main template navigation course aware.
2014-09-24 16:16:15 -04: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
AlasdairSwan
328c076bf0 Merge pull request #5333 from edx/alasdair/header-footer-accessibility-updates
Alasdair/header footer accessibility updates
2014-09-24 13:08:15 -04:00
Waheed Ahmed
f14dd9d3c5 Disabled student view if course is not yet released for students.
LMS-6617

Fixed wiki merge url regex.
TNL-413

ECOM-345 changed any lists that could display with only 1 item to divs

ECOM-345 Added aria tags for header

ECOM-364 Accessibility update for footer

added my name to the authors file

Addressing feedback from code review - removing unnecessary element references in selectors

Updated header aria-label to be main
2014-09-24 16:52:21 +00:00
Stephen Sanchez
eb7611286c Making the django main template navigation course aware. 2014-09-24 15:57:00 +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
Clinton Blackburn
3e9a5ecfd5 Properly Setting ANALYTICS_DASHBOARD_NAME for AWS 2014-09-23 16:21:31 -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
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 Baumgold
15b8aa4b6c Merge pull request #3747 from edx/pmitros/sane-course-listing-order
Puts course listings in a sane order
2014-09-23 13:09:09 -04:00
frances botsford
4e1aa77b99 Merge pull request #5303 from edx/diana/update-prof-ed-flow
Change some text when in professional ed flow
2014-09-23 12:44:58 -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
Brian Talbot
1b25be655c revising markup and styling for listing header on LMS course dashboard 2014-09-23 12:02:30 -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
Carlos Andrés Rocha
874c338175 Merge pull request #5316 from rocha/use-default-locale-in-openid-claim
Use default locale to OpenID profile claims.
2014-09-22 17:36:26 -04:00
Carlos Andrés Rocha
c35f4bf794 Merge pull request #5314 from rocha/configurable-oauth-enforce-secure
Allow SSL enforcement for OAuth2 provider to be configurable
2014-09-22 17:35:43 -04:00
Frances Botsford
ef1ef98653 adjusting ID verified status to be just verified status 2014-09-22 16:10:23 -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
e04c6c2a48 Merge pull request #5315 from rocha/fix-fullname-in-oauth2-handler
Return OpenID Connect user name from user profile.
2014-09-22 15:14:15 -04:00
Adam
ef525f288f Merge pull request #5295 from edx/adam/add-simple-help-modal-test
add simple help-modal-test
2014-09-22 13:17:47 -04:00
Carlos Andrés Rocha
19f95f0053 Return OpenID Connect user name from user profile. 2014-09-22 11:34:10 -04:00
Carlos Andrés Rocha
37d604a90f Allow SSL enforcement for OAuth2 provider to be configurable 2014-09-22 10:47:20 -04:00
Adam Palay
5fa38cb59e add simple help-modal-test 2014-09-22 09:34:32 -04:00
Waheed Ahmed
3e64faeaa3 Fixed wiki merge url regex.
TNL-413
2014-09-22 15:41:19 +05: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
Frances Botsford
8bd092ec4b adjusting style for professional educationand verification status 2014-09-19 16:27:20 -04: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
Diana Huang
c3f88f5def Change some text when in professional ed flow
ECOM-96
2014-09-19 14:18:15 -04:00
Renzo Lucioni
135ce24977 Merge pull request #5248 from edx/renzo/cleanup-translated-strings
Clean up translated strings in registration page, dashboard, and track selection flow
2014-09-19 12:57:39 -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