rezometz/re2o
8
0
Fork 0
mirror of https://gitlab.federez.net/re2o/re2o synced 2024-07-06 22:24:06 +00:00
Code Issues Releases Wiki Activity
2913 commits 211 branches 14 tags 12 MiB
Commit graph

2913 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Romain Garnier a6be269eec Fix some translations 2020-02-18 23:04:38 +01:00
Jean-Romain Garnier 1a49c1a744 Improve behavior when searching for rooms 2020-02-18 21:45:34 +00:00
Jean-Romain Garnier 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
Jean-Romain Garnier 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
Jean-Romain Garnier 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
Jean-Romain Garnier ab311e82bc Add ability to search by building+room 2020-02-16 18:35:46 +00:00
Jean-Romain Garnier fb97849609 Fix cheque cotisations being saved twice 2020-02-15 15:09:48 +01:00
Jean-Romain Garnier 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
Jean-Romain Garnier 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
Yoann Pétri 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
Yoann Pétri 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
Yoann Pétri 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
Yoann Pétri 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
Yoann Pétri 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
Yoann Pétri 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
Gabriel Detraz f91f284ed1 Fix js calculation of price - NaN bug 2019-12-27 17:00:41 +01:00
chirac 9e87f796aa Merge branch 'fix-overlapping-invoices' into 'dev' 
Fix Overlapping invoices.

See merge request federez/re2o!476
 2019-12-21 12:39:56 +01:00
Yoann Pétri e7a363866a Add start date tot create cotis 2019-12-20 07:43:35 +00:00
Hugo Levy-Falk 05501c90d9 Fix Overlapping invoices. 2019-12-15 15:24:54 +00:00
chirac c3fc672f14 Merge branch 'fix_advanced_search_filters' into 'dev' 
Fix advanced search filters

See merge request federez/re2o!475
 2019-12-07 14:25:21 +01:00
Jean-Romain Garnier fa5098fb37 Rebase to match dev 2019-12-07 13:09:17 +00:00
Jean-Romain Garnier 51f65340d8 Tweak filtering for users and clubs in search to better handle user-defined filters 2019-12-07 13:07:21 +00:00
Jean-Romain Garnier 33001cc734 Fix display filter in advance search not being taken into account 2019-12-07 13:07:21 +00:00
chirac a72ce9c91f Merge branch 'search_results_pagination' into 'dev' 
Search results pagination

See merge request federez/re2o!474
 2019-12-07 13:45:43 +01:00
Jean-Romain Garnier 7f4c796249 Tweak filtering for users and clubs in search to better handle user-defined filters 2019-12-06 13:24:09 +00:00
Jean-Romain Garnier 7817dd47a5 Fix display filter in advance search not being taken into account 2019-12-06 10:29:10 +00:00
Jean-Romain Garnier 83123d9dc1 Make search-results pagination more coherent with rest of pagination style 2019-12-06 00:15:06 +00:00
Jean-Romain Garnier 83a6dea5c9 Add pagination in search results 2019-12-06 00:01:13 +00:00
klafyvel a7d871e204 Merge branch 'fix_alias_perms' into 'dev' 
Fix function called by perm check

See merge request federez/re2o!473
 2019-11-25 15:41:10 +01:00
Gabriel Detraz 35e50964a1 Fix function called by perm check 2019-11-25 15:25:52 +01:00
chirac 9afe81b9e2 Merge branch 'translation' into 'dev' 
Translation

See merge request federez/re2o!471
 2019-11-24 23:32:47 +01:00
Laouen Fernet c8ed48145c Add migrations for improved translations 2019-11-24 23:27:57 +01:00
Laouen Fernet e26d21064e Improve internationalisation for email templates, scripts, commands and error messages 2019-11-24 23:27:57 +01:00
Laouen Fernet 7894e3267a Edit translations in users 2019-11-24 23:27:57 +01:00