Commit Graph
70 Commits
Author SHA1 Message Date
Romain Delanoë 89ae0fe0ad Merge branch 'master' into 'production'
Master

See merge request Romulus21/portal!66
2020-08-08 14:24:32 +00:00
Romain Delanoë 1c46c47de3 Update .gitlab-ci.yml 2020-08-06 12:50:10 +00:00
Romain Delanoë 9bd71b8b56 Update .gitlab-ci.yml 2020-08-06 12:38:51 +00:00
Romain Delanoë 5693e752c7 Update .gitlab-ci.yml 2020-08-06 12:34:07 +00:00
Romain Delanoë 66f2805793 Merge branch 'master' into 'production'
Master

See merge request Romulus21/portal!65
2020-08-06 10:49:20 +00:00
Romain Delanoë b6118cd738 Merge branch 'master' into 'production'
fix css bookmark

See merge request Romulus21/portal!64
2020-08-02 14:27:25 +00:00
Romain Delanoë 8d53879489 Merge branch 'master' into 'production'
Master

See merge request Romulus21/portal!63
2020-08-02 09:23:32 +00:00
Romain Delanoë 895891d643 Merge branch 'master' into 'production'
Master

See merge request Romulus21/portal!62
2020-08-01 15:15:47 +00:00
Romain Delanoë a08566a050 Merge branch 'master' into 'production'
Master

See merge request Romulus21/portal!61
2020-08-01 14:38:45 +00: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
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
Romain Delanoë 8a1f7e6648 Merge branch 'master' into 'production'
Master

See merge request Romulus21/portal!58
2020-07-26 20:22:39 +00: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
Romain Delanoë 01f311922b Merge branch 'master' into 'production'
Master

See merge request Romulus21/portal!56
2020-07-25 11:22:23 +00:00
Romain Delanoë 92d479b543 Merge branch 'master' into 'production'
Master

See merge request Romulus21/portal!55
2020-07-02 18:44:46 +00: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
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
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
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
Romain Delanoë 0c485f92fe Merge branch 'master' into 'production'
change logo

See merge request Romulus21/portal!50
2020-05-17 14:33:31 +00:00
Romain Delanoë 85054632df Merge branch 'master' into 'production'
change deploy with timer

See merge request Romulus21/portal!47
2020-05-09 12:04:19 +00:00
Romain Delanoë 855a128cf5 Merge branch 'master' into 'production'
Master

See merge request Romulus21/portal!46
2020-05-09 11:55:32 +00:00
Romain Delanoë 5f951f2235 Merge branch 'master' into 'production'
Master

See merge request Romulus21/portal!45
2020-05-09 08:31:00 +00:00
Romain Delanoë e2c9b44a83 Merge branch 'master' into 'production'
refact css tailwind

See merge request Romulus21/portal!44
2020-05-08 21:39:28 +00:00
Romain Delanoë 3f19a2ac1e Merge branch 'master' into 'production'
Master

See merge request Romulus21/portal!43
2020-05-08 10:51:46 +00:00
Romain Delanoë 39625e46bb Merge branch 'master' into 'production'
add interrogation logo

See merge request Romulus21/portal!42
2020-05-03 20:12:24 +00:00
Romain Delanoë fa1f6fd255 Merge branch 'master' into 'production'
Master

See merge request Romulus21/portal!41
2020-05-03 19:38:36 +00:00
Romain Delanoë 3a38ddc482 Merge branch 'master' into 'production'
Master

See merge request Romulus21/portal!40
2020-05-03 09:19:03 +00:00
Romain Delanoë 4f582b06c3 Merge branch 'master' into 'production'
refact toDo

See merge request Romulus21/portal!39
2020-05-03 07:20:20 +00:00
Romain Delanoë 468f16ffa0 Merge branch 'master' into 'production'
Master

See merge request Romulus21/portal!38
2020-05-02 14:26:50 +00:00
Romain Delanoë db63cdae50 Merge branch 'master' into 'production'
Master

See merge request Romulus21/portal!37
2020-05-02 09:18:59 +00:00
Romain Delanoë 5464237626 Merge branch 'master' into 'production'
Master

See merge request Romulus21/portal!36
2020-04-30 21:38:23 +00:00
Romain Delanoë f1d9cc219a Merge branch 'master' into 'production'
Master

See merge request Romulus21/portal!35
2020-04-27 19:44:30 +00:00
Romain Delanoë 2eaabc2479 Merge branch 'master' into 'production'
change logo

See merge request Romulus21/portal!34
2020-04-21 17:23:47 +00:00
Romain Delanoë 3a37ab3897 Merge branch 'master' into 'production'
add cover to profile & logout on dashbord

See merge request Romulus21/portal!33
2020-04-19 08:59:39 +00:00
Romain Delanoë 540f023210 Merge branch 'master' into 'production'
finish memos cover

See merge request Romulus21/portal!32
2020-04-18 13:59:56 +00:00
Romain Delanoë ecb231ee2a Merge branch 'master' into 'production'
Master

See merge request Romulus21/portal!31
2020-04-15 16:40:02 +00:00
Romain Delanoë e7efd25782 Merge branch 'master' into 'production'
add new fonctions on deploy

See merge request Romulus21/portal!30
2020-04-15 13:17:50 +00:00
Romain Delanoë d18da8bd42 Merge branch 'master' into 'production'
Master

