rezometz/re2o
8
0
Fork 0
mirror of https://gitlab.federez.net/re2o/re2o synced 2024-05-16 23:56:12 +00:00
Code Issues Releases Wiki Activity
2686 commits 211 branches 14 tags 12 MiB
Commit graph

2686 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Laouen Fernet b433e464ac Edit translations in topologie 2019-11-24 23:27:57 +01:00
Laouen Fernet 37129bd83e Edit translations in tickets 2019-11-24 23:27:56 +01:00
Laouen Fernet 062308f942 Edit translations in templates 2019-11-24 23:27:56 +01:00
Laouen Fernet 58de66e7a4 Edit translations in search 2019-11-24 23:27:56 +01:00
Laouen Fernet 90ff281d80 Edit translations in re2o 2019-11-24 23:27:56 +01:00
Laouen Fernet bcbf819cb9 Edit translations in preferences 2019-11-24 23:27:56 +01:00
Laouen Fernet 797d052e95 Edit translations in multi_op 2019-11-24 23:27:56 +01:00
Laouen Fernet 7ca5387d7b Edit translations in machines 2019-11-24 23:27:56 +01:00
Laouen Fernet 489a564ce8 Edit translations in logs 2019-11-24 23:27:56 +01:00
Laouen Fernet d24dd8225e Edit translations in cotisations 2019-11-24 23:27:56 +01:00
Laouen Fernet e8514ae8a9 Edit translations in api 2019-11-24 23:27:56 +01:00
Laouen Fernet 679e81ac7d Mark strings for translation in users 2019-11-24 23:27:56 +01:00
Laouen Fernet 207c8ba206 Mark strings for translation in topologie 2019-11-24 23:27:56 +01:00
Laouen Fernet 6522051728 Mark strings for translation in tickets 2019-11-24 23:27:55 +01:00
Laouen Fernet fe4de10f7a Mark strings for translation in templates 2019-11-24 23:27:55 +01:00
Laouen Fernet 5d4d9d71bf Mark strings for translation in search 2019-11-24 23:27:55 +01:00
Laouen Fernet b5769bb1f8 Mark strings for translation in re2o 2019-11-24 23:27:55 +01:00
Laouen Fernet 038a11fb75 Mark strings for translation in preferences 2019-11-24 23:27:55 +01:00
Laouen Fernet a745e8cc9c Mark strings for translation in multi_op 2019-11-24 23:27:55 +01:00
Laouen Fernet ac5d8e2080 Mark strings for translation in machines 2019-11-24 23:27:55 +01:00
Laouen Fernet 07ce7bd8a7 Mark strings for translation in logs 2019-11-24 23:27:55 +01:00
Laouen Fernet 2454de2032 Mark strings for translation in cotisations 2019-11-24 23:27:55 +01:00
Laouen Fernet 3743a46bc5 Mark strings for translation in api 2019-11-24 23:27:55 +01:00
chirac 8624105378 Merge branch 'bug-massive-boostrap-form' into 'dev' 
Fix massive fields sending incorrect data in POST request

See merge request federez/re2o!472
 2019-11-24 23:23:11 +01:00
Jean-Romain Garnier 755e95e644 Fix massive fields sending incorrect data in POST request 2019-11-24 22:10:55 +00:00
chirac af05df6c85 Merge branch 'fix_debug_remains' into 'dev' 
Fix klafy horrors

See merge request federez/re2o!470
 2019-11-17 13:06:52 +01:00
Hugo Levy-Falk 09da1b4d43 Fix klafy horrors 2019-11-17 11:58:23 +00:00