Commit Graph - Sith - Gitea: Git with a cup of tea

klmp200/Sith

Fork 0

mirror of https://github.com/ae-utbm/sith.git synced 2025-04-11 16:36:30 +00:00

Commit Graph

Select branches

Hide Pull Requests

celery

counter-activity-stats

dependabot/npm_and_yarn/vite-6.2.6

docker

eboutic-billing

edt

feature/easy_switch_weekmail_banner

feature/improved-header-buttons

features/migrate-from-xapian-to-elasticsearch

fix-club-detail

fix/license

gh-pages

header-fix

import-error

master

more-news

news-overflow

nfc

ninja-csrf

openapi

photos

promo_add_tool

refactor-election

skia/fix_galaxy

taiste

trombi

ts-album-fix

windows-update

#1000

#1001

#1002

#1003

#1004

#1005

#1006

#1007

#1008

#1009

#1010

#1011

#1012

#1013

#1014

#1015

#1015

#1016

#1017

#1018

#1019

#1020

#1021

#1022

#1023

#1024

#1025

#1026

#1027

#1028

#1029

#1030

#1031

#1032

#1033

#1034

#1035

#1036

#1037

#1038

#1039

#1040

#1041

#1042

#1043

#1044

#1045

#1046

#1046

#1047

#1048

#1049

#1050

#1051

#1052

#1053

#1054

#1054

#1055

#1056

#1057

#1058

#1059

#1060

#1061

#1062

#1063

#1064

#1065

#1066

#1067

#1068

#1069

#1070

#1071

#1072

#1072

#1073

#1074

#1075

#1076

#1076

#1077

#1078

#1078

#1079

#425

#426

#429

#432

#439

#440

#441

#442

#443

#446

#447

#448

#451

#452

#456

#457

#458

#460

#461

#469

#470

#471

#472

#474

#475

#476

#477

#480

#481

#482

#483

#484

#485

#486

#488

#489

#490

#491

#492

#493

#495

#496

#497

#498

#499

#500

#501

#503

#504

#505

#506

#507

#508

#510

#514

#515

#516

#517

#518

#519

#521

#522

#523

#525

#526

#527

#529

#530

#531

#532

#533

#536

#540

#541

#542

#543

#558

#559

#561

#562

#563

#564

#565

#571

#572

#573

#574

#575

#576

#578

#579

#580

#581

#582

#583

#584

#585

#586

#587

#589

#591

#592

#593

#594

#595

#596

#597

#598

#615

#616

#617

#618

#619

#620

#621

#621

#622

#623

#624

#625

#626

#628

#629

#630

#631

#632

#633

#634

#635

#636

#637

#638

#639

#640

#641

#642

#643

#644

#645

#647

#648

#649

#650

#651

#652

#653

#654

#655

#656

#657

#658

#659

#660

#661

#662

#663

#664

#665

#666

#667

#668

#669

#670

#671

#672

#673

#674

#675

#676

#677

#678

#679

#680

#681

#682

#683

#684

#685

#686

#687

#688

#689

#690

#691

#692

#693

#694

#695

#696

#697

#698

#699

#700

#701

#702

#703

#704

#705

#706

#707

#708

#709

#710

#711

#712

#713

#714

#715

#716

#717

#718

#719

#720

#721

#722

#722

#723

#724

#725

#726

#727

#728

#729

#730

#731

#732

#733

#734

#735

#736

#737

#738

#739

#740

#741

#742

#743

#744

#745

#746

#747

#748

#749

#750

#752

#754

#755

#756

#757

#758

#759

#760

#761

#762

#763

#764

#765

#766

#767

#768

#769

#770

#771

#772

#773

#774

#775

#776

#777

#778

#779

#780

#781

#782

#783

#784

#785

#786

#787

#788

#789

#790

#791

#792

#793

#794

#795

#796

#797

#798

#799

#800

#801

#803

#804

#805

#806

#807

#808

#809

#810

#811

#812

#813

#814

#815

#816

#817

#819

#820

#821

#822

#823

#824

#825

#826

#827

#828

#829

#830

#831

#832

#833

#834

#835

#836

#837

#838

#839

#840

#842

#843

#844

#845

#846

#847

#848

#849

#850

#851

#852

#853

#854

#855

#856

#857

#858

#859

#860

#861

#862

#863

#863

#864

#865

#866

#867

#868

#869

#870

#871

#872

#873

#874

#875

#876

#877

#878

