scodoc9_placement_PR #126

jmplace · 2021-09-18T11:12:22+02:00

jmplace commented

2021-09-18 11:12:22 +02:00

Deuxième essai

jmplace added 27 commits 2021-09-18 11:12:22 +02:00

770ccb4d6e fin fusion

a4d0205cc7 Merge remote-tracking branch 'origin/master' into clean

f828134ea2 complements scodoc.css pour formulaire

37484b7fc9 Merge branch 'master' into clean

050e54de3e placement fait

35768e9241 placement fait

ed07e42222 placement fait

7f63ab222b before refactoring

c8872bd220 excel file returned

c44aa808df preparation envoi fichier

01c264c3c7 add copy to .gitignore

a23ae38014 integration master

0ef822cfd8 déplacement du template placement

b3225e07f7 avant tests

5f6c434497 minor refactor

b6cc251c94 minor changes

5f0f437f2e Merge remote-tracking branch 'jmplace/temp' into temp

# Conflicts:
#	app/scodoc/sco_placement.py

42ef9f795f Merge remote-tracking branch 'origin/master' into temp

# Conflicts:
#	app/scodoc/sco_placement.py

44117fb0e2 blackify + suppress cr-at-eol

b03eee12a1 pylint corrections

6e7a104fb0 pylint corrections (suite)

87ecd09f0e fix a regression ; eliminate send_from_flask

2a72fb881b replace send_excel_file by scu.send_file

2519d08e40 remove breakpoints() + blackify

80f5536de5 Merge remote-tracking branch 'origin/master' into scodoc9_placement_PR

# Conflicts:
#	app/scodoc/sco_groups_view.py
#	app/scodoc/sco_placement.py

c955870e1e recheck

f7961a135a finalisation

viennet merged commit 11ba73d264 into master

2021-09-18 13:43:11 +02:00

viennet referenced this issue from a commit

2021-09-18 13:43:12 +02:00

Merge pull request 'scodoc9_placement_PR' (#126) from jmplace/ScoDoc-Lille:scodoc9_placement_PR into master

Sign in to join this conversation.

No reviewers

No Label

No Milestone

No project

No Assignees

1 Participants

Notifications

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: ScoDoc/ScoDoc#126