edx-platform

Files

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

djangoapps

WL-606

2017-01-25 15:05:57 +05:00

lib

Use latest pyparsing 2.0.x to avoid setuptools entanglement

2017-01-25 15:10:02 -05:00

static

inline discussion component filtering and sorting

2017-01-20 09:52:44 -05:00

templates

Added the templates for email subject, email body and the changes in submit_feedback function that now conditionally sends emails.

2016-11-16 12:12:00 -05:00

test

WL-606

2017-01-25 15:05:57 +05:00

__init__.py

Fix Pylint: F0010(parse-error)

2015-02-19 19:56:52 -08:00

.gitignore

…

README.rst

added READMEs for top level directories

2015-03-31 16:47:37 +02:00

README.rst

common
------

This directory contains common code shared between LMS and CMS, such as Mako templates, CSS, and Coffescript.