#879

#880

#881

#882

#883

#884

#885

#886

#887

#888

#889

#890

#891

#892

#893

#894

#895

#895

#896

#897

#898

#899

#900

#901

#902

#903

#904

#905

#906

#907

#908

#909

#910

#911

#912

#913

#914

#915

#916

#917

#918

#919

#920

#921

#922

#923

#924

#925

#926

#927

#928

#929

#930

#931

#932

#933

#934

#935

#936

#936

#937

#938

#939

#940

#941

#942

#943

#944

#945

#946

#947

#948

#949

#950

#950

#951

#952

#953

#954

#955

#956

#957

#958

#959

#960

#961

#962

#963

#964

#965

#966

#967

#968

#969

#970

#971

#972

#973

#974

#975

#976

#977

#978

#979

#979

#980

#981

#982

#983

#984

#985

#986

#987

#988

#989

#990

#991

#992

#993

#994

#995

#996

#997

#998

#999

9e5743a64c Merge branch 'defer-script-and-font-awesom' into 'master' Théo | Ailé 2022-08-05 18:12:29 +00:00
b5241ec75e Defer des balises script. Ajout de preload sur fa. Maréchal | Thomas 2022-08-05 13:22:09 +00:00
4f00224f0d Update dependencies, apply black and fix wrong default SITH_COUNTER_OFFICES values Sli 2022-08-04 18:08:10 +02:00
320a896610 Fix tests and broken forms Sli 2022-08-04 17:20:21 +02:00
08924c5e05 Fix wrong url and set default auto field Sli 2022-08-04 00:38:50 +02:00
98bfc308a7 Minimal working version Sli 2022-08-04 00:26:43 +02:00
dee24fbc9c Fix deprecation warnings Sli 2022-08-03 21:48:37 +02:00
2556427c7d Merge branch 'lsacienne/invitation_banner2' into 'master' Alexandre | L'Sacienne 2022-07-04 19:23:28 +00:00
a2b35e5bba

💄 Change banner to invitation banner lsacienne 2022-07-04 14:03:50 +02:00
3e8f1acb96 Merge branch 'election-css' into 'master' Alexandre | L'Sacienne 2022-06-15 19:13:47 +00:00
85788977fe

Moved file to correct place & improved CSS a bit Julien Constant 2022-06-15 15:32:16 +02:00
066ca5bada

This shouldn't be unminified Julien Constant 2022-06-15 01:57:57 +02:00
41369f738e

Improved Elections CSS for the table Julien Constant 2022-06-15 01:42:17 +02:00
67377b3cbf Merge branch 'lsacienne/change_weekmail_banner_P22_08_06_2022' into 'master' Alexandre | L'Sacienne 2022-06-14 09:18:26 +00:00
ac3d668655

💄 CHange the invitation banner in weekmail We now have the weekmail banner and not the invitation banner lsacienne 2022-06-08 22:05:24 +02:00
c57b15e159 Merge branch 'lsacienne/change_weekmail_banner_P22' into 'master' Alexandre | L'Sacienne 2022-06-01 21:14:38 +00:00
66efb8012e

♻️ Fix black pipeline lsacienne 2022-06-01 22:46:12 +02:00
cad0c0dadb

💄 Modification of the banner and footer for the special invitation lsacienne 2022-06-01 22:40:52 +02:00
b32c90ed5d

✨ Add of weekmail footer lsacienne 2022-06-01 22:39:44 +02:00
4d361dc67b

✨ Add of weekmail banner in 2 versions lsacienne 2022-06-01 22:39:17 +02:00
2b170d91f7

✨ Add of Invitation banner lsacienne 2022-06-01 22:38:44 +02:00
9e074d6ca6 Merge branch 'service_desk_reply' into 'master' Théo | Ailé 2022-05-26 13:46:54 +00:00
b655b2695b Update .gitlab/service_desk_templates/thank_you.md Théo | Ailé 2022-05-26 08:41:37 +00:00
366aeed2ba Merge branch 'lsacienne/refilling_authorized_for_Bdf_ae' into 'master' Théo | Ailé 2022-05-22 09:56:56 +00:00
454ae5f9e3 Add authorization to refill to the counters AE & BdF Alexandre | L'Sacienne 2022-05-22 09:56:53 +00:00
b811114425

fix black pipeline lsacienne 2022-05-21 21:53:25 +02:00
712e7c8939

Add of verification on the counter lsacienne 2022-05-21 12:23:34 +02:00
713cd92141

