Skip to content

Commit

Permalink
code improvements (#1423)
Browse files Browse the repository at this point in the history
* removed unused mapping information
* added support for further field types
* fixed changing date objects for begin and end
* added more project fields as invoice variables
* theme update and asset rebuild
  • Loading branch information
kevinpapst committed Jan 31, 2020
1 parent 9e2fccb commit 3ff46e0
Show file tree
Hide file tree
Showing 53 changed files with 1,982 additions and 1,652 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"gedmo/doctrine-extensions": "^2.4",
"jms/metadata": "^2.0",
"jms/serializer-bundle": "^3.2",
"kevinpapst/adminlte-bundle": "~3.0",
"kevinpapst/adminlte-bundle": "^3.0",
"kimai/kimai2-composer": "^0.1",
"laravolt/avatar": "^3.0",
"league/csv": "^9.4",
Expand Down
660 changes: 333 additions & 327 deletions composer.lock

Large diffs are not rendered by default.

34 changes: 17 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,26 @@
"prod": "node_modules/.bin/encore production"
},
"devDependencies": {
"@fortawesome/fontawesome-free": "~5.8.2",
"@symfony/webpack-encore": "^0.27.0",
"admin-lte": "~2.4.8",
"bootstrap-sass": "^3.3.7",
"@fortawesome/fontawesome-free": "^5.12",
"@symfony/webpack-encore": "^0.28",
"admin-lte": "^2.4",
"bootstrap-sass": "^3.4",
"chart.js": "~2.8.0",
"core-js": "^3.1.3",
"daterangepicker": "^3.0.3",
"fullcalendar": "^3.9.0",
"icheck": "^1.0.2",
"jquery": "^3.3.1",
"jquery-slimscroll": "^1.3.8",
"jquery-ui": "^1.12.1",
"js-cookie": "^2.2.0",
"moment": "^2.24.0",
"node-sass": "^4.9.0",
"sass-loader": "^7.0.2",
"select2": "^4.0.10",
"daterangepicker": "^3.0",
"fullcalendar": "^3.9",
"icheck": "^1.0",
"jquery": "^3.4",
"jquery-slimscroll": "^1.3",
"jquery-ui": "^1.12",
"js-cookie": "^2.2",
"moment": "^2.24",
"node-sass": "^4.13",
"sass-loader": "^7.3",
"select2": "^4.0",
"select2-bootstrap-theme": "^0.1.0-beta.10",
"sortablejs": "^1.10.1",
"sortablejs": "^1.10",
"sweetalert2": "^9.3",
"webpack-notifier": "^1.5.1"
"webpack-notifier": "^1.8"
}
}
1 change: 0 additions & 1 deletion public/build/0.1a6ffb43.js

This file was deleted.

1 change: 1 addition & 0 deletions public/build/0.f7fae2b9.js

Large diffs are not rendered by default.

File renamed without changes.
1 change: 1 addition & 0 deletions public/build/2.a47ad919.js

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion public/build/2.dad56560.js

This file was deleted.

1 change: 1 addition & 0 deletions public/build/app.04b966cf.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions public/build/app.2bde4971.css

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion public/build/app.712803ae.js

This file was deleted.

1 change: 0 additions & 1 deletion public/build/app.ee3257e6.css

This file was deleted.

1 change: 0 additions & 1 deletion public/build/calendar.13664a8f.js

This file was deleted.

1 change: 1 addition & 0 deletions public/build/calendar.5cc27719.js

Large diffs are not rendered by default.

