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

39994 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jillian Vogel
322ac8a468 Bumps the xblock-poll version to v1.2.5 
and removes the -e from the install, as per the requirements rules.
 2017-01-26 12:05:01 +10:30
Clinton Blackburn
01d79c518e Merge pull request #14394 from edx/clintonb/fix-oauth-settings 
Corrected OAuth URL for Docker-base devstack
 2017-01-25 17:46:45 -05:00
mikedikan
d9ccdbc45e Merge pull request #14385 from edx/mdikan/disable-course-code-in-rerun-form 
Disable changes to course code in re-run form
 2017-01-25 17:33:41 -05:00
Ben Patterson
f993576511 Merge pull request #14390 from edx/benp/expose-python-cyclo-complexity 
Print the paver output for python cyclomatic complexity to console.
 2017-01-25 16:18:06 -05:00
Mike Dikan
de569e4522 Disable changes to course code in re-run form 
ECOM-6898

Disable (make read-only) the field for course code in the re-run form.  This will prevent creation of course runs with a different course code in the course key that are intended to stand for the same course in a program, which presents problems for the course catalog mapping process.
 2017-01-25 16:01:38 -05:00
Clinton Blackburn
bb7c5b3384 Corrected OAuth URL for Docker-base devstack 
ECOM-6634
 2017-01-25 13:13:50 -05:00
Renzo Lucioni
7d7a198224 Merge pull request #14391 from edx/renzo/ignore-publication-status 
Ignore run publication status when requesting programs from the catalog
 2017-01-25 12:19:24 -05:00
Clinton Blackburn
f87018c54d Merge pull request #14389 from edx/clintonb/update-devstack-docker-settings 
Set LMS_BASE setting for Studio
 2017-01-25 11:45:15 -05:00
Renzo Lucioni
21cd5c8014 Ignore run publication status when requesting programs from the catalog 
The programs service has no concept of run publication status. The catalog does, and many runs returned by the programs service are marked as unpublished in the catalog. To maintain existing behavior and continue displaying these runs as part of their respective programs, we need to ignore their publication status.

ECOM-6925
 2017-01-25 11:34:16 -05:00
Feanil Patel
e887770bc7 Merge pull request #14384 from edx/feanil/use_system_firefox 
Use the system version of Firefox
 2017-01-25 09:55:35 -05:00
Ben Patterson
e124c4a6a2 Print the paver output for python cyclomatic complexity to console. 
The actual report will continue to be piped into reports/python_complexity.log.

By exposing the paver output (approx 4 lines), we'll be able to consume
the actual complexity number in our logs and therefore trend the results
in our log aggregator.
 2017-01-25 07:45:34 -05:00
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
Clinton Blackburn
681cc1dc53 Set LMS_BASE setting for Studio 
This allows previews in LMS to work properly.

ECOM-6634
 2017-01-25 02:05:13 -05: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
Feanil Patel
0d4399553b Use the system version of Firefox 
Use the system version of firefox for running test.
 2017-01-24 16:53:59 -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