Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
40,323 Commits 1 Branch 0 Tags
45eff7efd109e424df0a6895b962ebd590db180d
Commit Graph

40323 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jesse Shapiro
45eff7efd1 Merge pull request #14574 from open-craft/haikuginger/add-edx-api-collection-option 
[ENT-200] Add many=True kwarg to get_edx_api_data to modify empty return value
 2017-03-01 10:05:38 -05:00
Zia Fazal
84ad88b7af Merge pull request #14568 from edx/ziafazal/YONK-523-b 
Moved tagging aside xblock data save/update logic out of preview_hanlder
 2017-03-01 12:48:31 +05:00
Zia Fazal
9041ed1400 removed statement which updates xblock in preview handler 
added test to support changes

moved aside xblock data save logic int component_handler

changes after feedback

fixed typo
 2017-03-01 11:45:52 +05:00
Andy Armstrong
f6876ce199 Merge pull request #13937 from edx/andya/use-ui-blocks 
[WIP] Use web fragments for discussion and static tabs
 2017-03-01 00:36:48 -05:00
Nimisha Asthagiri
77a29242e3 Merge pull request #14571 from edx/beryl/cbs_models 
Storage-backed versioned Block Structures: Models
 2017-02-28 23:50:21 -05:00
Andy Armstrong
248558f1d4 Render Discussion tab using web fragments 2017-02-28 23:39:39 -05:00
George Song
5e21f64c2c Merge pull request #14585 from vagupta16/fix-course-about-invalid-course-id-upstream 
Ensure that course_about uses a valid course ID
 2017-02-28 09:32:16 -08:00
Jesse Shapiro
9d01bd9203 Merge pull request #14567 from open-craft/haikuginger/link-user-when-consent-disabled 
[ENT-210] Remove unnecessary pipeline element; use new name for existing element
 2017-02-28 11:37:57 -05:00
Jesse Shapiro
d61ad613c9 Add many=True kwarg to get_edx_api_data to modify empty return value; make resource_id checks slightly more strict 2017-02-28 11:34:10 -05:00
Cliff Dyer
c42bce4965 Merge pull request #14041 from ubc/ubcpi-0.6.0-update 
Update Peer Instruction XBlock to 0.6.2
 2017-02-28 10:37:26 -05:00
Jesse Shapiro
ff581d003f Remove unnecessary pipeline element; use new name for existing element 2017-02-28 09:54:57 -05:00
David Ormsbee
39fc6ce1f5 Merge pull request #14586 from edx/ormsbee/test_bulk_ops_1 
Move more tests to use bulk_operations
 2017-02-28 09:42:50 -05:00
David Ormsbee
825621a3dd Merge pull request #14589 from edx/ormsbee/faster_startup_pynliner 
LMS startup optimization: lazy load pynliner
 2017-02-28 09:00:32 -05:00
Ben Patterson
5f090e092e Merge pull request #14597 from edx/benp/fix-TNL-6040 
Benp/fix tnl-6040
 2017-02-27 18:21:53 -05:00
Pan Luo
6045fbcc58 Update UBCPI to 0.6.2 
Related changes https://github.com/ubc/ubcpi/pull/111
 2017-02-27 12:29:32 -08:00
Eric Fischer
e50d45dbb5 Merge pull request #14598 from edx/efischer/quick 
Cleaner grades exception handling
 2017-02-27 14:45:58 -05:00
Ben Patterson
819706a1c5 Remove flaky decorator. Feel optimistic. 2017-02-27 14:21:46 -05:00
David Ormsbee
b3a62bd252 LMS startup optimization: Load pynliner locally. 
pynliner imports cssutils, which has an expensive initialization. All
told, it can account for 15-20% of "fast" LMS startup (without asset
compilation). So we're going to load it locally here so that we delay
that one-time hit until we actually do the (rare) operation that is
sending a credit notification email.
 2017-02-27 14:07:44 -05:00
