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

25914 Commits

This Branch
This Branch
All Branches
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
Jesse Zoldak
77178e9fd0 Merge pull request #5378 from edx/zoldak/look-into-languagetest 
Add explanation and small optimizations to LanguageTest
 2014-09-25 12:17:14 -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
John Eskew
fcf57a8e0d Merge pull request #5370 from edx/jeskew/wrap_studio_views_in_bulk_ops 
Wrap studio views in bulk operations to minimize mongo calls.
 2014-09-24 20:41:33 -04:00
John Eskew
46cd9b0ad9 Add bulk_operations wrapper around all course-query-intensive Studio views. 2014-09-24 19:23:00 -04:00
Julia Hansbrough
6b061ad23b Response to CR 2014-09-24 21:20:49 +00:00
John Eskew
2f06073306 Pass _get_course_module() depth param down into modulestore get_course() instead of hard-coded zero. 2014-09-24 16:23:30 -04:00
Carlos Andrés Rocha
ed68b0ab8a Merge pull request #5385 from rocha/use-strings-in-session-key-value-store 
Use strings instead of tuples as keys in SessionKeyValueStore.
 2014-09-24 16:17:16 -04: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
Carlos Andrés Rocha
fc04d8f262 Use strings instead of tuples as keys in SessionKeyValueStore 
Some Django packages expect only strings as keys in the user session,
and it is also a recommended practice in the Django manual.
 2014-09-24 15:17:46 -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
5d5ff8d9c1 Docs 2014-09-24 17:24:42 +00:00
Julia Hansbrough
3fbbe57cef Add auto-registration to third party login flow 2014-09-24 17:24:42 +00:00
Julia Hansbrough
5b3c69bc87 Tests fixed 2014-09-24 17:24:42 +00:00
Julia Hansbrough
4d77b0552f Move server-side validation to enroll method 2014-09-24 17:23:25 +00:00
Sarina Canelake
3cdfdae8bb Merge pull request #5305 from lduarte1991/lduarte-harvardx-pr28 
Fixes check for Image Annotation Tool to include ID from image server and fix scrolling bug
 2014-09-24 13:10:50 -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
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
Jesse Zoldak
6d5e65c0bd Add explanation and small optimizations to languagetest 2014-09-24 12:36:52 -04:00
Stephen Sanchez
eb7611286c Making the django main template navigation course aware. 2014-09-24 15:57:00 +00:00
lduarte1991
29cddbca2c Annotation Tools: Non-critical highlights == undefined fixes 
i.e. they should be fixed but don’t cause the whole thing to break.

 - PR fixes

 - Reverted Fix
 2014-09-24 11:21:53 -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
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
Waqas Khalid
298ad30a22 Merge pull request #5142 from mlkwaqas/waqas/tnl150-stop-comment--on-closed-thread 
Don't allow commenting while the thread is closed
 2014-09-24 17:51:17 +05:00
Waqas Khalid
fcf46546c3 Don't allow commenting while the thread is closed 
When someone closes thread there is still option to add
comment which cause error when submitted. User shouldn't
be able to comment while the thread is closed.

TNL-150
 2014-09-24 15:28:34 +05:00
Waheed Ahmed
aa5781c14c Merge pull request #5294 from edx/waheed/tnl235-fix-video-transcript-not-follow 
Fixed transcript not follow with video on seek.
 2014-09-24 14:16:15 +05:00
Waheed Ahmed
ca1da6c8ed Fixed transcript not follow with video on seek. 
TNL-235
 2014-09-24 13:08:50 +05:00
Clinton Blackburn
7e1b44663b Merge pull request #5352 from edx/insights-name-fix 
Properly Setting ANALYTICS_DASHBOARD_NAME for AWS
 2014-09-23 17:45:17 -04:00
Clinton Blackburn
3e9a5ecfd5 Properly Setting ANALYTICS_DASHBOARD_NAME for AWS 2014-09-23 16:21:31 -04:00
Sarina Canelake
4551244265 Merge pull request #5348 from edx/sarina/09232014-translations-update 
Update translations (autogenerated message)
 2014-09-23 15:59:47 -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
Sarina Canelake
701d709b65 Update translations (autogenerated message) 2014-09-23 15:41:41 -04:00
Usman Khalid
ed84c1b27a Merge pull request #5246 from edx/usman/plat104-static-content-server 
Improvements to byte range handling in StaticContentServer.
 2014-09-24 00:15:46 +05:00
Usman Khalid
44f952daf5 Merge pull request #5293 from edx/usman/tnl388-invalid-xml-in-code-response 
If matlab grader sent unparsable response, show error message.
 2014-09-24 00:14:34 +05:00
Adam
96ac506f6f Merge pull request #5296 from edx/adam/hide-very-long-answers 
keep large answers from appearing (TNL-441)
 2014-09-23 14:01:03 -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
lduarte1991
b7313d6d2e Annotation Tools: Pylint Fix left over from previous PR 2014-09-23 13:03:48 -04:00
lduarte1991
5634096825 Image Annotation Tool: Fixes _isOpenSeaDragon function 2014-09-23 13:03:48 -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
Usman Khalid
5af162ebdf Refactored ContentServer tests to use ddt. 
PLAT-104
 2014-09-23 21:36:46 +05:00
Usman Khalid
7e29a5a65c Added tests for parse_range_header() in contentserver. 
PLAT-104
 2014-09-23 21:36:45 +05:00