8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2025-01-12 03:04:30 +00:00

Commit graph

  • 9e87f796aa Merge branch 'fix-overlapping-invoices' into 'dev' chirac 2019-12-21 12:39:56 +0100
  • e7a363866a Add start date tot create cotis Yoann Pietri 2019-12-20 07:43:35 +0000
  • 05501c90d9 Fix Overlapping invoices. Hugo Levy-Falk 2019-12-15 15:23:53 +0000
  • c3fc672f14 Merge branch 'fix_advanced_search_filters' into 'dev' chirac 2019-12-07 14:25:21 +0100
  • fa5098fb37 Rebase to match dev fix_advanced_search_filters Jean-Roman Garnier 2019-12-07 13:09:17 +0000
  • 51f65340d8 Tweak filtering for users and clubs in search to better handle user-defined filters Jean-Roman Garnier 2019-12-06 13:24:09 +0000
  • 33001cc734 Fix display filter in advance search not being taken into account Jean-Roman Garnier 2019-12-06 10:29:10 +0000
  • a72ce9c91f Merge branch 'search_results_pagination' into 'dev' chirac 2019-12-07 13:45:43 +0100
  • 7f4c796249 Tweak filtering for users and clubs in search to better handle user-defined filters Jean-Roman Garnier 2019-12-06 13:24:09 +0000
  • 7817dd47a5 Fix display filter in advance search not being taken into account Jean-Roman Garnier 2019-12-06 10:29:10 +0000
  • 83123d9dc1 Make search-results pagination more coherent with rest of pagination style search_results_pagination Jean-Roman Garnier 2019-12-06 00:15:06 +0000
  • 83a6dea5c9 Add pagination in search results Jean-Roman Garnier 2019-12-06 00:01:13 +0000
  • a7d871e204 Merge branch 'fix_alias_perms' into 'dev' klafyvel 2019-11-25 15:41:10 +0100
  • 35e50964a1 Fix function called by perm check Gabriel Detraz 2019-11-25 15:25:52 +0100
  • 9afe81b9e2 Merge branch 'translation' into 'dev' chirac 2019-11-24 23:32:47 +0100
  • c8ed48145c Add migrations for improved translations translation Laouen Fernet 2019-11-20 01:01:52 +0000
  • e26d21064e Improve internationalisation for email templates, scripts, commands and error messages Laouen Fernet 2019-11-16 14:11:57 +0000
  • 7894e3267a Edit translations in users Laouen Fernet 2019-11-16 15:21:22 +0000
  • b433e464ac Edit translations in topologie Laouen Fernet 2019-11-16 15:21:54 +0000
  • 37129bd83e Edit translations in tickets Laouen Fernet 2019-11-15 23:57:03 +0000
  • 062308f942 Edit translations in templates Laouen Fernet 2019-11-16 15:21:07 +0000
  • 58de66e7a4 Edit translations in search Laouen Fernet 2019-11-16 15:20:50 +0000
  • 90ff281d80 Edit translations in re2o Laouen Fernet 2019-11-16 15:21:38 +0000
  • bcbf819cb9 Edit translations in preferences Laouen Fernet 2019-11-16 15:20:34 +0000
  • 797d052e95 Edit translations in multi_op Laouen Fernet 2019-11-16 14:17:41 +0000
  • 7ca5387d7b Edit translations in machines Laouen Fernet 2019-11-16 15:20:12 +0000
  • 489a564ce8 Edit translations in logs Laouen Fernet 2019-11-16 15:19:52 +0000
  • d24dd8225e Edit translations in cotisations Laouen Fernet 2019-11-16 15:19:32 +0000
  • e8514ae8a9 Edit translations in api Laouen Fernet 2019-11-16 15:19:04 +0000
  • 679e81ac7d Mark strings for translation in users Laouen Fernet 2019-11-20 00:52:11 +0000
  • 207c8ba206 Mark strings for translation in topologie Laouen Fernet 2019-11-16 14:14:22 +0000
  • 6522051728 Mark strings for translation in tickets Laouen Fernet 2019-11-20 00:49:36 +0000
  • fe4de10f7a Mark strings for translation in templates Laouen Fernet 2019-11-16 14:13:35 +0000
  • 5d4d9d71bf Mark strings for translation in search Laouen Fernet 2019-11-16 14:12:54 +0000
  • b5769bb1f8 Mark strings for translation in re2o Laouen Fernet 2019-11-16 14:12:15 +0000
  • 038a11fb75 Mark strings for translation in preferences Laouen Fernet 2019-11-16 14:07:59 +0000
  • a745e8cc9c Mark strings for translation in multi_op Laouen Fernet 2019-11-15 19:06:05 +0000
  • ac5d8e2080 Mark strings for translation in machines Laouen Fernet 2019-11-16 14:07:15 +0000
  • 07ce7bd8a7 Mark strings for translation in logs Laouen Fernet 2019-11-16 14:03:08 +0000
  • 2454de2032 Mark strings for translation in cotisations Laouen Fernet 2019-11-16 14:02:32 +0000
  • 3743a46bc5 Mark strings for translation in api Laouen Fernet 2019-11-16 14:01:07 +0000
  • 8624105378 Merge branch 'bug-massive-boostrap-form' into 'dev' chirac 2019-11-24 23:23:11 +0100
  • 755e95e644 Fix massive fields sending incorrect data in POST request bug-massive-boostrap-form Jean-Roman Garnier 2019-11-24 22:10:55 +0000
  • af05df6c85 Merge branch 'fix_debug_remains' into 'dev' chirac 2019-11-17 13:06:52 +0100
  • 09da1b4d43 Fix klafy horrors Hugo Levy-Falk 2019-11-17 11:58:23 +0000
  • 5a83a577fa Merge branch 'display_preferences' into 'dev' chirac 2019-11-16 19:26:06 +0100
  • 35ba5b6e49 Add spaces where needed. display_preferences nanoy 2019-11-16 19:22:03 +0100
  • 540a8d0531 Merge branch '210-use-black-for-formatting' into 'dev' chirac 2019-11-04 23:16:57 +0100
  • c4a104b3b6 I like my black. Hugo Levy-Falk 2019-11-04 17:55:03 +0100
  • 2460a7d2a0 Merge branch '229-kill-dead-code' into 'dev' chirac 2019-11-04 22:44:40 +0100
  • ce862a3bde What Is Dead May Never Die 🧟 Hugo Levy-Falk 2019-11-04 17:49:17 +0100
  • 180ba11a51 Merge branch '222-allow-short-time-membership' into 'dev' chirac 2019-11-04 16:45:37 +0100
  • 034b50bc58 Fix #189 Hugo Levy-Falk 2019-11-04 00:25:29 +0100
  • e0a65e4d04 Setup tests for Vente model. Hugo Levy-Falk 2019-11-03 21:46:18 +0100
  • c76f32cf26 Fix #222 Hugo Levy-Falk 2019-10-02 23:42:54 +0200
  • c260d3889e Merge branch 'fix-edit-switch' into 'dev' chirac 2019-11-03 19:54:58 +0100
  • 804d5a711b Fix typo in view edit_switch Hugo Levy-Falk 2019-10-31 21:54:25 +0100
  • b5000ad367 Merge branch 'fix_date_summary' into 'dev' klafyvel 2019-10-29 18:11:33 +0100
  • 9c28662058 Fix display affichage date summary Gabriel Detraz 2019-10-29 17:49:23 +0100
  • ccab29ff9e Merge branch 'fix_ubuntu_tls' into 'dev' klafyvel 2019-10-21 16:59:34 +0200
  • 1385e8f458 Prevent crash with tls 1.3 and ubuntu (see https://github.com/FreeRADIUS/freeradius-server/issues/2385 ) Gabriel Detraz 2019-10-21 16:33:50 +0200
  • 31fdb644a2 Merge branch 'fix-interface-edition' into 'dev' chirac 2019-10-17 20:25:00 +0200
  • 42f65bea6a Fix DomainForm usage. Hugo Levy-Falk 2019-10-17 20:20:19 +0200
  • ef93bd7975 Merge branch 'fix_delete_set' into 'dev' klafyvel 2019-10-16 12:26:26 +0200
  • 6a590570c5 Fix delete_set form Gabriel Detraz 2019-10-15 00:17:38 +0200
  • 2c815ab98c Merge branch '212-feature-request-allow-to-define-ttl-for-dns-records' into 'dev' chirac 2019-10-16 12:18:53 +0200
  • 48ec3d353e default ttl to 0 Hugo Levy-Falk 2019-10-12 17:22:51 +0200
  • 13a06c1a67 TTL for DNAMEs Hugo Levy-Falk 2019-10-02 23:53:27 +0200
  • aab6fa2ba0 Fix #212 Hugo Levy-Falk 2019-10-02 22:48:33 +0200
  • 0d8bc2c578 Merge branch 'fix_divers_autoregister' into 'dev' klafyvel 2019-10-14 23:52:37 +0200
  • 47e67c3a40 Retourne au moins l'interface principale du switch Gabriel Detraz 2019-10-14 23:47:34 +0200
  • d51f1e126d Fix réponses multiples, ne crash pas Gabriel Detraz 2019-10-14 23:43:36 +0200
  • 5faf134690 Merge branch 'legal_notice' into 'dev' klafyvel 2019-10-12 17:07:05 +0200
  • aabacec83a Filter safe for info asso Gabriel Detraz 2019-10-10 21:57:06 +0200
  • e38e304087 Display legal notice Gabriel Detraz 2019-10-10 18:06:38 +0200
  • 59ce4829aa Merge branch 'multi_iptypes_switchs' into 'dev' klafyvel 2019-10-10 19:25:42 +0200
  • 0b8cdb8e07 Fix : Permet d'avoir plusieurs blocs de switchs ordonnés sur le même sous-réseau (ex /24 dans /16) Gabriel Detraz 2019-10-10 17:55:59 +0200
  • e98f3b2286 Merge branch 'fix_bugs_divers' into 'dev' klafyvel 2019-10-10 19:19:03 +0200
  • 58c120410a Fix : affichage des tickets, évite un crash Gabriel Detraz 2019-10-10 15:43:52 +0200
  • 144119c26a Fix : possibilité de mettre plusieurs clefs radius sans crash Gabriel Detraz 2019-10-10 15:43:01 +0200
  • 5fc0f3dc19 Affichage des mentions legales propres display_legal_notice Gabriel Detraz 2019-10-08 18:27:32 +0200
  • c5f96fee62 Fix : autorise blank pour message mail adhésion Gabriel Detraz 2019-10-08 18:27:09 +0200
  • ff9f6e5cc2 Merge branch 'multi_op_app' into 'dev' klafyvel 2019-10-01 22:47:43 +0200
  • bed24b5c1c Unusefull stuff Gabriel Detraz 2019-09-21 16:26:55 +0200
  • dfe15ec23d Button to remove port of a room Gabriel Detraz 2019-09-21 16:25:05 +0200
  • 2df79830b6 An optional app can possibly not have a pannel pref Gabriel Detraz 2019-09-20 23:03:44 +0200
  • 745a30280c Display connection state for luser Gabriel Detraz 2019-09-20 21:45:48 +0200
  • 6617d6a000 Fix affichage dans le dropdown adapté Gabriel Detraz 2019-09-20 19:56:19 +0200
  • 6d76d0a5f7 Contact view on optional app... is optionnal Gabriel Detraz 2019-09-20 13:56:26 +0200
  • 8a41a1af60 Fix bug affichage Gabriel Detraz 2019-09-20 00:37:59 +0200
  • 051ec84f6e Multi_opp app optional start Gabriel Detraz 2019-09-20 00:09:49 +0200
  • 9434da63af Merge branch 'bootstrap-accordion-ios' into 'dev' chirac 2019-10-01 21:59:38 +0200
  • e7679193b2 Bootstrap accordion ios jr-garnier 2019-10-01 21:59:38 +0200
  • a1b7b4b8d5 Change cursor pointer on collapsable elements bootstrap-accordion-ios JRock007 2019-10-01 20:13:51 +0200
  • 80328199c8 Merge branch 'better-vouchers' into 'dev' chirac 2019-10-01 19:35:16 +0200
  • 6171f42b66 Get the right mandate when creating voucher. Hugo Levy-Falk 2019-09-28 13:01:22 +0200
  • 5c0a4ce748 Fix form validation Hugo Levy-Falk 2019-09-28 12:38:57 +0200
  • b38521db69 For my klafy : return best mandate possible Gabriel Detraz 2019-09-24 01:04:38 +0200
  • 21f95fbc9d Simplify models.py chirac 2019-09-24 00:40:22 +0200
  • 7db8872bc8 Delete CotisationsOption.pres_name and better migration. Hugo Levy-Falk 2019-09-24 00:04:00 +0200