Charles-Edouard
/
Easy_solution
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
386 Commits 5 Branches 0 Tags 1.8 MiB
Commit Graph

386 Commits

Author SHA1 Message Date
Charles-Edouard MARGUERITE a20c1cd1fb Merge branch 'dev/organization/bugfix-2' into 'develop' 
fix organization not loading

See merge request easy-solutions/apps/easyportal!22
 2026-02-02 08:42:52 +00:00
Charles bcb0cbc9b9 fix organization not loading 2026-02-02 09:42:15 +01:00
Charles-Edouard MARGUERITE e7206d09e3 Merge branch 'dev/organization/bugfix-1' into 'develop' 
fix organization not loading

See merge request easy-solutions/apps/easyportal!21
 2026-02-02 08:23:55 +00:00
Charles 0a88ad0bde fix organization not loading 2026-02-02 09:10:30 +01:00
Charles-Edouard MARGUERITE 03d9cf5392 Merge branch 'dev/application/feature-1' into 'develop' 
update logo path

See merge request easy-solutions/apps/easyportal!20
 2026-02-02 07:49:00 +00:00
Charles cc98e539c7 update logo path 2026-02-02 08:47:05 +01:00
Charles-Edouard MARGUERITE 0d835573e8 Merge branch 'dev/organization/bugfix-1' into 'develop' 
bugfix

See merge request easy-solutions/apps/easyportal!19
 2026-01-28 15:43:40 +00:00
Charles 281e58c4a7 bugfix 2026-01-28 16:41:16 +01:00
Charles-Edouard MARGUERITE 0549494786 Merge branch 'dev/organization/bugfix-1' into 'develop' 
solve org error

See merge request easy-solutions/apps/easyportal!17
 2026-01-28 15:28:45 +00:00
Charles bc730155ba solve org error 2026-01-28 16:27:22 +01:00
Charles-Edouard MARGUERITE fef74fea64 Merge branch 'dev/user/update-1' into 'develop' 
Dev/user/update 1

See merge request easy-solutions/apps/easyportal!16
 2026-01-28 15:19:47 +00:00
Charles 99a68dad4d deactivate user on creation 2026-01-28 16:18:39 +01:00
Charles a41c5095b5 correct form method 2026-01-28 16:15:30 +01:00
Charles-Edouard MARGUERITE ac532dcf89 Merge branch 'mercure/setup' into 'develop' 
setup mercure

See merge request easy-solutions/apps/easyportal!15
 2026-01-28 15:11:42 +00:00
Charles 5b137b71b2 setup mercure 2026-01-28 16:10:28 +01:00
Charles-Edouard MARGUERITE f42accdbaa Merge branch 'ui/fixture-1' into 'develop' 
Visual update

See merge request easy-solutions/apps/easyportal!14
 2026-01-28 14:59:25 +00:00
Charles e6b575afd8 Visual update 2026-01-28 15:51:46 +01:00
Charles-Edouard MARGUERITE 0d3da8dfdf Merge branch 'dev/mailing/update-1' into 'develop' 
change expiry time

See merge request easy-solutions/apps/easyportal!13
 2026-01-28 14:38:05 +00:00
Charles 2bf438cb27 change expiry time 2026-01-28 15:36:08 +01:00
Charles-Edouard MARGUERITE 7dc369ee67 Merge branch 'dev/mailing/bugfix-3' into 'develop' 
resend correct mail to existing user

See merge request easy-solutions/apps/easyportal!12
 2026-01-28 13:18:22 +00:00
Charles df4363dd37 resend correct mail to existing user 2026-01-28 14:15:17 +01:00
Charles-Edouard MARGUERITE 2c7402249d Merge branch 'dev/mailing/bugfix-2' into 'develop' 
update mail sender

See merge request easy-solutions/apps/easyportal!11
 2026-01-28 10:44:07 +00:00