File renamed without changes.
42 changes: 21 additions & 21 deletions public/build/entrypoints.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,44 +2,44 @@
"entrypoints": {
"app": {
"js": [
"build/runtime.6ca1eea5.js",
"build/0.1a6ffb43.js",
"build/1.16767f92.js",
"build/app.712803ae.js"
"build/runtime.664a9501.js",
"build/0.f7fae2b9.js",
"build/1.c24a9c6f.js",
"build/app.04b966cf.js"
],
"css": [
"build/app.ee3257e6.css"
"build/app.2bde4971.css"
]
},
"chart": {
"js": [
"build/runtime.6ca1eea5.js",
"build/0.1a6ffb43.js",
"build/2.dad56560.js",
"build/chart.7f4d7f29.js"
"build/runtime.664a9501.js",
"build/0.f7fae2b9.js",
"build/2.a47ad919.js",
"build/chart.c9943f57.js"
]
},
"calendar": {
"js": [
"build/runtime.6ca1eea5.js",
"build/0.1a6ffb43.js",
"build/1.16767f92.js",
"build/calendar.13664a8f.js"
"build/runtime.664a9501.js",
"build/0.f7fae2b9.js",
"build/1.c24a9c6f.js",
"build/calendar.5cc27719.js"
],
"css": [
"build/calendar.ade7bcdf.css"
]
}
},
"integrity": {
"build/runtime.6ca1eea5.js": "sha384-xNNrNinl64G3nCUrIskgSjU0mUXXCB9lj6XCSInBTwxSKXk8uTMafnLHtdWdIGtd",
"build/0.1a6ffb43.js": "sha384-vuVCyLVj2b4h3jpKl+JSANRCacmXeLk+ihK5T5NZBO7+SJ5Y+o6d4qju116hTPSD",
"build/1.16767f92.js": "sha384-JPoKdrVtBemSiVBoAnmSxLML7xXM9zYeuwOPYQv/kLzt/P4cmLY5r9gH8oaGRPFG",
"build/app.712803ae.js": "sha384-yuwKAmpK2BtBrGezcOw8zGyW8ntAXMT1KMcw+i3kJoGpo6ziidJ8tsbY4I/1neR+",
"build/app.ee3257e6.css": "sha384-XYHDohm3nf3V2OxBYJ75ZpfKPRlYoUPyvvksn5mVomq7ADeqOipaWIw4Y8OKVooQ",
"build/2.dad56560.js": "sha384-oKsefSmRq0GL+Qa6f6jExXvFay3cM6YZFHQRKoAHi2p54UOCtjJfjF2eAB1qykoL",
"build/chart.7f4d7f29.js": "sha384-I57c9DtU3AOG2kzKqIZkIu0hi1aGYHRZ5QG4LKC9+9slzJnAMttPGXoL2cQG3m6y",
"build/calendar.13664a8f.js": "sha384-CDVRjmMRhA0KU90taIf50/DQOr1gbxGmdxVW8uj+qcwzKE843XPCz40fYQudopGU",
"build/runtime.664a9501.js": "sha384-xNNrNinl64G3nCUrIskgSjU0mUXXCB9lj6XCSInBTwxSKXk8uTMafnLHtdWdIGtd",
"build/0.f7fae2b9.js": "sha384-DR5A41RIECdWBd6xODR0b1hvGqcEYUyn9vNPreqK9VOCQWTF6bgxB4RVmqlOKilT",
"build/1.c24a9c6f.js": "sha384-JPoKdrVtBemSiVBoAnmSxLML7xXM9zYeuwOPYQv/kLzt/P4cmLY5r9gH8oaGRPFG",
"build/app.04b966cf.js": "sha384-YLonU58xAZI7lAtTqkSo0G/kTtOwRUf6YxuhlUyEHAGigBv7hMj8xowRix3qLWVP",
"build/app.2bde4971.css": "sha384-3bVuRNKO8FkMuSAu5Eefo+HJ9WNpiJsrIefh0qSdQsbk+8+MA1zre/NZ/AGrY1M9",
"build/2.a47ad919.js": "sha384-1h2P/tsl+bh8qgJd7S9irQHKuns7UATVxeFGLOCH85GPFXfAdRzgzx3nk5MrxzrV",
"build/chart.c9943f57.js": "sha384-I57c9DtU3AOG2kzKqIZkIu0hi1aGYHRZ5QG4LKC9+9slzJnAMttPGXoL2cQG3m6y",
"build/calendar.5cc27719.js": "sha384-cYpQuj3S8p9ZJEuC0Pfes0JED7mWJvW/2YGWy6MlYa+nt2xkj4bhAw7tpX9+qdwJ",
"build/calendar.ade7bcdf.css": "sha384-ta519W5+NY1a8FBh7rD4zORYTfUXCYTLci0Z25nf4BfodmuXqyPVNEe7dSe2/fRd"
}
}
Binary file not shown.
Binary file not shown.
Binary file added public/build/fonts/fa-brands-400.822d94f1.woff2
Binary file not shown.
Binary file removed public/build/fonts/fa-brands-400.9f018d10.woff
Binary file not shown.
Binary file removed public/build/fonts/fa-brands-400.9f4ce3dc.woff2
Binary file not shown.
Binary file added public/build/fonts/fa-brands-400.f4920c94.woff
Binary file not shown.
Binary file not shown.
Binary file removed public/build/fonts/fa-regular-400.7980a636.woff2
Binary file not shown.
Binary file removed public/build/fonts/fa-regular-400.7aaf5675.woff
Binary file not shown.
Binary file added public/build/fonts/fa-regular-400.9efb8697.woff2
Binary file not shown.
Binary file added public/build/fonts/fa-regular-400.a57bcf76.woff
Binary file not shown.
Binary file not shown.
Binary file removed public/build/fonts/fa-solid-900.0be94a07.woff
Binary file not shown.
Binary file not shown.
Binary file removed public/build/fonts/fa-solid-900.64b3e814.woff2
Binary file not shown.
Binary file not shown.
Binary file added public/build/fonts/fa-solid-900.93f28454.woff
Binary file not shown.
Binary file added public/build/fonts/fa-solid-900.f6121be5.woff2
Binary file not shown.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 3ff46e0

Please sign in to comment.