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

40335 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mushtaq Ali
3a9dc5de04 Merge pull request #14625 from edx/mushtaq/bug-bash-fixes 
Move Bug fixes
 2017-03-09 11:36:55 +05:00
Mushtaq Ali
e83bee65bd Fixed Backend: Move component directly to content experiment level (component will now be the sibling of groups) 
Fixed Move button is disabled when moving components inside conditional module

Fixed When navigating upward/backward, target parent is not set correct, resulting source to be moved in the previously selected parent
 2017-03-08 16:48:52 +05:00
Mushtaq Ali
de29ef94c6 Merge pull request #14457 from edx/mushtaq/restrict-move-action 
Allow move for content experiment
 2017-03-01 22:38:39 +05:00
Mushtaq Ali
0df3624132 Merge pull request #14465 from edx/ammar/bokchoy-tests 
bokchoy tests for move xblocks
 2017-03-01 21:40:21 +05:00
Mushtaq Ali
83de1eb99f Add content experiment test 2017-03-01 19:31:34 +05:00
muhammad-ammar
8a1ec3e690 bokchoy tests for move xblocks 2017-03-01 19:31:33 +05:00
Mushtaq Ali
485ffb1b68 restrict move action 2017-03-01 19:29:59 +05:00
Mushtaq Ali
e9b8e17fc8 Enable disable move - TNL-6063 2017-03-01 19:27:01 +05:00
Mushtaq Ali
e856f07b87 Move and undo move XBlock 
- TNL-6062
- TNL-6229
 2017-03-01 19:27:00 +05:00
muhammad-ammar
c7dc83c378 Move modal show course outline with breadcrumb 
TNL-6060
 2017-03-01 19:25:57 +05:00
Mushtaq Ali
bfeeeff708 Fix format parameter and test 2017-03-01 19:21:39 +05:00
muhammad-ammar
1b011af7e2 move dialog 
TNL-6047
 2017-03-01 19:21:38 +05:00
Mushtaq Ali
52f8c9763a Move an item - TNL-6064 2017-03-01 19:21:35 +05:00
Mushtaq Ali
3f355241be Get concise course outline data for move dialog box 
Get ancestor info for the given xblock
- TNL-6061
 2017-03-01 19:21:33 +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
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