Commit Graph

9068 Commits

Author SHA1 Message Date
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
Ned Batchelder
4d56f62d99 Merge pull request #5199 from edx/ned/remove-jsdraw
Remove JSDraw
2014-09-25 23:03:50 -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
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
Andy Armstrong
e22bd1b667 Merge pull request #5384 from edx/frances/fix/prof-ed-status-AB-tes
fixes for status for prof ed and verified registration
2014-09-24 15:22:09 -04: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
Frances Botsford
b889f9ef11 fixes for status for prof ed and verified registration on both variants of AB test 2014-09-24 14:11:18 -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
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
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
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
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
Stephen Sanchez
eb7611286c Making the django main template navigation course aware. 2014-09-24 15:57:00 +00: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
Clinton Blackburn
7fa7b52732 Properly Setting ANALYTICS_DASHBOARD_NAME for AWS 2014-09-24 10:24:09 -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
Ned Batchelder
364989b9ee Remove JSDraw 2014-09-24 09:56:05 -04: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
chrisndodge
d2d1f7b391 Merge pull request #5357 from edx/cdodge/allow-zero-percent-discount
per product, allow for zero percentage coupons
2014-09-24 08:47:21 -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
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
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
Chris Dodge
a28b45c46d per product, allow for zero percentage coupons 2014-09-23 15:29:26 -04:00
Chris Dodge
f34a1c9d11 Add the 'meta' column from the UserProfile table to the CSV download
add special case logic to get the 'meta' field into the downloaded CSV

wip

wip
2014-09-23 15:08:38 -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