adoralaura/shopping-list
1
0
Fork 0
mirror of https://github.com/tim-krehan/shopping-list.git synced 2024-11-23 22:30:41 +01:00
Code Issues Projects Releases Packages Wiki Activity
171 commits 4 branches 2 tags 5.2 MiB
Commit graph

171 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Krehan Tim
413c026dc7 fixed error during install, where "apache_get_modules" is not available 2018-11-12 09:02:43 +01:00
Krehan Tim
f191979f9b removed commented section 2018-11-12 08:50:04 +01:00
Tim Krehan
8758254a0f adduser call via ajax 2018-11-10 16:52:47 +01:00
Krehan Tim
2f3c8f7390 installation add user via class 2018-11-09 15:58:00 +01:00
Krehan Tim
5af2219bac simplyfied popup texts as function 2018-11-09 15:17:00 +01:00
Krehan Tim
3fceb49e47 Added Password Change and implemented user change in php class 2018-11-09 15:16:36 +01:00
Krehan Tim
28e7d78de1 implemented user class 2018-11-09 13:21:34 +01:00
Tim Krehan
84729d5912 added export for list entries 2018-10-29 22:23:51 +01:00
Tim Krehan
406c5d9e0a implemented export function 2018-10-29 22:14:56 +01:00
Tim Krehan
e7e5773762 added button stlye 2018-10-29 21:12:53 +01:00
Tim Krehan
426b83f364 added some js 2018-10-29 19:57:40 +01:00
Tim Krehan
5c122eff9c added som style and empty settings.js 2018-10-29 19:48:59 +01:00
Matthias Kalb
372e5499a4 minor format changes 2018-10-29 13:59:41 +01:00
Krehan Tim
83deda9216 added style 2018-10-29 08:55:24 +01:00
Krehan Tim
1751316783 added import content 2018-10-29 08:48:16 +01:00
Krehan Tim
00eeaa4dd4 added export layout 2018-10-29 08:45:49 +01:00
Krehan Tim
acb0f6c01c spelling error 2018-10-29 08:22:38 +01:00
Matthias Kalb
3a3f316400 fixed spelling error 2018-10-27 20:24:26 +02:00
Tim Krehan
97bdadfd8e provided code for later use 2018-10-27 19:49:00 +02:00
Tim Krehan
4d33f4416e tried some styling... 2018-10-27 19:47:45 +02:00
Tim Krehan
93a46fafe4 added settings site (styling required , though...) 2018-10-27 19:37:28 +02:00
Tim Krehan
79538bbd88 code styling 2018-10-27 18:50:00 +02:00
Tim Krehan
251f01451d added settings page 2018-10-27 18:32:43 +02:00
Tim Krehan
7df482871e added settings icon 2018-10-27 18:26:26 +02:00
Matthias Kalb
c6419e3353 Merge branch '2-Credentials-speichern-bei-Installation-verhindern' into 'develop' 
added 'autocomplete="off"' to installation process

See merge request bluekay/shopping-list!4
 2018-10-27 16:16:09 +00:00
Tim Krehan
4652198f11 added 'autocomplete="off"' to installation process 2018-10-27 18:06:25 +02:00
Matthias Kalb
13482ab3cd Merge branch '13-Recipe-Styling' into 'develop' 
added border arround recipe

See merge request bluekay/shopping-list!3
 2018-10-26 17:56:46 +00:00
Tim Krehan
25108665af added border arround recipe 2018-10-26 19:51:52 +02:00
Tim Krehan
264e9fcf3e Merge branch 'hourly-routine-installation-failing' into 'develop' 
Resolve "Hourly Routine Installation failing"

See merge request bluekay/shopping-list!2
 2018-10-26 17:46:54 +00:00
Tim Krehan
9db320ebff removed unnessesary creation of a table 2018-10-26 19:42:57 +02:00
Matthias Kalb
db2ee7169f removed event from installation routine 2018-10-26 19:05:16 +02:00
Matthias Kalb
8f1829e3f1 added removal of expired sessions on check for valid session 2018-10-26 19:04:49 +02:00
Matthias Kalb
aed65dc228 Merge branch 'Add-Parsedown-Support' into 'develop' 
Add parsedown support

See merge request bluekay/shopping-list!1
 2018-10-26 16:46:23 +00:00
Matthias Kalb
85cbf6d307 Merge branch 'develop' into 'Add-Parsedown-Support' 
# Conflicts:
#   README.md
 2018-10-26 16:46:01 +00:00
Matthias Kalb
c39feaf660 added installation instructions 2018-10-26 18:37:02 +02:00