Merge pull request #6 from edx/release

Release 2013-05-29, with Hotfix 2013-05-30 back into master
This commit is contained in:
marcotuts
2013-05-30 16:34:22 -07:00
15 changed files with 38070 additions and 7 deletions

38067
common/static/js/vendor/pdfjs/pdf.js vendored Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -1 +0,0 @@
34d1996e44f78168a73297217b3a0973c2ae90e1

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 MiB

View File

@@ -1 +0,0 @@
b154ce99fb5c8d413ba769e8cc0df94ed674c3f4

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 MiB

View File

@@ -1 +0,0 @@
2b8c58b098bdb17f9ddcbb2098f94c50fdcedf60

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 MiB

View File

@@ -1 +0,0 @@
7d8b9879f7e5b859910edba7249661eedd3fcf37

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 MiB

View File

@@ -1 +0,0 @@
caf8b43337faa75cef5da5cd090010215a67b1bd

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 MiB

View File

@@ -1 +0,0 @@
b4d043bb1ca4a8815d4a388a2c9d96038211417b

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 MiB

View File

@@ -1 +0,0 @@
6718f0c6e851376b5478baff94e1f1f4449bd938

View File

@@ -10,6 +10,9 @@ end
# the ENV_TOKENS to the templating context.
def preprocess_with_mako(filename)
# simple command-line invocation of Mako engine
# cdodge: the .gsub() are used to translate true->True and false->False to make the generated
# python actually valid python. This is just a short term hack to unblock the release train
# until a real fix can be made by people who know this better
mako = "from mako.template import Template;" +
"print Template(filename=\"#{filename}\")" +
# Total hack. It works because a Python dict literal has