Resolve "Pdf-merge lisäykset" - [merged]

[dezhidki]

In GitLab by @vivanauk on Sep 19, 2019, 12:34

Merges 1533-pdf-merge -> master

Closes #1533

[dezhidki]

In GitLab by @vivanauk on Sep 19, 2019, 15:54

added 1 commit

• 4e41ce54 - Add testing attachment validity and don't merge perusliite attachments

Compare with previous version

[dezhidki]

In GitLab by @vivanauk on Sep 20, 2019, 10:23

added 1 commit

• 38124eb4 - Remove wip code

Compare with previous version

[dezhidki]

In GitLab by @vivanauk on Sep 20, 2019, 10:24

added 1 commit

• 0aa08f6e - Add colors to macro-names and error icons

Compare with previous version

[dezhidki]

In GitLab by @vivanauk on Sep 20, 2019, 10:25

added 5 commits

• 0aa08f6e...dcfbe26f - 2 commits from branch master
• 74d6a50e - Add testing attachment validity and don't merge perusliite attachments
• 3c596bd8 - Remove wip code
• 0ad00e6b - Add colors to macro-names and error icons

Compare with previous version

[dezhidki]

In GitLab by @vivanauk on Sep 20, 2019, 10:37

added 1 commit

• bc605320 - Fix macro colors not showing

Compare with previous version

[dezhidki]

In GitLab by @Smibu on Sep 20, 2019, 10:37

Commented on timApp/util/pdftools.py line 391

paragraphs tyyppi näkyviin (List[DocParagraph] nähtävästi).

[dezhidki]

In GitLab by @Smibu on Sep 20, 2019, 10:37

Commented on timApp/static/scripts/tim/document/minutes/mergePdfCtrl.ts line 136

Tässä ng-style mieluummin, eli macroStyle palauttaisi objektin eikä merkkijonon.

[dezhidki]

In GitLab by @Smibu on Sep 20, 2019, 10:37

Commented on timApp/util/pdftools.py line 342

paragraphs tyyppi näkyviin (List[DocParagraph] nähtävästi).

[dezhidki]

In GitLab by @vivanauk on Sep 20, 2019, 10:47

resolved all threads

[dezhidki]

In GitLab by @vivanauk on Sep 20, 2019, 10:48

Commented on timApp/util/pdftools.py line 391

changed this line in version 6 of the diff

[dezhidki]

In GitLab by @vivanauk on Sep 20, 2019, 10:48

Commented on timApp/util/pdftools.py line 342

changed this line in version 6 of the diff

[dezhidki]

In GitLab by @vivanauk on Sep 20, 2019, 10:48

added 1 commit

• 44bd8904 - Adress review comments

Compare with previous version

[dezhidki]

In GitLab by @vivanauk on Sep 20, 2019, 10:48

added 1 commit

• 5f4d87e8 - Address review comments

Compare with previous version

[dezhidki]

In GitLab by @Smibu on Sep 20, 2019, 11:24

unmarked as a Work In Progress

[dezhidki]

In GitLab by @Smibu on Sep 20, 2019, 11:24

approved this merge request

[dezhidki]

In GitLab by @Smibu on Sep 20, 2019, 11:24

merged

[dezhidki]

In GitLab by @vivanauk on Sep 20, 2019, 13:02

marked as a Work In Progress

[dezhidki]

In GitLab by @vivanauk on Sep 20, 2019, 13:26

unmarked as a Work In Progress

[dezhidki]

In GitLab by @vivanauk on Sep 20, 2019, 13:26

unassigned @vivanauk