Eric Fischer
715076a48b Cleaner grades exception handling 2017-02-27 13:53:31 -05:00
Ben Patterson
a745b2d401 Temp commit to ensure flakiness is corrected. 2017-02-27 12:12:47 -05:00
Ben Patterson
4c527c370f Fix flakiness on test (it wasn't waiting for jquery to be loaded) 2017-02-27 12:11:58 -05:00
Jeremy Bowman
c8f7587f6b Merge pull request #14552 from edx/jmbowman/async_course_import 
PLAT-1104 Import courses asynchronously
 2017-02-27 12:01:06 -05:00
Jesse Shapiro
c6e6c8727d Merge pull request #14556 from open-craft/haikuginger/fix-enterprise-enrollment-api-url 
[ENT-208] Update AWS ENTERPRISE_ENROLLMENT_API_URL variable
 2017-02-27 10:41:44 -05:00
Nimisha Asthagiri
6f9b810f9a Storage-backed versioned Block Structures: Configuration 2017-02-27 00:39:22 -05:00
Nimisha Asthagiri
2f3b0b4cc8 Storage-backed versioned Block Structures: Settings 2017-02-27 00:39:22 -05:00
Nimisha Asthagiri
fb73888eba Storage-backed versioned Block Structures: Models 2017-02-27 00:39:21 -05:00
cahrens
8fedc08c2a Support web fragments for tabs. 2017-02-24 17:55:32 -05:00
David Ormsbee
d439da4418 Merge pull request #14583 from edx/ormsbee/remove_dealer_git_for_lms 
Remove dealer.git use for LMS.
 2017-02-24 17:37:43 -05:00
Eric Fischer
446f13c8e5 Merge pull request #14587 from edx/efischer/version_bumpbs 
Update ora2 and submissions
 2017-02-24 17:15:26 -05:00
Brandon DeRosier
36b0068bd1 Merge pull request #14542 from open-craft/bdero/ent-162 
ENT-162 Create an EnterpriseCourseEnrollment during the enrollment flow
 2017-02-24 16:24:19 -05:00
alisan617
c51c103880 Merge pull request #14576 from edx/alisan/discussion-topic-TNL-6205 
Discussion topic area section after Add Post
 2017-02-24 15:58:43 -05:00
David Ormsbee
ca1f76cedb Move more tests to use bulk_operations. 2017-02-24 15:21:45 -05:00
sanfordstudent
28e043ae62 Merge pull request #14582 from edx/sstudent/TNL-6297 
short circuit on library publish; for TNL-6297
 2017-02-24 15:16:09 -05:00
Christina Roberts
e67529464c Merge pull request #14573 from edx/christina/remove-profile-xblock 
Remove Profile XBlock.
 2017-02-24 15:04:54 -05:00
alisan617
4197ebf7f4 check if general topic exists 2017-02-24 15:04:25 -05:00
Eric Fischer
105184ecd2 Update ora2 and submissions 2017-02-24 15:02:00 -05:00
Brian Beggs
5a799c3e03 Merge pull request #14578 from edx/edx-django-release-util/0.3.0 
Change edx-django-release-util version.
 2017-02-24 14:32:55 -05:00
Varun Gupta
c235ad70bd ensure that course_about uses a valid course ID 2017-02-24 11:17:16 -08:00
Sanford Student
041a3df911 short circuit on library publish; for TNL-6297 2017-02-24 13:59:29 -05:00
David Ormsbee
4dc087ae69 Remove dealer.git use for LMS. 
We use the dealer.git library to determine the current revision of
edx-platform at startup time and store that as EDX_PLATFORM_REVISION in
our settings. This can take a surprisingly long time and involve a lot
of disk IO to initialize.

Studio still needs this functionality because it determines its static
asset folder based partly on the hash. This is horrible, because it
means all static assets are invalidated on every release instead of
just the ones that change. But that will be the subject of a different
PR.
 2017-02-24 11:16:11 -05:00
David Ormsbee
ae1853bc30 Merge pull request #14547 from edx/ormsbee/all_certs_for_user 
Find the courses a user has certs for up front.
 2017-02-23 23:20:38 -05:00
David Ormsbee
47e606b3ca Find the courses a user has certs for up front. 
Before this commit, we had to do a separate query for every course a
user was enrolled in when determining whether a course was refundable
(if you have a certificate, it isn't). Now the student dashboard will
make a one-time query to grab all of a user's cert-issued courses. This
is indexed, so it should be much faster than grabbing each one
separately.
 2017-02-23 22:24:00 -05:00
Brandon DeRosier
cb85ef1f5b ENT-162 Create an enterprise enrollment during the enrollment flow 2017-02-23 19:15:20 -05:00
Clinton Blackburn
78f235a5cb Enabled auto-auth for Docker-based devstack 
ECOM-7099
 2017-02-23 18:20:36 -05:00
Clinton Blackburn
9d9cf1a84b Added support for JWT authentication to the Enrollment API 
ECOM-7099
 2017-02-23 18:20:36 -05:00
Nimisha Asthagiri
e7ea1b47e5 Merge pull request #14572 from edx/beryl/cbs_config 
Storage-backed versioned Block Structures: Config
 2017-02-23 17:37:41 -05:00
Brian Beggs
dce30e5f3a Updating edx-django-release-util requirement to version 0.3.0 2017-02-23 16:45:46 -05:00
David Ormsbee
b0fd0a34a9 Merge pull request #14546 from edx/ormsbee/cache_overviews_on_enrollments 
Student Dashboard CourseOverviews with one query.
 2017-02-23 16:36:01 -05:00
David Ormsbee
8423ecb1c8 Student Dashboard CourseOverviews with one query. 
Pre-load the course overviews attached to CourseEnrollments on the
Student Dashboard, if possible. This will only grab the CourseOverviews
that already exist, and will not generate new ones. Any missing
CourseOverviews fall back to the lazily-created one-at-a-time behavior
they've always had. That's mostly because I wanted to optimize for the
common case in the least invasive way possible, and I don't want to get
caught up in locking issues.
 2017-02-23 15:50:44 -05:00
Ned Batchelder
b91792145e Merge pull request #14575 from edx/nedbat/update-translations 
Update translations (autogenerated message)
 2017-02-23 13:14:55 -05:00