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

Merge pull request #2312 from tsiegleauq/pdfmake_pdfmake

Browse Source 
Migrate to pdfmake/pdfmake
This commit is contained in:
Norman Jäckel 2016-08-25 12:44:33 +02:00 committed by GitHub
commit e63c1438f5
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

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

4
bower.json
View File

@ -29,14 +29,14 @@
"ng-dialog": "~0.5.6", "ng-dialog": "~0.5.6",
"ng-file-upload": "~11.2.3", "ng-file-upload": "~11.2.3",
"ngBootbox": "~0.1.3", "ngBootbox": "~0.1.3",
"pdfmake": "~0.1.17", "pdfmake-dist": "~0.1.27",
"open-sans-fontface": "https://github.com/OpenSlides/open-sans.git#1.4.2.post1", "open-sans-fontface": "https://github.com/OpenSlides/open-sans.git#1.4.2.post1",
"roboto-condensed": "~0.3.0", "roboto-condensed": "~0.3.0",
"tinymce-dist": "4.3.12", "tinymce-dist": "4.3.12",
"tinymce-i18n": "OpenSlides/tinymce-i18n#a186ad61e0aa30fdf657e88f405f966d790f0805" "tinymce-i18n": "OpenSlides/tinymce-i18n#a186ad61e0aa30fdf657e88f405f966d790f0805"
}, },
"overrides": { "overrides": {
"pdfmake-dist": { "pdfmake-dist-dist": {
"main": "build/pdfmake.min.js" "main": "build/pdfmake.min.js"
}, },
"pdfjs-dist": { "pdfjs-dist": {