Commit graph

Select branches

Hide pull requests

Aufinal/alcoolémie

Aufinal/backbone_checkout

Aufinal/es6-js

Evarin/sitecof-rewrite-urls

Kerl/mail_error_handling

Kerl/supportBDS/registration

Manet/k-fet/fix/160

Production

aureplop/core-deploy_initial

aureplop/hooks_fix-pre-commit

aureplop/install-authens

aureplop/js_basket

aureplop/kfet-auth

aureplop/kfet-auth_cms

aureplop/kpsul_js_refactor

aureplop/restructuring

bclement/autocomplete-queryset

bds-prod

bds-staging

cof-prod

cof-staging

fix-shared-session

gestion-clubs

journal-de-caisse

kerl/authens

kerl/bds_export

kerl/bds_home

kerl/bds_registration

kerl/clickable_links

kerl/dumpkfet

kerl/factor_autocompletion_views

kerl/negatifs_handle_smtp_errors

kerl/sitecof_absolute_urls

llanteri/kpsul-inventaires

luj/adhesions

mails

master

mdebray/ajout_recherche_petits_cours

nix-actions

petitscours

qwann/k-fet/graphs

staging

status-change-2024-nov-13

supportBDS

tbastian/kfet-rgpd

thubrecht/bds-tests

thubrecht/export-ventes

thubrecht/pause-mail-auto

#305

#306

#307

#313

#314

#315

#316

#317

#318

#319

#320

#321

#322

#323

#324

#325

#326

#327

#328

#330

#331

#332

#333

#334

#335

#336

#337

#338

#341

#342

#343

#344

#345

#346

#347

#349

#350

#351

#352

#353

#354

#355

#356

#357

#359

#360

#361

#362

#363

#364

#365

#367

#368

#369

#370

#371

#372

#373

#374

#375

#376

#377

#378

#379

#380

#381

#382

#383

#384

#385

#386

#387

#388

#389

#390

#392

#393

#394

#395

#396

#397

#398

#399

#401

#402

#405

#406

#407

#408

#409

#410

#411

#412

#413

#414

#415

#416

#417

#418

#419

#420

#421

#422

#423

#424

#425

#428

#429

#430

#431

#432

#433

#434

#435

#436

#437

#438

#439

#441

#442

#443

#444

#445

#447

#448

#449

#450

#451

#452

#453

#454

#455

#456

#457

#458

#459

#460

#461

#462

#464

#466

#467

#468

#469

#470

#471

#472

#474

#475

#476

#477

#478

#479

#480

#481

#482

#483

#484

#485

#487

#488

#489

#490

#491

#492

#493

#494

#495

#496

#497

#499

#500

#501

#502

#503

#504

#505

#506

#507

#508

#509

#510

#511

#512

#513

#514

#516

#517

#518

#519

#521

#522

#523

#524

#525

#526

#527

#528

#529

#530

#531

#532

#533

#534

#535

#536

#537

#538

#539

#540

#541

#542

#543

#544

#545

#546

#547

#548

#549

#550

#551

#552

#553

#554

#555

#556

#557

#558

#559

#560

#561

#562

#563

#564

#565

#566

#567

#568

#569

#570

#571

#572

#573

#574

#575

#576

#577

#578

#579

#580

#581

#582

#583

#584

#585

#586

#587

#588

#589

#590

#591

#592

#593

#594

#595

#596

#597

#598

#599

#600

#601

#602

#603

#604

#605

#606

#607

#608

#609

#610

#611

#615

#616

#617

#618

#619

#621

#622

#623

#624

#625

#626

#627

#628

#629

#630

#631

#632

#633

#634

#635

#636

#637

#638

#639

#640

#641

#642

#643

#644

#645

#646

#647

#648

#649

#650

#651

#652

#653

#654

#655

#656

#657

#658

#660

#661

#662

#663

#664

#665

#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

#723

#724

#725

#726

#727

#728

#729

#730

#731

#732

#733

#734

#736

#737

#738

#739

#740

#741

#742

#743

#744

#745

#746

#747

#748

#749

#750

#751

#752

#753

#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

#802

#803

#804

#805

#806

#807

#808

#809

#810

#811

#812

#813

#814

#815

#816