Charles 6403048e44 update mail sender 2026-01-28 11:43:03 +01:00
Charles-Edouard MARGUERITE 63396cafe6 Merge branch 'dev/user/clean-up-1' into 'develop' 
Dev/user/clean up 1

See merge request easy-solutions/apps/easyportal!10
 2026-01-28 10:30:00 +00:00
Charles 4b3a960e59 small word changes 2026-01-28 11:24:21 +01:00
Charles ce82296fa6 solved logger error bug 2026-01-28 11:07:31 +01:00
Charles-Edouard MARGUERITE 85e3de647c Merge branch 'dev/organization/picture-feature-1' into 'develop' 
Dev/organization/picture feature 1

See merge request easy-solutions/apps/easyportal!9
 2026-01-28 09:28:26 +00:00
Charles 3a610ba4d7 removed S3 and handles bugs that came with it 2026-01-28 10:26:32 +01:00
Charles 59bc78fe47 removed S3 and handles bugs that came with it 2026-01-28 10:08:55 +01:00
Charles-Edouard MARGUERITE 3d23e9cec3 Merge branch 'dev/ui/menu-feature-1' into 'develop' 
remove unused code

See merge request easy-solutions/apps/easyportal!8
 2026-01-27 10:36:52 +00:00
Charles 01a35c75a6 remove unused code 2026-01-27 11:33:02 +01:00
Charles-Edouard MARGUERITE d42dde624b Merge branch 'dev/organization/name-feature-1' into 'develop' 
drop not null on org name

See merge request easy-solutions/apps/easyportal!7
 2026-01-27 09:25:37 +00:00
Charles 9f619b5293 Drop not null on Org name 2026-01-27 10:23:18 +01:00
Charles 4c3c8c3043 resolve conflict 2026-01-27 09:49:19 +01:00
Charles-Edouard MARGUERITE 2c346c0484 Merge branch 'dev/portailV2' into 'develop' 
update csrf token

See merge request easy-solutions/apps/easyportal!5
 2026-01-26 15:20:31 +00:00
Charles ce4f045c00 update csrf 2026-01-26 16:18:43 +01:00
Charles-Edouard MARGUERITE 339d83cae2 Delete public.key 2026-01-26 14:58:27 +00:00
Charles-Edouard MARGUERITE 8fa42c6d1b Delete private.key 2026-01-26 14:58:20 +00:00
Charles-Edouard MARGUERITE 89c8ae5f4d Merge branch 'dev/portailV2' into 'develop' 
update version

See merge request easy-solutions/apps/easyportal!4
 2026-01-26 14:30:54 +00:00
Charles a6aba4f7d5 update version 2026-01-26 15:29:56 +01:00
Charles-Edouard MARGUERITE 0ad22cc465 Merge branch 'dev/portailV2' into 'develop' 
update user checker

See merge request easy-solutions/apps/easyportal!3
 2026-01-26 13:05:07 +00:00
Charles 940361ab4b update user checker 2026-01-26 14:03:33 +01:00
Charles df9f102ecf don't perform user check if SUPER ADMIN 2026-01-26 13:58:38 +01:00
Qada 64ebaa4e05 Merge branch 'dockerize-portal' into 'develop' 
Dockerize portal

See merge request easy-solutions/apps/easyportal!2
 2026-01-21 15:33:51 +00:00
qadamscqueezy 3113313ad3 Merge branch 'develop' into dockerize-portal 2026-01-21 16:33:37 +01:00
Charles a1b92aebce added flash to files 2026-01-21 16:08:21 +01:00
Charles 01f73c2ef4 Test for User Controller 2026-01-21 10:01:13 +01:00
qadamscqueezy 29c04cd843 add deployment and notification stages to CI pipeline 2026-01-19 22:58:05 +01:00
qadamscqueezy 07fbb7af2c update caddy file 2026-01-15 20:36:31 +01:00
Charles d26d1cb118 Organization Controller Tests 2026-01-06 14:29:29 +01:00