See merge request Romulus21/portal!29
2020-04-12 10:17:07 +00:00
Romain Delanoë 0f46313e40 Merge branch 'master' into 'production'
Master

See merge request Romulus21/portal!28
2020-04-12 08:24:56 +00:00
Romain Delanoë af5be8afb7 Merge branch 'master' into 'production'
Master

See merge request Romulus21/portal!27
2020-04-12 07:44:39 +00:00
Romain Delanoë a152586b30 Merge branch 'master' into 'production'
add loader

See merge request Romulus21/portal!26
2020-04-11 21:55:15 +00:00
Romain Delanoë a5879e0dd5 Merge branch 'master' into 'production'
add checkbox m

See merge request Romulus21/portal!25
2020-04-11 21:16:07 +00:00
Romain Delanoë 5c44ebcdcb Merge branch 'master' into 'production'
add checkbox m

See merge request Romulus21/portal!24
2020-04-11 21:11:46 +00:00
Romain Delanoë 877ca7f050 Merge branch 'master' into 'production'
add hangman dictionnary & input ajustment

See merge request Romulus21/portal!23
2020-04-11 15:28:50 +00:00
Romain Delanoë b204c8ab98 Merge branch 'master' into 'production'
update field input

See merge request Romulus21/portal!22
2020-04-11 10:38:29 +00:00
Romain Delanoë 43849abbe4 Merge branch 'master' into 'production'
change on memos display & inputs

See merge request Romulus21/portal!21
2020-04-11 10:28:43 +00:00
Romain Delanoë 477a9070d6 Merge branch 'master' into 'production'
fix menu memory, return memo button & add favicon

See merge request Romulus21/portal!20
2020-04-08 21:01:08 +00:00
Romain Delanoë f5daa5e0bc Merge branch 'master' into 'production'
no alert

See merge request Romulus21/portal!19
2020-04-08 20:30:21 +00:00
Romain Delanoë dbdf981eb1 Merge branch 'master' into 'production'
add small menu

See merge request Romulus21/portal!18
2020-04-07 21:51:08 +00:00
Romain Delanoë 18aaeffd94 Merge branch 'master' into 'production'
Master

See merge request Romulus21/portal!17
2020-04-05 05:58:35 +00:00
Romain Delanoë df37e237b9 Merge branch 'master' into 'production'
Master

See merge request Romulus21/portal!16
2020-04-04 16:57:37 +00:00
Romain Delanoë 516db59a32 Merge branch 'master' into 'production'
add SVG Icon

See merge request Romulus21/portal!15
2020-04-04 09:50:49 +00:00
Romain Delanoë 0f6783276f Merge branch 'master' into 'production'
add config file portal to fix env error maybe

See merge request Romulus21/portal!14
2020-04-04 09:20:03 +00:00
Romain Delanoë 2eb481d578 Merge branch 'master' into 'production'
fix Api key meteo

See merge request Romulus21/portal!13
2020-04-04 09:09:36 +00:00
Romain Delanoë e5e0f0d038 Merge branch 'master' into 'production'
Master

See merge request Romulus21/portal!12
2020-04-04 09:02:38 +00:00
Romain Delanoë e59f11d64e Merge branch 'master' into 'production'
Master

See merge request Romulus21/portal!11
2020-04-04 08:42:16 +00:00
Romain Delanoë 8f91759fa6 Merge branch 'feature/Meteo' into 'master'
Feature/meteo

See merge request Romulus21/portal!10
2020-04-04 08:41:22 +00:00
Romain Delanoë 5b96ef979e Merge branch 'master' into 'production'
fix deploy

See merge request Romulus21/portal!9
2020-03-29 13:33:42 +00:00
Romain Delanoë 517c4badb1 Merge branch 'master' into 'production'
finish deploy script

See merge request Romulus21/portal!8
2020-03-29 12:18:00 +00:00
Romain Delanoë 78271b776a Merge branch 'production' into 'master'
Production

See merge request Romulus21/portal!7
2020-03-29 10:13:36 +00:00
Romain Delanoë cbcf10b6c1 Merge branch 'master' into 'production'
Master

See merge request Romulus21/portal!6
2020-03-29 10:05:38 +00:00
Romain Delanoë a3f905901f Delete package-lock.json 2020-03-29 10:04:48 +00:00
Romain Delanoë 27669f3ae7 Delete package-lock.json 2020-03-29 10:04:09 +00:00
Romain Delanoë 70fd1adb31 Merge branch 'master' into 'production'
add deploy commands

See merge request Romulus21/portal!5
2020-03-29 09:50:09 +00:00
Romain Delanoë f32063ed74 Merge branch 'master' into 'production'
Master

See merge request Romulus21/portal!4
2020-03-29 09:29:06 +00:00
Romain Delanoë 2b3e4ea848 Merge branch 'master' into 'production'
reset public js css

See merge request Romulus21/portal!3
2020-03-28 11:13:54 +00:00
Romain Delanoë 77cd22bcfd Merge branch 'master' into 'production'
reset public js css

See merge request Romulus21/portal!2
2020-03-28 11:11:41 +00:00
Romain Delanoë 97701cd506 Merge branch 'master' into 'production'
fix some css

See merge request Romulus21/portal!1
2020-03-28 11:05:41 +00:00