Commit Graph

2365 Commits

Author SHA1 Message Date
leonard_montalbano
0db3acf271 fix des diff avec le master 2022-07-08 15:11:45 +02:00
leonard_montalbano
8b3c0ea414 Merge branch 'master' of https://scodoc.org/git/ScoDoc/ScoDoc into new_api 2022-07-08 15:06:04 +02:00
leonard_montalbano
e822ab4da0 Merge branch 'new_api' of https://scodoc.org/git/leonard.montalbano/ScoDoc into new_api 2022-07-08 14:28:34 +02:00
5806cd29a7 Fix: API /formsemestres_courants 2022-07-07 22:29:27 +02:00
07cd5041ff gitignore symlinks 2022-07-07 17:21:23 +02:00
11f6492965 Merge branch 'entreprises' of https://scodoc.org/git/viennet/ScoDoc 2022-07-07 16:40:22 +02:00
75923c161a black migration + version 9.3.16 2022-07-07 16:39:27 +02:00
f2f3fd0660 correction sco_excel 2022-07-07 15:30:50 +02:00
989930e4ce Merge branch 'new_api' of https://scodoc.org/git/leonard.montalbano/ScoDoc into new_api 2022-07-07 14:48:19 +02:00
1fd296179d fix des conflits 2022-07-07 14:47:06 +02:00
0140c404ea Merge branch 'entreprises' of https://scodoc.org/git/ScoDoc/ScoDoc into entreprises 2022-07-07 14:46:41 +02:00
a297126c1c Supprimer 'app/static/links/9.3.15' 2022-07-07 14:32:41 +02:00
98634f0d93 ajout tests unitaires pour bulletins formsemestre 2022-07-07 13:06:57 +02:00
7c340c798a version 2022-07-07 12:09:55 +02:00
d1250555b9 Merge branch 'master' of https://scodoc.org/git/viennet/ScoDoc 2022-07-07 12:01:16 +02:00
d8ff5152d1 Amélioration sco_excel 2022-07-07 11:59:47 +02:00
48912032c4 Amélioration sco_excel 2022-07-07 11:56:18 +02:00
89a64d92d3 Merge pull request 'Correction bug : "Faire figurer les décisions sur les bulletins"' (#436) from lehmann/ScoDoc-Front:master into master
Reviewed-on: https://scodoc.org/git/ScoDoc/ScoDoc/pulls/436
2022-07-06 23:28:20 +02:00
f9b4a582f5 Correction bug : "Faire figurer les décisions sur les bulletins" 2022-07-06 21:17:39 +02:00
ec987ad8fa ajout file d'ariane 2022-07-06 20:37:20 +02:00
17b73936de Merge branch 'entreprises' of https://scodoc.org/git/arthur.zhu/ScoDoc into entreprises 2022-07-06 17:35:42 +02:00
97b5ab8179 Page saisie jury: affiche version classique ou BUT 2022-07-06 00:19:02 +02:00
c9aa55979b Misc fixes. Suppr. validations BUT. 2022-07-06 00:05:14 +02:00
83ddd2bf03 Bul. DUT/ classic JSON: champ 'publie' 2022-07-05 20:40:21 +02:00
312faf74fb Fix: publication bulletin 2022-07-05 20:37:38 +02:00
180c21ffc4 Merge pull request 'Décisions RCUE relevé' (#429) from lehmann/ScoDoc-Front:master into master
Reviewed-on: https://scodoc.org/git/ScoDoc/ScoDoc/pulls/429
2022-07-05 19:55:52 +02:00
9474d420df fix problème symlinks 2022-07-05 16:09:26 +02:00
428cc61527 Décisions RCUE relevé 2022-07-05 15:46:17 +02:00
aa97a10bf8 Ajout d'informations sur l'arrêté BUT 2022-07-05 11:41:58 +02:00
512b38665f Jury BUT: traitement des DEF et DEM. Close #426 2022-07-04 23:50:55 +02:00
9f7d6a3020 lié migrations appli relations entreprises 2022-07-04 21:12:56 +02:00
9d26c3126a Merge branch 'master' of https://scodoc.org/git/ScoDoc/ScoDoc into entreprises 2022-07-04 20:45:58 +02:00
fa358c2da4 Fix: import users vide 2022-07-04 17:23:51 +02:00
b6052bf75f merge 2022-07-04 17:16:54 +02:00
0ad0521a6e Merge pull request 'Edit coef : correction flottants + somme ne prend plus en compte les bonus' (#427) from lehmann/ScoDoc-Front:master into master
Reviewed-on: https://scodoc.org/git/ScoDoc/ScoDoc/pulls/427
2022-07-04 17:13:49 +02:00
9bf05dd9cd Edit coef : correction flotants + somme ne prend plus en compte les bonus 2022-07-04 16:42:10 +02:00
3e62d9b425 Edit coef : correction nombres flotant & somme sans bonus 2022-07-04 16:38:26 +02:00
7e642317d3 cosmetic 2022-07-03 22:45:56 +02:00
d65a30a9e9 Tableaux recap: sauvegarde état. Close #414 2022-07-03 16:14:03 +02:00
c1f7bcdb92 Clé tri étudiants: laisse espaces internes 2022-07-03 11:30:07 +02:00
962015563a Fix: bug calcul année but 2022-07-03 08:38:12 +02:00
835234779f annotations 2022-07-03 08:31:01 +02:00
0bf636814d Merge branch 'master' of https://scodoc.org/git/viennet/ScoDoc 2022-07-02 11:17:15 +02:00
c5c7e9135b quelques annotations 2022-07-02 11:17:04 +02:00
fc7d844e53 Merge pull request 'fix logoname with dot problem' (#424) from jmplace/ScoDoc-Lille:fix_logoname_with_dot into master
Reviewed-on: https://scodoc.org/git/ScoDoc/ScoDoc/pulls/424
2022-07-02 10:57:55 +02:00
Jean-Marie PLACE
bc11f97354 fix logoname with dot problem 2022-07-02 10:53:56 +02:00
720e891f23 Optimisation apo_semset_maq_status 2022-07-02 00:00:29 +02:00
d23649d725 Améliore PV jury BUT: col. UEs, largeurs en excel, divers. 2022-07-01 22:29:31 +02:00
dbf562b701 Export table tcue: close #421 2022-07-01 16:34:36 +02:00
5a8add1aac Fix: calcul malus sur données vides 2022-07-01 09:48:08 +02:00