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

39981 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ayesha-baig
40e70302ea Merge pull request #14304 from edx/asadiqbal08/WL-606 
WL-606: Coupon Creation UI should not display for Otto courses
 2017-01-25 17:03:45 +05:00
asadiqbal
8f5ba0115c WL-606 2017-01-25 15:05:57 +05:00
Matjaz Gregoric
c7ff473e6d Merge pull request #14334 from open-craft/mtyaka/dndv2-bump-2.0.14 
Bump xblock-drag-and-drop-v2 to 2.0.14.
 2017-01-25 09:09:54 +01:00
John Eskew
ab190a8507 Merge pull request #14284 from open-craft/haikuginger/filter-by-block-name 
Restrict block ID comparison slightly to avoid false positives
 2017-01-24 19:32:14 -05:00
Nimisha Asthagiri
784ef04221 Merge pull request #14359 from edx/beryl/command_generate_cb_tasks 
Update generate_course_blocks management command to enqueue tasks.
 2017-01-24 17:24:30 -05:00
Ari Rizzitano
200e8568ef Merge pull request #14369 from edx/arizzitano/pa11ycrawler-ignore-update 
[pa11ycrawler] update location of ignore rules file
 2017-01-24 17:19:33 -05:00
Ari Rizzitano
c8cc7cc14b [pa11ycrawler] update location of pa11ycrawler ignore rules file (AC-701) 
[pa11ycrawler] update location of pa11ycrawler ignore rules file (AC-701)

patch test

temporarily force a pa11ycrawler PR run

remove temp run of pa11ycrawler
 2017-01-24 15:23:11 -05:00
Jesse Shapiro
3d080584e7 Merge pull request #14308 from open-craft/haikuginger/update-python-saml 
[ENT-4] Revert to canonical version of python-saml
 2017-01-24 07:34:03 -08:00
noraiz-anwar
44efc5aaf0 Merge pull request #14365 from edx/na/TNL-6333 
TNL-6333 Log play_video event after seek_video event
 2017-01-24 20:26:19 +05:00
Nimisha Asthagiri
c04f4401dc Update generate_course_blocks management command to enqueue tasks 2017-01-24 09:11:57 -05:00
Clinton Blackburn
bca141a54a Merge pull request #14376 from edx/clintonb/devstack 
Added settings for Docker-based devstack
 2017-01-24 01:27:59 -05:00
Clinton Blackburn
e7c0ed77e5 Added settings for Docker-based devstack 
ECOM-6634
 2017-01-24 00:38:00 -05:00
Clinton Blackburn
ae957709c9 Merge pull request #14377 from edx/clintonb/update-compile-sass 
Disabled system checks for the compile_sass management command
 2017-01-24 00:35:50 -05:00
Clinton Blackburn
9ab93d1fe2 Disabled system checks for the compile_sass management command 
The system checks require database access, which is not available when building Docker images. This relaxes the check, allowing the command to execute without a database.

ECOM-6634
 2017-01-23 23:47:17 -05:00
Nimisha Asthagiri
59532fb9a2 Merge pull request #14360 from edx/beryl/fix_db_updated_check 
Update has_database_updated_with_new_score to handle all block types
 2017-01-23 20:24:43 -05:00
Renzo Lucioni
d8cfd69f71 Merge pull request #14373 from edx/renzo/dashboard-programs-from-catalog 
Use switch to pull programs from the catalog for the student dashboard
 2017-01-23 16:50:24 -05:00
Ned Batchelder
02289ab5f5 Merge pull request #14371 from edx/ned/i18n-tools-037 
Use v0.3.7 of i18n-tools
 2017-01-23 16:25:48 -05:00
Renzo Lucioni
4c9066cf4e Use switch to pull programs from the catalog for the student dashboard 
ECOM-4422
 2017-01-23 15:57:59 -05:00
Christopher Lee
b287f48f8b Merge pull request #14301 from edx/clee/return-all-courses-on-mobile 
MA-3091: Return non-mobile courses from the mobile enrollments API
 2017-01-23 15:55:08 -05:00
Nimisha Asthagiri
5a9179bf00 Update has_database_updated_with_new_score to handle all block types 
TNL-6331
 2017-01-23 15:50:16 -05:00
christopher lee
b5e987ba61 MA-3091: Added mobile_available flag override admin setting 2017-01-23 15:04:40 -05:00
Nimisha Asthagiri
b83ed6ef68 Merge pull request #14358 from edx/beryl/bs_cache_invalidation 
Block Structure: Don't invalidate immediately upon course publish
 2017-01-23 14:47:31 -05:00
Nimisha Asthagiri
b79eda78fb Merge pull request #14368 from edx/beryl/bt_version_checking 
Fix Block Transformer version checking so cache can be pre-populated
 2017-01-23 14:28:47 -05:00
