Commit Graph

Select branches

Hide Pull Requests

celery

counter-activity-stats

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

picture-upload

promo_add_tool

real-album-images

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

#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

Mono Color

• b23d322a29 Instruction for prod with scss klmp200 2017-05-01 15:48:45 +02:00
• ee7fd1c423 Rename temporary_design klmp200 2017-05-01 15:46:40 +02:00
• 2048f27d58 New temporary design Krophil 2017-04-27 22:57:21 +02:00
• b401efc6a5 Merge branch 'krophil' into 'master' Skia 2017-05-10 10:42:32 +02:00
• 95d5907a3e Add translation Krophil 2017-05-10 09:50:31 +02:00
• 87c457498c Add small explanation in subscriptions Krophil 2017-04-26 00:51:56 +02:00
• 5920e0e52a Merge branch 'bugfix' into 'master' Skia 2017-05-07 19:43:55 +02:00
• 2ef3c0260a Fix error on accounting when no target_type specified klmp200 2017-05-06 21:15:44 +02:00
• 7cb9ea40ac Anonymous users can't edit weekmail klmp200 2017-04-14 15:38:54 +02:00
• 5a7b743c83 Try fix right issues in counter admin klmp200 2017-04-06 23:29:43 +02:00
• 7c069bb3ee Merge branch 'weekmail' into 'master' Skia 2017-05-05 15:33:13 +02:00
• 635702b58f color to hexa and change email for weekmail Krophil 2017-05-05 15:28:41 +02:00
• ca4152aaf2 Reset right public key for Eboutic Skia 2017-05-04 23:25:58 +02:00
• 778b7b22f2 Add Eboutic user guides and reference examples Skia 2017-05-01 19:56:19 +02:00
• a12b772587 Add some Eboutic tests Skia 2017-05-01 19:39:13 +02:00
• c7f48bd5f7 Fix counter view with no stock Skia 2017-05-01 16:53:30 +02:00
• 58fdb36911 Merge branch 'Elections' into 'master' Skia 2017-05-01 15:58:49 +02:00
• 8b1a19e2ff Delete django.mo file that reappeared with the stock app Skia 2017-05-01 15:10:18 +02:00
• 0b81d6a4c6 Merge branch 'weekmail' into 'master' Sli 2017-05-01 13:17:58 +02:00
• d7305488b6 Add new banner Krophil 2017-04-27 20:43:25 +02:00
• 7815796d8b New css for weekmail Krophil 2017-04-27 14:39:25 +02:00
• c0531feb27 Merge branch 'stock' into 'master' Skia 2017-04-25 16:17:24 +02:00
• a99cb3e0db Add header to stock files Skia 2017-04-25 16:17:04 +02:00
• f2aadae8e8 Fix errors on election tests klmp200 2017-02-01 18:09:47 +01:00
• b5363c2987 Firsts tests for elections klmp200 2017-02-01 17:38:16 +01:00
• e26ad85729 Reset stock migrations Skia 2017-04-25 09:49:05 +02:00
• 116aa6b8b5 Update stock URLs Skia 2017-04-25 09:45:13 +02:00
• 423313f008 Update stock translations Skia 2017-04-25 09:16:38 +02:00
• df20bf6dde Reindent stock app Skia 2017-04-25 08:57:07 +02:00
• 20deda8a8e Merge branch 'master' into stock Skia 2017-04-24 18:07:25 +02:00
• 83deae5964 Apply GPLv3 to Sith, and add header to every concerned file Skia 2017-04-24 17:51:12 +02:00
• 8c82c27483 Add helpers in CONTRIBUTING Skia 2017-04-24 17:35:39 +02:00
• 16b6b137d7 Merge branch 'krophil' into 'master' Skia 2017-04-19 11:06:19 +02:00
• 553b33c313 Proposal for summary sending confirmation Krophil 2017-04-19 01:43:34 +02:00
• 6a815e5a21 Small news improvement and bug fixes Skia 2017-04-12 21:08:51 +02:00
• 44dacce9f2 Add forum signature Skia 2017-04-12 19:38:54 +02:00
• 3aa5070a38 Add preview button in the Forum Skia 2017-04-12 19:19:25 +02:00
• 830e94d73c Show that a message exists even if we can't see it Skia 2017-04-10 23:27:34 +02:00
• 24c02f4638 Fix last message when the real last is deleted Skia 2017-04-10 15:34:32 +02:00
• 9e61b11827 Mark all messages as read even if user can't see them Skia 2017-04-10 15:33:43 +02:00
• cbfaf13536 Merge branch 'counter' into 'master' Skia 2017-04-05 15:11:46 +02:00
• edc438bc0e More readability for sum klmp200 2017-04-05 14:59:41 +02:00
• 6ca183ad55 Better sum writing klmp200 2017-04-05 14:23:51 +02:00
• 53a2a160be Add CB refills sum klmp200 2017-04-05 13:32:20 +02:00
• ec8ee15d0e Merge branch 'bugfix' into 'master' Skia 2017-04-04 15:48:59 +02:00
• 34f3fadd3d Rename counter mixin klmp200 2017-04-04 15:45:02 +02:00
• d4815df55f Better right counter management klmp200 2017-04-03 15:00:13 +02:00
• 824411b13d Rights fix for counters klmp200 2017-04-03 13:50:28 +02:00
• 1430479a1d Some rights fix klmp200 2017-04-03 11:57:28 +02:00
• 5d89786c8f Serious counter fix klmp200 2017-04-03 10:41:36 +02:00
• a38d711c62 Merge branch 'bugfix' into 'master' Skia 2017-04-03 09:47:48 +02:00
• fb09719317 Hide start_date for non root user from clubs klmp200 2017-04-03 09:41:35 +02:00
• 41c9f6381a Merge branch 'bugfix' into 'master' Skia 2017-03-31 11:35:12 +02:00
• 231922cbaa Merge branch 'sas' into 'master' Skia 2017-03-31 11:34:10 +02:00
• 9f2566a244 Fix continuous integration klmp200 2017-03-30 22:16:14 +02:00
• 60e2e0d4f9 Better to use os.path.join for paths klmp200 2017-03-30 19:13:47 +02:00
• 1f844da005 Preload on sas klmp200 2017-03-28 18:46:10 +02:00
• 33e4cd6ca4 Merge branch 'bugfix' into 'master' Skia 2017-03-28 15:58:30 +02:00
• 8787e5e708 Better protection for stats klmp200 2017-03-28 14:39:52 +02:00
• a078bae260 Merge branch 'bugfix' into 'master' Skia 2017-03-28 08:11:02 +02:00
• 63506b1506 Protect stats from other users klmp200 2017-03-28 01:03:31 +02:00
• dfd465c7f9 Fix bug where customer can't buy an item when they have the just amount klmp200 2017-03-28 00:48:08 +02:00
• 0d918d80d3 Avoid negative value in refilings klmp200 2017-03-28 00:17:09 +02:00
• ccd67e50b8 Avoid unothorised customer to buy in counter by modifying url klmp200 2017-03-27 23:24:25 +02:00
• 5eb1e609cc Fixed tests issues klmp200 2017-03-27 22:47:24 +02:00
• 50413abf76 Fix a weekmail deleteview, and make some translate fix Skia 2017-03-27 15:16:01 +02:00
• b28ce200e6 Fix some translations Skia 2017-03-27 14:31:58 +02:00
• 3cf1628435 Fix weekmail new article link Skia 2017-03-24 14:01:05 +01:00
• 39b32d456c Some com templates improvments and reordering some models Skia 2017-03-24 09:19:15 +01:00
• d2da5716ba Automodere profile files Skia 2017-03-24 08:43:13 +01:00
• e56b2476b7 Fix notifications local time Skia 2017-03-17 18:11:14 +01:00
• 0887fe6c9e Arg, forgot another Ariadne's thread fix Skia 2017-03-16 08:15:16 +01:00
• 825228cad6 Forum cosmetic Skia 2017-03-15 19:24:01 +01:00
• 3993d17efe Fix forum Ariadne's thread Skia 2017-03-15 18:35:15 +01:00
• f400be3a79 Refactor topic to use paginator instead of custom paging Skia 2017-03-15 18:34:22 +01:00
• 701f23b539 Merge branch 'bugfix' into 'master' Skia 2017-03-15 08:15:17 +01:00
• cfcb671bf0 forgoten o of shame (not for me) klmp200 2017-03-14 19:09:12 +01:00
• 5e0f790247 Merge branch 'counter' into 'master' Skia 2017-03-14 17:39:03 +01:00
• 493d48bcca Pagination length in settings klmp200 2017-03-13 23:32:06 +01:00
• e4deacbe56 Pagination for cash sumary klmp200 2017-03-13 16:32:59 +01:00
• 3fd4d4b04b Merge branch 'Tresorerie' into 'master' Skia 2017-03-12 23:05:44 +01:00
• 729a3608ba Add some pagination on forum topics Skia 2017-03-12 20:24:16 +01:00
• 5932aad9fa Improve journal removing Krophil 2017-03-12 20:33:17 +01:00
• 5f9ec9a2ab Merge branch 'Tresorerie' of https://ae-dev.utbm.fr/ae/Sith into Tresorerie Krophil 2017-03-12 20:22:52 +01:00
• 65e2514df2 Small template fixes in forum Skia 2017-03-12 18:31:35 +01:00
• a56d3a3088 Add a help_text to Weekmail edit form Skia 2017-03-12 18:13:04 +01:00
• 73cbfd3e82 Add Forum ordering number Skia 2017-03-12 18:06:01 +01:00
• 0bf457de50 Hiding some already forbidden stuff klmp200 2017-03-11 11:57:20 +01:00
• 8329a19cc2 fix permissions Krophil 2017-02-27 01:09:50 +01:00
• 95775d3b9b adaptations for settings and deletion checked Krophil 2017-02-06 22:18:44 +01:00
• 6c8671c160 Better club roles in settings klmp200 2017-02-06 16:50:11 +01:00
• 1acac17d7e Several modifications in accounting Krophil 2017-02-05 17:26:04 +01:00
• 8133db804e fix permission for companies Krophil 2017-02-05 15:50:42 +01:00
• 554929b4ec small fix in canViewList Krophil 2017-02-05 15:22:52 +01:00
• ffbad7e2e7 Merge branch 'wiki' into 'master' Skia 2017-03-08 14:37:59 +01:00
• 95f984824a Fix accents in wiki page name and allow to delete a page klmp200 2017-03-08 13:25:23 +01:00
• b90d930594 Merge branch 'bugfix' into 'master' Skia 2017-03-03 00:04:47 +01:00
• 158a140aa4 No negative values for cash summary klmp200 2017-03-01 10:21:57 +01:00
• 39b102d8aa README: add counting lines of code Skia 2017-02-27 15:40:48 +01:00
• ebe76c83c7 fix permissions Krophil 2017-02-27 01:09:50 +01:00