Commit graph

106 commits

Author SHA1 Message Date
Tim Krehan
358d97826d fix mobile nav not showing list as highlighted, if no "site" is set 2019-05-23 14:56:43 +02:00
Tim Krehan
5b41ed338c Merge branch 'prevent-sqlinjection' into 'develop'
Prevent sqlinjection

See merge request bluekay/shopping-list!12
2019-05-23 12:43:48 +00:00
Tim Krehan
ce1b280770 fixed highlighting of current site 2019-05-23 14:19:35 +02:00
Tim Krehan
1f02ec4450 changed title to match product name 2019-05-23 14:14:16 +02:00
Tim Krehan
e6e384c516 added icons to expanded list 2019-05-23 13:59:28 +02:00
Tim Krehan
7592bc4fa3 new responsive nav 2019-05-23 11:58:26 +02:00
Tim Krehan
996c00307f added al little padding to the body 2019-05-23 10:17:08 +02:00
Tim Krehan
b5010c335a fixed theming 2019-05-23 09:15:50 +02:00
Tim Krehan
e7b8c4c0c6 not needed 2019-05-23 09:08:54 +02:00
Tim Krehan
ff2c9f777e toast not clickable issue fixed 2019-05-23 09:02:51 +02:00
Tim Krehan
33543cc125 renamed bin to js 2019-05-23 08:58:48 +02:00
Tim Krehan
f36e30240c no default theme given... 2019-05-23 08:50:51 +02:00
Tim Krehan
87e896cbe6 provide new item flashing 2019-05-23 08:47:48 +02:00
Tim Krehan
8c444e1bb9 some tweaks 2019-05-22 21:17:53 +02:00
Tim Krehan
35fd7ca908 fixed missing notification, if user exist, but password wrong 2019-05-22 20:56:09 +02:00
Tim Krehan
c6df17af7f fixed remember me not working 2019-05-22 20:52:06 +02:00
Tim Krehan
24d4122682 new themes.... if this gets merged anyway :D 2019-05-22 14:22:24 +02:00
Tim Krehan
7cb09a2e67 last minute fix 2019-05-22 10:58:23 +02:00
Tim Krehan
199539a1c3 sql sanitized 2019-05-22 10:48:09 +02:00
Tim Krehan
3fe391dbc8 fuck this 2019-05-22 10:46:18 +02:00
Tim Krehan
865fee3640 Merge branch 'prevent-sqlinjection' of https://gitlab.com/bluekay/shopping-list into prevent-sqlinjection 2019-05-22 10:45:50 +02:00
Tim Krehan
6257036261 sql inject 2019-05-22 10:45:09 +02:00
Tim Krehan
0c0d9c366c sql inject 2019-05-22 10:44:36 +02:00
Tim Krehan
531c210b75 sql inject prevent 2019-05-22 10:38:07 +02:00
Tim Krehan
543b9aafef sql sanitizing 2019-05-22 10:16:13 +02:00
Tim Krehan
04c9776a65 done with preparing list sql statements 2019-05-22 09:12:09 +02:00
Tim Krehan
8515304423 sql inject for add listitem 2019-05-22 08:42:36 +02:00
Tim Krehan
eacd172218 sanitize sql to prepare for sql injection 2019-05-22 08:37:37 +02:00
Tim Krehan
08531b6502 Merge branch '29-fix-typeahead-in-create-update-recipe-form' into 'develop'
Resolve "fix typeahead in create/update recipe form"

See merge request bluekay/shopping-list!11
2019-05-21 18:52:37 +00:00
Tim Krehan
973cb0fdec fixed autocomplete 2019-05-21 16:47:14 +02:00
Tim Krehan
2c8892848a Merge branch 'minor-bugfixes-after-bootstrap-integration' into 'develop'
Minor bugfixes after bootstrap integration

See merge request bluekay/shopping-list!10
2019-05-21 13:22:52 +00:00
Tim Krehan
43c21c010e implemented full settings functionality 2019-05-21 10:28:07 +02:00
Tim Krehan
a73628d769 implemented autocomplete again 2019-05-21 09:21:59 +02:00
Tim Krehan
9831151903 add margn to recipe card bottom 2019-05-20 08:38:56 +02:00
Tim Krehan
7b700cb820 prepared autocomplete 2019-05-19 20:31:37 +02:00
Tim Krehan
1c18fe20a0 added hosting for own fonts (no google integration 2019-05-19 19:55:51 +02:00
Tim Krehan
5a3bb96c70 made some style changes to list input 2019-05-19 19:16:15 +02:00
Tim Krehan
370206b967 removed backup css 2019-05-19 18:50:41 +02:00
Tim Krehan
f2e350f51d manual merge 2019-05-19 18:37:00 +02:00
Matthias Kalb
6afac228f7 added version.json, $version variable via version.php 2019-01-23 15:43:17 +01:00
Matthias Kalb
0dfe45acab Merge branch 'ci-test' into 'develop'
CI Syntaxchecks

See merge request bluekay/shopping-list!7
2019-01-20 09:25:51 +00:00
Matthias Kalb
a2a7c10c10 CI Syntaxchecks 2019-01-20 00:00:17 +01:00
Tim Krehan
4124c4b8a7 Merge branch 'add-api-url' into 'develop'
Add api url

See merge request bluekay/shopping-list!6
2018-12-17 10:32:30 +00:00
Tim Krehan
dfde633df5 Merge branch '17-Export-Import-Option' into 'develop'
Resolve "Export/Import-Option"

See merge request bluekay/shopping-list!5
2018-12-17 10:26:40 +00:00
Krehan Tim
a1e40f7902 fixed missing user api 2018-11-20 13:53:17 +01:00
Krehan Tim
62294afa3b added api url 2018-11-20 09:59:59 +01:00
Krehan Tim
5772c3f9f5 fixed double json extension while downloading error file 2018-11-14 16:28:05 +01:00
Krehan Tim
5f18b295a4 added import for listitems (hopefully) 2018-11-14 16:25:50 +01:00
Krehan Tim
2acc164365 implemented recipe import 2018-11-14 16:08:36 +01:00
Krehan Tim
ddbdcaa728 added .htaccess to prevent unauthorized access 2018-11-12 13:30:54 +01:00