Compare commits

...

200 Commits

Author SHA1 Message Date
Arnaud Fornerot 4959a10857 Merge branch 'master' into dist/envole/6/master 2022-07-06 11:18:42 +02:00
Arnaud Fornerot d42fdbfedd Merge branch 'master' into dist/envole/6/master 2022-05-10 09:32:08 +02:00
Arnaud Fornerot 70e2d49e7c Merge branch 'master' into dist/envole/6/master 2022-03-03 11:55:03 +01:00
Arnaud Fornerot 666b90d513 Merge branch 'master' into dist/envole/6/master 2022-02-21 14:02:28 +01:00
Arnaud Fornerot cbae74f041 Merge branch 'master' into dist/envole/6/master 2022-02-04 13:34:04 +01:00
Arnaud Fornerot ecbaed5c85 Merge branch 'master' into dist/envole/6/master 2022-02-04 11:33:43 +01:00
Arnaud Fornerot e2d9380f65 Merge branch 'master' into dist/envole/6/master 2022-02-03 16:53:55 +01:00
Arnaud Fornerot 21fc95f71e Merge branch 'master' into dist/envole/6/master 2022-02-03 16:49:54 +01:00
Arnaud Fornerot 3818a38106 Merge branch 'master' into dist/envole/6/master 2021-12-08 11:33:34 +01:00
Arnaud Fornerot d155d5331f Merge branch 'master' into dist/envole/6/master 2021-12-08 09:39:19 +01:00
Arnaud Fornerot f535e165ef Merge branch 'master' into dist/envole/6/master 2021-12-07 17:06:43 +01:00
Arnaud Fornerot fce9842064 Merge branch 'master' into dist/envole/6/master 2021-12-06 11:56:04 +01:00
Arnaud Fornerot fec7eff6c5 Merge branch 'master' into dist/envole/6/master 2021-10-18 15:10:39 +02:00
Arnaud Fornerot e41093d3b9 Merge branch 'master' into dist/envole/6/master 2021-10-07 10:54:33 +02:00
Arnaud Fornerot 91d2febf2e Merge branch 'master' into dist/envole/6/master 2021-09-14 11:45:01 +02:00
Arnaud Fornerot 0fc2346281 Merge branch 'master' into dist/envole/6/master 2021-08-27 10:59:48 +02:00
Arnaud Fornerot fbb5a4aca6 Merge branch 'master' into dist/envole/6/master 2021-07-20 10:21:52 +02:00
Arnaud Fornerot 98718ccc1e Merge branch 'master' into dist/envole/6/master 2021-07-12 16:35:55 +02:00
Arnaud Fornerot 5147a2b105 Merge branch 'master' into dist/envole/6/master 2021-07-12 15:51:41 +02:00
Arnaud Fornerot 9a260e6ae5 Merge branch 'master' into dist/envole/6/master 2021-07-12 12:49:59 +02:00
Arnaud Fornerot 8b794e8aa1 Merge branch 'master' into dist/envole/6/master 2021-07-05 14:41:20 +02:00
Arnaud Fornerot f228f01c62 Merge branch 'master' into dist/envole/6/master 2021-07-05 10:47:55 +02:00
Arnaud Fornerot de04ab9bdb Merge branch 'master' into dist/envole/6/master 2021-06-17 15:08:49 +02:00
Arnaud Fornerot 729ed9fba9 Merge branch 'master' into dist/envole/6/master 2021-06-15 10:21:33 +02:00
Arnaud Fornerot 39f45ab8b8 resolution conflit 2021-06-11 15:38:41 +02:00
Arnaud Fornerot aef67571f6 Merge branch 'master' into dist/envole/6/master 2021-05-21 11:06:50 +02:00
Arnaud Fornerot 2ec1ae6824 Merge branch 'master' into dist/envole/6/master 2021-05-17 11:17:31 +02:00
Arnaud Fornerot 0ab5a40d98 Merge branch 'master' into dist/envole/6/master 2021-05-06 13:47:42 +02:00
Arnaud Fornerot edd59cd60c Merge branch 'master' into dist/envole/6/master 2021-05-04 11:08:09 +02:00
Arnaud Fornerot da0f0ad0f3 Merge branch 'master' into dist/envole/6/master 2021-04-27 10:13:40 +02:00
Arnaud Fornerot 996651ca0e Merge branch 'master' into dist/envole/6/master 2021-04-26 15:43:33 +02:00
Arnaud Fornerot a78b2051f1 Merge branch 'master' into dist/envole/6/master 2021-04-21 09:18:28 +02:00
Arnaud Fornerot d61216216a Merge branch 'master' into dist/envole/6/master 2021-04-08 10:31:36 +02:00
Arnaud Fornerot 1381e4f7be Merge branch 'master' into dist/envole/6/master 2021-04-02 14:39:51 +02:00
Arnaud Fornerot 1d490ae066 Merge branch 'master' into dist/envole/6/master 2021-04-02 11:12:10 +02:00
Arnaud Fornerot a2a54c3501 Merge branch 'master' into dist/envole/6/master 2021-04-02 10:19:34 +02:00
Arnaud Fornerot 2d88133e60 Merge branch 'master' into dist/envole/6/master 2021-03-29 16:10:28 +02:00
Arnaud Fornerot fdb7c9850e Merge branch 'master' into dist/envole/6/master 2021-03-29 09:22:37 +02:00
Arnaud Fornerot 3b6095cec7 Merge branch 'master' into dist/envole/6/master 2021-03-26 10:40:39 +01:00
Arnaud Fornerot 75925d4969 Merge branch 'master' into dist/envole/6/master 2021-03-26 09:52:00 +01:00
Arnaud Fornerot 74c0a44f56 Merge branch 'master' into dist/envole/6/master 2021-03-24 09:21:53 +01:00
Arnaud Fornerot 788e0f511f Merge branch 'master' into dist/envole/6/master 2021-03-12 16:55:26 +01:00
Arnaud Fornerot 1461ceca06 Merge branch 'master' into dist/envole/6/master 2021-03-12 11:52:45 +01:00
Arnaud Fornerot 4328e7b7c8 Merge branch 'master' into dist/envole/6/master 2021-03-11 11:09:36 +01:00
Arnaud Fornerot 9433a39649 Merge branch 'master' into dist/envole/6/master 2021-03-10 16:45:35 +01:00
Arnaud Fornerot 4247ead6bd Merge branch 'master' into dist/envole/6/master 2021-03-09 10:31:18 +01:00
Arnaud Fornerot 3389eecb74 Merge branch 'master' into dist/envole/6/master 2021-03-09 10:12:12 +01:00
Arnaud Fornerot ee4c59a859 Merge branch 'master' into dist/envole/6/master 2021-03-08 16:01:39 +01:00
Arnaud Fornerot f2df26e0d9 Merge branch 'master' into dist/envole/6/master 2021-03-08 15:46:37 +01:00
Arnaud Fornerot 429ce0ba1f Merge branch 'master' into dist/envole/6/master 2021-03-08 15:29:11 +01:00
Arnaud Fornerot 4314cec399 Merge branch 'master' into dist/envole/6/master 2021-03-08 10:50:49 +01:00
Arnaud Fornerot aaaf22e3ba Merge branch 'master' into dist/envole/6/master 2021-03-05 17:00:51 +01:00
Arnaud Fornerot 23219dd58e Merge branch 'master' into dist/envole/6/master 2021-03-05 16:27:00 +01:00
Arnaud Fornerot a11928569b Merge branch 'master' into dist/envole/6/master 2021-03-05 15:22:17 +01:00
Arnaud Fornerot b40e3c4eb8 Merge branch 'master' into dist/envole/6/master 2021-03-04 17:04:20 +01:00
Arnaud Fornerot b2d20b59cc Merge branch 'master' into dist/envole/6/master 2021-03-04 13:48:06 +01:00
Arnaud Fornerot 0ed4fec378 Merge branch 'master' into dist/envole/6/master 2021-03-03 18:08:01 +01:00
Arnaud Fornerot e1458a0cac Merge branch 'master' into dist/envole/6/master 2021-03-03 17:36:12 +01:00
Arnaud Fornerot c17677e871 Merge branch 'master' into dist/envole/6/master 2021-03-03 16:39:00 +01:00
Arnaud Fornerot 0904f306ce Merge branch 'master' into dist/envole/6/master 2021-02-24 17:01:12 +01:00
Arnaud Fornerot 69848cf0cf Merge branch 'master' into dist/envole/6/master 2021-02-24 10:55:33 +01:00
Arnaud Fornerot 8da037fd77 Merge branch 'master' into dist/envole/6/master 2021-02-23 16:35:25 +01:00
Arnaud Fornerot 9cae1480bb Merge branch 'master' into dist/envole/6/master 2021-02-23 13:45:47 +01:00
Arnaud Fornerot 34123aeb58 Merge branch 'master' into dist/envole/6/master 2021-02-23 13:29:08 +01:00
Arnaud Fornerot 83eac6491c Merge branch 'master' into dist/envole/6/master 2021-02-19 13:01:30 +01:00
Arnaud Fornerot 824a23e172 Merge branch 'master' into dist/envole/6/master 2021-02-17 10:55:58 +01:00
Arnaud Fornerot 36a9b2e2bd Merge branch 'master' into dist/envole/6/master 2021-02-09 16:48:32 +01:00
Arnaud Fornerot 3f9bd75d82 Merge branch 'master' into dist/envole/6/master 2021-02-09 09:53:00 +01:00
Arnaud Fornerot 2bb89b008d Merge branch 'master' into dist/envole/6/master 2021-02-03 10:52:03 +01:00
Arnaud Fornerot c82afe13de Merge branch 'master' into dist/envole/6/master 2021-02-02 11:23:14 +01:00
Arnaud Fornerot 3442eb0d12 Merge branch 'master' into dist/envole/6/master 2021-02-01 11:35:39 +01:00
Arnaud Fornerot 30a89a23b8 Merge branch 'master' into dist/envole/6/master 2021-02-01 11:08:39 +01:00
Arnaud Fornerot 0afd32a4e6 Merge branch 'master' into dist/envole/6/master 2021-01-28 10:30:36 +01:00
Arnaud Fornerot 6890d67bba Merge branch 'master' into dist/envole/6/master 2021-01-27 15:42:12 +01:00
Arnaud Fornerot e684ee6701 Merge branch 'master' into dist/envole/6/master 2021-01-27 10:48:20 +01:00
Arnaud Fornerot 031ca517ed Merge branch 'master' into dist/envole/6/master 2021-01-25 15:02:36 +01:00
Arnaud Fornerot ff9d07e0cb Merge branch 'master' into dist/envole/6/master 2021-01-21 17:32:11 +01:00
Arnaud Fornerot 2077f643ab Merge branch 'master' into dist/envole/6/master 2021-01-21 16:03:06 +01:00
Arnaud Fornerot c88666dc9f resolution conflic 2021-01-21 15:23:45 +01:00
Arnaud Fornerot 4a92ef8dbb Merge branch 'master' into dist/envole/6/master 2021-01-20 16:30:05 +01:00
Arnaud Fornerot 92923badd8 prise en compte du logrotate dans le paquet 2021-01-20 13:23:15 +01:00
Arnaud Fornerot de2bf97fef Merge branch 'master' into dist/envole/6/master 2021-01-13 10:38:50 +01:00
Arnaud Fornerot 258a7089d1 Merge branch 'master' into dist/envole/6/master 2021-01-13 09:18:05 +01:00
Arnaud Fornerot 907ea53eb1 Merge branch 'master' into dist/envole/6/master 2021-01-08 15:49:44 +01:00
Arnaud Fornerot d69e869c10 Merge branch 'master' into dist/envole/6/master 2021-01-08 14:55:28 +01:00
Arnaud Fornerot ff71bfb5a4 Merge branch 'master' into dist/envole/6/master 2021-01-05 10:06:37 +01:00
Arnaud Fornerot d2dbe98e64 Merge branch 'master' into dist/envole/6/master 2020-12-16 11:55:19 +01:00
Arnaud Fornerot cce91c421a Merge branch 'master' into dist/envole/6/master 2020-12-16 11:14:37 +01:00
Arnaud Fornerot 5dd372f2a2 Merge branch 'master' into dist/envole/6/master 2020-12-16 10:24:08 +01:00
Arnaud Fornerot 0dba8c4dc1 resolve conflic 2020-12-15 16:37:58 +01:00
Arnaud Fornerot 8dc2d81ab3 Merge branch 'master' into dist/envole/6/master 2020-11-19 15:16:20 +01:00
Arnaud Fornerot 0885efd1f4 Merge branch 'master' into dist/envole/6/master 2020-11-06 14:10:45 +01:00
Arnaud Fornerot b648137665 Merge branch 'master' into dist/envole/6/master 2020-10-27 09:05:42 +01:00
Arnaud Fornerot cd4472ee71 Merge branch 'master' into dist/envole/6/master 2020-10-23 14:28:03 +02:00
Arnaud Fornerot 2c8cc7a987 Merge branch 'master' into dist/envole/6/master 2020-10-23 14:03:55 +02:00
Arnaud Fornerot f07b95f1e4 Merge branch 'master' into dist/envole/6/master 2020-10-21 15:32:13 +02:00
Arnaud Fornerot ae1a97bcbd Merge branch 'master' into dist/envole/6/master 2020-10-19 11:01:12 +02:00
Arnaud Fornerot 632102c813 Merge branch 'master' into dist/envole/6/master 2020-10-19 10:33:11 +02:00
Arnaud Fornerot 5326152ff4 Merge branch 'master' into dist/envole/6/master 2020-10-14 09:44:50 +02:00
Arnaud Fornerot c02d5f0869 Merge branch 'master' into dist/envole/6/master 2020-10-13 17:40:03 +02:00
Arnaud Fornerot 6f752a6b44 Merge branch 'master' into dist/envole/6/master 2020-10-13 11:15:45 +02:00
Arnaud Fornerot 9b6e140808 resolution merge 2020-10-09 15:49:56 +02:00
Arnaud Fornerot 30e4609f6f Merge branch 'master' into dist/envole/6/master 2020-10-07 11:14:49 +02:00
Arnaud Fornerot cc71a435f7 Merge branch 'master' into dist/envole/6/master 2020-10-06 17:12:50 +02:00
Arnaud Fornerot d32ded9f5e Merge branch 'master' into dist/envole/6/master 2020-10-01 16:35:39 +02:00
Arnaud Fornerot b1d9c2dc63 Merge branch 'master' into dist/envole/6/master 2020-10-01 16:09:55 +02:00
Arnaud Fornerot 173ceacc8e Merge branch 'master' into dist/envole/6/master 2020-09-30 17:07:13 +02:00
Arnaud Fornerot 0999f11f8c Merge branch 'master' into dist/envole/6/master 2020-09-29 09:09:32 +02:00
Arnaud Fornerot 273ce5a3df Merge branch 'master' into dist/envole/6/master 2020-09-24 16:22:59 +02:00
Arnaud Fornerot d8be4e06e1 Merge branch 'master' into dist/envole/6/master 2020-09-23 15:30:46 +02:00
Arnaud Fornerot d64c20519d Merge branch 'master' into dist/envole/6/master 2020-09-23 14:48:43 +02:00
Arnaud Fornerot a2ebec25f8 Merge branch 'master' into dist/envole/6/master 2020-09-21 11:00:22 +02:00
Arnaud Fornerot 2e5a8d39a5 Merge branch 'master' into dist/envole/6/master 2020-09-18 15:14:50 +02:00
Arnaud Fornerot 82b329ab8f Merge branch 'master' into dist/envole/6/master 2020-09-17 15:36:41 +02:00
Arnaud Fornerot 6da8f15c2d Merge branch 'master' into dist/envole/6/master 2020-09-02 16:25:44 +02:00
Arnaud Fornerot 8659a32942 resolution conflit 2020-09-02 11:48:45 +02:00
Arnaud Fornerot 68c8d599ff Merge branch 'master' into dist/envole/6/master 2020-07-27 10:19:39 +02:00
Arnaud Fornerot 95784beed6 Merge branch 'master' into dist/envole/6/master 2020-07-23 10:09:10 +02:00
Arnaud Fornerot 30eb0d07e2 Merge branch 'master' into dist/envole/6/master 2020-07-22 13:39:52 +02:00
Arnaud Fornerot 87ef7fb6c7 resolution merge 2020-07-17 16:08:06 +02:00
Arnaud Fornerot af5fbf0a6a Merge branch 'master' into dist/envole/6/master 2020-07-15 16:57:37 +02:00
Arnaud Fornerot 4ae4dabb9f resolv conflict 2020-07-10 12:23:07 +02:00
Arnaud Fornerot 2392318922 Merge branch 'master' into dist/envole/6/master 2020-07-10 09:37:23 +02:00
Arnaud Fornerot 5ee9a52554 Merge branch 'master' into dist/envole/6/master 2020-07-07 09:25:12 +02:00
Arnaud Fornerot ec6cf7e062 Merge branch 'master' into dist/envole/6/master 2020-07-06 12:00:07 +02:00
Arnaud Fornerot 5cdd0a6703 Merge branch 'master' into dist/envole/6/master 2020-07-06 11:54:32 +02:00
Arnaud Fornerot d1637e4efa Merge branch 'master' into dist/envole/6/master 2020-06-26 15:46:34 +02:00
Arnaud Fornerot ba41570721 Merge branch 'master' into dist/envole/6/master 2020-06-26 08:43:25 +02:00
Arnaud Fornerot 0777934192 Merge branch 'master' into dist/envole/6/master 2020-06-25 13:40:55 +02:00
Arnaud Fornerot 0a6a5abe38 conflic 2020-06-24 13:46:57 +02:00
Arnaud Fornerot 220bb795ae Merge branch 'master' into dist/envole/6/master 2020-06-24 12:04:55 +02:00
Arnaud Fornerot 1877f101ee Merge branch 'master' into dist/envole/6/master 2020-06-24 11:41:37 +02:00
Arnaud Fornerot 50ae3ed4c4 Merge branch 'master' into dist/envole/6/master 2020-06-24 09:54:52 +02:00
Arnaud Fornerot e03af01666 Merge branch 'master' into dist/envole/6/master 2020-06-22 13:32:50 +02:00
Arnaud Fornerot 36b8cee983 Merge branch 'master' into dist/envole/6/master 2020-06-22 09:49:41 +02:00
Arnaud Fornerot 286e49653e Merge branch 'master' into dist/envole/6/master 2020-06-18 11:59:09 +02:00
Arnaud Fornerot 3a0c0c1458 Merge branch 'master' into dist/envole/6/master 2020-06-18 10:59:45 +02:00
Arnaud Fornerot 58a07356be resol merge 2020-06-17 08:52:17 +02:00
Arnaud Fornerot de87ac1261 Merge branch 'master' into dist/envole/6/master 2020-05-27 15:37:14 +02:00
Arnaud Fornerot 9f99fe2c3f Merge branch 'master' into dist/envole/6/master 2020-05-27 15:34:34 +02:00
Arnaud Fornerot 2d2d8f0938 Merge branch 'master' into dist/envole/6/master 2020-05-15 16:03:17 +02:00
Arnaud Fornerot 3f10684027 resolution merge 2020-05-15 15:52:05 +02:00
Arnaud Fornerot 8fe1009186 Merge branch 'master' into dist/envole/6/master 2020-05-15 15:37:05 +02:00
Arnaud Fornerot 314ec0e85c Merge branch 'master' into dist/envole/6/master 2020-04-21 12:22:11 +02:00
Arnaud Fornerot 59e4b0ee28 Merge branch 'master' into dist/envole/6/master 2020-04-20 16:05:30 +02:00
Arnaud Fornerot d983e70f1d Merge branch 'master' into dist/envole/6/master 2020-04-20 13:58:46 +02:00
Arnaud Fornerot 425eeb4f3b Merge branch 'master' into dist/envole/6/master 2020-04-20 11:33:02 +02:00
Arnaud Fornerot 0cb286080d Merge branch 'master' into dist/envole/6/master 2020-04-20 09:36:38 +02:00
Arnaud Fornerot 3eedb4d086 Merge branch 'master' into dist/envole/6/master 2020-04-20 08:49:54 +02:00
Arnaud Fornerot 362047c295 Merge branch 'master' into dist/envole/6/master 2020-04-16 16:11:00 +02:00
Arnaud Fornerot f3d465f491 Merge branch 'master' into dist/envole/6/master 2020-03-09 11:29:34 +01:00
Arnaud Fornerot 189ed35825 Merge branch 'master' into dist/envole/6/master 2020-03-09 09:29:53 +01:00
Arnaud Fornerot 767dbe7230 Merge branch 'master' into dist/envole/6/master 2020-03-03 10:56:48 +01:00
Arnaud Fornerot c74f82e475 Merge branch 'master' into dist/envole/6/master 2020-03-03 10:22:38 +01:00
Arnaud Fornerot 75e2737524 Merge branch 'master' into dist/envole/6/master 2020-02-28 15:37:42 +01:00
Arnaud Fornerot c788b97fca Merge branch 'master' into dist/envole/6/master 2020-02-28 10:58:13 +01:00
Arnaud Fornerot c813e78c69 Merge branch 'master' into dist/envole/6/master 2020-02-26 17:41:48 +01:00
Arnaud Fornerot e2da7e081f reglage conflit 2020-02-26 10:31:49 +01:00
Arnaud Fornerot afaa822d50 conflit 2020-02-13 11:21:06 +01:00
Arnaud Fornerot 90eb93eebe Merge branch 'master' into dist/envole/6/master 2020-02-13 09:39:48 +01:00
Arnaud Fornerot 03526d3374 Merge branch 'master' into dist/envole/6/master 2020-02-12 09:45:35 +01:00
Arnaud Fornerot bb77cc0ea0 Merge branch 'master' into dist/envole/6/master 2020-02-10 10:52:24 +01:00
Arnaud Fornerot 5adab0951c Merge branch 'master' into dist/envole/6/master 2020-02-10 10:33:31 +01:00
Arnaud Fornerot fc06da09c9 Merge branch 'master' into dist/envole/6/master 2020-02-10 09:52:42 +01:00
Arnaud Fornerot 743e9b6d3b Merge branch 'master' into dist/envole/6/master 2020-01-16 16:21:14 +01:00
Arnaud Fornerot bc2e2b4e4c Merge branch 'master' into dist/envole/6/master 2020-01-13 15:47:48 +01:00
Arnaud Fornerot d649c11821 Merge branch 'master' into dist/envole/6/master 2020-01-08 15:45:34 +01:00
Arnaud Fornerot 61c8ad37fd Merge branch 'master' into dist/envole/6/master 2020-01-08 15:27:07 +01:00
Arnaud Fornerot a97ba39dbd Merge branch 'master' into dist/envole/6/master 2020-01-06 09:21:19 +01:00
Arnaud Fornerot 3e35acb028 Merge branch 'master' into dist/envole/6/master 2019-12-19 14:13:03 +01:00
Arnaud Fornerot 5b14604d9c Merge branch 'master' into dist/envole/6/master 2019-12-18 14:54:25 +01:00
Arnaud Fornerot 81740cd4e5 Merge branch 'master' into dist/envole/6/master 2019-12-16 17:21:35 +01:00
Arnaud Fornerot 8211c08403 Merge branch 'master' into dist/envole/6/master 2019-12-16 17:20:11 +01:00
Arnaud Fornerot 1acce9d3fd Merge branch 'master' into dist/envole/6/master 2019-12-16 17:14:52 +01:00
Arnaud Fornerot 742383206e Merge branch 'master' into dist/envole/6/master 2019-12-16 17:04:33 +01:00
Arnaud Fornerot f54efc703c Merge branch 'master' into dist/envole/6/master 2019-12-13 15:46:30 +01:00
Arnaud Fornerot d31d2d8628 Merge branch 'master' into dist/envole/6/master 2019-12-09 13:37:56 +01:00
Arnaud Fornerot 8e00e5765a Merge branch 'master' into dist/envole/6/master 2019-12-06 11:21:00 +01:00
Arnaud Fornerot 5f933a67b9 Merge branch 'master' into dist/envole/6/master 2019-12-06 10:59:04 +01:00
Arnaud Fornerot 72ad84e1b7 Merge branch 'master' into dist/envole/6/master 2019-12-05 14:17:49 +01:00
Arnaud Fornerot 0c099b0784 Merge branch 'master' into dist/envole/6/master 2019-11-21 10:42:56 +01:00
Arnaud Fornerot 99f29975d8 resoulion merge 2019-11-20 10:02:37 +01:00
Arnaud Fornerot f141b15e48 dep 2019-11-19 11:00:44 +01:00
Arnaud Fornerot 7416dfaa3e Merge branch 'master' into dist/envole/6/master 2019-11-19 10:28:59 +01:00
Arnaud Fornerot 03e0a1dc7c Merge branch 'master' into dist/envole/6/master 2019-11-19 10:26:14 +01:00
Arnaud Fornerot fb5e3c72ee dependance sur envole-dependances 2019-11-19 10:25:56 +01:00
Arnaud Fornerot a0bb903635 ajout php-imagick en dépendance 2019-11-18 16:34:51 +01:00
Arnaud Fornerot 6ad1eb5569 résolution conflit 2019-11-15 11:45:54 +01:00
afornerot 9cbcdd28b9 déclaration du proxy en http et non plus en tcp (ref #29) 2019-10-29 16:16:41 +01:00
Arnaud Fornerot 2b1625b5f8 Merge branch 'master' into dist/envole/6/master 2019-10-29 09:45:34 +01:00
Arnaud Fornerot 28e9c37e48 Merge branch 'master' into dist/envole/6/master 2019-10-23 10:44:18 +02:00
Arnaud Fornerot 2262bebcda Merge branch 'master' into dist/envole/6/master 2019-10-18 14:10:19 +02:00
Arnaud Fornerot f0ae7eb4f4 Merge branch 'master' into dist/envole/6/master 2019-10-18 13:56:17 +02:00
Arnaud Fornerot df29e2ca71 Merge branch 'master' into dist/envole/6/master 2019-10-16 13:55:20 +02:00
Arnaud Fornerot ef0d452bc2 Merge branch 'master' into dist/envole/6/master 2019-10-09 13:49:02 +02:00
Arnaud Fornerot ab2129de6e Merge branch 'master' into dist/envole/6/master 2019-10-04 11:40:46 +02:00
Arnaud Fornerot b14a2b3434 dep sur composer et envole-themes 2019-09-27 13:46:38 +02:00
Arnaud Fornerot faf244cf06 Merge branch 'master' into dist/envole/6/master 2019-09-27 13:39:57 +02:00
Arnaud Fornerot 1acf74126e Merge branch 'master' into dist/envole/6/master 2019-09-25 14:11:13 +02:00
Arnaud Fornerot 7ebc37268c repertoire debian 2019-09-25 14:08:13 +02:00
11 changed files with 85 additions and 0 deletions

1
debian/compat vendored Normal file
View File

@ -0,0 +1 @@
7

24
debian/control vendored Normal file
View File

@ -0,0 +1,24 @@
Source: eole-ninegate
Section: web
Priority: optional
Maintainer: Equipe Envole <eole@ac-dijon.fr>
Build-Depends: debhelper (>= 7.0.50)
Standards-Version: 3.8.4
Homepage: http://eole.orion.education.fr/diff/
Vcs-Git: http://dev-eole.ac-dijon.fr/git/ninegate
Vcs-Browser: http://dev-eole.ac-dijon.fr/projects/ninegate/repository
Package: ninegate-sso
Architecture: all
Depends: ${misc:Depends}, eole-sso
Description: Filtre SSO pour ninegate "EOLE".
Package: eole-ninegate
Architecture: all
Depends: ${misc:Depends}, eole-web (>= 2.6.1), ninegate-sso, eole-envole-dependances
Description: Eolisation de l'application ninegate.
Package: ninegate-apps
Architecture: all
Depends: ${misc:Depends}, eole-web-pkg (>= 2.6.1), envole-dependances-apps
Description: Sources pour ninegate "EOLE".

44
debian/copyright vendored Normal file
View File

@ -0,0 +1,44 @@
Format: http://dep.debian.net/deps/dep5
Upstream-Name: {PROJECT}
Source: {URL}
Files: *
Copyright: YEAR {UPSTREAM} {AUTHOR} <{MAIL}>
License: {UPSTREAM LICENSE}
Files: debian/*
Copyright: 2012 Équipe EOLE <eole@ac-dijon.fr>
License: CeCILL-2
License: {UPSTREAM LICENSE}
{TEXT OF THE LICENSE}
License: CeCILL-2
This software is governed by the CeCILL-2 license under French law and
abiding by the rules of distribution of free software. You can use,
modify and or redistribute the software under the terms of the CeCILL-2
license as circulated by CEA, CNRS and INRIA at the following URL
"http://www.cecill.info";.
.
As a counterpart to the access to the source code and rights to copy,
modify and redistribute granted by the license, users are provided only
with a limited warranty and the software's author, the holder of the
economic rights, and the successive licensors have only limited
liability.
.
In this respect, the user's attention is drawn to the risks associated
with loading, using, modifying and/or developing or reproducing the
software by the user in light of its specific status of free software,
that may mean that it is complicated to manipulate, and that also
therefore means that it is reserved for developers and experienced
professionals having in-depth computer knowledge. Users are therefore
encouraged to load and test the software's suitability as regards their
requirements in conditions enabling the security of their systems and/or
data to be ensured and, more generally, to use and operate it in the
same conditions as regards security.
.
The fact that you are presently reading this means that you have had
knowledge of the CeCILL-2 license and that you accept its terms.
.
On Eole systems, the complete text of the CeCILL-2 License can be found
in '/usr/share/common-licenses/CeCILL-2-en'.

1
debian/eole-ninegate.install vendored Normal file
View File

@ -0,0 +1 @@
usr/share/eole

3
debian/gbp.conf vendored Normal file
View File

@ -0,0 +1,3 @@
# Set per distribution debian tag
[DEFAULT]
debian-tag = debian/envole/%(version)s

2
debian/ninegate-apps.install vendored Normal file
View File

@ -0,0 +1,2 @@
var/www/html
etc

1
debian/ninegate-sso.install vendored Normal file
View File

@ -0,0 +1 @@
usr/share/sso

8
debian/rules vendored Executable file
View File

@ -0,0 +1,8 @@
#!/usr/bin/make -f
# -*- makefile -*-
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
%:
dh $@

1
debian/source/format vendored Normal file
View File

@ -0,0 +1 @@
3.0 (native)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 27 KiB