Skip to content

Commit

Permalink
Merged PR 30: Mobile Code
Browse files Browse the repository at this point in the history
This implements the framework for mobile development within Tribbles.

Related work items: KETSE#76, KETSE#77, KETSE#78, KETSE#79
  • Loading branch information
dstoudt authored and Gpopereyes committed Aug 3, 2018
2 parents cc693ac + 4963dcd commit 019c3ee
Show file tree
Hide file tree
Showing 9 changed files with 5,715 additions and 26 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ var/files/*/
!var/logs/.gitkeep
!var/files/.gitkeep
composer.phar
composer.lock
vendor/
build/
web/bundles/
Expand Down
3 changes: 3 additions & 0 deletions app/config/default/parameters.yml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,6 @@ parameters:
converter: 'api' # api|unoconv
redis_host: 127.0.0.1
redis_port: 6379
jwt_key: ~
jwt_algorithm: HS256
jwt_expiration_seconds: 600
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@
"reprovinci/solr-php-client": "1.0.3",
"mrclay/minify": "^2.2",
"friendsofsymfony/rest-bundle": "^1.7",
"jms/serializer-bundle": "^1.1"
"jms/serializer-bundle": "^1.1",
"firebase/php-jwt": "^5.0"
},
"require-dev": {
"phpunit/phpunit": "^5.2.12",
Expand Down
Loading

0 comments on commit 019c3ee

Please sign in to comment.