ag-admin
/
OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2771 from tsiegleauq/issue2769-new-pdfmake-source 

return to original pdfmake (fixes #2769)
This commit is contained in:
Emanuel Schütze 2016-12-14 12:28:01 +01:00 committed by GitHub
parent cebfbf5b8d 5e3b52661e
commit 7cbc0d4bfe
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.rst
View File

@ -184,7 +184,7 @@ OpenSlides uses the following projects or parts of them:
* `angular-gettext <http://angular-gettext.rocketeer.be/>`_, License: MIT
* `angular-loading-bar <https://chieffancypants.github.io/angular-loading-bar>`_, License: MIT
* `angular-messages <http://angularjs.org>`_, License: MIT
* `pdfmake <https://github.com/pdfmake/pdfmake>`_, License: MIT
* `pdfmake <https://github.com/bpampuch/pdfmake>`_, License: MIT
* `angular-pdf <http://github.com/sayanee/angularjs-pdf>`_, License: MIT
* `angular-sanitize <http://angularjs.org>`_, License: MIT
* `angular-scroll-glue <https://github.com/Luegg/angularjs-scroll-glue>`_, License: MIT

4
bower.json
View File

@ -34,13 +34,13 @@
"ng-file-upload": "~11.2.3",
"ngstorage": "~0.3.11",
"ngBootbox": "~0.1.3",
"pdfmake-dist": "~0.1.27",
"pdfmake": "bpampuch/pdfmake#3b44129d599424cd0e306fc5014ba3a129220c64",
"roboto-fontface": "~0.6.0",
"tinymce": "~4.4.3",
"tinymce-i18n": "OpenSlides/tinymce-i18n#a186ad61e0aa30fdf657e88f405f966d790f0805"
},
"overrides": {
"pdfmake-dist": {
"pdfmake": {
"main": [
"build/pdfmake.min.js",
"build/vfs_fonts.js"