Add Split Packages and output file format options #104

aguilerapy · 2020-07-03T00:49:33Z

closes #81

…o 81-split_files

81 split files

aguilerapy · 2020-07-03T00:57:43Z

Work of @Ravf95 from UCA.

aguilerapy · 2020-07-03T01:05:08Z

closes #82

# Conflicts: # default/templates/default/compile.html # locale/es/LC_MESSAGES/django.po

romifz

Looks good, my only question is why the encoding/pretty print options are not available for other features like compile and to-json.

Also, I think we don't have a URL input option for this feature, should we use this PR to add it?

default/decorators.py

default/static/js/uploader.js

default/templates/default/snippets/optional_arguments.html

default/templates/default/split-packages.html

locale/es/LC_MESSAGES/django.po

# Conflicts: # default/static/css/custom.css

Co-authored-by: Romina Fernández <romifz@gmail.com>

# Conflicts: # default/templates/default/split-packages.html

default/static/js/uploader.js

Co-authored-by: Romina Fernández <romifz@gmail.com>

# Conflicts: # default/decorators.py # default/static/js/uploader.js # default/templates/default/base-uploader.html # default/templates/default/compile.html # default/templates/default/snippets/published_date_scripts.html # default/templates/default/snippets/url_uploader_scripts.html # default/templates/default/to-json.html # default/templates/default/to-spreadsheet.html # default/templates/default/upgrade.html # default/views.py # locale/es/LC_MESSAGES/django.po

romifz

I've added a few small suggestions, once they're addressed I think we are good to go.

default/static/js/uploader.js

default/static/js/url_uploader.js

locale/es/LC_MESSAGES/django.po

Co-authored-by: Romina Fernández <romifz@gmail.com>

…nto 81-split_files

# Conflicts: # default/templates/default/to-spreadsheet.html # default/views.py # locale/es/LC_MESSAGES/django.po

Ravf95 and others added 15 commits June 1, 2020 14:31

added new function, split packages

c5364fd

Merge branch '81-split_files' of https://github.com/Ravf95/toucan int…

6a56e15

…o 81-split_files

added pretty json and encoding to optional arguments

c85a733

changes for formatted imports

20c8465

updates and fixes

4279f71

applied suggested changes

1441bdc

Merge pull request #99 from Ravf95/81-split_files

aa45592

81 split files

Add new icon for split-packages

c5b1538

Update index.html

e4f6657

Update descriptions for split-packages

7dd50fa

Update name method for split-packages

2720ebf

Reorder paths

de03eb8

Update check split size

3ed9e80

Update translations

aa75a10

Fix warning

8e93be7

aguilerapy changed the title ~~Add Split Package~~ Add Split Packages Jul 3, 2020

aguilerapy changed the title ~~Add Split Packages~~ Add Split Packages and output file format options Jul 3, 2020

aguilerapy mentioned this pull request Jul 3, 2020

Hide options after finishing processing #105

Closed

aguilerapy added 2 commits July 6, 2020 09:09

Merge branch 'master' into 81-split_files

5221c84

# Conflicts: # default/templates/default/compile.html # locale/es/LC_MESSAGES/django.po

Fix merge conflicts and update translations

e766b6d

aguilerapy requested a review from romifz July 6, 2020 23:12

romifz suggested changes Jul 10, 2020

View reviewed changes

aguilerapy and others added 6 commits July 16, 2020 13:49

Merge branch 'master' into 81-split_files

20465c8

# Conflicts: # default/static/css/custom.css

Update default/templates/default/split-packages.html

9c36ba3

Co-authored-by: Romina Fernández <romifz@gmail.com>

Update to validate_split_size

5ad9f0a

Update templates

3db92b5

Update translations

0470613

Merge remote-tracking branch 'origin/81-split_files' into 81-split_files

23eaee6

# Conflicts: # default/templates/default/split-packages.html

aguilerapy added 6 commits July 20, 2020 21:49

Update translations

6ff61bc

Update decorators

7ea5d22

Update templates and create js files

7819ad2

Fix template

0406942

Update translations

d955cbc

Fix warning

d95e156

aguilerapy requested a review from romifz July 24, 2020 00:15

romifz suggested changes Jul 25, 2020

View reviewed changes

default/static/js/uploader.js Outdated Show resolved Hide resolved

default/static/js/uploader.js Outdated Show resolved Hide resolved

aguilerapy and others added 2 commits July 27, 2020 11:52

Update default/static/js/uploader.js

eed2435

Co-authored-by: Romina Fernández <romifz@gmail.com>

Remove trigger

b132f35

aguilerapy requested a review from romifz July 27, 2020 16:01

aguilerapy mentioned this pull request Aug 4, 2020

Allow the results of one function to be the input for another function #96

Merged

aguilerapy removed the request for review from romifz August 6, 2020 15:30

aguilerapy added 2 commits August 7, 2020 14:42

Add options for to-json

1638a8e

Update tests

ac6ff1b

aguilerapy requested a review from romifz August 7, 2020 19:34

aguilerapy added 3 commits August 12, 2020 18:52

Fix merge conflicts

6ad4dc1

Fix merge conflicts and minor changes

0962f94

romifz suggested changes Aug 14, 2020

View reviewed changes

default/static/js/uploader.js Outdated Show resolved Hide resolved

default/static/js/uploader.js Outdated Show resolved Hide resolved

default/static/js/url_uploader.js Outdated Show resolved Hide resolved

locale/es/LC_MESSAGES/django.po Show resolved Hide resolved

aguilerapy and others added 4 commits September 3, 2020 21:23

Update changes

71ddca5

Apply suggestions from code review

adef9a6

Co-authored-by: Romina Fernández <romifz@gmail.com>

Merge branch 'master' into 81-split_files

d9ba4bf

Merge branch '81-split_files' of github.com:open-contracting/toucan i…

e65a31b

…nto 81-split_files

romifz approved these changes Sep 4, 2020

View reviewed changes

aguilerapy added 2 commits September 8, 2020 09:36

Merge branch 'master' into 81-split_files

019b420

# Conflicts: # default/templates/default/to-spreadsheet.html # default/views.py # locale/es/LC_MESSAGES/django.po

Fix merge conflicts

5c9de63

romifz approved these changes Sep 8, 2020

View reviewed changes

romifz merged commit 2fa3d53 into master Sep 8, 2020

romifz deleted the 81-split_files branch September 8, 2020 23:56

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Split Packages and output file format options #104

Add Split Packages and output file format options #104

aguilerapy commented Jul 3, 2020

aguilerapy commented Jul 3, 2020

aguilerapy commented Jul 3, 2020

romifz left a comment

romifz left a comment

Add Split Packages and output file format options #104

Add Split Packages and output file format options #104

Conversation

aguilerapy commented Jul 3, 2020

aguilerapy commented Jul 3, 2020

aguilerapy commented Jul 3, 2020

romifz left a comment

Choose a reason for hiding this comment

romifz left a comment

Choose a reason for hiding this comment