8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-22 19:33:11 +00:00
Commit graph

3900 commits

Author SHA1 Message Date
chapeau
0fc6b5f966 Add optional build stage 2024-03-10 15:00:51 +01:00
chapeau
1014839328 Merge branch 'docker-prod' into 'dev'
docker de prod

See merge request re2o/re2o!641
2024-03-10 11:06:29 +00:00
chapeau
88d77172fc docker de prod 2024-03-10 11:06:29 +00:00
chapeau
810568411a Merge branch '137-activer-les-tests-dans-la-ci' into 'dev'
Resolve "Activer les tests dans la CI"

See merge request re2o/re2o!640
2024-03-08 10:05:51 +00:00
faercol
7f36f4eb3f typo 2024-03-08 09:43:45 +00:00
chapeau
26b3d9a5b0 typo 2024-03-08 10:37:55 +01:00
chapeau
df7e836ba1 Change how the dev docker uses local_settings and activate tests in CI 2024-03-08 10:21:00 +01:00
chapeau
fe382783c0 Update dockerfile structure 2024-03-08 10:05:24 +01:00
chapeau
5554476920 Merge branch '349-migrate-from-pip-to-poetry' into 'dev'
Resolve "Migrate from pip to poetry"

See merge request re2o/re2o!639
2024-03-08 08:36:27 +00:00
chapeau
39a70ca0d2 a few changes 2024-03-08 08:15:49 +01:00
chapeau
e1851f59a8 Run poetry by default 2024-03-03 11:44:43 +01:00
chapeau
ea0b020866 First draft for the changelog 2024-03-03 09:43:23 +01:00
faercol
a7d2fc9f98 Merge branch '348-mutliple-cotisations' into 'dev'
Resolve "Mutliple cotisations bought in an invoice are calculated in the wrong order"

See merge request re2o/re2o!637
2024-03-02 18:49:57 +00:00
chapeau
96abac05bf Add UT for cotisation order 2024-03-02 15:40:22 +01:00
chapeau
9b3892a1ea Sort articles by number of membership/cotisation months before saving a invoice 2024-03-02 15:28:03 +01:00
chapeau
cab6598d28 Merge branch '347-tests-are-broken' into 'dev'
Resolve "Tests are broken"

See merge request re2o/re2o!635
2024-03-02 14:26:42 +00:00
chapeau
1bf6b36e99 Fix typos 2024-03-02 15:22:00 +01:00
chapeau
55b0d7bc62 remove tests for cotisation starting at a specified date, as the feature is broken an unused 2024-02-29 14:01:25 +01:00
chapeau
c12cc07d72 Fix cotisations/test_views tests 2024-02-29 11:07:26 +01:00
chapeau
c95e4b7a4b Fix some tests 2024-02-20 16:25:52 +01:00
chapeau
e3f77f16c3 Move ldap tests under the correct app 2024-02-20 16:20:49 +01:00
chapeau
471fd52bdb Unit tests of disabled optionnal apps are no longer run 2024-02-20 16:20:02 +01:00
chapeau
92dc1a2699 Fix a 500 error on /api/cotisations/cotisation/ api route 2024-02-19 15:57:59 +01:00
faercol
5d408812d7 Merge branch 'fix-ldap-migration' into 'dev'
Fix LDAP migration #338

See merge request re2o/re2o!634
2024-02-18 17:50:12 +00:00
chapeau
b162170bf4 Fix LDAP migration #338 2024-02-18 18:23:05 +01:00
chapeau
19b39cc62f Update .gitlab-ci.yml file 2024-02-17 06:05:48 +00:00
chapeau
51d3b28bf2 Update .gitlab-ci.yml file 2024-02-17 05:58:54 +00:00
chapeau
30b5a5af79 Merge branch 'update-chapeau-dev' into 'dev'
Changement de prénom

See merge request re2o/re2o!629
2022-12-07 21:31:39 +00:00
chapeau
597faf0a20 Changement de prénom 2022-12-07 21:24:50 +00:00
nanoy
710cb0a16c Merge branch 'custom_link' into 'dev'
add custom_link to navbar

See merge request re2o/re2o!631
2022-08-02 09:36:08 +00:00
854accfab0 feat(custom_link): choose position in the navbar for links 2022-07-29 15:01:22 +02:00
89ba77c528 feat(custom_link): rename variable and import settings correctly 2022-07-29 14:29:13 +02:00
313af3e7f4 add licence 2022-07-29 13:46:46 +02:00
d6040ad6bb doc(link): add doc for link_custom 2022-07-29 13:36:20 +02:00
542ca59d4e add custom link to nav bar 2022-07-29 13:00:50 +02:00
ef8bc842df Merge branch 'dev' into 'dev'
Update contributor name

See merge request re2o/re2o!627
2022-02-27 11:34:59 +00:00
Yohann D'ANELLO
cc5212f0d4
Replace contributor name
Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>
2022-02-22 15:53:29 +01:00
8627c7d686 Merge branch 'fix-autocapture' into 'dev'
fix: Fix autocapture

See merge request re2o/re2o!623
2022-01-09 19:20:07 +00:00
6bf8494a5d fix: Fix autocapture 2022-01-09 19:20:04 +00:00
ca2e999089 Merge branch '343-ldap_sync-and-ldap_rebuild-do-not-regenerate-service-users-2' into 'dev'
fix: Resolve "ldap_sync and ldap_rebuild do not regenerate service-users"

See merge request re2o/re2o!618
2021-09-05 12:58:00 +00:00
545c370c6a fix: Resolve "ldap_sync and ldap_rebuild do not regenerate service-users" 2021-09-05 12:57:59 +00:00
nanoy
8eeace95ce Merge branch 'html_invoice_template' into 'dev'
feat: Replace LaTeX invoice templates with HTML templates

See merge request re2o/re2o!621
2021-08-09 09:04:40 +00:00
0901b9b439 feat: Replace LaTeX invoice templates with HTML templates 2021-08-09 09:04:39 +00:00
nanoy
71e219735b Merge branch 'add_deposit_app' into 'dev'
feat: Create deposits app

See merge request re2o/re2o!622
2021-08-07 22:28:19 +00:00
369942e2e4 feat: Create deposits app 2021-08-07 22:28:18 +00:00
2efe778ed8 Merge branch 'fix_342' into 'dev'
fix: invalid function signature in DateTimePicker since django 2.1

See merge request re2o/re2o!619
2021-07-17 15:38:20 +00:00
avrstud
0b8ea4ccfb fix: #342 2021-07-15 23:29:08 +02:00
01e316914a Merge branch 'fix_set' into 'dev'
Fix : reverse set declaration

See merge request re2o/re2o!616
2021-07-06 12:15:33 +00:00
fb70401d63 fix set 2021-07-06 12:08:12 +00:00
ea4ebd5c08 Merge branch 'fix_pwd_ntlm' into 'dev'
fix: #339

See merge request re2o/re2o!615
2021-07-06 12:07:51 +00:00