#817

#818

#819

#820

#821

#822

#823

#824

#825

#826

#827

#828

#829

#830

#831

#832

#833

#835

#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

#865

#866

#867

#869

v0.1

v0.10

v0.11

v0.3

v0.3.1

v0.3.2

v0.3.3

v0.4

v0.4.1

v0.4.2

v0.5

v0.6

v0.7

v0.7.1

v0.7.2

v0.8

v0.9

Mono Color

• 1062fd480f update provisioning Ludovic Stephan 2017-02-08 15:11:48 -02:00
• 066df73b62 add different operation types Ludovic Stephan 2017-02-08 15:11:38 -02:00
• ef59c115f6 avec le css c'est mieux Qwann 2017-02-08 15:40:58 +01:00
• 6be2adc47a removing "open-Kfet-feature" to keep it for an other merge request Qwann 2017-02-08 12:47:11 +01:00
• a4fdb99267 Revert "WS : quand la K-Fêt est ouverte ?" Qwann 2017-02-08 12:42:07 +01:00
• bb78091cc5 checkout fixture Ludovic Stephan 2017-02-07 23:59:49 -02:00
• 8346dd65d1 dev data kfet Ludovic Stephan 2017-02-07 23:22:31 -02:00
• db94a8904c remove addition of new opegroups Ludovic Stephan 2017-02-07 18:45:57 -02:00
• 2013fec68b move fixtures Ludovic Stephan 2017-02-07 18:42:31 -02:00
• 217624fe08 Merge branch 'Kerl/fix_dev_data' into 'master' Martin Pepin 2017-02-07 11:00:44 +01:00
• 8d0f803639 Corrige l'affichage du prix Ludovic Stephan 2017-02-06 16:42:19 -02:00
• 5654fd84e8 Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/own_password Ludovic Stephan 2017-02-06 16:37:48 -02:00
• 2394a5e5d2 add low stock css to WS Ludovic Stephan 2017-02-05 21:38:13 -02:00
• 95e96d8ce5 Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/visibilite_stock Ludovic Stephan 2017-02-05 19:56:34 -02:00
• 44202811ae not supporting future.builtins anymore in templatetags Qwann 2017-02-05 22:39:20 +01:00
• 45eb384cfd Use class-based views Martin Pépin 2017-02-05 17:35:41 +01:00
• 9aa4782d57 Move petits-cours forms in another file Martin Pépin 2017-02-05 17:10:51 +01:00
• 81681ad0e5 Turn 2 functions into class/objects methods Martin Pépin 2017-02-05 17:07:58 +01:00
• 2bc5f3d646 Style and PEP8 Martin Pépin 2017-02-05 13:49:01 +01:00
• bb4e9dde4f End of py2 support Martin Pépin 2017-02-05 13:32:31 +01:00
• b404c989ff pep8 Ludovic Stephan 2017-02-05 03:42:02 -02:00
• 1d5e693045 ws for transfers Ludovic Stephan 2017-02-05 03:26:15 -02:00
• 1ea334341b ws update for history and transfer pages Ludovic Stephan 2017-02-05 03:04:41 -02:00
• f8aa67721c fix socket update Ludovic Stephan 2017-02-05 02:19:20 -02:00
• 8895daff6a Merge branch 'Aufinal/transferts_historique' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/transferts_historique Ludovic Stephan 2017-02-04 23:22:54 -02:00
• 1e5c55a540 update readme Martin Pépin 2017-02-04 11:57:58 +01:00
• 5b0dc1a07f Merge branch 'fix/117' into 'k-fet' Martin Pepin 2017-02-04 11:23:30 +01:00
• f274c1e978 Un seul message pour la liste des inscriptions Martin Pépin 2017-02-04 00:01:15 +01:00
• 13da42b823 typo Martin Pépin 2017-02-03 23:41:33 +01:00
• 54f09820bf Merge branch 'Kerl/messages' of https://git.eleves.ens.fr/cof-geek/GestioCOF into Kerl/messages Martin Pépin 2017-02-03 18:30:47 +01:00
• 8c34e2f83f proper use of messages in petits cours Martin Pépin 2017-01-30 13:50:24 +01:00
• fd42563f7f Proper use of messages in calendar subscription Martin Pépin 2017-01-30 13:46:16 +01:00
• 51c0e2dabc proper use of messages in registration Martin Pépin 2017-01-30 13:36:51 +01:00
• b7ecac3db6 Proper use of messages in profile edit Martin Pépin 2017-01-30 13:19:50 +01:00
• 1fe1b94afc Proper use of messages in events Martin Pépin 2017-01-30 13:12:01 +01:00
• b12b5c938f Proper use of messages in inscription-reventes Martin Pépin 2017-01-29 23:05:59 +01:00
• efea92b5d2 Proper use of messages in places Martin Pépin 2017-01-29 22:49:32 +01:00
• 91fff8a11e Proper use of messages in BdA inscription Martin Pépin 2017-01-29 17:13:01 +01:00
• 0666b5288f Proper use of messages in survies Martin Pépin 2017-01-29 16:24:07 +01:00
• d31b9f59ab Traitement des messages Martin Pépin 2017-01-28 19:46:56 +01:00
• 45856ca872 update README Martin Pépin 2017-02-03 17:29:33 +01:00
• ba88b94320 Fixes and cleanup Martin Pépin 2017-02-03 17:07:50 +01:00
• 18b186929c Dev data loaded using a django admin command Martin Pépin 2017-01-30 23:13:32 +01:00
• 1bf5352097 Merge branch 'Aufinal/fix_87' into 'k-fet' Aurélien Delobelle 2017-02-02 12:28:56 +01:00
• d5bf249212 Merge branch 'qwann/k-fet/stock_update' into 'k-fet' Aurélien Delobelle 2017-02-02 12:24:54 +01:00
• bc14205d29 fixing decimal issue2 Qwann 2017-02-01 19:32:18 +01:00
• 47d7a3ec6e fixes #87 Ludovic Stephan 2017-01-31 16:35:52 -02:00
• 863699bfb6 Merge branch 'qwann/k-fet/stock_update' of git.eleves.ens.fr:cof-geek/gestioCOF into qwann/k-fet/stock_update Qwann 2017-01-31 16:03:00 +01:00
• 1275fdff99 fixes #127 fixing stock update Qwann 2017-01-31 15:55:38 +01:00
• a400832c6d fixing stock update Qwann 2017-01-31 15:55:38 +01:00
• cf4a3ec64b Traitement des messages Martin Pépin 2017-01-28 19:46:56 +01:00
• ce9f717f06 WS : quand la K-Fêt est ouverte ? Qwann 2017-01-27 21:46:21 +01:00
• ddf6343826 Merge branch 'qwann/k-fet/stats' into qwann/k-fet/home Qwann 2017-01-27 13:13:28 +01:00
• df824a3a70 Merge branch 'k-fet' into qwann/k-fet/stats Qwann 2017-01-27 13:10:31 +01:00
• 0ac1eaf414 fixing decimal_issue Qwann 2017-01-27 13:08:50 +01:00
• 5cedabf5a8 Merge branch 'qwann/k-fet/stats' into qwann/k-fet/home Qwann 2017-01-27 12:15:47 +01:00
• 2f1fe15be3 fixing decimal_issue merging Qwann 2017-01-27 12:08:18 +01:00
• 5ee188e4df Merge branch 'qwann/k-fet/stats' of git.eleves.ens.fr:cof-geek/gestioCOF into qwann/k-fet/stats Qwann 2017-01-27 11:56:39 +01:00
• a13c40736c Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into qwann/k-fet/stats Qwann 2017-01-27 11:54:50 +01:00
• 7ab4e949d8 k-fet in gestiocof menu Qwann 2017-01-26 20:40:55 +01:00
• aa1afccf1f adding argumement hidden to Article in order to avoid some articles to appear in the menu Qwann 2017-01-26 19:22:38 +01:00
• 3ca38bd8e9 Carte done. Qwann 2017-01-26 17:19:42 +01:00
• c2b74ea625 Merge branch 'Kerl/bda_models_update' into 'master' Martin Pepin 2017-01-25 23:58:23 +01:00
• 75ff77c4ec Merge branch 'Aufinal/search_account' into 'k-fet' Martin Pepin 2017-01-25 23:58:08 +01:00
• a63966b2f6 carte styling done Qwann 2017-01-25 23:41:16 +01:00
• bd7f767953 Cleanup Martin Pépin 2017-01-25 23:23:53 +01:00
• 9607fab046 future removed Qwann 2017-01-25 16:00:48 +01:00
• 30cebac6e6 Merge branch 'hotfix/bda-static' Qwann 2017-01-24 20:39:14 +01:00
• 045f3f58e5 Met inscription-formset àa la bonne place Martin Pépin 2017-01-24 20:34:53 +01:00
• 6b95403318 Merge branch 'master' of git.eleves.ens.fr:cof-geek/gestioCOF Qwann 2017-01-24 20:05:34 +01:00
• b52c0bf6c9 Merge branch 'Kerl/csv' Qwann 2017-01-24 20:03:33 +01:00
• 0d1cece6db adding columns features Qwann 2017-01-24 19:56:58 +01:00
• 939e0f32a2 Merge branch 'qwann/decimal_fixes' into 'k-fet' Martin Pepin 2017-01-24 19:49:33 +01:00
• f48f6c57a7 Merge branch 'qwann/decimal_fixes' into qwann/k-fet/stats Qwann 2017-01-24 19:43:08 +01:00
• 94f8705ea4 wrong merge fixed Qwann 2017-01-24 19:42:15 +01:00
• df2a9bb1b3 factorising BalanceStat views Qwann 2017-01-24 16:54:02 +01:00
• 947de3b638 wrong months in 'last months' stats Qwann 2017-01-20 21:21:51 +01:00
• 61a7f2df1e sourcing get_thing in a js file Qwann 2017-01-20 21:05:22 +01:00
• 232b293052 typos fixed Qwann 2017-01-20 20:27:24 +01:00
• f8c49ae90c docstring instead of comments Qwann 2017-01-20 20:13:03 +01:00
• e6854d7987 using strftime instead of a personnal function Qwann 2017-01-20 20:07:03 +01:00
• de3db1405e Merge branch 'qwann/decimal_fixes' into qwann/k-fet/stats Qwann 2017-01-20 18:53:49 +01:00
• fff7a2022b conflict solved Qwann 2017-01-20 18:45:28 +01:00
• 8b4f7ad60c decimal cast for operation.amount Qwann 2017-01-20 18:34:45 +01:00
• 7e5910e0b3 balance templatetag fixed Qwann 2017-01-20 18:10:49 +01:00
• 1b0144691f No need for len of query Ludovic Stephan 2017-01-20 07:32:11 -02:00
• 832dc0ce10 Search shortcut Ludovic Stephan 2017-01-19 22:54:11 -02:00
• 016989c4de search results css Ludovic Stephan 2017-01-19 22:53:58 -02:00
• e7956f3b62 Account search w/ autocomplete Ludovic Stephan 2017-01-19 12:36:40 -02:00
• eff37f6c89 plain text highlighting Ludovic Stephan 2017-01-19 01:42:00 -02:00
• 88aec52141 PEP8 + typo Ludovic Stephan 2017-01-19 01:06:09 -02:00
• bdbb252a05 Revert "first fixes" Qwann 2017-01-17 17:16:53 +01:00
• d6e13dbd61 Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/visibilite_stock Ludovic Stephan 2017-01-16 23:57:27 -02:00
• 1ddd34d50e Merge branch 'qwann/k-fet/stats' of git.eleves.ens.fr:cof-geek/gestioCOF into qwann/k-fet/stats Qwann 2017-01-14 16:24:56 +01:00
• a14f1db9a1 doc added for kfet new fixtures Qwann 2017-01-03 02:22:46 +01:00
• 76db0c86a3 Add fixtures. Michele Orrù 2017-01-03 01:17:49 +01:00
• 5877218af5 first fixes Qwann 2016-12-27 15:44:58 +01:00
• 993b8ae87b Merge branch 'master' into Kerl/use_django_custommail Martin Pépin 2017-01-13 01:02:01 +01:00
• 697511a884 Merge branch 'hotfix/urls' into 'master' Martin Pepin 2017-01-10 23:30:37 +01:00
• cef40dff70 Typo et renommage Martin Pépin 2017-01-10 23:26:11 +01:00