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

Commit graph

  • d6cc00c9d7 Correction d'erreur dans les labels grisel-davy 2018-04-18 18:59:55 +02:00
  • 22d49864a7 Ajout des bornes wifi grisel-davy 2018-04-18 18:38:59 +02:00
  • 30140de2ae Des methodes raccourci pour mon gentil grizzly Gabriel Detraz 2018-04-18 18:11:36 +02:00
  • 9569e22df9 Set language button Maël Kervella 2018-04-16 18:07:54 +00:00
  • f7b2e22d3c Templatisation du graphe grisel-davy 2018-04-18 16:48:46 +02:00
  • 736c676bbe Graph caché par défaut sur la page grisel-davy 2018-04-17 21:34:59 +02:00
  • d2946a94b5 affiche les superuser Hugo LEVY-FALK 2018-04-17 00:32:37 +02:00
  • ad12dff8d5 Merge branch 'fix_86_number_of_machines' into 'master' moamoak 2018-04-17 00:02:01 +02:00
  • e4d53e6791 Fix #86 Hugo LEVY-FALK 2018-04-16 23:57:22 +02:00
  • 6b3448986d Dossier media/images Gabriel Detraz 2018-04-16 20:26:47 +02:00
  • c64f71c2c4 Merge branch 'master' into graph_topo chirac 2018-04-16 19:27:14 +02:00
  • 42ddb747b7 Merge branch 'twitter_and_fb' into graph_topo chirac 2018-04-16 19:26:15 +02:00
  • 39d8340e6c Merge branch 'twitter_and_fb' into 'master' grizzly 2018-04-16 18:37:55 +02:00
  • 6bece0bcb2 Merge branch 'migration_misnamed_permissions' into 'master' chirac 2018-04-16 18:27:08 +02:00
  • b77a612845 Merge branch 'switch_better_display' into 'master' chirac 2018-04-16 18:26:24 +02:00
  • 5453b845e2 Merge branch 'fix_stack' into 'master' chirac 2018-04-16 18:26:04 +02:00
  • f38c12fcc3 Accueil -> Home Gabriel Detraz 2018-04-16 18:22:51 +02:00
  • 5624247487 Fix #104 Gabriel Detraz 2018-04-16 06:54:34 +02:00
  • e515360936 Oublie du fichier de génération de la page d'accueil Gabriel Detraz 2018-04-16 06:41:38 +02:00
  • 2839a0ce19 Fix #102 Gabriel Detraz 2018-04-16 05:51:25 +02:00
  • b118e1199e Fix #108 Gabriel Detraz 2018-04-16 05:28:27 +02:00
  • c1e3d34b84 Fix : migration for renaming permission Srv.view_soa to Srv.view_srv Maël Kervella 2018-04-15 23:52:24 +00:00
  • 8e057db5ea Merge branch 'master' into graph_topo chirac 2018-04-15 21:22:47 +02:00
  • 79f4f8051a Merge branch 'Fix_asso_description' into 'master' chirac 2018-04-15 20:54:05 +02:00
  • 48030d9a53 Let use HTML tags in asso description Maël Kervella 2018-04-15 18:51:04 +00:00
  • b550794fc8 Merge branch 'custom_error_pages' into 'master' chirac 2018-04-15 20:26:15 +02:00
  • e3209d77dc Encode Error 500 image into base64 Maël Kervella 2018-04-15 17:53:59 +00:00
  • 21bfbed542 Merge branch 'fix_upload_img' into 'master' moamoak 2018-04-15 20:19:53 +02:00
  • a639e6a809 Do not display <img> on home page services when no image Maël Kervella 2018-04-15 18:16:50 +00:00
  • 68830f2e64 Fix no img file Gabriel Detraz 2018-04-15 19:42:45 +02:00
  • 8de1865a81 Merge branch 'custom_error_pages' into 'master' chirac 2018-04-15 19:35:03 +02:00
  • 1225af69bd Add custom Error 500 page Maël Kervella 2018-04-15 17:05:27 +00:00
  • 6c6422aff3 Merge branch 'fix_upload_img' into 'master' chirac 2018-04-15 19:29:34 +02:00
  • 98eae95632 Avoid duplicate settings and keeps comments Maël Kervella 2018-04-15 17:26:28 +00:00
  • 2337a24997 Fix #106 Gabriel Detraz 2018-04-15 19:09:12 +02:00
  • d911452ae0 Merge branch 'moamoak/pep8_and_pylint' into 'master' chirac 2018-04-15 17:52:45 +02:00
  • f7f8f7493b Fix : various little things Maël Kervella 2018-04-15 13:34:51 +00:00
  • 6c30c36943 Fix : missing migrations Maël Kervella 2018-04-15 10:54:53 +00:00
  • 915d5e8931 Fix: user.models.User.auto_uid can't be static Maël Kervella 2018-04-15 10:51:05 +00:00
  • 0065e2e0f5 Fix unused variables in kwargs Maël Kervella 2018-04-15 01:00:05 +00:00
  • 1469c7d6a6 Pylint compliance on users Maël Kervella 2018-04-14 23:16:49 +00:00
  • 4a1b97bbe3 Pylint compliance on topologie Maël Kervella 2018-04-14 22:06:29 +00:00
  • 595c6b99fa Pylint compliance on search Maël Kervella 2018-04-14 21:44:00 +00:00
  • 2ca271bf82 Pylint compliance on re2o Maël Kervella 2018-04-14 19:29:16 +00:00
  • 332e8a3413 Pylint compliance on preferences Maël Kervella 2018-04-14 18:55:24 +00:00
  • e88141db56 Pylint compliance on machines Maël Kervella 2018-04-14 18:19:02 +00:00
  • 2114a6ebba Pylint compliance on logs Maël Kervella 2018-04-14 15:30:14 +00:00
  • f2c91199d1 Pylint compliance on cotisations Maël Kervella 2018-04-14 13:39:51 +00:00
  • cc4401ff20 Pylint compliance on api Maël Kervella 2018-04-14 11:49:39 +00:00
  • 955bf42b02 Missing Fixes Maël Kervella 2018-04-14 01:53:34 +00:00
  • 7b0b5c2af4 Pep8 compliance on users Maël Kervella 2018-04-14 01:25:05 +00:00
  • 8afc8e4304 Pep8 compliance on topologie Maël Kervella 2018-04-14 00:20:44 +00:00
  • 48d904b6de Pep8 compliance on re2o Maël Kervella 2018-04-13 23:42:22 +00:00
  • 287ce23d1c Pep8 compliance on machines Maël Kervella 2018-04-13 22:48:44 +00:00
  • 0c8bb61574 Pep8 compliance on logs Maël Kervella 2018-04-13 20:37:04 +00:00
  • 9d7a7fa1f5 Pep8 compliance on freeradius Maël Kervella 2018-04-13 20:11:55 +00:00
  • 0dace45c5e Pep8 compliance on api Maël Kervella 2018-04-13 19:35:52 +00:00
  • b25137acf4 Pep8 compliance on cotisations Maël Kervella 2018-04-13 18:58:29 +00:00
  • e56c80b747 Merge branch 'Fix_migrations_cotis' into 'master' chirac 2018-04-14 21:01:00 +02:00
  • 12a8f2ede6 Fix: missing migrations due to translation of cotisation Maël Kervella 2018-04-14 18:57:48 +00:00
  • 08dbd2615f Merge branch 'rm_stuff_settings' into 'master' moamoak 2018-04-14 17:38:46 +02:00
  • a4f66ca1b4 Merge branch 'Fix_regression_mailing' into 'master' chirac 2018-04-14 17:36:45 +02:00
  • a99ee1a29c Update models.py chirac 2018-04-14 17:35:07 +02:00
  • f2929baaef Update settings.py chirac 2018-04-14 17:14:32 +02:00
  • 02b7ab826b Merge branch 'Fix_95' into 'master' chirac 2018-04-14 17:11:15 +02:00
  • 4a67ee8556 Fix the display of mailing info on clubs Maël Kervella 2018-04-14 11:53:59 +00:00
  • 4f1831d5f9 Little fix in cotis Maël Kervella 2018-04-14 01:43:00 +00:00
  • 0dc5d56250 Création et affichage du graph des switchs grisel-davy 2018-04-13 20:31:51 +02:00
  • aa7ded9f20 Fix #95 by removing duplicates classes and functions Maël Kervella 2018-04-13 17:30:48 +00:00
  • badad16376 Merge branch 'Fix_cotis_err_500' into 'master' klafyvel 2018-04-13 18:58:56 +02:00
  • 34c5af62f4 Fix: Error rename Maël Kervella 2018-04-13 12:32:39 +00:00
  • 8fb8e14a30 Fix Use string and not variables in %-notation fornat Mael Kervella 2018-04-13 11:40:02 +00:00
  • 8226bd405c Fix for an unstable database state Fix_strange_foreign_key_state Maël Kervella 2018-04-11 23:39:22 +00:00
  • 0f35bfe7e0 Merge branch 'switch_port_color' into 'master' moamoak 2018-04-11 23:40:43 +02:00
  • eb1567a9b7 un peu de couleurs sur l'affichage des switchs Gabriel Detraz 2018-04-11 23:36:56 +02:00
  • aa8129a4ad Merge branch 'Fix_81_Create_custom_invoice' into 'master' chirac 2018-04-11 23:00:43 +02:00
  • 1447d7b173 Added choice for multiple articles in new PDF invoice Maël Kervella 2018-04-11 19:53:54 +00:00
  • 11ed8b6afe Fix trailing 'e' Maël Kervella 2018-04-11 18:40:59 +00:00
  • 9232282cdf Align PDF invoice info and better hline for tables Maël Kervella 2018-04-11 18:38:07 +00:00
  • d9c42e89db Fix 81 and Strip out facture.tex for readability Maël Kervella 2018-04-11 17:20:40 +00:00
  • cd0e11815c Merge branch 'moamoak/improve_about' into 'master' chirac 2018-04-11 18:40:48 +02:00
  • 9067582118 Remove multiple try/except for getting git info Maël Kervella 2018-04-11 13:29:14 +00:00
  • ce8fa57747 Add cache for about view Maël Kervella 2018-04-11 11:40:55 +00:00
  • 001728ca70 Add python3-git as dependency in isntall script Maël Kervella 2018-04-11 11:31:20 +00:00
  • 7d54c10c29 Add many information on about page Maël Kervella 2018-04-10 22:07:26 +00:00
  • 16162ff9bb Merge branch 'fix_cotis' into 'master' moamoak 2018-04-11 11:35:37 +02:00
  • 25cd61ddca Fix bug sur cotisation Gabriel Detraz 2018-04-11 09:30:46 +00:00
  • 5a6acb5941 Merge branch 'service_user_del' into 'master' moamoak 2018-04-10 19:50:48 +02:00
  • 529fbe6c95 Fix del/edit serviceuser Gabriel Detraz 2018-04-10 19:12:28 +02:00
  • e80c50ffe3 Merge branch '92_Stats_models_broken' into 'master' chirac 2018-04-10 18:41:32 +02:00
  • dad5887e5e Merge branch 'moamoak/91_search_broken' into 'master' chirac 2018-04-10 18:41:10 +02:00
  • 304ca82eca Merge branch 'moamoak/89_move_building_and_switchbay_info' into 'master' chirac 2018-04-10 18:40:55 +02:00
  • 91faad5806 Replace Object.PRETTY_NAME with Object._meta.verbose_name.title() Maël Kervella 2018-04-10 13:47:38 +00:00
  • 4d9f707c58 Search in switch.location replaced by switch.switchbay.building.name Maël Kervella 2018-04-10 12:58:52 +00:00
  • b805ca94d7 Rename index_stack into index_physical_grouping Maël Kervella 2018-04-10 12:11:48 +00:00
  • e924e91964 Move Building and SwitchBay infos on the Stack info page Maël Kervella 2018-04-10 11:56:17 +00:00
  • 33a75494e4 Merge branch 'maj_crans' into 'master' klafyvel 2018-04-09 23:31:51 +02:00
  • f95f6b812a Merge branch 'foreign_origin' into 'master' Gabriel Detraz 2018-04-09 22:51:29 +02:00
  • 566649ab45 Origin devient une foreignkey Gabriel Detraz 2018-04-09 22:49:44 +02:00
  • a38e56cde4 Merge branch 'translation' into 'master' chirac 2018-04-09 20:13:31 +02:00