Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,693 Commits 1 Branch 0 Tags
4b9792a149bb2276feeaa4857a96f62194c8d714
Commit Graph

31693 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Carson Gee
4b9792a149 Resolved LogHandler bug in rf6266 2015-07-28 19:14:51 -04:00
Will Daly
a1f79a3c03 Add in-course reverification to advanced components. 2015-07-28 17:17:49 -04:00
Will Daly
65367a2ded ECOM-1911: Fixes to credit requirements in Studio. 
* Exclude orphaned XBlocks from requirements because they have been deleted.
* Sort ICRV requirements by start date, then by display name.
 2015-07-28 17:17:43 -04:00
Braden MacDonald
9e00e2b397 Allow previewing cohorted content when masquerading 2015-07-28 17:17:34 -04:00
jsa
849ad8df94 commerce/api: Don’t allow setting expiration of prof modes. 
XCOM-497
 2015-07-28 17:17:13 -04:00
jsa
7d8fb73934 commerce/api: pass expiration_datetime when updating modes 2015-07-28 17:17:05 -04:00
Clinton Blackburn
c2fdf8cb2a Corrected CourseMode Display Name 
The Commerce API now sets the correct display name for known course modes, but continues to default to the mode slug for unknown course modes.
 2015-07-28 17:16:43 -04:00
Chris Dodge
81502176e1 Integrate timed and proctored exam authoring into Studio 2015-07-28 17:16:06 -04:00
John Baker
7f3b5c889a Merge pull request #9003 from edx/rc/2015-07-22 
Rc/2015-07-22
 2015-07-28 14:21:48 -04:00
John Baker
d6a4949144 Merge pull request #9079 from edx/release 
Release
 2015-07-27 14:10:43 -04:00
Usman Khalid
ce0cc0a346 Merge pull request #9083 from edx/youtube-api-v3 
Upgrade video player to use Youtube API v3.
 2015-07-27 23:10:11 +05:00
muzaffaryousaf
f58764875c Skipping the failing tests; which are also failing in master 
Can see if we remove skipIf from video base class.

TNL-2413
 2015-07-27 21:22:35 +05:00
muzaffaryousaf
7dfd567cb5 Using youtube api (v3) instead of v2 to get the video duration . 
TNL-2413
 2015-07-27 21:22:34 +05:00
Kyle McCormick
11386571c5 Merge pull request #9048 from edx/kyle/course-overviews-migration-fix 
Fix conflicting 0004_ migrations on course_overviews
 2015-07-27 12:10:23 -04:00
Kyle McCormick
ea89e2d83b Fix conflicting 0004_ migrations on course_overviews 
What happened:
* First, I merged `0004_default_lowest_passing_grade_to_None.py`, which adds `null=True` to `lowest_passing_grade`.
* Later, Renzo merged `0004_auto__add_field_courseoverview_enrollment_start__add_field_courseoverv.py`, which adds a bunch of enrollment-related fields
* Neither migrations' `models` variables reflects the changes in the other one.
* release currently has just `0004_default...`
* master and rc/2015-07-22 have `0004_auto...` and `0004_default...`, in that order.

What this commit changes:
* Change `0004_auto...` to `0005_add_enrollment_fields.py`
* Update `models` in `0005_...` to have `null=True` for `lowest_passing_grade`
 2015-07-24 11:41:42 -04:00
Will Daly
13e80befe1 Merge pull request #9018 from edx/hotfix/2015-07-23 
Hotfix 2015-07-23: Allow course staff to bypass embargo rules.
 2015-07-23 12:02:03 -07:00
Will Daly
eefbf77edf Allow course staff to bypass embargo rules. 2015-07-23 08:26:43 -07:00
Sarina Canelake
69a1a069e9 Merge pull request #9002 from edx/sarina/22072015-translations-update 
Update translations (autogenerated message)
 2015-07-22 15:00:38 -04:00
Brian Talbot
b75f900b22 Merge pull request #8266 from edx/talbs/fix-font-face-calls 
LMS/Studio: Reduce font-face file calls
 2015-07-22 14:48:44 -04:00
Sarina Canelake
7407280e90 Update translations (autogenerated message) 2015-07-22 14:16:03 -04:00
Andy Armstrong
c0eaeb7efc Merge pull request #9000 from edx/andya/fix-discovery-Jasmine-tests 
Fix broken Jasmine tests for course discovery
 2015-07-22 14:02:26 -04:00
Daniel Friedman
d61d193dab Merge pull request #8859 from edx/dan-f/teams-list-view 
Teams List View
 2015-07-22 13:24:02 -04:00
Andy Armstrong
a328770c86 Fix broken Jasmine tests for course discovery 2015-07-22 12:17:51 -04:00
Daniel Friedman
21b39ca467 Add teams-for-topic list view to Teams page. 
TNL-1898

Also adds a generic paginated list view and Teams list view. The
common PaginatedView takes a collection and a view class for its items
and creates a header and footer with correct pagination. The topics
list view is refactored to use this generic view.

Authors:
  - Peter Fogg <pfogg@edx.org>
  - Daniel Friedman <dfriedman58@gmail.com>
 2015-07-22 12:02:40 -04:00
