Commit Graph

201 Commits

Author SHA1 Message Date
Romain Delanoë
8d53879489 Merge branch 'master' into 'production'
Master

See merge request Romulus21/portal!63
2020-08-02 09:23:32 +00:00
81b600339f fix CSS & add description 2020-08-02 11:22:19 +02:00
8d49c38115 ifx merge for update 2020-08-01 17:34:10 +02:00
Romain Delanoë
895891d643 Merge branch 'master' into 'production'
Master

See merge request Romulus21/portal!62
2020-08-01 15:15:47 +00:00
c49f226677 fix save & update memos & memos order 2020-08-01 17:15:15 +02:00
f0058bf606 fix font input color for auth 2020-08-01 16:50:25 +02:00
Romain Delanoë
a08566a050 Merge branch 'master' into 'production'
Master

See merge request Romulus21/portal!61
2020-08-01 14:38:45 +00:00
f91eff1ccc fix auth css & update composer & npm 2020-08-01 16:37:52 +02:00
117ed6cfdc fix checked input status after move 2020-08-01 16:27:09 +02:00
Romain Delanoë
226288bd71 Merge branch 'master' into 'production'
fix passport bug with cookies

See merge request Romulus21/portal!60
2020-07-28 07:23:31 +00:00
783f9c14fc fix passport bug with cookies 2020-07-28 09:22:56 +02:00
Romain Delanoë
2b6f468f08 Merge branch 'master' into 'production'
fix security Laravel

See merge request Romulus21/portal!59
2020-07-28 06:25:08 +00:00
4560466a64 fix security Laravel 2020-07-28 08:24:25 +02:00
Romain Delanoë
8a1f7e6648 Merge branch 'master' into 'production'
Master

See merge request Romulus21/portal!58
2020-07-26 20:22:39 +00:00
0f6a16e027 Merge branch 'feature/Theme' 2020-07-26 22:21:41 +02:00
4ff5e2308d fix npm update 2020-07-26 22:21:27 +02:00
18fbf2f601 refact theme todo with bug drag 2020-07-26 22:15:30 +02:00
8f66aee23d refact front 2020-07-25 17:22:58 +02:00
214f311150 update composer 2020-07-25 13:55:51 +02:00
Romain Delanoë
e3385e00ef Merge branch 'master' into 'production'
fix purgecss remove code pre blocquote tags

See merge request Romulus21/portal!57
2020-07-25 11:47:12 +00:00
a4af2abb69 fix purgecss remove code pre blocquote tags 2020-07-25 13:46:29 +02:00
Romain Delanoë
01f311922b Merge branch 'master' into 'production'
Master

See merge request Romulus21/portal!56
2020-07-25 11:22:23 +00:00
5414cad135 test fix code color 2020-07-25 13:20:28 +02:00
01d4fd4a4f start Events test 2020-07-19 16:28:28 +02:00
ee81ee6216 finish Events Category crud 2020-07-19 15:40:55 +02:00
6a1c83dc59 add Event Catégory bien admin 2020-07-19 13:03:32 +02:00
1e7e1fc09e add foreignkey to event table 2020-07-19 12:39:22 +02:00
fe14127648 event add store test 2020-07-19 12:15:23 +02:00
7b00dd2975 make config gitlab-ci 2020-07-04 08:43:03 +02:00
a6150bf9cf make config gitlab-ci 2020-07-04 08:32:43 +02:00
b6ceb3e91c make config gitlab-ci 2020-07-03 20:08:18 +02:00
4d3f9db3c9 make config gitlab-ci 2020-07-03 19:58:47 +02:00
353596cd01 make config gitlab-ci 2020-07-03 19:52:22 +02:00
05f23e96aa make config gitlab-ci 2020-07-03 19:48:20 +02:00
3b6fb54584 make config gitlab-ci 2020-07-03 19:44:22 +02:00
edc6927d70 make config gitlab-ci 2020-07-03 19:41:28 +02:00
caa1d675a3 make config gitlab-ci 2020-07-03 19:38:42 +02:00
36f99418f8 make config gitlab-ci 2020-07-03 19:05:11 +02:00
Romain Delanoë
92d479b543 Merge branch 'master' into 'production'
Master

See merge request Romulus21/portal!55
2020-07-02 18:44:46 +00:00
b6143e67a8 add meteo home board 2020-07-02 20:40:38 +02:00
Romain Delanoë
53f6cd19fa Add .gitlab-ci.yml 2020-06-18 21:10:15 +00:00
Romain Delanoë
382e431287 Merge branch 'master' into 'production'
optimize deploy with down & up

See merge request Romulus21/portal!54
2020-06-18 21:09:01 +00:00
4197d310f2 optimize deploy with down & up 2020-06-18 23:08:03 +02:00
Romain Delanoë
1017df6245 Merge branch 'master' into 'production'
add domotics links

See merge request Romulus21/portal!53
2020-06-18 21:03:28 +00:00
2779789558 add domotics links 2020-06-18 23:02:15 +02:00
Romain Delanoë
ba9d3cdc24 Merge branch 'master' into 'production'
add small pic to User avatar

See merge request Romulus21/portal!52
2020-05-17 18:24:39 +00:00
d5be73c622 add small pic to User avatar 2020-05-17 20:23:41 +02:00
Romain Delanoë
33443011b7 Merge branch 'master' into 'production'
add thumbnail cover on memo

See merge request Romulus21/portal!51
2020-05-17 17:31:20 +00:00
aae3dba36e add thumbnail cover on memo 2020-05-17 19:23:50 +02:00
Romain Delanoë
0c485f92fe Merge branch 'master' into 'production'
change logo

See merge request Romulus21/portal!50
2020-05-17 14:33:31 +00:00