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

31690 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
muzaffaryousaf
38ef22b8a2 Using youtube api (v3) instead of v2 to get the video duration . 
TNL-2413
 2015-07-24 17:03:46 +05:00
chrisndodge
5e195c8eeb Merge pull request #8962 from edx/cdodge/proctoring-studio 
Integrate timed and proctored exam authoring into Studio
 2015-07-23 15:53:17 -04:00
Will Daly
c2f0a68fba Merge pull request #9028 from edx/release 
Merge release back to master
 2015-07-23 12:48:17 -07: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
Chris Dodge
3748119961 Integrate timed and proctored exam authoring into Studio 2015-07-23 14:43:17 -04:00
Christopher Lee
a76eb7de7a Merge pull request #8571 from edx/clee/discussion-api-view-thread-endorsed 
Added get unanswered/unread threads in discussion api
 2015-07-23 13:12:01 -04:00
christopher lee
5d8d1619a0 Added unanswered/unread query params for thread in discussion api 
Discusion API now takes a view parameter when getting a thread list.
This view parameter only takes "unread" or "unanswered" as possible
values.
 2015-07-23 11:41:08 -04:00
Will Daly
eefbf77edf Allow course staff to bypass embargo rules. 2015-07-23 08:26:43 -07:00
Matt Drayer
31b2be17d6 Merge pull request #9010 from edx/ziafazal/SOL-1045-hide-generate-certs-button 
SOL-1045: hiding generated certificate button in case of self paced courses
 2015-07-23 10:13:23 -04:00
Zia Fazal
5925edbfbc hiding generated certificate button in case of self paced courses 2015-07-23 17:02:34 +05:00
Syed Hasan raza
a347db40b1 Merge pull request #8819 from edx/shr/bug/TNL-2592-old-mongo-xblock-dates 
start-date-reset-to-DEFAULT_START_DATE
 2015-07-23 00:34:44 -07:00
Peter Fogg
dbef376736 Merge pull request #8999 from edx/peter-fogg/tnl-2703 
Remove unnecessary DB call in team pagination.
 2015-07-22 16:24:35 -04:00
Peter Fogg
948f652cf0 Remove unnecessary DB call in team pagination. 2015-07-22 15:46:09 -04: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
Syed Hassan Raza
7b1bcc3250 start-date-reset-to-DEFAULT_START_DATE 2015-07-22 13:17:48 +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
Renzo Lucioni
f50f045bcf Update edx-oauth2-provider to 0.5.4 
Conflicts:
	requirements/edx/github.txt
 2015-07-21 11:02:46 -04:00
cahrens
497d76fa54 Optimize edxnotes files. 2015-07-21 10:54:02 -04:00
utkjad
274e6de22b PLAT-734 Fix slow transaction due to multiple calls to unpickling 2015-07-21 13:56:38 +00:00