|
|
742db91f1d
|
Add group mailings
|
2020-03-29 01:29:41 +01:00 |
|
Gabriel Detraz
|
dcb51bf267
|
Merge branch 'master' into dev
|
2020-03-29 01:24:50 +01:00 |
|
Laouen Fernet
|
43d207590b
|
Merge branch 'fix_tickets_perm_name' into 'master'
Fix tickets permissions name
See merge request federez/re2o!493
|
2020-03-29 01:10:32 +01:00 |
|
Gabriel Detraz
|
c356613a83
|
Fix tickets permissions name
|
2020-03-29 01:00:21 +01:00 |
|
|
|
b0f02bcee5
|
Merge branch 'fix_bootstrap3_correctversion' into 'master'
Drop support python2 in boostrap3 12
See merge request federez/re2o!492
|
2020-03-27 21:35:07 +01:00 |
|
Gabriel Detraz
|
d526759270
|
Drop support python2 in boostrap3 12
|
2020-03-27 20:21:49 +00:00 |
|
chirac
|
2555e50f63
|
Merge branch 'translate_readme' into 'dev'
Translate readme
See merge request federez/re2o!490
|
2020-03-03 18:52:26 +01:00 |
|
grisel-davy
|
2f9ac1a168
|
finish readme
|
2020-03-01 00:07:10 +00:00 |
|
grizzly
|
2e2c5f625c
|
Adding english version, respond to #157
|
2020-02-28 20:24:10 +01:00 |
|
chirac
|
5b4ba6c7dc
|
Merge branch 'cant_change_user_roles' into 'dev'
Cant change user roles without being superuser
See merge request federez/re2o!489
|
2020-02-20 09:41:49 +01:00 |
|
|
|
97151cd656
|
Fix permission allowing user to change groups
|
2020-02-20 09:30:41 +01:00 |
|
chirac
|
d058fe5b59
|
Merge branch 'room_building_search' into 'dev'
Improve search functionality
See merge request federez/re2o!488
|
2020-02-19 11:21:28 +01:00 |
|
Jean-Romain Garnier
|
57631f368d
|
Fix wrong translation in advanced search
|
2020-02-19 11:10:07 +01:00 |
|
Jean-Romain Garnier
|
d6316bbc0b
|
Fix translation
|
2020-02-19 11:07:53 +01:00 |
|
Jean-Romain Garnier
|
a708fe2dda
|
Fix linting issues
|
2020-02-19 11:06:57 +01:00 |
|
|
|
870523b439
|
Add ability to search by building and room name without space
|
2020-02-19 09:50:16 +00:00 |
|
Jean-Romain Garnier
|
27b4bee02c
|
Remove duplicate translation
|
2020-02-18 23:43:35 +01:00 |
|
Jean-Romain Garnier
|
562973efc7
|
Fix typo in translation
|
2020-02-18 23:41:15 +01:00 |
|
Jean-Romain Garnier
|
615f25146f
|
Fix wrongfuly "No result" in search
|
2020-02-18 23:37:37 +01:00 |
|
Jean-Romain Garnier
|
a6be269eec
|
Fix some translations
|
2020-02-18 23:04:38 +01:00 |
|
|
|
1a49c1a744
|
Improve behavior when searching for rooms
|
2020-02-18 21:45:34 +00:00 |
|
|
|
0347086ca4
|
Fix identation error
|
2020-02-18 18:01:39 +00:00 |
|
Jean-Romain Garnier
|
805cc450cc
|
Merge branch 'room_building_search' of gitlab.federez.net:federez/re2o into room_building_search
|
2020-02-18 18:53:04 +01:00 |
|
Jean-Romain Garnier
|
8a9c8eaaaa
|
Add ability to make queries case sensitive
|
2020-02-18 18:52:50 +01:00 |
|
|
|
c49beb02ee
|
Fix import error
|
2020-02-18 17:18:44 +00:00 |
|
Jean-Romain Garnier
|
8323bc46da
|
Split search/views into 2 files
|
2020-02-18 18:16:08 +01:00 |
|
Jean-Romain Garnier
|
89d2d6a1d2
|
Update description for advanced search
|
2020-02-18 16:04:54 +01:00 |
|
|
|
66183f9288
|
Add plaintext representation for Query
|
2020-02-18 14:01:48 +00:00 |
|
Jean-Romain Garnier
|
e36a7c7f1f
|
Create Query class
|
2020-02-18 14:29:47 +01:00 |
|
Jean-Romain Garnier
|
7ba5ff8be6
|
Handle queries with "+" operators
|
2020-02-18 12:02:08 +01:00 |
|
|
|
ab311e82bc
|
Add ability to search by building+room
|
2020-02-16 18:35:46 +00:00 |
|
|
|
fb97849609
|
Fix cheque cotisations being saved twice
|
2020-02-15 15:09:48 +01:00 |
|
|
|
0057832192
|
Merge branch 'fix_dhcp_api_serializer' into 'dev'
Add ip_type in dhcp api serializer
See merge request federez/re2o!486
|
2020-02-15 14:51:43 +01:00 |
|
chirac
|
2374a2b4b8
|
Merge branch 'cheque-payments-applied-twice' into 'master'
Fix cheque cotisations being saved twice
Closes #236
See merge request federez/re2o!487
|
2020-02-15 14:39:38 +01:00 |
|
|
|
8f75078152
|
Fix cheque cotisations being saved twice
|
2020-02-15 12:30:37 +00:00 |
|
chapeau
|
5975bb905e
|
Add ip_type in dhcp api serializer
|
2020-02-04 10:54:33 +00:00 |
|
|
|
706b309a2a
|
Merge branch 'fix_api_perm_check' into 'master'
Fix api permission check
See merge request federez/re2o!484
|
2020-02-03 18:20:43 +01:00 |
|
chapeau
|
ce4b3290dc
|
Fix api permission check
|
2020-02-03 16:56:51 +00:00 |
|
|
|
8e37baef7b
|
Merge branch 'fix_type_variable' into 'master'
Correction : la variable type a changé de nom
See merge request federez/re2o!483
|
2020-02-03 16:40:14 +01:00 |
|
Gabriel Detraz
|
f5d1412635
|
Correction : la variable type a changé de nom
|
2020-02-03 15:44:03 +01:00 |
|
|
|
9fdf6056ce
|
Merge branch 'fix_nomage_machine' into 'master'
Fix nomage machine
See merge request federez/re2o!481
|
2020-01-25 12:32:08 +01:00 |
|
Gabriel Detraz
|
740746febd
|
Fix bug nomage machine -> referencement utilisateur cible
|
2020-01-25 12:32:03 +01:00 |
|
|
|
cb999b260c
|
Merge branch 'fix_del_ns' into 'master'
Fix del ns
See merge request federez/re2o!480
|
2020-01-25 12:28:19 +01:00 |
|
Gabriel Detraz
|
cdb4d73373
|
Fix conflicting variable names (ns vs nss)
|
2020-01-25 12:25:58 +01:00 |
|
|
|
b896799a97
|
Merge branch 'hotfix_vendor_indexerror' into 'master'
Rattrapage d'une erreur index Error sur la récupération du vendeur
See merge request federez/re2o!479
|
2020-01-25 12:22:58 +01:00 |
|
Gabriel Detraz
|
54db192e8f
|
Rattrapage d'une erreur index Error sur la récupération du vendeur
|
2020-01-24 21:00:08 +01:00 |
|
Hugo Levy-Falk
|
56fdfca1aa
|
Release : 2.8
|
2019-12-28 13:04:04 +01:00 |
|
Hugo Levy-Falk
|
d1d3542828
|
update contributors for 2.8
|
2019-12-28 12:56:07 +01:00 |
|
|
|
aa63561a62
|
Merge branch 'fix_js_vente' into 'dev'
Fix js vente
See merge request federez/re2o!478
|
2019-12-27 18:09:49 +01:00 |
|
Gabriel Detraz
|
8118c9edf2
|
Fix float display
|
2019-12-27 18:01:16 +01:00 |
|
