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

40014 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jillian Vogel
f06be21f11 Merge pull request #14305 from open-craft/jill/bump-django-storage-swift 
Bumps django-storage-swift to 1.2.15
 2017-01-27 09:50:29 +10:30
Clinton Blackburn
5ff02315cc Merge pull request #14397 from edx/clintonb/update-edx-drf-extensions 
Updated edx-rest-api-client to 1.7.1
 2017-01-26 16:24:30 -05:00
Dennis Jen
a107754ff4 Merge pull request #14386 from edx/dsjen/tracking 
Added user tracking id to profile scope in oauth2 handler.
 2017-01-26 15:20:42 -05:00
Clinton Blackburn
aec759fd65 Updated edx-rest-api-client to 1.7.1 
https://github.com/edx/edx-rest-api-client/compare/1.6.0...1.7.1

ECOM-6634
 2017-01-26 15:13:01 -05:00
Eric Fischer
d4df42687e Merge pull request #14381 from edx/efischer/xml_cache_logging 
Log course on no-retry update_course_in_cache errors
 2017-01-26 14:01:18 -05:00
Ned Batchelder
36d454fe6e Merge pull request #14403 from edx/nedbat/i18n-tools-from-pypi 
edx-i18n-tools is on PyPI, get it from there.
 2017-01-26 11:45:15 -05:00
Ned Batchelder
7f4ce79ca4 edx-i18n-tools is on PyPI, get it from there. 2017-01-26 10:52:45 -05:00
Ned Batchelder
8a2411e3e6 Merge pull request #14396 from edx/ned/pip9 
Try pip 9.0.1 and setuptools 34.0.2
 2017-01-26 10:48:53 -05:00
sanfordstudent
09c021e7ee Merge pull request #14370 from edx/sstudent/grades-tasks-logging 
add task id to logging and log database exceptions for TNL-6332
 2017-01-26 10:44:09 -05:00
Sanford Student
dd93496f7a add task id to logging and log database exceptions 
for TNL-6332, TNL-6373
 2017-01-26 10:06:34 -05:00
Dennis Jen
080f2b90db Added tracking claim to profile scope in oauth handler. 2017-01-26 09:49:47 -05:00
Cliff Dyer
c3e284f5bd Merge pull request #14345 from edx/beryl/rerun-failed-tasks 
Create infrastructure for reapplying tasks
 2017-01-26 09:46:03 -05:00
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
J. Cliff Dyer
df7c2715d3 Create infrastructure for reapplying tasks 
and cleaning up tasks that have been resolved.

TNL-6252
 2017-01-25 16:22:40 -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
Ned Batchelder
4433edd05c Pyparsing might need to be in pre? 2017-01-25 15:15:33 -05:00
Ned Batchelder
84b25dd896 Keep the sandbox reqs in sync 2017-01-25 15:11:23 -05:00
Ned Batchelder
8d791b5823 Use latest pyparsing 2.0.x to avoid setuptools entanglement 
With 2.0.1, and setuptools 34.0.2, errors happen like:

File "/edx/app/edxapp/venvs/edxapp-sandbox/local/lib/python2.7/site-packages/packaging/requirements.py", line 59, in <module>
    MARKER_EXPR = originalTextFor(MARKER_EXPR())("marker")
TypeError: __call__() takes exactly 2 arguments (1 given)

(cherry picked from commit 73519b3547359a0b791e39d4665f51ac66449a17)
 2017-01-25 15:10:02 -05:00
Ned Batchelder
041fede334 Try the latest of pip and setuptools 2017-01-25 15:04:22 -05:00
Ned Batchelder
a117416ed2 Add versions to all non-dash-e installations 2017-01-25 14:51:36 -05:00
Ned Batchelder
91a235a96d Fix two wrong egg names 
These are the only two egg names that are wrong in this file.  We have
to uninstall i18n-tools, because the distribution name changed.  The
lti-consumer XBlock hasn't changed named, we just had the wrong name in
the requirements file.
 2017-01-25 14:22:58 -05:00
Clinton Blackburn
bb7c5b3384 Corrected OAuth URL for Docker-base devstack 
ECOM-6634
 2017-01-25 13:13:50 -05:00
Eric Fischer
0dd617897b Log course on no-retry update_course_in_cache errors 2017-01-25 12:41:39 -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