Modification of the settings to fit better with the code lsacienne 2022-05-21 12:23:23 +02:00
4154b499b1

Add of a new settings for the counters AE & BdF lsacienne 2022-05-21 09:45:28 +02:00
253f204225 Merge branch '125-fix-family-tree' into 'master' Théo | Ailé 2022-05-08 12:09:38 +00:00
7241f3eb1d Ajout de pygraphviz en dépendance Théo | Ailé 2022-05-08 12:09:37 +00:00
2422f60898 Merge branch 'lsacienne/refilling_only_for_ae_member' into 'master' Alexandre | L'Sacienne 2022-05-05 21:53:57 +00:00
ba6599fa56

Add of tests lsacienne 2022-05-05 23:24:08 +02:00
f2666f6fb0

Replace the query by a function which already existed lsacienne 2022-05-02 00:04:00 +02:00
b33839191d

Fix black pipeline lsacienne 2022-04-28 13:16:03 +02:00
ee3e375dde

Post request management lsacienne 2022-04-28 11:13:07 +02:00
5b0f7ca21b Merge branch 'skia/deploy_in_ci' into 'master' Théo | Ailé 2022-04-27 18:21:49 +00:00
f581d91730 gitlab-ci: deploy with Gitlab CI/CD Skia 2022-04-27 18:21:48 +00:00
bbf362691b

Change to use settings instead of hardcoding lsacienne 2022-04-27 15:38:55 +02:00
15e2c8c7b3

Fix the balck pipeline lsacienne 2022-04-27 15:38:14 +02:00
f838127730 Merge branch 'aile-master-patch-00174' into 'master' Théo | Ailé 2022-04-27 13:13:08 +00:00
d4c0bb3b0e

Fix pipeline Théo DURR 2022-04-27 14:52:33 +02:00
b81aee3f1c Update badges and links Théo | Ailé 2022-04-27 09:50:38 +00:00
c6caf5dbce

Add of restriction for refilling lsacienne 2022-04-20 14:01:33 +02:00
7acc59f2cd Merge branch 'lsacienne/refilling_date' into 'master' Théo | Ailé 2022-04-19 10:28:09 +00:00
757ff7ead7

Add of date in the counter/refilling_list view lsacienne 2022-04-19 12:02:22 +02:00
bc2fe16b74 Merge branch '117-django-2-2-not-compatible-with-psycopg-2-9' into 'master' Théo | Ailé 2022-04-18 20:21:19 +00:00
35363d9ee7 Resolve "Django 2.2 not compatible with psycopg 2.9" Théo | Ailé 2022-04-18 20:21:18 +00:00
52106db6fd Merge branch '118-black-pipeline-is-broken' into 'master' Théo | Ailé 2022-04-18 18:33:39 +00:00
c4b1829e78 Resolve "Black pipeline is broken" Théo | Ailé 2022-04-18 18:33:36 +00:00
489a9378c5 Merge branch 'poetry' into 'master' Théo | Ailé 2022-03-26 21:27:22 +00:00
28ae109b32 Add missing dependencies and improve pipeline Sli 2022-03-26 21:27:20 +00:00
e7a6a94ff2 Merge branch 'doc-windows-install' into 'master' Alexandre | L'Sacienne 2022-03-03 18:18:55 +00:00
234556a172 Merge branch 'skia/fix_eboutic' into 'master' Skia 2022-03-02 16:21:10 +00:00
e4ddceabea club: fix tests with inclusive translation Skia 2022-02-28 14:41:01 +01:00
05dd3ad642 gitlab-ci: use poetry Skia 2022-02-28 10:34:15 +01:00
6c5db61a97 eboutic: et_autoanswer: don't require 'Auto' to proceed checking the request Skia 2022-02-28 09:57:41 +01:00
a0e4e9e8e3 Update 'black' version Skia 2022-02-28 10:01:23 +01:00
c66df77d4a Merge branch 'master' of https://ae-dev.utbm.fr/ae/Sith lsacienne 2022-02-18 16:35:10 +01:00
cfb6b34630

