root/claypot
Watch
1
0
Fork
You've already forked claypot
 0
Code Issues 15 Pull requests 1 Projects Releases Packages Wiki Activity

API for recipe relations #122

Merged
david merged 23 commits from 50-related-recipes into master 2019-07-23 20:49:26 +00:00
Conversation 30 Commits 23 Files changed 23 +745 -97
david commented 2019-07-09 21:16:00 +00:00 (Migrated from dev.cryptec.at)

Closes #50

Closes #50
david commented 2019-07-09 21:18:05 +00:00 (Migrated from dev.cryptec.at)

added 1 commit

  • 214e2641 - Black-format migration

Compare with previous version

added 1 commit <ul><li>214e2641 - Black-format migration</li></ul> [Compare with previous version](/root/claypot/merge_requests/42/diffs?diff_id=366&start_sha=2451b8af439e6cbb1ff144ddaeb5a288dc0342b7)
david commented 2019-07-10 19:40:28 +00:00 (Migrated from dev.cryptec.at)

added 1 commit

  • 9147160d - Intermediate commit for debug

Compare with previous version

added 1 commit <ul><li>9147160d - Intermediate commit for debug</li></ul> [Compare with previous version](/root/claypot/merge_requests/42/diffs?diff_id=367&start_sha=214e26418c4a6d91e2ece7f2dcdeceecd5efce2a)
david commented 2019-07-10 20:18:51 +00:00 (Migrated from dev.cryptec.at)

added 1 commit

  • 5e61eae3 - Slot machine

Compare with previous version

added 1 commit <ul><li>5e61eae3 - Slot machine</li></ul> [Compare with previous version](/root/claypot/merge_requests/42/diffs?diff_id=368&start_sha=9147160d06e053ff9ddd70e64aab92b048ea53cc)
david commented 2019-07-14 20:13:20 +00:00 (Migrated from dev.cryptec.at)

added 2 commits

  • f1d556a5 - Add RecipeRelation to Django admin
  • 14be01d1 - Add user interface for recipe relations

Compare with previous version

added 2 commits <ul><li>f1d556a5 - Add RecipeRelation to Django admin</li><li>14be01d1 - Add user interface for recipe relations</li></ul> [Compare with previous version](/root/claypot/merge_requests/42/diffs?diff_id=371&start_sha=5e61eae3f8ebcc491a2ef8379ab396a515b24660)
david commented 2019-07-14 20:22:53 +00:00 (Migrated from dev.cryptec.at)

added 12 commits

  • 14be01d1...30576889 - 5 commits from branch master
  • 5c0416b9 - API for recipe relations
  • c7ee3957 - Black-format migration
  • 08345f2c - Intermediate commit for debug
  • 523f44ad - Slot machine
  • 757b5e39 - Add RecipeRelation to Django admin
  • 31d92b29 - Add user interface for recipe relations
  • ff2b902c - Remove superfluous import

Compare with previous version

added 12 commits <ul><li>14be01d1...30576889 - 5 commits from branch <code>master</code></li><li>5c0416b9 - API for recipe relations</li><li>c7ee3957 - Black-format migration</li><li>08345f2c - Intermediate commit for debug</li><li>523f44ad - Slot machine</li><li>757b5e39 - Add RecipeRelation to Django admin</li><li>31d92b29 - Add user interface for recipe relations</li><li>ff2b902c - Remove superfluous import</li></ul> [Compare with previous version](/root/claypot/merge_requests/42/diffs?diff_id=372&start_sha=14be01d1f8d83b8ed02ee3cb2db4db69c4b86487)
david commented 2019-07-14 20:23:15 +00:00 (Migrated from dev.cryptec.at)

unmarked as a Work In Progress

unmarked as a **Work In Progress**
root commented 2019-07-17 19:47:05 +00:00 (Migrated from dev.cryptec.at)

frontend/src/components/RecipeList.vue shouldn't do two things at once. The functionality should be split up.

`frontend/src/components/RecipeList.vue` shouldn't do two things at once. The functionality should be split up.
root commented 2019-07-17 19:48:45 +00:00 (Migrated from dev.cryptec.at)

