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
189 commits 4 branches 2 tags 5.2 MiB
Commit graph

189 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tim Krehan
0b00dec6ce
Merge pull request #8 from tim-krehan/minor-bugfixes-after-master-release 
Minor bugfixes after master release
 2023-12-02 09:54:30 +01:00
Tim Krehan
3cc8514329
Update config.php 2023-12-02 09:53:07 +01:00
Tim Krehan
1e307f6c84
Merge pull request #7 from tim-krehan/features/fix-PHP8-error 
fix PHP 8 error requiring construct keyword
 2023-12-02 09:51:02 +01:00
Tim Krehan
871b3e169e fix PHP 8 error requiring construct keyword 2023-12-02 09:50:15 +01:00
lauralani
7f690f9852
Merge pull request #3 from tim-krehan/develop 
add Summernote & IIS readyness
 2021-04-01 21:24:48 +02:00
lauralani
b5cebdadfb
Merge pull request #2 from lauralani/feature-webapp-readiness 
add web.config to make application ready for azure
 2021-04-01 18:21:56 +02:00
lauralani
b5d4e5874a
add web.config to make application ready for azure 2021-04-01 18:17:09 +02:00
Tim Krehan
acf22a45a5 Merge branch 'minor-bugfixes-after-master-release' of https://gitlab.com/bluekay/shopping-list into minor-bugfixes-after-master-release 2019-07-03 11:44:48 +02:00
Tim Krehan
0b77acc68d add custom checkboxes to list to fit with themes #2 2019-07-03 11:44:44 +02:00
=
f45ac2864d add custom checkboxes to list to fit with themes 2019-07-03 11:43:02 +02:00
Tim Krehan
8c07907cc2 Update install_adduser.php 2019-06-11 18:56:07 +00:00
Tim Krehan
05a48c72a7 Update install.php 2019-06-11 18:55:42 +00:00
Tim Krehan
3d52aaa10e fixed popover not changing 2019-06-10 20:34:21 +02:00
Tim Krehan
c41f973402 another bugfix concerning the htacces file 2019-06-10 20:25:41 +02:00
Tim Krehan
777c52ae06 refactored htacces to use the new syntax 2019-06-10 20:21:35 +02:00
Tim Krehan
e169a36e5b add header and styles to fit for iframe insertions 2019-06-04 11:20:52 +02:00
Tim Krehan
5cb5edcfaa Merge branch 'integrate-wysiwyg-editor' into 'develop' 
Integrate wysiwyg editor

See merge request bluekay/shopping-list!20
 2019-06-04 07:58:40 +00:00
Tim Krehan
fc36704463 update editor and size of table column 2019-06-04 09:56:31 +02:00
Tim Krehan
752f4ffc9b add SummerNote to Recipe Edit Area 2019-06-04 09:15:06 +02:00
Tim Krehan
f935ab334e Merge branch 'develop' into 'master' 
fix it, to use definitly utf8*MB4*

See merge request bluekay/shopping-list!19
 2019-06-03 14:48:23 +00:00
Tim Krehan
0714af841c fix it, to use definitly utf8*MB4* 2019-06-03 16:46:59 +02:00
Tim Krehan
af6a6889a8 Merge branch 'develop' into 'master' 
fixed recipe import issue

See merge request bluekay/shopping-list!18
 2019-06-03 14:05:58 +00:00
Tim Krehan
96a20267f7 fixed recipe import issue 2019-06-03 16:02:41 +02:00
Matthias Kalb
b08deae131 Merge branch 'develop' into 'master' 
Develop

Closes #12

See merge request bluekay/shopping-list!17
 2019-06-03 12:40:00 +00:00
Tim Krehan
c65695e986 Merge branch '28-datenbankscript-auf-utf8mb4_bin-umstellen' into 'develop' 
Resolve "Datenbankscript auf utf8mb4_bin umstellen"

See merge request bluekay/shopping-list!16
 2019-06-03 12:26:49 +00:00
Tim Krehan
147d5edb22 fixed error popup not showing up 2019-06-03 14:25:48 +02:00
Tim Krehan
287da38f69 added utf8mb4 support in install script 2019-06-03 14:19:01 +02:00
Tim Krehan
12a64f38d6 Merge branch '19-edit-single-list-entries-without-deleting-and-readding' into 'develop' 
Resolve "Edit Single list Entries without deleting and readding"

See merge request bluekay/shopping-list!15
 2019-05-28 14:01:00 +00:00
Tim Krehan
f3f65c6748 edit inline for single list entries 2019-05-28 15:55:00 +02:00
Tim Krehan
467960037f edit list entry 2019-05-28 12:04:14 +02:00
Tim Krehan
b6b4358157 implemented remove item 2019-05-28 09:12:47 +02:00
Tim Krehan
1d1e6cf6a5 update readme to shoutout to browserstack (as they give opensource free unlimited testing) 2019-05-27 10:01:18 +02:00
Tim Krehan
0531f3be61 fix sketch theme 2019-05-27 08:50:20 +02:00
Tim Krehan
6cc7c7da5a added margin to form-control 2019-05-26 19:43:27 +02:00
Tim Krehan
079a949dfe form-control 2019-05-26 19:40:48 +02:00
Tim Krehan
950a6ac8be Add form-control to list newitem 2019-05-26 17:27:47 +00:00
Tim Krehan
fae3c0a9f9 dropdown alignment 2019-05-26 19:01:43 +02:00
Tim Krehan
53c4012cb0 butten tests 2019-05-26 18:58:08 +02:00
Tim Krehan
0ac5bffcd9 tset, button change color with parent element 2019-05-26 18:49:12 +02:00
Tim Krehan
6416e8011e added type button to button, to prevent submitting form 2019-05-26 18:41:54 +02:00
Tim Krehan
76b2b40014 remove alert, looks shitt< 2019-05-26 18:39:59 +02:00
Tim Krehan
9a87e88007 alert on delete 2019-05-26 18:38:53 +02:00
Tim Krehan
673359f89d angle-down 2019-05-26 18:38:06 +02:00
Tim Krehan
f4dd755552 added correct messages, and icons 2019-05-26 18:37:08 +02:00
Tim Krehan
dd1ee64c6c added the angle right icon again 2019-05-26 18:33:01 +02:00
Tim Krehan
befb8b7c24 added some formatting 2019-05-26 18:32:05 +02:00
Tim Krehan
e4e230a244 added the fucking properties 2019-05-26 18:30:36 +02:00
Tim Krehan
c21a3cdaf8 a 2019-05-26 18:26:43 +02:00
Tim Krehan
9d44b41813 add dropdown to surrounding div 2019-05-26 18:22:58 +02:00
Tim Krehan
21d40c1475 ... 2019-05-26 18:21:34 +02:00