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

• ef864cec32 Merge branch 'Aufinal/visibilite_stock' into 'k-fet' Aurélien Delobelle 2017-02-13 16:42:22 +01:00
• 2e8fc45a1b Merge branch 'Aufinal/own_password' into 'k-fet' Aurélien Delobelle 2017-02-13 16:32:40 +01:00
• 46e9e82da8 move account save Ludovic Stephan 2017-02-13 12:19:47 -02:00
• 9cae3ad0bd Merge branch 'k-fet' into qwann/k-fet/stats Qwann 2017-02-13 14:37:29 +01:00
• 83e41c292e css tweaks Ludovic Stephan 2017-02-13 11:34:47 -02:00
• 43aab26530 Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/visibilite_stock Ludovic Stephan 2017-02-13 10:51:24 -02:00
• fdcf4c3ab0 fix property location Aurélien Delobelle 2017-02-13 13:48:57 +01:00
• d7a13229ad Fix CI config Martin Pépin 2017-02-13 13:41:34 +01:00
• 1a684471c2 Merge branch 'Aufinal/fix_amounts' into 'k-fet' Aurélien Delobelle 2017-02-13 08:25:13 +01:00
• d9fc683525 update account_data[] to account_manager.account. Aurélien Delobelle 2017-02-13 00:41:41 +01:00
• 890be9b343 refactor account k-psul js - part 1 Aurélien Delobelle 2017-02-13 00:23:32 +01:00
• 3fa0e4de6c different rounding for accounts Ludovic Stephan 2017-02-12 19:05:41 -02:00
• 3dfd8bf616 interface for order_to_inventory Ludovic Stephan 2017-02-12 18:04:50 -02:00
• 7f5132961f Add the cof_members group Martin Pépin 2017-02-12 19:49:30 +01:00
• 659c6e720a Merge branch 'master' into supportBDS Martin Pépin 2017-02-12 19:36:17 +01:00
• e1a8c0e8dd Add missing files Martin Pépin 2017-02-12 19:06:28 +01:00
• 1d7499d3b2 simplify profile edition and test it Martin Pépin 2017-02-12 18:46:22 +01:00
• f5b23174de Fix test_database issue in bootstrap Martin Pépin 2017-02-12 17:39:30 +01:00
• 266a789d97 Merge branch 'Kerl/messages' Martin Pépin 2017-02-12 16:47:44 +01:00
• 0420839b20 Test the authentication Martin Pépin 2017-02-12 15:19:40 +01:00
• 8b620a5319 PEP8 in gestion/tests.py Martin Pépin 2017-02-12 14:18:51 +01:00
• a28c00e474 Move the auth stuff to gestion/ Martin Pépin 2017-02-12 14:14:08 +01:00
• 031b992fa3 fix brackets & lowstock indication Ludovic Stephan 2017-02-12 11:09:03 -02:00
• 99d04fb75e bugfix Ludovic Stephan 2017-02-12 11:02:54 -02:00
• 5c7a1d6874 Refactor JS Settings K-Psul Aurélien Delobelle 2017-02-12 13:26:02 +01:00
• 8279bddf4e clean js k-psul Aurélien Delobelle 2017-02-12 05:59:57 +01:00
• 4a5d9f880a Merge branch 'Aufinal/fix_amounts' into 'k-fet' Aurélien Delobelle 2017-02-12 05:09:30 +01:00
• db899a891b css tweaks Ludovic Stephan 2017-02-12 02:03:41 -02:00
• 50b667993f Merge branch 'master' into supportBDS Martin Pépin 2017-02-12 04:24:33 +01:00
• 15d79aff2d add help tooltips Ludovic Stephan 2017-02-12 00:48:24 -02:00
• be8eb4ac28 add (temporary) better presentation Ludovic Stephan 2017-02-12 00:01:22 -02:00
• 481409253b simpler string pluralizing Ludovic Stephan 2017-02-11 21:44:32 -02:00
• 02735642f1 better pluralize Ludovic Stephan 2017-02-11 21:41:09 -02:00
• fc2de20ab8 use switch + move text Ludovic Stephan 2017-02-11 21:38:07 -02:00
• 94937fc7cd Add groups cof_members and cof_buro. Michele Orrù 2017-02-11 23:05:51 +01:00
• 49e6101156 Merge branch 'qwann/k-fet/decimal_issue2' into 'k-fet' Aurélien Delobelle 2017-02-11 22:04:10 +01:00
• db4786abf8 Merge branch 'manet/correction-commandes' into 'k-fet' Aurélien Delobelle 2017-02-11 22:00:45 +01:00
• dc822d3c72 Add license Martin Pepin 2017-02-11 21:35:29 +01:00
• 427859c2f5 Oublis Martin Pépin 2017-02-11 21:33:25 +01:00
• d41d905366 PEP8 Martin Pépin 2017-02-11 21:20:51 +01:00
• 313b5cf61d Merge branch 'master' into Aufinal/dev_data_kfet Martin Pépin 2017-02-11 21:01:37 +01:00
• 70e89e3737 Merge branch 'master' into Kerl/messages Martin Pépin 2017-02-11 20:55:17 +01:00
• 65341f0ecb Minor error Martin Pépin 2017-02-11 20:43:49 +01:00
• b5037329dd small fixes + migration enable admin interface for bds Qwann 2017-02-11 20:36:16 +01:00
• d46ab87e9b Merge branch 'michele.orru/gestioCOF-supportBDS' into supportBDS Qwann 2017-02-11 20:17:23 +01:00
• f53ced6a33 Merge branch 'supportBDS' into michele.orru/gestioCOF-supportBDS Qwann 2017-02-11 19:21:23 +01:00
• ee1f29b17d Make is_cof a property and start developing permissions. Michele Orrù 2017-02-11 18:48:13 +01:00
• b9ed7320ec Fix user registration Qwann 2017-02-11 18:41:47 +01:00
• fcf392f40d Merge remote-tracking branch 'origin/tmp' into michele.orru/gestioCOF-supportBDS Qwann 2017-02-11 18:02:05 +01:00
• 3365d7b9a1 Updates the decorators Martin Pépin 2017-02-11 17:21:59 +01:00
• b16219f8ee fixing profile view Qwann 2017-02-11 17:57:37 +01:00
• 6c3e1bd2db Fix the loaddevdata script Martin Pépin 2017-02-11 17:13:08 +01:00
• a2b8dee022 Fix #134. Michele Orrù 2017-02-11 17:13:48 +01:00
• 5b54d76e36 Merge branch 'Kerl/use_django_custommail' Qwann 2017-02-11 16:30:12 +01:00
• ec7012ee47 Merge branch 'Kerl/use_django_custommail' of git.eleves.ens.fr:cof-geek/gestioCOF into Kerl/use_django_custommail Qwann 2017-02-11 16:22:09 +01:00
• 924a289a78 cleaning UGLY django template style and moving some template files Qwann 2017-02-11 16:21:13 +01:00
• 27bf59d4c0 Merge branch 'Kerl/use_django_custommail' of git.eleves.ens.fr:cof-geek/gestioCOF into Kerl/use_django_custommail Martin Pépin 2017-02-11 16:16:00 +01:00
• b4bf437447 Minor fixes Martin Pépin 2017-02-11 16:15:17 +01:00
• f0c3def935 Make the test really works. Michele Orrù 2017-02-11 15:47:31 +01:00
• 5d35112c87 Merge branch 'Kerl/use_django_custommail' of git.eleves.ens.fr:cof-geek/gestioCOF into Kerl/use_django_custommail Qwann 2017-02-11 15:34:04 +01:00
• 62dc04c19f cleaning ugly html Qwann 2017-02-11 15:33:22 +01:00
• 0e759405c7 Change the migration index Martin Pépin 2017-02-11 15:13:29 +01:00
• 376e829502 Reaching a point where I can query /k-fet. Michele Orrù 2017-02-11 15:07:45 +01:00
• f50ef1d51a Merge remote-tracking branch 'origin/supportBDS-fixes1' into supportBDS Michele Orrù 2017-02-11 14:26:55 +01:00
• b639c04549 Fix the registration forms Martin Pépin 2017-02-11 00:21:11 +01:00
• 675ff99414 Supprime les doublons avec jquery Martin Pépin 2017-02-11 11:50:49 +01:00
• 99a19f850a typo Martin Pépin 2017-02-11 11:41:49 +01:00
• 71fb020e10 Merge branch 'master' into Kerl/messages Martin Pépin 2017-02-11 11:40:47 +01:00
• 6e55905781 Merge branch 'master' into Kerl/use_django_custommail Martin Pépin 2017-02-11 03:20:29 +01:00
• 06eafdae47 Merge branch 'master' of git.eleves.ens.fr:cof-geek/gestioCOF Qwann 2017-02-11 02:54:54 +01:00
• 5136e394d4 Merge branch 'Kerl/modernize_petitscours' Qwann 2017-02-11 02:54:22 +01:00
• ed01508481 using context_object_name and moving template Qwann 2017-02-11 02:51:43 +01:00
• b1cf96d0ae Move profile editing to gestion Martin Pépin 2017-02-10 23:12:12 +01:00
• 1060a0a368 Merge branch 'Kerl/ldap' into 'master' Robin Champenois 2017-02-11 02:42:00 +01:00
• 02a8e74e3b Optimize code, better queries Martin Pépin 2017-02-11 02:31:55 +01:00
• d4b696db70 Merge branch 'master' into Kerl/ldap Martin Pépin 2017-02-11 01:55:02 +01:00
• f0774a3e3c Merge branch 'robin' into 'master' Martin Pepin 2017-02-11 00:37:16 +01:00
• 815a5f274c Fix some reviewing considerations. Michele Orrù 2017-02-11 00:21:24 +01:00
• 25c3106168 Add some tests about how profiles types should relate to each other. Michele Orrù 2017-02-10 23:47:45 +01:00
• 22da04c3e2 s/cofprofile/profile/g into k-fêt. Michele Orrù 2017-02-10 22:58:01 +01:00
• f87f1ceff1 kfetOpen bullet working Qwann 2017-02-11 00:29:12 +01:00
• 839d60e48f Support tactile jquery-ui Evarin 2017-02-11 00:11:14 +01:00
• 58d708b791 Move profile editing to gestion Martin Pépin 2017-02-10 23:12:12 +01:00
• 80d8cb6b7e Mise à jour des dépendances jquery-ui et jquery Evarin 2017-02-10 23:47:49 +01:00
• f39d1545f0 Generic profiles and migrations. Ubuntu 2017-02-10 19:10:45 +00:00
• 399e5ca16d Jolie mise en page pour les demandes de petit cours Evarin 2017-02-10 20:42:54 +01:00
• f7ec5ef9ee Grise les spectacles passés dans la liste des spectacles pour le BdA Evarin 2017-02-10 19:58:22 +01:00
• 5aff771d9c Set the new structure of gestioCOF Martin Pépin 2017-02-09 21:04:32 +01:00
• 4808650fa0 kfet_open is updatable Qwann 2017-02-09 14:05:29 +01:00
• e32faf6182 Merge branch 'Aufinal/select_all' into 'master' Martin Pepin 2017-02-09 12:29:08 +01:00
• 8e7428a11e Répercute le déplacement du template dans les vues Martin Pépin 2017-02-09 12:26:08 +01:00
• ca73dc27bb move template Ludovic Stephan 2017-02-08 21:13:02 -02:00
• 46638bd6d8 fixes #85 Ludovic Stephan 2017-02-08 21:08:00 -02:00
• 9ade88d076 add stdout log Ludovic Stephan 2017-02-08 15:54:49 -02:00
• 01dbf7293c withdrawals cost money Ludovic Stephan 2017-02-08 15:38:59 -02:00
• 5ea9705528 use decimal Ludovic Stephan 2017-02-08 15:38:27 -02:00
• b692b92f74 correct return value for get_or_create Ludovic Stephan 2017-02-08 15:32:05 -02:00
• 3b318cf623 correct timedelta Ludovic Stephan 2017-02-08 15:31:10 -02:00
• c6e84b8cb4 bug Ludovic Stephan 2017-02-08 15:29:40 -02:00
• 4e62eb0aee create checkout dynamically Ludovic Stephan 2017-02-08 15:26:56 -02:00