Ned Batchelder
ed0594bda5 .po files changed slightly with latest i18n-tools 2017-01-23 13:57:30 -05:00
Ned Batchelder
26b0567343 Adapt tests to the latest i18n-tools 2017-01-23 13:56:58 -05:00
Renzo Lucioni
c84eda42f8 Merge pull request #14357 from edx/renzo/catalog-switch 
Transition program list and detail pages to the catalog
 2017-01-23 12:35:44 -05:00
Ned Batchelder
2cec36d6ce Use v0.3.7 of i18n-tools 2017-01-23 12:13:32 -05:00
Calen Pennington
d5a879d319 Merge pull request #14367 from edx/release 
Merge release to master
 2017-01-23 11:56:08 -05:00
Renzo Lucioni
3fd23629a3 Transition program list and detail pages to the catalog 
Uses a Waffle Switch to route traffic between the programs and catalog services. A future commit will remove use of the switch and use the catalog exclusively.

ECOM-4422
 2017-01-23 11:29:38 -05:00
Renzo Lucioni
21e92a41d1 Add testing utility for toggling Waffle Switches 2017-01-23 11:29:38 -05:00
Nimisha Asthagiri
408ed01b1d Block Structure: Don't invalidate immediately upon course publish 
Introduces the use of Waffle to put the change behind a Switch.
TNL-6323
 2017-01-23 11:27:30 -05:00
Nimisha Asthagiri
4ef07c25bd Fix Block Transformer version checking so cache can be pre-populated 
This change requires Block Transformer schema changes to be backwards
compatible for older Block Transformer code versions - at least 1
version back to allow smooth deployments in a multi-version setting.
 2017-01-23 10:56:50 -05:00
Calen Pennington
67c3b083a8 Merge pull request #14366 from edx/release-candidate 
Merge Release candidate to Release
 2017-01-23 09:05:15 -05:00
noraiz-anwar
4679766655 Emit play_video event after seek_video event 2017-01-23 17:36:43 +05:00
Renzo Lucioni
12c595f80d Merge pull request #14353 from edx/renzo/waffle 
Reintroduce Waffle
 2017-01-20 17:15:35 -05:00
Ned Batchelder
ce97df15c5 Merge pull request #14356 from edx/ned/update-translations 
Update translations (autogenerated message)
 2017-01-20 17:01:10 -05:00
Renzo Lucioni
3f6d6cbf84 Reintroduce Waffle 
Waffle serves as a complement to config models. It's useful in feature rollout situations where you may not want to incur the overhead of creating and committing a migration (required for adding a field to a config model), and also handles gradual, percentage-based rollouts.

ECOM-4422
 2017-01-20 16:20:13 -05:00
Renzo Lucioni
acef28c70c Merge pull request #14259 from edx/ECOM-6535 
ECOM-6535 Change celery task to only pull from catalog and not programs api
 2017-01-20 15:55:57 -05:00
Ned Batchelder
aadd48eb7b Update translations (autogenerated message) 2017-01-20 20:01:52 +00:00
Matthew Piatetsky
05b461824e Pull programs from catalog when issuing program credentials 
Lays the groundwork for pulling all program data from the catalog.

ECOM-6535
 2017-01-20 14:48:43 -05:00
Calen Pennington
a432f15ccd Merge pull request #14355 from edx/release 
Merge release to master
 2017-01-20 12:48:55 -05:00
Calen Pennington
e4c0c61ded Merge pull request #14354 from cpennington/merge-release-candidate 
Merge pull request #14351 from edx/release
 2017-01-20 12:42:29 -05:00
alisan617
bcaeaffa7b Merge pull request #14338 from edx/alisan/inline-discussion-sort-TNL-6117 
Inline discussion sorting TNL-6117
 2017-01-20 10:48:35 -05:00
alisan617
f12dfae2d1 inline discussion component filtering and sorting 
TNL-6117
 2017-01-20 09:52:44 -05:00
Robert Raposa
126229a54a Merge pull request #14348 from edx/robrap/upgrade-xblock-lti-consumer 
OSPR-1490: Upgrade to 1.1.1 release of xblock-lti-consumer
 2017-01-19 16:54:49 -05:00
Robert Raposa
23c61ada7f Upgrade to v1.1.1 release of xblock-lti-consumer 2017-01-19 16:14:06 -05:00
Christina Roberts
b9c3848449 Merge pull request #14337 from edx/christina/tnl-6050 
Allow "masquerading as a group member" in Preview
 2017-01-19 15:49:02 -05:00
cahrens
a6776f6973 Always check group access when masquerading. 
TNL-6050
 2017-01-19 14:47:10 -05:00
Calen Pennington
cd4971a45f Merge pull request #14351 from edx/release 
Merge pull request #14350 from edx/release-candidate
 2017-01-19 14:04:21 -05:00
Calen Pennington
7df62ee89a Merge pull request #14350 from edx/release-candidate 
Merge release-candidate to release
 2017-01-19 09:57:50 -05:00