fd006c505a
Refactor navbar and general frontend.
...
The menus of the navbar is reorganized
The footer is changed into a navbar
The right sidebar is placed to the left
The left sidebar is deleted
Header navbar and leftsidebar are now fixed
Physical grouing is split into 4 views
2020-11-15 20:41:23 +01:00
klafyvel
1fd8863370
Merge branch 'fix_disable_emailnotyetconfirmed_translation' into 'dev'
...
Fix disable_emailnotyetconfirmed translation
See merge request re2o/re2o!568
2020-11-12 19:23:08 +01:00
Jean-Romain Garnier
2949b31edf
Fix disable_emailnotyetconfirmed translation
2020-11-12 12:14:13 +01:00
klafyvel
850dcfb800
Merge branch 'fix_user_history_key_error' into 'dev'
...
Fix #295
See merge request re2o/re2o!567
2020-11-12 11:33:59 +01:00
Jean-Romain Garnier
b247d0c2c8
Fix #295
...
KeyError could be raised when omparing versions with different fields
2020-11-12 11:23:01 +01:00
grisel-davy
efc08d3f9a
Forgot the paginator in the MR !566 .
2020-11-04 22:10:18 +01:00
Gabriel Detraz
dfb688f995
Fix : default value should be 0
2020-11-02 23:43:54 +01:00
Gabriel Detraz
01af6ea927
Fix error on migration 48 and split for pg_triggers reason
2020-11-02 23:07:13 +01:00
chirac
d8bc523827
Merge branch 'fix_tables_half_width' into 'dev'
...
Fix tables half width
See merge request re2o/re2o!566
2020-11-01 14:08:10 +01:00
grisel-davy
a12ed72c87
Break word with CSS and not with a specific method of interfaces
2020-10-28 21:23:49 +01:00
grisel-davy
8a722d825e
Fix the overflow of text in the sidenav for small screen
2020-10-28 19:33:37 +01:00
grisel-davy
10de0d0ac8
Turn table row into panels
2020-10-27 16:04:21 +01:00
grisel-davy
17f09c551b
reorganize infos on contact page
2020-10-27 12:20:26 +01:00
grisel-davy
7bedf0c9dc
Affichage améliorer avec 2 footers
2020-10-27 11:41:46 +01:00
grisel-davy
b5c01bf58f
Table -> grid pour l'affichage sur telephone
2020-10-27 11:31:51 +01:00
grisel-davy
0a2c48da6b
Affichage sans chevauchement sur toute la gamme de largeur
2020-10-26 19:23:41 +01:00
grisel-davy
718e761d2a
Affichage sans chevauchement sur toute la gamme de largeurs
2020-10-26 19:15:51 +01:00
grisel-davy
8a67b0ca0e
Turn tables into grids
2020-10-25 23:47:59 +01:00
grisel-davy
dba0da249e
Add paginator, updates machines, create aff_machines, and minor changes
2020-10-24 00:52:25 +02:00
grisel-davy
685c88d2e5
Fix typo and update display port profils
2020-10-23 19:13:02 +02:00
grisel-davy
57d22e9aaf
fix typo in iptypes and update display of switchs
2020-10-23 12:09:09 +02:00
grisel-davy
4f5bdc1d0b
Add listings of articles to aff of all cotisations
2020-10-23 11:41:02 +02:00
grisel-davy
a3f4deb145
Update display of ip_types
2020-10-23 10:12:18 +02:00
grisel-davy
0bcb6cc680
Remove redundant code, reuse aff_ templates
2020-10-23 00:15:34 +02:00
grisel-davy
6cc6326f15
Not perfect but much better
2020-10-22 23:55:05 +02:00
chirac
e8d4cbf9ed
Merge branch 'remove_profil_image' into 'dev'
...
Remove profil image
See merge request re2o/re2o!565
2020-10-22 16:42:38 +02:00
grisel-davy
5163fd5e53
Remove profile_image field from the api
2020-10-22 15:43:06 +02:00
grisel-davy
98a5c01430
Remove profile_image
2020-10-22 15:39:30 +02:00
chirac
38b79aec19
Merge branch 'split_profil' into 'dev'
...
Split profil
See merge request re2o/re2o!564
2020-10-20 13:32:51 +02:00
grisel-davy
e2c2ce6b18
Check to avoid multiple messages
2020-10-20 12:32:50 +02:00
grisel-davy
c931ec9fa0
Add number of article in the display of cotisation
2020-10-18 17:36:10 +02:00
grisel-davy
ccce9d2de9
Move facture list to cotisation, add paginator
2020-10-18 15:22:48 +02:00
grisel-davy
a6d63521fd
Rename profil view in apps and count machines in user profil view
2020-10-18 14:51:58 +02:00
grisel-davy
9a42485c0a
Create profil template and corresponding view
2020-10-18 13:28:32 +02:00
grisel-davy
9005dc78b9
Fix test of subscription or connection to display message
2020-10-17 13:52:40 +02:00
chirac
9a2cae3b8f
Merge branch 'fix_unarchived_vente' into 'dev'
...
Don't know why, but it solves issue #281
See merge request re2o/re2o!563
2020-10-17 01:27:46 +02:00
grisel-davy
3e3040550d
Don't know why, but it solves issue #281
2020-10-17 01:06:24 +02:00
grizzly
b0fdeca744
Merge branch 'fix_memb_adh' into 'dev'
...
Fix memb adh
See merge request re2o/re2o!562
2020-10-17 00:40:18 +02:00
grisel-davy
89c805f61b
Replace null by 0 in default value of duration_*
2020-10-17 00:34:56 +02:00
grisel-davy
bf298492f3
Merge branch 'fix_memb_adh' of https://gitlab.federez.net/federez/re2o into fix_memb_adh
2020-10-15 19:24:54 +02:00
grisel-davy
23698a1653
Fix the test for ventes in the set_active function. This function could be greatly improved if the duraction could not be null.
2020-10-15 19:21:16 +02:00
Gabriel Detraz
108154d6ce
Fix query test for set_active function
2020-10-13 22:51:18 +02:00
grisel-davy
8c06bd4fca
Fix creation of cotisation
2020-10-12 11:59:37 +02:00
grisel-davy
bb861eb089
split query into two filters
2020-10-08 23:24:37 +02:00
Gabriel Detraz
0a427cd30d
Fix all_adherent and all_has_access function
2020-10-08 22:30:41 +02:00
histausse
a01c9e2303
Add the need_membership field to article
...
This field is a boolean indicating if the article can be purshased by
nonmembers.
2020-10-08 22:23:34 +02:00
histausse
640499a9e2
Split the membership duration from the connection duration
...
changes:
Article:
remove COTISATION_TYPE, duration(_days), type_cotisation
add duration(_days)_connection, duration(_days)_membership
Vente:
remove COTISATION_TYPE, duration(_days), type_cotisation
add duration(_days)_connection, duration(_days)_membership
add method `test_membership_or_connection()` to replace
`bool(type_cotisation)`
Cotisation:
remove COTISATION_TYPE, date_start, date_end, type_cotisation
add date_start_con, date_end_con, date_start_memb, date_end_memb
create_cotis(date_start=False) -> create_cotis(date_start_con=False, date_start_memb=False)
+ migration
+ changes to use the new models in the remaining of the code
2020-10-08 22:22:48 +02:00
Gabriel Detraz
4003856b47
Supprime l'avatar à la création (inutile/buggé)
2020-10-08 21:15:30 +02:00
Gabriel Detraz
53dd1920d7
Fix publication parser error
2020-10-06 21:57:47 +02:00
chirac
8c5cfc65ae
Merge branch 'patch-1' into 'master'
...
Update pip_requirements.txt; fix 1.6.0 version which crashes with 1.7.0
See merge request re2o/re2o!561
2020-10-04 23:05:57 +02:00