Frances Botsford
6d6bfa7f35 added incontext option to system message styles for teams 2015-07-22 12:02:40 -04:00
Davorin Šego
6ee905095c Merge pull request #8973 from edx/dsego/SOL-731 
Update edx-search, fix lms filter generator and courseware index tests
 2015-07-22 17:47:32 +02:00
Davorin Sego
a43cf589e0 Update edx-search, fix lms filter generator and courseware index tests 2015-07-22 16:44:01 +02:00
Adam
845e1d6296 Merge pull request #8998 from edx/merge-release-into-master 
Merge release into master
 2015-07-22 09:49:24 -04:00
Adam Palay
e515842395 Merge remote-tracking branch 'origin/release' into merge-release-into-master 
Conflicts:
	requirements/edx/github.txt
 2015-07-22 08:10:26 -04:00
Adam
5fe01036a4 Merge pull request #8978 from edx/hotfix/2015-07-20 
PLA-749 Fix student dashboard for users enrolled in CCX courses
 2015-07-22 08:04:25 -04:00
Ahsan Ulhaq
9e634a17b1 Merge pull request #8849 from edx/ahsan/ECOM-1525-credit-eligibility-email-notification-updated 
credit eligibility and payment receipt email
 2015-07-22 14:20:16 +05:00
Ahsan Ulhaq
06b085f8b4 credit eligibility and payment receipt email 
ECOM-1796
ECOM-1525
 2015-07-22 12:34:38 +05:00
tlindaliu
cb3140e953 Merge pull request #8782 from edx/lliu/courseware-access 
Add courseware_access field to mobile API
 2015-07-21 23:54:12 -04:00
tlindaliu
5aeccd520b MA-834: Add new fields to course enrollments endpoint in mobile API 
Fields are start_type, start_display, and courseware_access.
 2015-07-21 22:44:50 -04:00
Daniel Friedman
db6755fae8 Fix URL trailing slash bug in teams endpoint 2015-07-21 17:02:47 -04:00
Daniel Friedman
106e3127d8 Add Backbone model and collection for teams. 2015-07-21 17:02:47 -04:00
Alison Hodges
9d574b4e57 Merge pull request #8882 from edx/ahodges/randomize_strings 
Fixes DOC-841 per multiple requests
 2015-07-21 15:25:12 -04:00
Christina Roberts
e5928bacc2 Merge pull request #8894 from edx/andya/lms-requirejs 
Implement RequireJS Optimizer in the LMS
 2015-07-21 15:07:49 -04:00
Renzo Lucioni
fbe0784541 Merge pull request #8990 from edx/renzo/update-edx-oauth2-provider 
Update edx-oauth2-provider to 0.5.5
 2015-07-21 15:05:24 -04:00
Alison Hodges
6f70ed38b4 Fixes DOC-841 per multiple requests 
@stroilova @shnayder please verify that I have updated these files
correctly. @catong complete the thread started in email.
 2015-07-21 13:23:33 -04:00
Will Daly
81e677b713 Merge pull request #8959 from edx/will/separate-verification-and-upgrade-deadline 
Separate verification deadline from upgrade deadline
 2015-07-21 09:50:53 -07:00
Sarina Canelake
081549df85 Merge pull request #8991 from edx/sarina/20150721-translations-update 
Update translations (autogenerated message)
 2015-07-21 12:43:15 -04:00
Christina Roberts
e9e5b5bd6e Merge pull request #8765 from edx/christina/lms-requirejs/notes 
Optimize edxnotes files.
 2015-07-21 11:47:50 -04:00
Sarina Canelake
2cc334eed0 Update translations (autogenerated message) 2015-07-21 11:45:01 -04:00
Will Daly
25fa2ffc2d Separate verification deadline from upgrade deadline 
* Add verification deadline model.
* Populate verification deadlines from course modes table.
* Update student dashboard to use verification deadlines.
* Update pay-and-verify view to use verification deadlines.
* Simplify Django admin for course modes and add validation.
* Add verification deadline to Django admin for course modes.
* Add UI for when the upgrade deadline is missed in the pay-and-verify flow.
 2015-07-21 08:43:14 -07:00
Renzo Lucioni
527def32e4 Update edx-oauth2-provider to 0.5.5 
0.5.5 includes oauth2-provider's tests module
 2015-07-21 11:37:07 -04:00
Max Rothman
3ede0b0d0a Merge pull request #8988 from edx/max/update-oauth2-provider 
Update edx-oauth2-provider to 0.5.4
 2015-07-21 11:23:48 -04:00
Utkarsh
231059c24b Merge pull request #8989 from edx/utkjad/fixtemp 
PLAT-734 Fix slow transaction due to multiple calls to unpickling
 2015-07-21 11:07:12 -04:00
Calen Pennington
8e1686c8cf Merge pull request #8980 from cpennington/cache-ccx-lookups 
Cache ccx lookups
 2015-07-21 11:06:43 -04:00
Calen Pennington
22e4fb30f5 Merge pull request #8987 from edx/ormsbee/inline_discussion_ccx_perf_hotfix 
Ormsbee/inline discussion ccx perf hotfix
 2015-07-21 11:06:33 -04:00