Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Topic Collections + Harvest JSON #595

Closed
wants to merge 55 commits into from
Closed

Topic Collections + Harvest JSON #595

wants to merge 55 commits into from

Conversation

Fasand
Copy link
Contributor

@Fasand Fasand commented Aug 5, 2021 •
edited
Loading

Jelikož jsem na TC začal pracovat až po několika změnách na Harvests a základním nastavení pro Harvest JSON, ještě to nechám trochu uležet a PR nakonec bude jak pro Harvest JSON tak pro Topic Collection rozdělení.

Fasand added 25 commits May 4, 2021 09:32
@Fasand
add TopicCollection.[collection_alias, aggregation_with_same_type], i…
fdf4cb3 
…mplement get_collection_json
@Fasand
first shot at creating JSON for Harvest with many TODOs RE #402
1e13521
@Fasand
use DEBUG=True for local docker, don't cache templates if in DEBUG
464046a
@Fasand
num sources in a category are computed for PUBLIC sources, not ARCHIV…
fedea62 
…ING fixes #569
@Fasand
Harvest custom sources don't need to have archiving states
f93c10a
@Fasand
add Topic Collection seed URLs link to detail
08a6ae2
@Fasand
update www bootstrap to 4.6, fix broken styles
bb82c05
@Fasand
add seed URLs buttons to Topic Collection seeder and web (csv)
eeb5c52
@Fasand
add collectstatic to prepare.sh
2637b3c
@Fasand
fix visible-sm Bootstrap classes, remove clearfixes (don't do anythin…
42ff335 
…g anymore)
@Fasand
add active page underlining to Nominate
46c8935
@Fasand
fix Select2 vs Bootstrap form-control styling – selected option overflow
651b029
@Fasand
swap current/wayback URLs in WWW TopicCollection detail, swap normal/…
1d774de 
…italic style
@Fasand
only show Django toolbar for fasand/petr
ee746f1
@Fasand
topic collections: add wayback_url to non-archived and custom seeds, …
5af8d04 
…leave them italic
@Fasand
add TODO for adding HarvestEditView harvest_type checking
e841ad7
@Fasand
merge harvest-json with master
7571c74
@Fasand
include custom seeds in the OneShot collection
1e378ab
@Fasand
remove tabs/newlines from custom_seeds when serving JSON, update TODO…
1586637 
…s, add JsonUrls view for Harvest
@Fasand
add combined aliases and annotations to Harvest JSON
18e10ca
@Fasand
change Harvest.scheduled_on to DateTimeField, use stock DateTimeInput…
c9819bf 
… with czech input, datetime-local is causing issues
@Fasand
! add migration to split Internal and External TopicCollections, not …
d330373 
…yet fully solved
@Fasand
refactor Topic Collection views, add new for External, update URLs, a…
685eb9f 
…dd link to sidebar; still not on WWW
@Fasand
implement ExternalTopicCollection custom_sources and custom_seeds, sh…
2006b60 
…ow from all internal collections on WWW
@Fasand
make some TC tests changes but most fail because we're in-between lar…
3fae33f 
…ge changes
@Fasand Fasand self-assigned this Aug 5, 2021
Fasand and others added 4 commits August 9, 2021 10:18
@Fasand
add Harvest.ReadyToHarvest state before Running, freezes seeds; fix s…
2b94f44 
…cheduled_on URL reverse
@Fasand
add migration for ReadyToHarvest status
8bc1efd
@dependabot @Fasand
Bump django from 2.2.20 to 2.2.24
6728b08 
Bumps [django](https://github.com/django/django) from 2.2.20 to 2.2.24.
- [Release notes](https://github.com/django/django/releases)
- [Commits](django/django@2.2.20...2.2.24)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot @Fasand
Bump urllib3 from 1.25.9 to 1.26.5
7afda92 
Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.25.9 to 1.26.5.
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst)
- [Commits](urllib3/urllib3@1.25.9...1.26.5)

---
updated-dependencies:
- dependency-name: urllib3
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
dependabot bot and others added 26 commits August 9, 2021 10:30
@dependabot @Fasand
Bump pillow from 8.1.1 to 8.2.0
0f1a715 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.1.1 to 8.2.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
- [Commits](python-pillow/Pillow@8.1.1...8.2.0)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot @Fasand
Bump django from 2.2.20 to 2.2.24
0a359f9 
Bumps [django](https://github.com/django/django) from 2.2.20 to 2.2.24.
- [Release notes](https://github.com/django/django/releases)
- [Commits](django/django@2.2.20...2.2.24)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot @Fasand
Bump urllib3 from 1.25.9 to 1.26.5
90628f3 
Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.25.9 to 1.26.5.
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst)
- [Commits](urllib3/urllib3@1.25.9...1.26.5)

---
updated-dependencies:
- dependency-name: urllib3
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot @Fasand
Bump pillow from 8.1.1 to 8.2.0
6675378 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.1.1 to 8.2.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
- [Commits](python-pillow/Pillow@8.1.1...8.2.0)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
@Fasand
fix Select2 vs Bootstrap form-control styling – selected option overflow
4186b33
@Fasand
! add migration to split Internal and External TopicCollections, not …
a590f9f 
…yet fully solved
@Fasand
add TopicCollection.[collection_alias, aggregation_with_same_type], i…
00ffdf6 
…mplement get_collection_json
@Fasand
first shot at creating JSON for Harvest with many TODOs RE #402
39ee4eb
@Fasand
add TODO for adding HarvestEditView harvest_type checking
f1db958
@Fasand
include custom seeds in the OneShot collection
e2bee38
@Fasand
remove tabs/newlines from custom_seeds when serving JSON, update TODO…
be59fa3 
…s, add JsonUrls view for Harvest
@Fasand
add combined aliases and annotations to Harvest JSON
89d1dbb
@Fasand
change Harvest.scheduled_on to DateTimeField, use stock DateTimeInput…
e2b8b3e 
… with czech input, datetime-local is causing issues
@Fasand
! add migration to split Internal and External TopicCollections, not …
67cdc67 
…yet fully solved
@Fasand
refactor Topic Collection views, add new for External, update URLs, a…
25e8a6a 
…dd link to sidebar; still not on WWW
@Fasand
implement ExternalTopicCollection custom_sources and custom_seeds, sh…
f57dd37 
…ow from all internal collections on WWW
@Fasand
make some TC tests changes but most fail because we're in-between lar…
0a3d5f5 
…ge changes
@Fasand
add Harvest.ReadyToHarvest state before Running, freezes seeds; fix s…
a632f92 
…cheduled_on URL reverse
@Fasand
add migration for ReadyToHarvest status
32c99d4
@Fasand
fix Select2 vs Bootstrap form-control styling – selected option overflow
772bf6d
@Fasand
! add migration to split Internal and External TopicCollections, not …
fe216e5 
…yet fully solved
@Fasand
add TopicCollection.[collection_alias, aggregation_with_same_type], i…
1a241ac 
…mplement get_collection_json
@Fasand
include custom seeds in the OneShot collection
96044e6
@Fasand
refactor Topic Collection views, add new for External, update URLs, a…
d15f0f3 
…dd link to sidebar; still not on WWW
@Fasand
! add migration to split Internal and External TopicCollections, not …
09fe674 
…yet fully solved
@Fasand
horrible git merge, just trying to get beck above master
232ca6b
@Fasand Fasand closed this Aug 9, 2021
@Fasand Fasand deleted the collections branch August 9, 2021 09:12
@Fasand Fasand removed their assignment Aug 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Rozdeleni objektu kolekci Scheduling sklizni s u kolekci s pravidelnou frekvenci
1 participant
@Fasand