We should apply the eslint formatting suggestion for all .vue files

We should apply the eslint formatting suggestion for all .vue files
root commented 2019-07-17 19:51:22 +00:00 (Migrated from dev.cryptec.at)

The thumbnail size could be a bit smaller, what do you think @david ?

The thumbnail size could be a bit smaller, what do you think @david ?
root commented 2019-07-17 19:53:27 +00:00 (Migrated from dev.cryptec.at)

The + and - buttons don't have the same size.

The + and - buttons don't have the same size.
root commented 2019-07-17 19:55:11 +00:00 (Migrated from dev.cryptec.at)

estimated_waiting_duration is set twice.

`estimated_waiting_duration` is set twice.
root commented 2019-07-17 20:07:11 +00:00 (Migrated from dev.cryptec.at)

marked as a Work In Progress

marked as a **Work In Progress**
david commented 2019-07-18 20:03:05 +00:00 (Migrated from dev.cryptec.at)

changed this line in version 7 of the diff

changed this line in [version 7 of the diff](/root/claypot/merge_requests/42/diffs?diff_id=374&start_sha=ff2b902c1ad0af4caec32d4bf14767cdadbb0695#341a906723c7da81fa6c83f639044d16e7df9d7a_119_119)
david commented 2019-07-18 20:03:06 +00:00 (Migrated from dev.cryptec.at)

changed this line in version 7 of the diff

changed this line in [version 7 of the diff](/root/claypot/merge_requests/42/diffs?diff_id=374&start_sha=ff2b902c1ad0af4caec32d4bf14767cdadbb0695#341a906723c7da81fa6c83f639044d16e7df9d7a_136_119)
david commented 2019-07-18 20:03:06 +00:00 (Migrated from dev.cryptec.at)

changed this line in version 7 of the diff

changed this line in [version 7 of the diff](/root/claypot/merge_requests/42/diffs?diff_id=374&start_sha=ff2b902c1ad0af4caec32d4bf14767cdadbb0695#341a906723c7da81fa6c83f639044d16e7df9d7a_141_119)
david commented 2019-07-18 20:03:06 +00:00 (Migrated from dev.cryptec.at)

changed this line in version 7 of the diff

changed this line in [version 7 of the diff](/root/claypot/merge_requests/42/diffs?diff_id=374&start_sha=ff2b902c1ad0af4caec32d4bf14767cdadbb0695#bad10223f7a56481d3fde380bede4c5cb8ce8773_99_99)
david commented 2019-07-18 20:03:06 +00:00 (Migrated from dev.cryptec.at)

added 5 commits

  • 013c9424 - Use v-bind shortcut for uniformity
  • 9d9a4fd3 - Move recipe relations to separate module
  • d81e3e48 - Remove duplicated translation
  • 6b5d6adf - Some styles for usability
  • dc4179c1 - Renamed scale-input to ScaleInput

Compare with previous version

added 5 commits <ul><li>013c9424 - Use v-bind shortcut for uniformity</li><li>9d9a4fd3 - Move recipe relations to separate module</li><li>d81e3e48 - Remove duplicated translation</li><li>6b5d6adf - Some styles for usability</li><li>dc4179c1 - Renamed scale-input to ScaleInput</li></ul> [Compare with previous version](/root/claypot/merge_requests/42/diffs?diff_id=374&start_sha=ff2b902c1ad0af4caec32d4bf14767cdadbb0695)
david commented 2019-07-18 20:14:46 +00:00 (Migrated from dev.cryptec.at)

Done.

Done.
david commented 2019-07-18 20:15:08 +00:00 (Migrated from dev.cryptec.at)

Done in !124. !124 will merge into this merge request.

Done in !124. !124 will merge into this merge request.
david commented 2019-07-18 20:27:56 +00:00 (Migrated from dev.cryptec.at)

added 1 commit

  • 11969b2a - Smaller thumbnails for recipe relations

Compare with previous version

added 1 commit <ul><li>11969b2a - Smaller thumbnails for recipe relations</li></ul> [Compare with previous version](/root/claypot/merge_requests/42/diffs?diff_id=376&start_sha=dc4179c19076af4d3e2f0cd532eada9f6f9d77fd)
david commented 2019-07-18 20:28:33 +00:00 (Migrated from dev.cryptec.at)

Made it two thirds of the regular thumbnails.

Made it two thirds of the regular thumbnails.
david commented 2019-07-18 20:28:34 +00:00 (Migrated from dev.cryptec.at)

resolved all discussions

resolved all discussions
david commented 2019-07-18 20:28:59 +00:00 (Migrated from dev.cryptec.at)

unmarked as a Work In Progress

unmarked as a **Work In Progress**
david commented 2019-07-18 20:28:59 +00:00 (Migrated from dev.cryptec.at)

assigned to @root

assigned to @root
root commented 2019-07-19 16:48:25 +00:00 (Migrated from dev.cryptec.at)

added 2 commits

  • a8fbb318 - Apply all eslint fixes
  • aea13686 - Merge branch 'apply-eslint-fixes' into '50-related-recipes'

Compare with previous version

added 2 commits <ul><li>a8fbb318 - Apply all eslint fixes</li><li>aea13686 - Merge branch &#39;apply-eslint-fixes&#39; into &#39;50-related-recipes&#39;</li></ul> [Compare with previous version](/root/claypot/merge_requests/42/diffs?diff_id=377&start_sha=11969b2acbe752da9a811f0fe36345c5ec84aa80)
david commented 2019-07-20 11:18:59 +00:00 (Migrated from dev.cryptec.at)

added 2 commits

Compare with previous version

added 2 commits <ul><li>ecf2efde - Add String as type</li><li>f40b085b - Fix styling of RecipeRelationGallery</li></ul> [Compare with previous version](/root/claypot/merge_requests/42/diffs?diff_id=378&start_sha=aea1368679f15d5d15d696a0575aeb2124bf3de8)
david commented 2019-07-20 13:05:41 +00:00 (Migrated from dev.cryptec.at)

added 1 commit

  • e2e64260 - Rework removing recipe relations UI

Compare with previous version

added 1 commit <ul><li>e2e64260 - Rework removing recipe relations UI</li></ul> [Compare with previous version](/root/claypot/merge_requests/42/diffs?diff_id=379&start_sha=f40b085bf1e430261c370b9cf8b52f990360346e)
david commented 2019-07-23 20:47:29 +00:00 (Migrated from dev.cryptec.at)

added 5 commits

  • b431dbe4 - Don't use overlay for delete mode
  • 86301a90 - Fix styling of related recipes
  • 1e07b13d - Prohibit adding a relation to the same recipe
  • c4e91055 - Fix vue template code style
  • a67b6eb0 - Merge branch 'related-recipes-suggestion' into '50-related-recipes'

Compare with previous version

added 5 commits <ul><li>b431dbe4 - Don&#39;t use overlay for delete mode</li><li>86301a90 - Fix styling of related recipes</li><li>1e07b13d - Prohibit adding a relation to the same recipe</li><li>c4e91055 - Fix vue template code style</li><li>a67b6eb0 - Merge branch &#39;related-recipes-suggestion&#39; into &#39;50-related-recipes&#39;</li></ul> [Compare with previous version](/root/claypot/merge_requests/42/diffs?diff_id=383&start_sha=e2e642604ce02284b90007a160d720a0db7e7497)
david (Migrated from dev.cryptec.at) scheduled this pull request to auto merge when all checks succeed 2019-07-23 20:49:06 +00:00
david commented 2019-07-23 20:49:26 +00:00 (Migrated from dev.cryptec.at)

mentioned in commit 51b0fbd800

mentioned in commit 51b0fbd8007243e32d8cb27ffcfa695a7f74f0dc
david commented 2019-07-23 20:49:26 +00:00 (Migrated from dev.cryptec.at)

merged

merged
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug

   
Doing

   
maybe
This we might want to add

  
next

   
sentry
Created by Sentry

  
To Do
No labels
bug
Doing
maybe
next
sentry
To Do
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
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
root/claypot!122
No description provided.