Merge pull request #64 from demokratie-live/sprint#10/issue-fixes-#2 · demokratie-live/democracy-development@36a67c5 · GitHub

Commit

Merge pull request #64 from demokratie-live/sprint#10/issue-fixes-#2

Browse files

Sprint#10/issue fixes #2

Loading branch information

ulfgebhardt committed Apr 23, 2018

2 parents 522ac9c + d00d9ab commit 36a67c5

bundestag.io

Submodule bundestag.io updated 0 files

client

Submodule client updated 25 files

+9 −0		CHANGELOG.md
+ −		android/app/src/main/assets/fonts/DemocracyFont.ttf
+17 −0		assets/svgs/DemocracyFont/checkmark-double.svg
+12 −0		assets/svgs/DemocracyFont/checkmark.svg
+17 −0		iconfont/DemocracyFont.css
+ −		iconfont/DemocracyFont.eot
+24 −0		iconfont/DemocracyFont.html
+6 −0		iconfont/DemocracyFont.js
+4 −0		iconfont/DemocracyFont.json
+18 −0		iconfont/DemocracyFont.svg
+ −		iconfont/DemocracyFont.ttf
+ −		iconfont/DemocracyFont.woff
+4 −0		ios/democracyclient.xcodeproj/project.pbxproj
+1 −0		ios/democracyclient/Info.plist
+2 −0		package.json
+20 −4		src/components/VoteListItem.js
+7 −0		src/graphql/fragments/ProcedureVoted.js
+4 −0		src/graphql/queries/getProcedures.js
+18 −3		src/screens/Detail/Segment.js
+26 −20		src/screens/Detail/Segments/VoteResults.js
+1 −1		src/screens/Detail/Voting.js
+39 −3		src/screens/Detail/index.js
+0 −2		src/screens/VoteList/List.js
+14 −1		src/screens/VoteVarification/BallotBox.js
+266 −15		yarn.lock

server

Submodule server updated 3 files

+8 −0		src/graphql/resolvers/Procedure.js
+2 −0		src/graphql/schemas/Procedure.js
+1 −1		src/services/notifications/apn.js

0 comments on commit `36a67c5`

Please sign in to comment.