Martin Pepin
25f4c64835
Merge branch 'Aufinal/bda_fixes' into 'master'
...
Fix pour BdA-Revente
See merge request cof-geek/gestioCOF!263
2018-04-07 14:55:33 +02:00
Martin Pépin
87a6722143
Merge branch 'master' into Aufinal/bda_fixes
2018-04-07 14:46:07 +02:00
Martin Pépin
568a58c52a
Merge branch 'qwann/separate_list'
2018-04-07 14:25:04 +02:00
Martin Pépin
53a4c78903
Remove duplicate line
2018-04-07 14:21:07 +02:00
Martin Pépin
158b19778b
also sort the unsold table
2018-04-07 14:20:41 +02:00
Martin Pépin
6d0ec6de43
Merge branch 'master' into qwann/separate_list
2018-04-07 14:09:48 +02:00
Martin Pepin
9d7486585b
Merge branch 'aureplop/kfet-sticky_thead' into 'master'
...
kfet -- Tables are sortable
Closes #171
See merge request cof-geek/gestioCOF!277
2018-04-07 13:47:55 +02:00
Martin Pépin
71b4e6253d
Merge branch 'master' into aureplop/cof-tests_calendar
2018-04-07 13:42:19 +02:00
Martin Pépin
fba105fdd1
Merge branch 'master' into aureplop/kfet-sticky_thead
2018-04-07 13:32:20 +02:00
Martin Pépin
7512454825
Merge branch 'master' into aureplop/cof-tests_registration
2018-04-07 13:20:33 +02:00
Martin Pepin
3463017d59
build status in README.me
2018-04-07 12:54:50 +02:00
Martin Pepin
9986cb1dc7
Merge branch 'aureplop/cof-tests_misc' into 'master'
...
cof -- Add tests for some views
See merge request cof-geek/gestioCOF!292
2018-04-07 12:46:25 +02:00
Martin Pépin
71a61fe31d
Merge branch 'master' into aureplop/cof-tests_misc
2018-04-07 12:41:42 +02:00
Martin Pepin
0cceed9052
Merge branch 'aureplop/cof-tests_export' into 'master'
...
cof -- Add tests for export views
See merge request cof-geek/gestioCOF!291
2018-04-07 12:15:06 +02:00
Martin Pépin
6328cdaa19
Tests: the order of our csv files is not relevant
2018-04-07 12:05:16 +02:00
Martin Pépin
ee33762845
Merge branch 'master' into aureplop/cof-tests_export
2018-04-07 11:24:05 +02:00
Martin Pepin
2d14296c47
Merge branch 'aureplop/cof-tests_club' into 'master'
...
cof -- Add tests for club views
See merge request cof-geek/gestioCOF!289
2018-04-07 10:54:31 +02:00
Martin Pépin
660f395b67
Merge branch 'master' into aureplop/cof-tests_club
2018-04-07 10:49:52 +02:00
Martin Pepin
f23d351ddc
Merge branch 'aureplop/cof-tests_calendar' into 'master'
...
cof -- Add tests for calendar views
See merge request cof-geek/gestioCOF!290
2018-04-07 10:33:35 +02:00
Martin Pépin
60d8e76fee
Merge branch 'master' into aureplop/cof-tests_calendar
2018-04-07 10:24:41 +02:00
Martin Pépin
623047dca2
Fix old-style reversal of calendar urls
2018-04-06 11:11:02 +02:00
Martin Pepin
16d7b4f7c0
Merge branch 'aureplop/cof-tests_event' into 'master'
...
cof -- Add tests for event views
See merge request cof-geek/gestioCOF!286
2018-04-06 00:24:23 +02:00
Martin Pépin
bf464f9378
Merge branch 'master' into aureplop/cof-tests_event
2018-04-06 00:16:08 +02:00
Martin Pépin
35e17a81a6
New year -> new promo -> migration in k-fet
2018-04-05 23:48:53 +02:00
Qwann
cc27e4d964
show not sold article in a different list
2018-03-22 15:25:03 +01:00
Evarin
3d091f50b5
Suppr captcha page, ajout block iframe
2018-03-21 21:53:48 +01:00
Evarin
347497602c
Revert urls prefixing
2018-02-20 17:21:26 +01:00
Evarin
6d6c995563
Fixtures fonctionnelles
2018-02-20 17:13:21 +01:00
Martin Pepin
307c48ca76
Merge branch 'elarnon/fix-182' into 'master'
...
Properly propagate the default number of places in tirage
Closes #182
See merge request cof-geek/gestioCOF!295
2018-02-20 14:40:20 +01:00
Martin Pepin
cadbd1b7c2
Merge branch 'elarnon/compat_fixes' into 'master'
...
Various fixes for Django 1.11
See merge request cof-geek/gestioCOF!294
2018-02-20 14:38:21 +01:00
Martin Pepin
746c5e2053
Merge branch 'elarnon/bash_set_e' into 'master'
...
Make provisioning script stop immediately on errors
See merge request cof-geek/gestioCOF!293
2018-02-20 14:36:28 +01:00
Basile Clement
6ecc9a54b3
Properly propagate the default number of places in tirage
...
Fixes #182 .
2018-02-11 19:24:01 +01:00
Basile Clement
3314670cab
Various fixes for Django 1.11
...
- The {% cycle %} command was used non-quoted arguments separated by
commas, while it is supposed to use quoted arguments separated by
spaces (I'm actually not sure how that ever worked :)
- django-bootstrap-form was at version 3.2.1 which is not compatible
with Django 1.11 (but also required by GestioCOF). I upgraded it to
version 3.3.
2018-02-11 19:09:07 +01:00
Basile Clement
ac1a57d969
Make provisioning script stop immediately on errors
...
By default, bash will ignore any failing commands and happily proceed to
execute the next ones. This is usually not the behavior the we want in
provisioning script (or ever in scripts, actually): if one step of the
provisioning fails, it doesn't make much sense to proceed with the
following ones.
This simple patch uses `set -e` to ask bash to abort the whole script if
any command within it fails, leading to outputs that are easier to parse
since the commands following a failing one will usually fail also,
hiding the root cause.
2018-02-11 17:01:26 +01:00
Martin Pepin
8f0eec0e88
Merge branch 'aureplop/cof-tests_survey' into 'master'
...
cof -- Add tests for survey views
See merge request cof-geek/gestioCOF!285
2018-02-06 13:48:46 +01:00
Martin Pepin
d88ce44989
Merge branch 'aureplop/fix-autocomplete-js' into 'master'
...
Fix autocomplete in registration views.
See merge request cof-geek/gestioCOF!288
2018-02-05 22:49:18 +01:00
Martin Pepin
c94a9ecb44
Merge branch 'aureplop/kfet_initial-statement' into 'master'
...
kfet -- Create initial statement on checkout save
See merge request cof-geek/gestioCOF!283
2018-02-05 22:42:04 +01:00
Martin Pépin
d57c75d2a0
Minor simplificatons after code review
2018-02-05 22:36:08 +01:00
Martin Pepin
a3295ca6a3
Merge branch 'aureplop/fix-184' into 'master'
...
Fix available checkouts in K-Psul
Closes #184
See merge request cof-geek/gestioCOF!282
2018-02-05 22:35:04 +01:00
Martin Pepin
09433f6f15
Merge branch 'aureplop/speed-up-tests' into 'master'
...
Speed up tests in dev (×40)
See merge request cof-geek/gestioCOF!281
2018-02-05 22:18:52 +01:00
Martin Pepin
8c68270a4d
Merge branch 'aureplop/Kerl/drop_py2_compat' into 'Kerl/drop_py2_compat'
...
Py3 allows to shorten super()
See merge request cof-geek/gestioCOF!284
2018-02-05 22:14:04 +01:00
Evarin
63ce694b4d
Fix dependency
2018-02-03 22:39:50 +01:00
Evarin
59116f2d46
International wagtail urls
2018-02-03 22:34:37 +01:00
Evarin
88e911ff9d
Fixtures mises à jour
2018-01-28 23:45:46 +01:00
Evarin
ba87044638
Calendrier dynamique + sympa + jolies dates
2018-01-28 23:44:48 +01:00
Evarin
f8952225d6
Apparence et Responsiveness
2018-01-28 19:10:14 +01:00
Evarin
c11ccf2ecc
Tri des annuaires
2018-01-28 19:09:35 +01:00
Aurélien Delobelle
afa6972280
Better handling of non-authorized users in config edition view
2018-01-22 21:59:41 +01:00
Aurélien Delobelle
0235c4f7e8
Fix profile edition view
...
- Fix a typo.
- Bump version of django-bootstrap-form to be comaptible with Django
1.11.
2018-01-22 21:59:41 +01:00
Aurélien Delobelle
f8361b9114
Add & fix urls naming
2018-01-22 21:59:41 +01:00
