Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,558 Commits 1 Branch 0 Tags
7c02782f90934d201d94de8de368da56121d45cf
Commit Graph

28558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam
73b3e21823 Merge pull request #5395 from lduarte1991/lduarte-harvardx-pr30 
Annotation Tools: Fixes issue - Thumbnail check breaks tool on creation
 2014-09-25 15:14:52 -04:00
srpearce
2fbf67b257 Merge pull request #5374 from edx/markhoeber-documentaton-doc995 
Release Notes - Sept 25, 2014
 2014-09-25 15:10:30 -04:00
lduarte1991
7f8dd6a11e Annotation Tools: Thumbnail check breaks on creation 
- Fixed second similar function.

Conflicts:
	common/static/js/vendor/ova/OpenSeaDragonAnnotation.js
 2014-09-25 15:07:43 -04:00
Sylvia Pearce
23cba83028 Revisions to mobile FAQ for students 2014-09-25 13:25:11 -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
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
Braden MacDonald
8e32672228 Fix UnicodeError with anonymous student IDs 2014-09-24 20:17:47 -07: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
Sylvia Pearce
4d816d08f8 Draft of mobile FAQ 2014-09-24 17:12:57 -04: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
Mark Hoeber
7630cf7a78 Release Notes - Sept 25, 2014 2014-09-24 15:56:54 -04: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
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
Jesse Zoldak
6a7c318d22 Increase randomness of course name in testcase 2014-09-24 15:14:11 -04:00
Sarina Canelake
752570832c Merge pull request #5381 from edx/sarina/annotations-fix 
Image Annotation Tool: Fixes _isOpenSeaDragon function
 2014-09-24 14:27:17 -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
Sarina Canelake
5cdd4f4c80 Update translations (autogenerated message) 2014-09-24 14:19:21 -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
Oleg Marshev
5b72e1591d Merge pull request #5379 from edx/oleg/lti-add-username-email 
Allow students to send username and email to third parties (TNL-405).
 2014-09-24 21:10:32 +03:00
Carlos Andrés Rocha
617b53cbb9 Merge pull request #5375 from rocha/update-oauth2-provider 
Update version of edx-oauth2-provider
 2014-09-24 13:52:21 -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
chrisndodge
c928252b5a Revert "Revert "add an additional tag so we can route zendesk tickets better for..." 2014-09-24 13:19:51 -04:00
lduarte1991
d3fffde3a0 Image Annotation Tool: Fixes _isOpenSeaDragon function 2014-09-24 13:12:31 -04: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
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
d7c715ebee Merge pull request #5380 from edx/revert-5359-cdodge/add-microsite-tag-to-zendesk 
Revert "add an additional tag so we can route zendesk tickets better for...
 2014-09-24 12:47:10 -04: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
Jesse Zoldak
6d5e65c0bd Add explanation and small optimizations to languagetest 2014-09-24 12:36:52 -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
Carlos Andrés Rocha
8d04580a0c Update version of edx-oauth2-provider 2014-09-24 11:35:33 -04: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