Updated roles to be more inclusive lsacienne 2022-02-18 16:30:45 +01:00
d8fd0adf47 Merge branch 'skia/et_autoanswer' into 'master' Skia 2022-02-10 12:32:43 +00:00
928ae13a8a Merge branch 'bugfix-113-error500' into 'master' Théo | Ailé 2022-02-10 12:30:55 +00:00
c2e0ea70e4 eboutic: change HTTP return code to avoid blaming the bank's service Skia 2022-01-04 14:45:19 +01:00
782ce24895 Changed python3 to python Julien Constant 2021-12-02 12:22:34 +01:00
b630742fd4 #113: bug fixed Cyrille 2021-11-30 17:54:51 +01:00
b20df930a2 Merge branch 'feature-111-fixture_documentation' into 'master' Ailé 2021-11-25 22:06:41 +00:00
d60a96fc5c correct populate.rst Cyrille 2021-11-23 23:44:34 +01:00
05b0a0ab2f Adapted WSL doc to follow recommendation :) Julien Constant 2021-11-23 19:19:24 +01:00
9eb137e503 add fixture documentation Cyrille 2021-11-22 21:37:10 +01:00
7d797009bb Added WSL windows doc for project install Julien Constant 2021-11-19 13:10:18 +01:00
3c1818f229 Merge branch 'family_rework' into 'master' Ailé 2021-11-18 15:38:13 +00:00
d8b69e9b45

Updated text and translations to be more inclusive Ailé 2021-11-18 16:24:14 +01:00
9177c9d4c2 Merge branch 'bugfix-110-ClubSellings' into 'master' Ailé 2021-11-18 14:32:11 +00:00
5195352975 fixed black pipeline Cyrille Stroesser 2021-11-18 15:14:39 +01:00
deb8f865df fix #110 Cyrille Stroesser 2021-11-18 15:04:25 +01:00
5b2c70e4fb Merge branch 'gender_options' into 'master' Ailé 2021-11-18 09:07:21 +00:00
f66db0859e Fix pronouns field being mandatory Cel 2021-11-18 09:07:19 +00:00
b6488d1d00 Merge branch 'poor_logo_quality' into 'master' Ailé 2021-11-10 11:33:05 +00:00
6a4ac336ad

Updated somo logo size where they looked blurry (we love responsive) Ailé 2021-11-10 12:11:07 +01:00
7ac6dcf8a0 Merge branch 'family_rework' into 'master' Ailé 2021-11-10 10:35:40 +00:00
c6a3677cc5

Fixed duplicated translation Ailé 2021-11-05 21:11:52 +01:00
707459acd6

Changed word 'Godfather' to 'Family' Ailé 2021-11-05 21:01:19 +01:00
6390c3320e

Applied black on migration Ailé 2021-11-05 20:40:20 +01:00
b8aabc466c

Fixed locales +Pronoun description on the user's profile Ailé 2021-11-05 20:28:37 +01:00
c66e4232b9

Merge branch 'master' into gender_options Théo DURR 2021-11-05 17:18:17 +01:00
336450d43f Merge branch 'add-promo-logos' into 'master' Ailé 2021-10-27 10:22:07 +00:00
7e66aadd6f Add missing promo logos Julien 2021-10-27 08:37:58 +02:00
bf2b796936 Merge branch 'poetry' into 'master' Sli 2021-10-15 16:12:59 +00:00
85623f48a9 Using poetry as a dependency system for development Sli 2021-10-15 16:12:56 +00:00
4fbee9c3de Make pronouns visible on profile and miniprofile Celeste 2021-10-13 08:59:40 +02:00
bfa3b45547 counter_click.jinja: fix error display with Vue Skia 2021-10-11 22:09:45 +02:00
677a9da469 Merge branch 'master' into gender_options Celeste 2021-10-11 17:13:06 +02:00
1f7752d457 Add pronouns to profile ; Update gender settings Céleste 2021-09-30 18:17:22 +02:00
89979dbf61 com: news list: fix UI for admins Skia 2021-10-03 19:08:14 +02:00
8d1abb8f33 Add .mailmap file for cleaner stats Skia 2021-10-03 18:44:47 +02:00
2df3494c3b Merge branch 'skia/weekmail_fix' into 'master' Skia 2021-10-03 16:35:41 +00:00
39bb490257 com: fix weekmail for the case of non-existing email addresses Skia 2021-10-03 17:20:43 +02:00
7a7aad0503 style: fix header bar on medium size screens Skia 2021-10-03 16:08:53 +02:00
b157a3fa90 Merge branch 'skia/mobile_ui' into 'master' Skia 2021-10-01 17:05:11 +00:00
1b688a8aa5 Add a first version of a mobile friendly UI Skia 2021-10-01 18:37:13 +02:00