commit afd82c31d7451d5709e29c61440ce4479a58df6d Author: smilerz <smilerz@gmail.com> Date: Wed Jun 9 20:40:08 2021 -0500 yarn build commit 1ba5ebcc71595a89690356c60050c996dfed69a8 Author: smilerz <smilerz@gmail.com> Date: Wed Jun 9 20:34:58 2021 -0500 minor fixes commit 3bc045e8e4bd8d3802607f9d5202b67a2159c0c0 Author: smilerz <smilerz@gmail.com> Date: Wed Jun 9 20:05:27 2021 -0500 undelete manage.py commit b5ddcb4f81dc860405d849fa6fea33af381415d8 Author: smilerz <smilerz@gmail.com> Date: Wed Jun 9 19:54:59 2021 -0500 flake8 cleanup commit 84e611c0d6633ca5eede8e55f0a0d42dce12a938 Merge:c52cd359
52fea8b3 Author: smilerz <smilerz@gmail.com> Date: Wed Jun 9 19:54:44 2021 -0500 Merge branch 'working_with_keywords' into vue_keywords commit 52fea8b3736621c8b0a960c5cdd5bc2702654763 Author: smilerz <smilerz@gmail.com> Date: Wed Jun 9 19:34:46 2021 -0500 minor edit commit bccbd52f64e76be085390bec9c7d08cd79611536 Author: smilerz <smilerz@gmail.com> Date: Wed Jun 9 18:53:43 2021 -0500 refactored using openapi and updated tests commit be86145884035a7daf266816a2aa6678f679530d Author: smilerz <smilerz@gmail.com> Date: Wed Jun 9 07:19:31 2021 -0500 update migrations commit 034402054ca08196f6fd1f5b6c49cd210bbf35c5 Author: smilerz <smilerz@gmail.com> Date: Tue Jun 8 17:21:04 2021 -0500 fix migrations commit 4c5c93a7c1e079b3205aea5625e77a3757d639c6 Author: smilerz <smilerz@gmail.com> Date: Tue Jun 8 17:07:00 2021 -0500 Fix after rebase commit 80087b5a99cd8bafa2c0f9ffa0a8e476abb511fc Author: smilerz <smilerz@gmail.com> Date: Tue Jun 8 12:41:24 2021 -0500 fix ingredient missing commit 432577bfd8c196148dcec71afb816bb8ac9025de Author: smilerz <smilerz@gmail.com> Date: Tue Jun 8 12:33:04 2021 -0500 test for tree and root keyword parameters commit abc969f923e9cc30f3a33786b8d7d217458aab15 Author: smilerz <smilerz@gmail.com> Date: Tue Jun 8 10:39:49 2021 -0500 refactored move and merge APIs commit 28d2dc18e8713279815a7955779af953592203c5 Author: smilerz <smilerz@gmail.com> Date: Mon Jun 7 10:49:48 2021 -0500 fix from rebase commit 4f5225c1e52e83e87cc3955ebefd3d57acb4014f Author: smilerz <smilerz@gmail.com> Date: Sun Jun 6 17:14:48 2021 -0500 fix after rebase commit 36fd3578af585b0dd60ebd6a55f5c4c3da3498dd Author: smilerz <smilerz@gmail.com> Date: Sun Jun 6 16:54:16 2021 -0500 fix migrations commit 437b2b23207e118c3887fc31caa12f798d394dc7 Author: smilerz <smilerz@gmail.com> Date: Sun Jun 6 16:19:38 2021 -0500 Fix after rebase commit 55ccaf8d05262490d1050ca1a48afe430deb8b80 Author: smilerz <smilerz@gmail.com> Date: Sun Jun 6 15:45:08 2021 -0500 fix nginx config commit 20bee3318bfac32cf57ec9053406a0ef831f897b Author: smilerz <smilerz@gmail.com> Date: Thu May 20 16:48:07 2021 -0500 WIP commit 73154ec00e8e81fe42e89e9f34762cb0e0ada92b Author: smilerz <smilerz@gmail.com> Date: Thu May 20 16:47:43 2021 -0500 WIP commit 2a585624f9315bd82bc79b6ff4541a74000746a6 Author: smilerz <smilerz@gmail.com> Date: Thu May 20 16:27:42 2021 -0500 WIP commit 2d9de4aed0783c0ae1c8b38c3f00c0ab0b12324a Author: smilerz <smilerz@gmail.com> Date: Thu May 20 15:37:51 2021 -0500 WIP commit a259d285889e38d914d937443238c25a1e2b8a6a Author: smilerz <smilerz@gmail.com> Date: Thu May 20 08:25:20 2021 -0500 WIP commit 35c25befab067a8e50f0d01d89ecbc739cc84bfe Author: smilerz <smilerz@gmail.com> Date: Tue May 11 13:26:07 2021 -0500 delete old keyword tree list commit 2aab22667ce273ef6ffaee34374aa6c63d66ba70 Author: smilerz <smilerz@gmail.com> Date: Mon May 10 14:30:31 2021 -0500 view recipes in keyword view commit 1247eda4e2565894c89638b13beea5f3603c9d36 Author: smilerz <smilerz@gmail.com> Date: Sun May 9 19:46:30 2021 -0500 finished drag and drop actions commit 7468bc551865e64af67a97cf78e7e87f8198e2bf Author: smilerz <smilerz@gmail.com> Date: Thu May 6 15:48:57 2021 -0500 stubbed out drag and drop actions commit 3cf7709eedee02372ffceff2045bb95b10bbf332 Author: smilerz <smilerz@gmail.com> Date: Wed May 5 21:01:45 2021 -0500 stubbed out drag-and-drop actions commit 72976645730ec0130ea7c228247baf1a3b5298a0 Author: smilerz <smilerz@gmail.com> Date: Tue May 4 10:30:31 2021 -0500 fix recipe pages commit e79e947af572bcb1ffae7e936e8356dc34f0611c Author: smilerz <smilerz@gmail.com> Date: Tue May 4 10:21:08 2021 -0500 WIP commit 3b9a2dcff12eb9cfbe7d5f26f70e891a10d3284a Author: smilerz <smilerz@gmail.com> Date: Sun May 2 20:31:06 2021 -0500 Fix after rebase commit d2b7734d491b7d1eaecbc486ff914ebeb2e903d1 Author: smilerz <smilerz@gmail.com> Date: Sat May 1 15:50:15 2021 -0500 added infinite scroll commit 1efb8c8938bd4bea954f7fb5802d218f7e779913 Author: smilerz <smilerz@gmail.com> Date: Sat May 1 07:45:23 2021 -0500 WIP commit 0aa55fbb33886bd9e8f26feb322a63d2776917f5 Author: smilerz <smilerz@gmail.com> Date: Sat May 1 07:24:50 2021 -0500 cleanup after rebase commit a0c31868ca2f45fd3d664180a0d9bc93c9dcfb8d Author: smilerz <smilerz@gmail.com> Date: Fri Apr 30 15:11:53 2021 -0500 stubbed out move keyword commit fb62ae0ac8a577405f429da99c73f0b9d65bfc00 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 29 14:52:22 2021 -0500 WIP commit c3d88adf9c1fae5a5d1e368d7099cf3ba77cb725 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 28 19:11:32 2021 -0500 new and edit keyword modals commit 5ab1fc33ab9859f53993db5dac516936532c56d8 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 28 12:06:46 2021 -0500 removed conficting migration commit 7016ef7bd40f48a91191c66f131ff8afb1c58816 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 28 11:42:43 2021 -0500 added new keyword modal commit 6676b442068e240b9a6a81d9bb88f7c7af53bc5c Author: smilerz <smilerz@gmail.com> Date: Tue Apr 27 12:42:17 2021 -0500 added delete modal commit da9bb141030ba01914278819436365a568f6e903 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 26 11:30:31 2021 -0500 keyword card layout commit f802908ec466c7eee07b4b508172f23d153ab1e7 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 26 08:33:32 2021 -0500 WIP commit cdce84b66b7750bc25cbe21d036c3e45eb47648f Author: smilerz <smilerz@gmail.com> Date: Sun Apr 25 20:26:55 2021 -0500 filter by keyword commit ae68ce02c99ae27769f8dd2299337870e3aaef2f Author: smilerz <smilerz@gmail.com> Date: Sun Apr 25 19:54:00 2021 -0500 Squashed commit of the following: commit 33d084f201502377f672bfa78e334069bfadab29 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 25 19:50:51 2021 -0500 add trigrams to full text search commit 199a75d4b0ab924f896e8e53a5e5e55917c2a540 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 25 19:35:17 2021 -0500 add unaccent to full text search vectors commit db13383614700f60f29d80ff24a71f4aaeb3f200 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 25 19:09:54 2021 -0500 WIP commit ca06f6cf7936df0bdc633f1bbf9c2a5cfa84066d Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 19:01:20 2021 -0500 add trigrams to search rank commit a5d1c400efccdd3ad47807c4a2f990b983243d06 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 15:19:37 2021 -0500 simplified code commit 15261536c8ebab7156c366dcd4e21c5330550fde Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 14:42:10 2021 -0500 updated search v2 with full text search commit 51f4af6487bfbccc66998160e0ba3e4318dc6621 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 13:23:09 2021 -0500 rebase commit 2df9fc9d33a2b558b82cc8e614f18d0ebc409b83 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 13:22:48 2021 -0500 filter.py commit f90f3186d95ae64c7f88bad5fccb003d7d3f44a6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 20:17:54 2021 -0500 added multi-language support to FTS commit 3cfe14bdae4a4d8995e9d7bf3daacbe05544b0a7 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 19:42:22 2021 -0500 rebuild recipe index from admin site commit ef17ce2d57e869ddb84e4af8a37c2081cbf41e65 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 19:07:50 2021 -0500 command line to rebuild index commit 306c662f0b8dc39dee3cc6011d5d9f4c1ac2f325 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 17:01:18 2021 -0500 updated to handle sqlite commit 8c049697a55fd328a1e93607991c9160db80b6cc Author: smilerz <smilerz@gmail.com> Date: Fri Apr 9 12:47:17 2021 -0500 fixed smalltable commit c6f8d199efeb5d8b0f5b63a0113afbd856398857 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 9 12:46:07 2021 -0500 working proof of concept commit92c65ec1e8
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 21:21:41 2021 +0200 fixed test meal plan commita376c3a5b6
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:55:48 2021 +0200 meal plan random fix commit058d705170
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:19:11 2021 +0200 meal plan in search commit4ad5d6ef2f
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 15:01:39 2021 +0200 fixed test + added api doc for new search commite676b4bac3
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 14:05:19 2021 +0200 added api pagination for recipes commit04488741c4
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:11:19 2021 +0200 adv search mobile styling commit99004ad34b
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:03:15 2021 +0200 new search and setting commitf78f7dfc14
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 02:55:50 2021 +0200 search ui improvements and filter commit880db58d38
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 21:28:29 2021 +0200 v2 search filtering commitd1d65d878c
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 14:11:10 2021 +0200 v2 search progress commit3194a7580d
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 12:57:02 2021 +0200 basics of v2 search working commit c573dc7d2f4db1011392199a004708f0dfdd2b31 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 25 18:03:37 2021 -0500 WIP commit 41605f391265f2d928a8d4a684842bda3e54b3f6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 25 17:47:38 2021 -0500 stubbed out Keyword Card commit f86abee5674dae063d9de8fbaf96136292a874b2 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 23 17:16:23 2021 -0500 create split screen for keywords commit b972f28379645bc40619c1da1a531f04db2943b9 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 23 15:29:23 2021 -0500 stubbed out new keyword view commit e81b99cdcaac0a52b248911762f0ba9ff69446ed Author: smilerz <smilerz@gmail.com> Date: Fri Apr 23 15:28:48 2021 -0500 enhanced keyword api to include child/parent capability commit dd2855f05e8dac2714775a2a1ae604405b03914b Author: smilerz <smilerz@gmail.com> Date: Fri Apr 23 12:00:47 2021 -0500 removed space from keyword form commit 8c5f572e5a2eca3cdd4e904f88fbff3265e49fc9 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 23 11:09:38 2021 -0500 expanded keyword tests and fixed failures commit e22975e4656f6663e2e278ca6362d1abeacdd407 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 22 18:02:15 2021 -0500 moved get_or_create to keyword model commit 328a833c1022ac6e17c383e328bf1aa10f6e67c0 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 22 16:35:42 2021 -0500 squash keyword commit 75d8d078e0922f8761ac426b9d775f900d76fc8f Author: smilerz <smilerz@gmail.com> Date: Thu Apr 22 16:35:31 2021 -0500 Squashed commit of the following: commit e766d4de6825efad3ec55823196f2872fab025c5 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:39:57 2021 -0500 updated migrate commit cb94109a31d3c63dc22c7f22ac7a990a11e39f33 Merge: d16ad580862c0f
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:37:54 2021 -0500 Merge branch 'main_fork' into keywords commit d16ad58ed60c75077a0e8cce0295c4fb3e241493 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 31 20:12:59 2021 -0500 fixed keyword serializer to pass tests commit 189c2fc647702dca4f6744df85eda3cf287cdbe5 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 31 18:03:23 2021 -0500 updated keyword test to create tree nodes commit f716a20549f706f7427b9162ace6fab1a28e85c9 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 31 14:46:57 2021 -0500 fixed api to accept all fields commit 1677042993dc74cca412a1ebb89648d5581f6eef Author: smilerz <smilerz@gmail.com> Date: Wed Mar 31 09:45:17 2021 -0500 restore delete in keyword api commit 3f08cb33195aeeaf1c731f959c57975deb84b9f0 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 31 09:41:19 2021 -0500 allow delete of keyword parent commit 74a842a283729ad11f7177476920ff1bb472bde5 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 31 09:37:26 2021 -0500 scopes and MP_Node work together on keywords commit 145dff4e096537d06524dab9f745ab600222766c Author: smilerz <smilerz@gmail.com> Date: Wed Mar 31 09:36:48 2021 -0500 safely delete keyword parent commit 69eb2481f57e18ceb499a73d26f8f9220eb575f8 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 31 09:36:26 2021 -0500 cosmetic updates commit 6925ef3333bfee8c8e59ac6d2324e84dd1d2533d Author: smilerz <smilerz@gmail.com> Date: Tue Mar 30 16:46:36 2021 -0500 removed space from Keyword commit e029ecd18501817f4f6350cb98793628fba049c8 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 30 16:25:02 2021 -0500 fixed sort order commit 2b47da0c92f8d813e93d6e65c5a26d06f5b60582 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 30 14:39:59 2021 -0500 delete migrations commit 20492167298c7f284f9df0d7308a75cc93fd4c6d Author: smilerz <smilerz@gmail.com> Date: Tue Mar 30 14:39:43 2021 -0500 recreate keywored migration commit ff71eb857683abc2db088ced5ca8890e3e313b5e Author: smilerz <smilerz@gmail.com> Date: Tue Mar 30 12:52:37 2021 -0500 db migration for keyword tree commit 071b3e0650bede75c73a5dd198c5ccdcbd0f483b Author: smilerz <smilerz@gmail.com> Date: Tue Mar 30 12:38:45 2021 -0500 initial attempt at merge with upstream commit 6b7c9b4287413841681ebc630036e587cf10a813 Merge: 7078994d16d77f
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 30 12:36:06 2021 -0500 Merge branch 'main_fork' into keywords commit 70789940520e220f0c2e168b0ec295e412b42462 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 3 09:57:36 2021 -0600 finished tree_template commit 8dd2e7da9e99c4005de19ad6d16dcce02154d2dc Author: smilerz <smilerz@gmail.com> Date: Mon Mar 1 16:25:15 2021 -0600 added tests for move_keyword api commit 5d52e3bff0504f6ce596d38e15fdad67b294321b Author: smilerz <smilerz@gmail.com> Date: Mon Mar 1 14:47:28 2021 -0600 added api to move keyword nodes commit 0f13ba84b957ff9f9eb7e95b921a607c6138b700 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 1 11:31:39 2021 -0600 convert Keyword from list to tree commit 05b9a85371613a31e53d7f2742f863edff8b1f43 Author: smilerz <smilerz@gmail.com> Date: Wed Feb 24 16:57:20 2021 -0600 update tests to reflect changes in Keyword commit c833a8b0928ce4f84b072c75de1d4b2c0ab057bd Author: smilerz <smilerz@gmail.com> Date: Wed Feb 24 16:56:55 2021 -0600 remove DELETE method from keyword API commit a4136dc849227a6c7b60db120778eb618e8501dc Author: smilerz <smilerz@gmail.com> Date: Wed Feb 24 12:09:55 2021 -0600 fixed adding keyword in new recipe form commit 17c5b6bf92b95e63ae671dd107bae6d2d0c7f503 Author: smilerz <smilerz@gmail.com> Date: Wed Feb 24 11:59:54 2021 -0600 fixed adding keyword during recipe import commit 0bf05da863de4bf86d886d3e757c7a712da0948a Author: smilerz <smilerz@gmail.com> Date: Thu Apr 22 16:08:52 2021 -0500 new branch commit 1f50bec6d146f93426fa740948e34a7e9b38cdc7 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 22 11:26:44 2021 -0500 truncate query params on url commit ff131ffcef751a393a7831c584443d298951fdca Author: smilerz <smilerz@gmail.com> Date: Thu Apr 22 10:07:24 2021 -0500 bookmarklet includes url script_name commit a568c474b30a62d1e73b0fc06820ff3c2f2ee772 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 19:00:20 2021 -0500 add trigram to rank commit 597563bfa1c9bdf70e0c7f2839a87b01d50b09b0 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 18:46:35 2021 -0500 Squashed commit of the following: commit 1c5f74bd182eb502e27d03cc7f93e5e0db8c3362 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 20 12:24:05 2021 -0500 change markdown link from hard-coded to reverse commit 76c56e2a063ec45f97b4d898e106a2b378b95b96 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 14:16:17 2021 -0500 missing '/' commit 47a13811a3a6e47e5f6f1c3ccd515c1989bd4617 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:41:26 2021 -0500 yarn build commit 0d2c1fabe9f982179ec9d26cbb79bc0cebfef9c5 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:31:48 2021 -0500 Squashed commit of the following: commit e03f626fd08a3e048dbd968d623ee58b7f865929 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:04:39 2021 -0500 yarn build commit b511f929ffcc7a670bd7955269982e05c591783a Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 21:17:31 2021 -0500 update service worker with base path commit f13f02d481618583017c71fb654adaa86585ef0b Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:54:17 2021 -0500 WIP commit f2f927c16f52baa6b9a31cd9992e8c7c8739d666 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:40:59 2021 -0500 default value if localStorage fails commit 424e8a9b93d8aa9962a3b6f963fff5c6e23dfa56 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:30:38 2021 -0500 fixed missing '/' commit d49a206ddf5952036b295804f9e31e52a1b45af6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:13:04 2021 -0500 updated .env.template commit ac94ea7afac36f65e1658f3d29f4e2b8f0475ba6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 15:31:37 2021 -0500 WIP commit c9a687df1b21ac6584d0f958e65c5cfc040406ca Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 10:19:02 2021 -0500 WIP commit 7fe8c7fbe52c96f1ccd4128db256656e43af3fa0 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 08:10:08 2021 -0500 added nginx config commit b5540d85872d9d69bda3787db7ecccfce893236f Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 08:03:09 2021 -0500 allow subfolder config on NGINX commit92c65ec1e8
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 21:21:41 2021 +0200 fixed test meal plan commita376c3a5b6
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:55:48 2021 +0200 meal plan random fix commit058d705170
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:19:11 2021 +0200 meal plan in search commit4ad5d6ef2f
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 15:01:39 2021 +0200 fixed test + added api doc for new search commite676b4bac3
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 14:05:19 2021 +0200 added api pagination for recipes commit04488741c4
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:11:19 2021 +0200 adv search mobile styling commit99004ad34b
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:03:15 2021 +0200 new search and setting commitf78f7dfc14
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 02:55:50 2021 +0200 search ui improvements and filter commit880db58d38
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 21:28:29 2021 +0200 v2 search filtering commitd1d65d878c
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 14:11:10 2021 +0200 v2 search progress commit3194a7580d
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 12:57:02 2021 +0200 basics of v2 search working commit b65800f0004dd6609b7a2be5c55d4d3b7117b9a8 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 18:20:57 2021 -0500 removed trigram commit 0445cbe081df1741ab1f550149eecdd2dd645580 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 16:05:53 2021 -0500 add trigram search to v2 commit 7c0b19472eb7c2092fc33ef2a686628b1cafe8d2 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 15:27:50 2021 -0500 Squashed commit of the following: commit a5d1c400efccdd3ad47807c4a2f990b983243d06 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 15:19:37 2021 -0500 simplified code commit 15261536c8ebab7156c366dcd4e21c5330550fde Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 14:42:10 2021 -0500 updated search v2 with full text search commit 51f4af6487bfbccc66998160e0ba3e4318dc6621 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 13:23:09 2021 -0500 rebase commit 2df9fc9d33a2b558b82cc8e614f18d0ebc409b83 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 13:22:48 2021 -0500 filter.py commit f90f3186d95ae64c7f88bad5fccb003d7d3f44a6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 20:17:54 2021 -0500 added multi-language support to FTS commit 3cfe14bdae4a4d8995e9d7bf3daacbe05544b0a7 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 19:42:22 2021 -0500 rebuild recipe index from admin site commit ef17ce2d57e869ddb84e4af8a37c2081cbf41e65 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 19:07:50 2021 -0500 command line to rebuild index commit 306c662f0b8dc39dee3cc6011d5d9f4c1ac2f325 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 17:01:18 2021 -0500 updated to handle sqlite commit 8c049697a55fd328a1e93607991c9160db80b6cc Author: smilerz <smilerz@gmail.com> Date: Fri Apr 9 12:47:17 2021 -0500 fixed smalltable commit c6f8d199efeb5d8b0f5b63a0113afbd856398857 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 9 12:46:07 2021 -0500 working proof of concept commit92c65ec1e8
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 21:21:41 2021 +0200 fixed test meal plan commita376c3a5b6
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:55:48 2021 +0200 meal plan random fix commit058d705170
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:19:11 2021 +0200 meal plan in search commit4ad5d6ef2f
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 15:01:39 2021 +0200 fixed test + added api doc for new search commite676b4bac3
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 14:05:19 2021 +0200 added api pagination for recipes commit04488741c4
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:11:19 2021 +0200 adv search mobile styling commit99004ad34b
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:03:15 2021 +0200 new search and setting commitf78f7dfc14
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 02:55:50 2021 +0200 search ui improvements and filter commit880db58d38
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 21:28:29 2021 +0200 v2 search filtering commitd1d65d878c
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 14:11:10 2021 +0200 v2 search progress commit3194a7580d
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 12:57:02 2021 +0200 basics of v2 search working commit d358ced6d108592739a54142fc93f5b3b9f2f88b Author: smilerz <smilerz@gmail.com> Date: Tue Apr 20 12:21:58 2021 -0500 changed hardlink markdown link to reverse commit 30e0eb2ea8b01a2739cc0180cc7475c3e608e3fd Author: smilerz <smilerz@gmail.com> Date: Tue Apr 20 09:15:57 2021 -0500 changed keyword to get_or_create commit add9c5196a0ec6e61d80c3c2bef6b34ee6074d36 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 20 08:08:13 2021 -0500 strip food and keywords on url import commit 3d425c6b4011c058b2a9c9c56faf97fc0741e1be Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 15:31:49 2021 -0500 fix bookmarklet loading commit 70f2d5287ec16a09b440353980ab2fe8f4d2cb68 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 14:36:52 2021 -0500 WIP commit 366f3e4a5028b8345bb857d04090ac5508a03f5c Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 14:15:17 2021 -0500 missing / commit 7343886b0128b2d0f178b0bcd3fdf1768822d52e Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:44:54 2021 -0500 Squashed commit of the following: commit 47a13811a3a6e47e5f6f1c3ccd515c1989bd4617 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:41:26 2021 -0500 yarn build commit 0d2c1fabe9f982179ec9d26cbb79bc0cebfef9c5 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:31:48 2021 -0500 Squashed commit of the following: commit e03f626fd08a3e048dbd968d623ee58b7f865929 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:04:39 2021 -0500 yarn build commit b511f929ffcc7a670bd7955269982e05c591783a Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 21:17:31 2021 -0500 update service worker with base path commit f13f02d481618583017c71fb654adaa86585ef0b Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:54:17 2021 -0500 WIP commit f2f927c16f52baa6b9a31cd9992e8c7c8739d666 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:40:59 2021 -0500 default value if localStorage fails commit 424e8a9b93d8aa9962a3b6f963fff5c6e23dfa56 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:30:38 2021 -0500 fixed missing '/' commit d49a206ddf5952036b295804f9e31e52a1b45af6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:13:04 2021 -0500 updated .env.template commit ac94ea7afac36f65e1658f3d29f4e2b8f0475ba6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 15:31:37 2021 -0500 WIP commit c9a687df1b21ac6584d0f958e65c5cfc040406ca Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 10:19:02 2021 -0500 WIP commit 7fe8c7fbe52c96f1ccd4128db256656e43af3fa0 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 08:10:08 2021 -0500 added nginx config commit b5540d85872d9d69bda3787db7ecccfce893236f Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 08:03:09 2021 -0500 allow subfolder config on NGINX commit92c65ec1e8
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 21:21:41 2021 +0200 fixed test meal plan commita376c3a5b6
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:55:48 2021 +0200 meal plan random fix commit058d705170
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:19:11 2021 +0200 meal plan in search commit4ad5d6ef2f
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 15:01:39 2021 +0200 fixed test + added api doc for new search commite676b4bac3
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 14:05:19 2021 +0200 added api pagination for recipes commit04488741c4
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:11:19 2021 +0200 adv search mobile styling commit99004ad34b
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:03:15 2021 +0200 new search and setting commitf78f7dfc14
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 02:55:50 2021 +0200 search ui improvements and filter commit880db58d38
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 21:28:29 2021 +0200 v2 search filtering commitd1d65d878c
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 14:11:10 2021 +0200 v2 search progress commit3194a7580d
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 12:57:02 2021 +0200 basics of v2 search working commit e82152cba25b38839303d055e7b5b138a8fad23b Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:05:43 2021 -0500 yarn build commit b94e540f480ec2daf71e6463a79b0d0c5a874b53 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 12:58:44 2021 -0500 updated base_path in api-generator commit c3d823105be6f5a57961c7ae16f21600ff1ef268 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 21:18:08 2021 -0500 updated service worker with base path commit 885770d86d39d8730918f40489ada92b27f8247c Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:53:30 2021 -0500 WIP commit 2813d906b088fb90de58f51b5deb8301fbc6c873 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:39:33 2021 -0500 added default window location in case local storage failed commit c4c78eb55ad081a007e4f1061a29f704a6601f6a Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:33:19 2021 -0500 added trailing '/' commit e72766a597c09c1f9bf454b37998da54a79d9b7d Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:06:18 2021 -0500 dynamically set api-generator path commit 30e2396984d7d9d07fa930bc8a284546dae3db4f Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 16:27:24 2021 -0500 WIP commit 7479c7b065cafaa1a1ebaeab36b9e5ab8097b2bc Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 15:50:41 2021 -0500 WIP commit 6e7288be0a18ea1258e7a88894cc22aa7f1d921d Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 15:43:07 2021 -0500 Squashed commit of the following: commit ac94ea7afac36f65e1658f3d29f4e2b8f0475ba6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 15:31:37 2021 -0500 WIP commit c9a687df1b21ac6584d0f958e65c5cfc040406ca Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 10:19:02 2021 -0500 WIP commit 7fe8c7fbe52c96f1ccd4128db256656e43af3fa0 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 08:10:08 2021 -0500 added nginx config commit b5540d85872d9d69bda3787db7ecccfce893236f Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 08:03:09 2021 -0500 allow subfolder config on NGINX commit92c65ec1e8
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 21:21:41 2021 +0200 fixed test meal plan commita376c3a5b6
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:55:48 2021 +0200 meal plan random fix commit058d705170
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:19:11 2021 +0200 meal plan in search commit4ad5d6ef2f
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 15:01:39 2021 +0200 fixed test + added api doc for new search commite676b4bac3
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 14:05:19 2021 +0200 added api pagination for recipes commit04488741c4
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:11:19 2021 +0200 adv search mobile styling commit99004ad34b
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:03:15 2021 +0200 new search and setting commitf78f7dfc14
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 02:55:50 2021 +0200 search ui improvements and filter commit880db58d38
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 21:28:29 2021 +0200 v2 search filtering commitd1d65d878c
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 14:11:10 2021 +0200 v2 search progress commit3194a7580d
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 12:57:02 2021 +0200 basics of v2 search working commit a78327bd719a5eedc6d19e0af3e4823187133ac6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 10:28:55 2021 -0500 wip commit 00051709e824f61eab984f01df677cc93470f0e1 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 10:28:26 2021 -0500 settings for nginx subfolder commit 39e3d28e46e3aeb22f2b1ef22acc7490cd2c0e32 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 07:57:28 2021 -0500 WIP commit 1c6a428e20cab13bf08f062e6673a1f143d90511 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 22:29:21 2021 -0500 allow app to be served at proxy subfolder commit e8cd814ddae3b69d457e085e5522b1dcbb2e5a91 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 20:16:28 2021 -0500 Squashed commit of the following: commit f03456411939b9f09704c057e20a970f9545dc0b Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 18:28:45 2021 -0500 no_perm commit 0262d1630dfcae204848a9fa6c41dc36958414d6 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:29:11 2021 -0500 removed unnecessary console message commit 069a02e67a99805ea04b3f2248d48584e146eadd Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:25:23 2021 -0500 removed commented out settings commit 1be713ff9db5e94fc68cfa25f4b8a219edff39b2 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:24:27 2021 -0500 removed unused cors_headers commit 5c9e1f015a6ff667968e6421341061af09d1b34a Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:22:15 2021 -0500 removed line breaks commit 0e92b029d46bbaaf2a5bf2526165d3a4075581f1 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:21:21 2021 -0500 removed console.log() commit e435325e66a1dc25fb9d24391eec5ed76503d969 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 11:17:00 2021 -0500 Fix after rebase commit c6e1add18be6e9791c7142a78129a879020c6f17 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 07:44:53 2021 -0500 updated model commit c52cd0b177da20cbed9a9d606ee4ec54ab865f38 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:46:38 2021 -0500 convert servings to number on import commit a3cf59c7a47dc39bec74b772f789e1c052884550 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:15:59 2021 -0500 update tests to handle url decoding commit 7ff1783578c90e2c6ae931b345d580279daeedf0 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:57:10 2021 -0500 bring parser inline with json_import branch commit 204f3ddf845a91c50d54d8dbd2f1d754d3076d25 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 08:50:00 2021 -0500 unescape html document commit 28291f96afdb70c8259104997000fe9544e0d134 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 11:29:35 2021 -0500 updated bookmarklet to work with updated import process commit e7c7823916febeb0adbe7e548633b737125ad3b7 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:52 2021 -0500 Squashed commit of the following: commit 707d862e01a7497a1f22879d314b865a35e0e85b Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:00 2021 -0500 works now commit 3942a445ed4f2ccec57de25eacd86ea4e4dd6bdb Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:25:24 2021 -0500 updated serializer and api commit 10dc746eb175c7f805a8a8ffa7ce49977a7ce97e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:20:19 2021 -0500 fixed bookmarklet commit 9779104902d3be0258c95cd2eeebcba0d5d48892 Merge: bb8262c 0cb3928 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:56:27 2021 -0500 Merge branch 'bookmarklet' into json_import commit 0cb39284bb835ffc6cfee3e4306aadc4a64a25be Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commit e89e0218de684d40b2e2bfb6ba833891206c828e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commit bb8262ccabb93c56fbc18c407d5a0653b8b3ca79 Merge: b1e73aa35a7f62
Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 20:35:57 2021 -0500 Merge branch 'main_fork' into json_import commit e01efbbf764bbe6b0e1cefac6c0311dd18a0d503 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:20:03 2021 -0500 added missing bookmarklet commit 3e5f3a36a48cdca0087a551a9a6b4d942d81bf19 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:18:14 2021 -0500 Revert "bug fix url import" This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23. commit 22135c7d40a399fafef994372e7ba128fc37c596 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 13 16:44:05 2021 -0500 removed extra string normalization commit 7ab59c55ac75f50997156f8808c18d12ef7ac8f3 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 21:22:56 2021 -0500 updated migration commit 0f6f8c9eeb642a2824c6952a69c2a2a12e628d24 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:14:50 2021 -0500 updated recipe targets in tests to reflect html decoding commit c56add95a4627f5ed874bbce3cb7b0f4d8adbb9f Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 13:28:35 2021 -0500 fixes #527 commit 09993a71515b9b977f074e14e11cf9e4b5c72b96 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 10:57:13 2021 -0500 bug fix url import commit 625d23d994b84be082f20ef1f6527d1d742a7157 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 07:02:43 2021 -0500 url import bug fixes commit df4b2adf7dcd8099871167ed8bab779e976002a4 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:43:33 2021 -0500 bug fix tests commit 0a61c9f9def1da5841031e39ced99a08a2536958 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:41:00 2021 -0500 bug fix url import commit afbf1153bfcc29baa80a07019f337a9c02b66a63 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:26:29 2021 -0500 recipe import tests commit 5857ed171e3b667764f2882d3ee7b73c15bdab8b Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 12:32:11 2021 -0500 simplified url import commit 33cc780cfd8001a0293951f25fd19b3db8ce0461 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 09:20:15 2021 -0500 add data for url_import test commit 322552a1f1434e7ca52f75886e752f31ea5915f3 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:43:36 2021 -0500 added all ATK sites to custom scraper commit 6455e597fbc2a394f217fe8c11d2bc89e8add1a4 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:23 2021 -0500 added cooksillustrated custom scraper commit 1c6ad94a2d8bf466e35c56a1cd82dff9039371c6 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:01 2021 -0500 ensure time is always a number commit fbbc057a8a2964eb6a4ac7d2324adacc679db2d6 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 2 15:19:20 2021 -0500 added ability to create custom scrapers commit fd293f150e959f67b3e8260061f8a72898e0990c Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:21:28 2021 -0500 removed old json importer commit 86b330583a6f5946b5743df8b447dccc1db3ade0 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:19:18 2021 -0500 updated import from source to use text scraper commit c4be53661293bc54c9069c2604d8fe1a61dceddf Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:08:56 2021 -0500 remove old html_import function commit 6a6314e09be06d17cc11bf55e95992f0a10b54ed Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:07:51 2021 -0500 wrapper for recipe_scrapers to parse text input commit 64524c01c8da795269bd2dbdfb5e6a02d47e8904 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:17:46 2021 -0500 fixed broken tab commit 4701d62739550754960e6d1eac437f0d2cea004f Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:11:54 2021 -0500 delete bookmarklet on import commit 4233980dd9df8e0e961363d464b41c61ad1c6288 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:53:06 2021 -0500 removed console message commit 16e34fe3b134bf31bc84c6f7584662a171fa9748 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:51:14 2021 -0500 fixed ingredient display on preview commit c51d715cfee7a787dcd7b1c3dd0beb24a14962d3 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 11:49:56 2021 -0500 redirect to import url for processing commit 29c199320502711a3197eade37f6021064c7dcb0 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 06:39:44 2021 -0500 added hack to fix scopes & CORS for bookmarklet commit 958faf9972d26ad9f78eaaa1126af51d7a3b333b Author: smilerz <smilerz@gmail.com> Date: Sun Mar 28 18:39:20 2021 -0500 added CORS middleware commit c284f830dc7e7339cd2f54185f2ff8ea6866ef19 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 26 14:47:24 2021 -0500 added bookmarklet model and api commit cbfc5fa973c002bc1ce75d3d2671986007b6a3a7 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 17:48:32 2021 -0500 bookmarklet passing data to form commit d9815e445828293bb2965c7c98ab6acf3afe3833 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 14:02:57 2021 -0500 added bookmarklet that doesn't work yet commit 0e327f3bf865a99e95368bf4b74ee9545d9a2b1a Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 14:14:56 2021 -0500 Squashed commit of the following: commit81a8734fac
Merge:abcef54
f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:41:13 2021 +0100 Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support Add iOS webclip icon support commitabcef54e72
Merge:e15c92c
7527646
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:30:43 2021 +0100 Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1 Bump recipe-scrapers from 12.2.0 to 12.2.1 commite15c92cda5
Merge:58fc269
45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:26:06 2021 +0100 Merge pull request #501 from smilerz/main_fork fix json direct import when wrapped in @graph commit45dba6fad2
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:23:55 2021 -0500 fix json direct import when wrapped in @graph commitf67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 15:49:12 2021 +0100 Add generated icons from icongenerator. commit53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 12:48:58 2021 +0100 Fix errors in favicon SVG. commit7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Mar 19 05:51:22 2021 +0000 Bump recipe-scrapers from 12.2.0 to 12.2.1 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1) Signed-off-by: dependabot[bot] <support@github.com> commit 18c5bf8a3eb7dd22504bbd2e40acab9269cc6804 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 13:58:16 2021 -0500 updated links to import recipes commit 9f643b0b85cc89a36a86681e20c68c177959e1a1 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:54:41 2021 -0500 added collapsable cards commit b37594eb84988043afa450de871a036f72a811ee Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:32:55 2021 -0500 cosmetic cleanup commit e5f76034dfc174d3ce307de1c0c5683a159733a9 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:15:57 2021 -0500 added image import commit 792cfb0791c2e682589995ccd1b85eca0a04061c Author: smilerz <smilerz@gmail.com> Date: Mon Mar 22 15:13:01 2021 -0500 consolidated integration imports into url_import commit aa6c9430bce1a63e46ff0325f13e4f4d7369cc00 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:49 2021 -0500 staged app import tabs commit 3dd92d811c140d925b153f30db29e11e4c8a18cc Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:16 2021 -0500 fixed missing space in keyword when adding recipe commit d79283ccabdd014c62dc820f382830421908cf0a Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:08:51 2021 -0500 removed unused templates commit 3f95eb2f3db42628994f1ea80fd5010fa1b247ba Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 13:13:56 2021 -0500 combined json import and source import commit 5016314ab57102454a95e48f0ba50b6031cc5400 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 16:06:02 2021 -0500 more fix from super ugly merge commit 27a489c45a5b169818e36c79591757f99f64c637 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:17:10 2021 -0500 more cleanup from ugly merge commit f7517d51dd9aad61b1e80ec20947c4f597834691 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 11:24:23 2021 -0500 fixed ugly merge commit 7095b6ef89fe350d591f1103c4c1a2d27c60d28f Author: smilerz <smilerz@gmail.com> Date: Thu Mar 18 12:09:53 2021 -0500 added drag and drop to ingredients commit bdadc7168f37eede0f91a2bfa060200273e440a9 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 15 15:56:44 2021 -0500 manually parse json commit 4bcd7e462db760d00483a90883028e5404f33299 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:33:07 2021 -0600 update urls.py commit 794d2798bfe56a27af5e8786e5f3b9701be7fe81 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:32:47 2021 -0600 commit merge from Patralos/recipes commit e97bc6ea89d8c366104d08ce561dd3d3c17c1578 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 15:34:47 2021 -0600 updated URL import page with tab interface commit 7732bc44b83c23901873bce1075b7ac2e68cee07 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 11:29:10 2021 -0600 import raw json/html commit 368d2211efa86e1146e95e3ddd1192b81f0422c2 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 7 14:28:29 2021 -0600 refactored json parser to create functions for each sub parser commit 3ddff8b468e0c85d1a4ff61b565b78c5be0f77ea Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 22:27:32 2021 +0100 replace common fractions with their concrete value (else parsing is not possible) commit 083048e125f63463edca6f4855f6a8e974f61a21 Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 21:37:39 2021 +0100 Allow recipes to be imported from json directly commit 95652d98008eca6ad5c79b928b02f98176846a4e Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 20:15:41 2021 -0500 Squashed commit of the following: commit7930c2417c
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 17:12:43 2021 -0500 update ATK scrape to handle empty headnote commit2f27413c0a
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 14:12:24 2021 -0500 parse multiple ingredientGroups previous version assumed only a single item in a list - this loops through each item commit5869a8ad1b
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 13:43:34 2021 -0500 fixes to pass tests commit0640a265fc
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 13:42:56 2021 -0500 added test for spruce eats commitd449fc8fd8
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 12:49:42 2021 -0500 updated normalization to skip removing line breaks commitb9ee77709b
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 12:49:06 2021 -0500 updated ATK scraper to include header notes in instructions commit 27b7f58c2548f634aba5d2dc2422cc321b0b2cca Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 15:57:20 2021 -0500 updated message commit 6f61d1309f1bfd143a4b723e120054d0aea62e82 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 14:17:16 2021 -0500 fixed ATK scraper commit 30d54770561ddf1d9e88409574d92cb5799e6961 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 13:44:29 2021 -0500 Squashed commit of the following: commit5869a8ad1b
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 13:43:34 2021 -0500 fixes to pass tests commit0640a265fc
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 13:42:56 2021 -0500 added test for spruce eats commitd449fc8fd8
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 12:49:42 2021 -0500 updated normalization to skip removing line breaks commitb9ee77709b
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 12:49:06 2021 -0500 updated ATK scraper to include header notes in instructions commit 007c66d9b13edba49bd441e95c4b480837c074c7 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 11:58:40 2021 -0500 added upcoming features commit 13cdc8f9befef484b66208c54531b97a6aac81e2 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 17:45:42 2021 -0500 Squashed commit of the following: commitba061df1b6
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 17:30:59 2021 -0500 catch attribute error on cooktime commit7cc515bcdf
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 17:08:25 2021 -0500 fix manual url import commit724748d38a
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 14:09:10 2021 -0500 corrected api import workflow commitb2c1c6e301
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 11:26:26 2021 -0500 restored missing manual url scrape commit987be4b04d
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 09:02:27 2021 -0500 Fix after rebase commitca84da68c4
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 18:39:44 2021 -0500 catch attibute error when scrape missing schema commitd75e39fbcd
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 16:27:18 2021 -0500 set persistent connections to db commiteb2593aacd
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 16:08:04 2021 -0500 handle text in cook times during import commit496e04cfc8
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:47:35 2021 -0500 convert servings to number on import commitd814d13d54
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 13:17:15 2021 -0500 custom scraper fails safe commitd0cedaf7a1
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 12:48:26 2021 -0500 added name parser commit01f504f7b1
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:31:47 2021 -0500 updated tests to handle html decoding commitc716346f1f
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:55:07 2021 -0500 flake commitfef5236931
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:53:45 2021 -0500 decode url strings in text_parser commitb115c37eb8
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:32:33 2021 -0500 catch error on scrape.image() commit1e17f3703a
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:28:46 2021 -0500 trap error on scrape.title() commit468b986314
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:05:28 2021 -0500 updated tests commita531d135b5
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:42:31 2021 -0500 remove html tags from description commit7524609cd0
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commita28f8e65d5
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commitd193637091
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:20:03 2021 -0500 added missing bookmarklet commit0953af05fc
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:18:14 2021 -0500 Revert "bug fix url import" This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23. commit19e8e5cb5b
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 13 16:44:05 2021 -0500 removed extra string normalization commit43c808380d
Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 21:22:56 2021 -0500 updated migration commit7ab8b84044
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:14:50 2021 -0500 updated recipe targets in tests to reflect html decoding commitd739fe6752
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 13:28:35 2021 -0500 fixes #527 commita84c41e29f
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 10:57:13 2021 -0500 bug fix url import commit393aba1f31
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 07:02:43 2021 -0500 url import bug fixes commit436a070730
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:43:33 2021 -0500 bug fix tests commit2fe6788ce5
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:41:00 2021 -0500 bug fix url import commit747d146389
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:26:29 2021 -0500 recipe import tests commitefe4c4043d
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 12:32:11 2021 -0500 simplified url import commitc6739ba8e0
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 09:20:15 2021 -0500 add data for url_import test commit50140db668
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:43:36 2021 -0500 added all ATK sites to custom scraper commit028b2dfb22
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:23 2021 -0500 added cooksillustrated custom scraper commitec6a10ca0a
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:01 2021 -0500 ensure time is always a number commit3cf949bf8d
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 2 15:19:20 2021 -0500 added ability to create custom scrapers commit0a62225797
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:21:28 2021 -0500 removed old json importer commita54f4e1367
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:19:18 2021 -0500 updated import from source to use text scraper commitbf3c30a8fb
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:08:56 2021 -0500 remove old html_import function commitf811f5996e
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:07:51 2021 -0500 wrapper for recipe_scrapers to parse text input commita3490240f4
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:17:46 2021 -0500 fixed broken tab commitb26aea96f4
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:11:54 2021 -0500 delete bookmarklet on import commit4d4af5fdf2
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:53:06 2021 -0500 removed console message commit3da74505d6
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:51:14 2021 -0500 fixed ingredient display on preview commitc8a4861df8
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 11:49:56 2021 -0500 redirect to import url for processing commit5e27cd606e
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 06:39:44 2021 -0500 added hack to fix scopes & CORS for bookmarklet commita341fd8ebe
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 28 18:39:20 2021 -0500 added CORS middleware commit9a62b6e4e7
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 26 14:47:24 2021 -0500 added bookmarklet model and api commitf80c44bca3
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 17:48:32 2021 -0500 bookmarklet passing data to form commit09d2e9f831
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 14:02:57 2021 -0500 added bookmarklet that doesn't work yet commit4d5a9e446f
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 14:14:56 2021 -0500 Squashed commit of the following: commit81a8734fac
Merge:abcef54
f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:41:13 2021 +0100 Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support Add iOS webclip icon support commitabcef54e72
Merge:e15c92c
7527646
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:30:43 2021 +0100 Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1 Bump recipe-scrapers from 12.2.0 to 12.2.1 commite15c92cda5
Merge:58fc269
45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:26:06 2021 +0100 Merge pull request #501 from smilerz/main_fork fix json direct import when wrapped in @graph commit45dba6fad2
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:23:55 2021 -0500 fix json direct import when wrapped in @graph commitf67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 15:49:12 2021 +0100 Add generated icons from icongenerator. commit53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 12:48:58 2021 +0100 Fix errors in favicon SVG. commit7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Mar 19 05:51:22 2021 +0000 Bump recipe-scrapers from 12.2.0 to 12.2.1 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1) Signed-off-by: dependabot[bot] <support@github.com> commit6a2c27749f
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 13:58:16 2021 -0500 updated links to import recipes commitde60e12073
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:54:41 2021 -0500 added collapsable cards commit1188ed9227
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:32:55 2021 -0500 cosmetic cleanup commitcb708e7e47
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:15:57 2021 -0500 added image import commit215eadb4a0
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 22 15:13:01 2021 -0500 consolidated integration imports into url_import commit4ffc54f720
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:49 2021 -0500 staged app import tabs commit21f6c7a21f
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:16 2021 -0500 fixed missing space in keyword when adding recipe commitce7c6939d2
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:08:51 2021 -0500 removed unused templates commit40a2f7ff90
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 13:13:56 2021 -0500 combined json import and source import commit4015517c0a
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 16:06:02 2021 -0500 more fix from super ugly merge commit7c8d41753c
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:17:10 2021 -0500 more cleanup from ugly merge commit90670613c5
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 11:24:23 2021 -0500 fixed ugly merge commit647c1678f1
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 18 12:09:53 2021 -0500 added drag and drop to ingredients commit44dee16e0a
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 15 15:56:44 2021 -0500 manually parse json commitf8fedcac82
Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:33:07 2021 -0600 update urls.py commit3a48d0e580
Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:32:47 2021 -0600 commit merge from Patralos/recipes commit9930789aa8
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 15:34:47 2021 -0600 updated URL import page with tab interface commit83fce6461a
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 11:29:10 2021 -0600 import raw json/html commitf0d37244b6
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 7 14:28:29 2021 -0600 refactored json parser to create functions for each sub parser commit386834f409
Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 21:37:39 2021 +0100 Allow recipes to be imported from json directly commit b16b8231f0a02a70ecd04fa62118af988c3bb171 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 17:30:59 2021 -0500 catch attribute error on cooktime commit 18dd32e13ec07426fd9891ee582d1fbf58a51ffa Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 17:08:25 2021 -0500 fix manual url import commit 696d43467054463267da1f7eb2b7692505b28496 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:33:51 2021 -0500 Squashed commit of the following: commit 8e2a15aff203cacd8956c947eecf3967f5b66015 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:29:11 2021 -0500 removed unnecessary console message commit 436d5b3165340772a859899578f7386edfcd587f Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:25:23 2021 -0500 removed commented out settings commit ba6b58b198d2e9260544d64e107afee9420ae340 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:24:27 2021 -0500 removed unused cors_headers commit c7690c391f341d8d92500276f243e99f8700528e Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:22:15 2021 -0500 removed line breaks commit 3259f86ff8b911fa8489922eee43c4465ea81d61 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:21:21 2021 -0500 removed console.log() commit 24552a2d9b644c86dee900322989fb3306ca1b4e Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 14:58:48 2021 -0500 fix after rebase commit bdf8ce1c3357609013c84d2661371ede815cd700 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 11:17:00 2021 -0500 Fix after rebase commit 58cd295e7ae8caa9be588508eb1795fd4a00e810 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 07:44:53 2021 -0500 updated model commit ec786ef8a19f9459cd4c890c60330bcadafb0247 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:46:38 2021 -0500 convert servings to number on import commit 90cc1711b185290778e973821b17a7574c6d3428 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:15:59 2021 -0500 update tests to handle url decoding commit 466eae617cace3b662fe480427018b0ac7a7ab1d Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:57:10 2021 -0500 bring parser inline with json_import branch commit 2668406d4625f747305482ede28e256c94aefcf9 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 08:50:00 2021 -0500 unescape html document commit f765347aec15b7765eaec830dd8dfda1f17b7597 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 11:29:35 2021 -0500 updated bookmarklet to work with updated import process commit 60d95ebf3d4e1c8af7f3b6832adfb28ce13a51aa Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:52 2021 -0500 Squashed commit of the following: commit 707d862e01a7497a1f22879d314b865a35e0e85b Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:00 2021 -0500 works now commit 3942a445ed4f2ccec57de25eacd86ea4e4dd6bdb Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:25:24 2021 -0500 updated serializer and api commit 10dc746eb175c7f805a8a8ffa7ce49977a7ce97e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:20:19 2021 -0500 fixed bookmarklet commit 9779104902d3be0258c95cd2eeebcba0d5d48892 Merge: bb8262c 0cb3928 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:56:27 2021 -0500 Merge branch 'bookmarklet' into json_import commit 0cb39284bb835ffc6cfee3e4306aadc4a64a25be Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commit e89e0218de684d40b2e2bfb6ba833891206c828e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commit bb8262ccabb93c56fbc18c407d5a0653b8b3ca79 Merge: b1e73aa35a7f62
Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 20:35:57 2021 -0500 Merge branch 'main_fork' into json_import commit f50d33a9b2658f6bf27797f645fbd842528a716c Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:20:03 2021 -0500 added missing bookmarklet commit cd482ae8451d3b920d7bb7a2b76044645f6a2e0b Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:18:14 2021 -0500 Revert "bug fix url import" This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23. commit 7032c7cc990af5790073348c3039d907d3469a7e Author: smilerz <smilerz@gmail.com> Date: Tue Apr 13 16:44:05 2021 -0500 removed extra string normalization commit 04b4aeecb9b13ae0023636f65dec8fc0ca1b8e0f Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 21:22:56 2021 -0500 updated migration commit 8b4059d0beed9ae8da9a6943ed550b0a82e12e03 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:14:50 2021 -0500 updated recipe targets in tests to reflect html decoding commit 7388f30ef333315736a8614c2009db37404f4916 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 13:28:35 2021 -0500 fixes #527 commit 6d811738535a81cab737b10f006f50c32cc32f13 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 10:57:13 2021 -0500 bug fix url import commit cbe400cdaccb0fcbebeafea199cf14be3deeb150 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 07:02:43 2021 -0500 url import bug fixes commit f4e33a830b826d1930639f552a2e32882c14d2ba Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:43:33 2021 -0500 bug fix tests commit 1d1cbbe965a5255bd9cabb138a2f1432956a4c6e Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:41:00 2021 -0500 bug fix url import commit 31cf4da8f3dcface57399976679379d11ca6d81e Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:26:29 2021 -0500 recipe import tests commit 1d1b5b545ab35626636ec4d9e1ce020fe508e520 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 12:32:11 2021 -0500 simplified url import commit 25140fa64e9306421956b90e40f53c00429e7c5e Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 09:20:15 2021 -0500 add data for url_import test commit 14d97f671ad356c8212ffc7fdd5b15fce8b5a7c1 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:43:36 2021 -0500 added all ATK sites to custom scraper commit 10975665626ae958f45e4c76b5125978e4776c41 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:23 2021 -0500 added cooksillustrated custom scraper commit 9ea33ec10bc32aa6ffed0c8cd6d5a4b4e123eff1 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:01 2021 -0500 ensure time is always a number commit ceb85137dd25a2cc6192165af9ac9b515cd5cfee Author: smilerz <smilerz@gmail.com> Date: Fri Apr 2 15:19:20 2021 -0500 added ability to create custom scrapers commit cc53a8debe36e65f9f487ac8c31cf3235bad5370 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:21:28 2021 -0500 removed old json importer commit d2233df427cc577fd6ea87458d821ac37c4def48 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:19:18 2021 -0500 updated import from source to use text scraper commit 9a0fcf9d2b6d35f01c16aa1c1a1074bb42577a3e Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:08:56 2021 -0500 remove old html_import function commit 2bc5fbbdcc5d395b7ed7aa1879449e16da0ee2d1 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:07:51 2021 -0500 wrapper for recipe_scrapers to parse text input commit 4a3c1a94a97ec18109ba43a5bbe90a6aa8e622c4 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:17:46 2021 -0500 fixed broken tab commit 6b92f8c325dd4a3c43fec0efe9b20181eaea0951 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:11:54 2021 -0500 delete bookmarklet on import commit dcd12899fd361868d4542e882d413292ef37a92b Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:53:06 2021 -0500 removed console message commit 3e58d79a9279e63af66356d14c7204121f6055dd Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:51:14 2021 -0500 fixed ingredient display on preview commit 1eb6ba707c41f52711ed2d68e3758ce9c70465ec Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 11:49:56 2021 -0500 redirect to import url for processing commit 95b50edc0f33afc1557b6a766e610a6c74b2e8a0 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 06:39:44 2021 -0500 added hack to fix scopes & CORS for bookmarklet commit bdc85694309fb79b9c214f0330848be82c372156 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 28 18:39:20 2021 -0500 added CORS middleware commit c1f5ec44c3f45dd403cc600ed5e38b814fedd138 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 26 14:47:24 2021 -0500 added bookmarklet model and api commit cc9a6fe14adbca88dc8753a7271ed4d47e638822 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 17:48:32 2021 -0500 bookmarklet passing data to form commit 3bf58f633610caa266e210fcdbecdedd0edf2465 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 14:02:57 2021 -0500 added bookmarklet that doesn't work yet commit 9a11ebc7746f2acdd156a574703ea05a0aba0a9b Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 14:14:56 2021 -0500 Squashed commit of the following: commit81a8734fac
Merge:abcef54
f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:41:13 2021 +0100 Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support Add iOS webclip icon support commitabcef54e72
Merge:e15c92c
7527646
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:30:43 2021 +0100 Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1 Bump recipe-scrapers from 12.2.0 to 12.2.1 commite15c92cda5
Merge:58fc269
45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:26:06 2021 +0100 Merge pull request #501 from smilerz/main_fork fix json direct import when wrapped in @graph commit45dba6fad2
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:23:55 2021 -0500 fix json direct import when wrapped in @graph commitf67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 15:49:12 2021 +0100 Add generated icons from icongenerator. commit53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 12:48:58 2021 +0100 Fix errors in favicon SVG. commit7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Mar 19 05:51:22 2021 +0000 Bump recipe-scrapers from 12.2.0 to 12.2.1 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1) Signed-off-by: dependabot[bot] <support@github.com> commit 9307226d777d5648d1cacc0107241dfaec3a4405 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 13:58:16 2021 -0500 updated links to import recipes commit bec00d05898c074b893df7338248b7803f8272c1 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:54:41 2021 -0500 added collapsable cards commit 2d647a2f6aa1afacb6651a6294bba571fafc3190 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:32:55 2021 -0500 cosmetic cleanup commit 48cd8ce5f1c5c3ea2372b0f3fcdb2a9491be52f4 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:15:57 2021 -0500 added image import commit 12e82211ace004c93726b8f6327adee1d1a58f78 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 22 15:13:01 2021 -0500 consolidated integration imports into url_import commit 8cf5dae5482d7b28e386760ca039c60efdfbdb9a Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:49 2021 -0500 staged app import tabs commit a255450fad53f9482711a252ec98b353b66a15df Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:16 2021 -0500 fixed missing space in keyword when adding recipe commit 2bb4dd9954c4913c6b4bd9e23f60315ed0c46552 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:08:51 2021 -0500 removed unused templates commit cddbebbc85377227ba9d753cf9d58db03e7f5ee2 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 13:13:56 2021 -0500 combined json import and source import commit b929bd9ae3a061dc2660602cb2ffb036b7e6cac7 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 16:06:02 2021 -0500 more fix from super ugly merge commit 558eb25faee2f8362a9af1380b40b11a3c05b6fa Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:17:10 2021 -0500 more cleanup from ugly merge commit 8906345e107096a657fac8cdff497548dbaa9ffd Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 11:24:23 2021 -0500 fixed ugly merge commit 966edebfedf89a7976f47dd0526e0aeb41aa0feb Author: smilerz <smilerz@gmail.com> Date: Thu Mar 18 12:09:53 2021 -0500 added drag and drop to ingredients commit a9b24c9f03a223bbf59613a10f000ce1b421383f Author: smilerz <smilerz@gmail.com> Date: Mon Mar 15 15:56:44 2021 -0500 manually parse json commit 908ae04ef98d629da0cd74e94d1401fa6c5ac654 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:33:07 2021 -0600 update urls.py commit e3828f96e6d2db5877789b5bd9be9cc4eb151d5f Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:32:47 2021 -0600 commit merge from Patralos/recipes commit a21fe044ed527dae2ea9a8bce854c628b1a39910 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 15:34:47 2021 -0600 updated URL import page with tab interface commit 59a30f579a25758ec58a938e8a315dd986e62cbf Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 11:29:10 2021 -0600 import raw json/html commit 299194409d9c0a395aaf5d69106c2f35baa1d402 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 7 14:28:29 2021 -0600 refactored json parser to create functions for each sub parser commit 0e480ba82f25a3fa705a9adc2cf82f5234797b44 Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 22:27:32 2021 +0100 replace common fractions with their concrete value (else parsing is not possible) commit 40fb268d2d2cfe5250b1a900eafb4819fd85572b Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 21:37:39 2021 +0100 Allow recipes to be imported from json directly commit987be4b04d
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 09:02:27 2021 -0500 Fix after rebase commitca84da68c4
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 18:39:44 2021 -0500 catch attibute error when scrape missing schema commitd75e39fbcd
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 16:27:18 2021 -0500 set persistent connections to db commiteb2593aacd
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 16:08:04 2021 -0500 handle text in cook times during import commit496e04cfc8
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:47:35 2021 -0500 convert servings to number on import commitd814d13d54
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 13:17:15 2021 -0500 custom scraper fails safe commitd0cedaf7a1
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 12:48:26 2021 -0500 added name parser commit01f504f7b1
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:31:47 2021 -0500 updated tests to handle html decoding commitc716346f1f
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:55:07 2021 -0500 flake commitfef5236931
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:53:45 2021 -0500 decode url strings in text_parser commitb115c37eb8
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:32:33 2021 -0500 catch error on scrape.image() commit1e17f3703a
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:28:46 2021 -0500 trap error on scrape.title() commit468b986314
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:05:28 2021 -0500 updated tests commita531d135b5
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:42:31 2021 -0500 remove html tags from description commit7524609cd0
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commita28f8e65d5
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commitd193637091
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:20:03 2021 -0500 added missing bookmarklet commit0953af05fc
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:18:14 2021 -0500 Revert "bug fix url import" This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23. commit19e8e5cb5b
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 13 16:44:05 2021 -0500 removed extra string normalization commit43c808380d
Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 21:22:56 2021 -0500 updated migration commit7ab8b84044
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:14:50 2021 -0500 updated recipe targets in tests to reflect html decoding commitd739fe6752
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 13:28:35 2021 -0500 fixes #527 commita84c41e29f
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 10:57:13 2021 -0500 bug fix url import commit393aba1f31
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 07:02:43 2021 -0500 url import bug fixes commit436a070730
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:43:33 2021 -0500 bug fix tests commit2fe6788ce5
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:41:00 2021 -0500 bug fix url import commit747d146389
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:26:29 2021 -0500 recipe import tests commitefe4c4043d
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 12:32:11 2021 -0500 simplified url import commitc6739ba8e0
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 09:20:15 2021 -0500 add data for url_import test commit50140db668
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:43:36 2021 -0500 added all ATK sites to custom scraper commit028b2dfb22
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:23 2021 -0500 added cooksillustrated custom scraper commitec6a10ca0a
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:01 2021 -0500 ensure time is always a number commit3cf949bf8d
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 2 15:19:20 2021 -0500 added ability to create custom scrapers commit0a62225797
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:21:28 2021 -0500 removed old json importer commita54f4e1367
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:19:18 2021 -0500 updated import from source to use text scraper commitbf3c30a8fb
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:08:56 2021 -0500 remove old html_import function commitf811f5996e
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:07:51 2021 -0500 wrapper for recipe_scrapers to parse text input commita3490240f4
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:17:46 2021 -0500 fixed broken tab commitb26aea96f4
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:11:54 2021 -0500 delete bookmarklet on import commit4d4af5fdf2
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:53:06 2021 -0500 removed console message commit3da74505d6
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:51:14 2021 -0500 fixed ingredient display on preview commitc8a4861df8
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 11:49:56 2021 -0500 redirect to import url for processing commit5e27cd606e
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 06:39:44 2021 -0500 added hack to fix scopes & CORS for bookmarklet commita341fd8ebe
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 28 18:39:20 2021 -0500 added CORS middleware commit9a62b6e4e7
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 26 14:47:24 2021 -0500 added bookmarklet model and api commitf80c44bca3
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 17:48:32 2021 -0500 bookmarklet passing data to form commit09d2e9f831
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 14:02:57 2021 -0500 added bookmarklet that doesn't work yet commit4d5a9e446f
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 14:14:56 2021 -0500 Squashed commit of the following: commit81a8734fac
Merge:abcef54
f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:41:13 2021 +0100 Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support Add iOS webclip icon support commitabcef54e72
Merge:e15c92c
7527646
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:30:43 2021 +0100 Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1 Bump recipe-scrapers from 12.2.0 to 12.2.1 commite15c92cda5
Merge:58fc269
45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:26:06 2021 +0100 Merge pull request #501 from smilerz/main_fork fix json direct import when wrapped in @graph commit45dba6fad2
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:23:55 2021 -0500 fix json direct import when wrapped in @graph commitf67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 15:49:12 2021 +0100 Add generated icons from icongenerator. commit53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 12:48:58 2021 +0100 Fix errors in favicon SVG. commit7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Mar 19 05:51:22 2021 +0000 Bump recipe-scrapers from 12.2.0 to 12.2.1 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1) Signed-off-by: dependabot[bot] <support@github.com> commit6a2c27749f
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 13:58:16 2021 -0500 updated links to import recipes commitde60e12073
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:54:41 2021 -0500 added collapsable cards commit1188ed9227
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:32:55 2021 -0500 cosmetic cleanup commitcb708e7e47
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:15:57 2021 -0500 added image import commit215eadb4a0
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 22 15:13:01 2021 -0500 consolidated integration imports into url_import commit4ffc54f720
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:49 2021 -0500 staged app import tabs commit21f6c7a21f
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:16 2021 -0500 fixed missing space in keyword when adding recipe commitce7c6939d2
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:08:51 2021 -0500 removed unused templates commit40a2f7ff90
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 13:13:56 2021 -0500 combined json import and source import commit4015517c0a
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 16:06:02 2021 -0500 more fix from super ugly merge commit7c8d41753c
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:17:10 2021 -0500 more cleanup from ugly merge commit90670613c5
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 11:24:23 2021 -0500 fixed ugly merge commit647c1678f1
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 18 12:09:53 2021 -0500 added drag and drop to ingredients commit44dee16e0a
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 15 15:56:44 2021 -0500 manually parse json commitf8fedcac82
Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:33:07 2021 -0600 update urls.py commit3a48d0e580
Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:32:47 2021 -0600 commit merge from Patralos/recipes commit9930789aa8
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 15:34:47 2021 -0600 updated URL import page with tab interface commit83fce6461a
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 11:29:10 2021 -0600 import raw json/html commitf0d37244b6
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 7 14:28:29 2021 -0600 refactored json parser to create functions for each sub parser commit386834f409
Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 21:37:39 2021 +0100 Allow recipes to be imported from json directly commit 83b87d9c948bbda67bbfe03aaedc5d26587d49ed Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:08:08 2021 -0500 Fix after rebase commit be7279ea24209847e83a0d8ccc4a4a841862ae76 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 07:48:52 2021 -0500 Squashed commit of the following: commit 7642ac66b4d679fb3bd40d783d8c00e969e48413 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 07:44:53 2021 -0500 updated model commit c887fae3a2b85ad23772944d311761b85bd67031 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:46:38 2021 -0500 convert servings to number on import commit 34966bcef2993f4d0a1309362b0648f2096db996 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:15:59 2021 -0500 update tests to handle url decoding commit 86676772676395482901c195888898e7eaafc015 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:57:10 2021 -0500 bring parser inline with json_import branch commit 2b547f67cd180ca457691e15bc9edc1ae033ecc8 Merge: e5ada34 51d4ffe Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:43:27 2021 -0500 Merge branch 'bookmarklet' of github.com:smilerz/recipes into bookmarklet commit 51d4ffef18d359f75d377eee27bd15816957ac53 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 08:50:00 2021 -0500 unescape html document commit e5ada345d869409b240fd0746a88f269b6c28c2c Merge: 5b7df0a8d02cad
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 12:39:37 2021 -0500 Merge branch 'deprecation-fixes' into bookmarklet commit8d02cad7d9
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 12 14:12:04 2021 -0500 resolved deprecation warnings introduced in django 3.2 commit 9424ee823a3f02368ab4893efcac1977dde12230 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 18:38:46 2021 -0500 removed cors_header import - unused commit 58b0abfcb931aad2bff9839b335b5bba65198fa7 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 18:38:00 2021 -0500 catch attribute error when scrape has no schema commit 2297f02adb56e74e66fc5d4aa07a9f16284e0967 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 16:03:56 2021 -0500 handle text cook times on import commit 8a2e05113311c4596b89d0bf28a1abf0b330e003 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:45:34 2021 -0500 convert servings to number on import commit 285bdb637cf7691eee9a93f7b5cd3e1e902b781b Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 13:10:23 2021 -0500 name parser handles list commit 04bdba9d2114131b8e5e380ad80bba1a1a4e8430 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:52:34 2021 -0500 updated docs for personal beta commit e836e04b9cf179deda426741103db7fce94f2259 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 08:57:35 2021 -0500 decode html data when passing bookmarklet commit af7265559151b17446736aa200273f528a5dff41 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:39:30 2021 -0500 extra error catching commit eb7a5ea614bf2bc7fad78721b21c4c1e76189404 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 18:48:45 2021 -0500 more shenanigans commit b4f4e8af09ca04feffdd4d668f439ccae10e2425 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 18:25:24 2021 -0500 add debugpy to requirements commit 360548219e75b8bcc57437c71d72e38b1eea20d0 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 18:24:24 2021 -0500 remote debug commit c2a66e8f7cf7f3167a2c11f4b71c02b4ee781584 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 18:03:15 2021 -0500 remote debug in container commit fe1c9f78c8915942ec0f7d650dca981941196165 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 16:48:09 2021 -0500 nope, this one works commit 75e8953f27587101feb8a19457d5274dbbb08235 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 16:28:31 2021 -0500 it finally works commit edcf0c9562038994704f4b7a4ecefa3eefc116eb Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 15:40:36 2021 -0500 fix test again commit eeeef897817afb31cde1f38d664b65e7766d4ca8 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 15:02:57 2021 -0500 add bookmarklet back commit 9e82189d2120007d645d26acfa2a258b1ddbf12f Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 14:40:13 2021 -0500 extra docker tags commit 84ed96619100aa0a312599177bf2185b66652183 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 14:29:52 2021 -0500 build hook commit 27ef76216e1445c015b0e809e17fb372e944594b Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:44:03 2021 -0500 fixed workflow commit e53fa20f7abcd812c26a5db510ebb0bf22df6be5 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:42:00 2021 -0500 fixed branch reference commit d02154a7f77250c86f70ab9b4d2196c9209cb4db Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:39:08 2021 -0500 personalized build commit aa0fd608336a497238e6e4199f034eb198a919d5 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:05:28 2021 -0500 updated tests commit 335098b0013142b68daef596d93afe4960955565 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 11:52:06 2021 -0500 fixed admin commit 9ad84264605e1c0715071f90e9484b42a0743a0a Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 11:29:35 2021 -0500 updated bookmarklet to work with updated import process commit 70902047eb6423519fda8a829ec8a82ff4b21d6e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:42:31 2021 -0500 remove html tags from description commit 62dc60381b29cc0d3ebc4f958342bf2de9f70274 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:52 2021 -0500 Squashed commit of the following: commit 707d862e01a7497a1f22879d314b865a35e0e85b Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:00 2021 -0500 works now commit 3942a445ed4f2ccec57de25eacd86ea4e4dd6bdb Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:25:24 2021 -0500 updated serializer and api commit 10dc746eb175c7f805a8a8ffa7ce49977a7ce97e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:20:19 2021 -0500 fixed bookmarklet commit 9779104902d3be0258c95cd2eeebcba0d5d48892 Merge: bb8262c 0cb3928 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:56:27 2021 -0500 Merge branch 'bookmarklet' into json_import commit 0cb39284bb835ffc6cfee3e4306aadc4a64a25be Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commit e89e0218de684d40b2e2bfb6ba833891206c828e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commit bb8262ccabb93c56fbc18c407d5a0653b8b3ca79 Merge: b1e73aa35a7f62
Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 20:35:57 2021 -0500 Merge branch 'main_fork' into json_import commit 9cc62d1b5c9f304af14c989bc236eb175e059829 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commit 18ed196db0a19a35b78b84858a30e1fb12cfbdb4 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commit bf2ac5de86b1dec1db013371ad30406cf9617c57 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:20:03 2021 -0500 added missing bookmarklet commit 61c0f2608b5a75f688a98f470a020881ed86babb Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:18:14 2021 -0500 Revert "bug fix url import" This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23. commit 1d7f83e70fffbd63ac813f0bc9911c15acf4977e Author: smilerz <smilerz@gmail.com> Date: Tue Apr 13 16:44:05 2021 -0500 removed extra string normalization commit f8c579cd70a402d154efdb3a1e383f4935027884 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 21:22:56 2021 -0500 updated migration commit f442ae8a39b38c3555971b9de2f3286ad5cc9e46 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:14:50 2021 -0500 updated recipe targets in tests to reflect html decoding commit 1b491fa1f06693c9e356af4f1c07372ffcd4417d Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 13:28:35 2021 -0500 fixes #527 commit 1caeddcb4ea9321d1c92480118be5cff77caaa76 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 10:57:13 2021 -0500 bug fix url import commit 7450842baeb2d1db1406e0a34f5b4fb8ca01112c Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 07:02:43 2021 -0500 url import bug fixes commit af2259639ed86eabd88c0f09eec254f9cdac2eed Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:43:33 2021 -0500 bug fix tests commit d477f11b9152cc86372e7b0403fff135d1f4dd00 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:41:00 2021 -0500 bug fix url import commit 3159a97e53d91c1b8cd388d9c86faa2af8669110 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:26:29 2021 -0500 recipe import tests commit b5f535b1b17b85c88b3a312360cb83d1c253bfad Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 12:32:11 2021 -0500 simplified url import commit 7e15525bc4b1710da3c9d3a7606276c0c39456e3 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 09:20:15 2021 -0500 add data for url_import test commit 240f4008efe2cd7f5d4738bcf02700234aca5d20 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:43:36 2021 -0500 added all ATK sites to custom scraper commit acab9b6268b56592be5ceacefda7d1503f3a6253 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:23 2021 -0500 added cooksillustrated custom scraper commit 18bab0dd498b0413f272e305799eea2eb06da697 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:01 2021 -0500 ensure time is always a number commit dcb791ec1b47e958dcf26d0eb3e761a8e6f68d2b Author: smilerz <smilerz@gmail.com> Date: Fri Apr 2 15:19:20 2021 -0500 added ability to create custom scrapers commit 5e4bdc1dd095d39e4df2e80921e4f7be2f50b80e Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:21:28 2021 -0500 removed old json importer commit 11e05fc5c30ee842896b1766d9ff50e559e743cc Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:19:18 2021 -0500 updated import from source to use text scraper commit 80d8657d551cdb7393631cf6af2171ad48288b22 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:08:56 2021 -0500 remove old html_import function commit ecc74ebab163afa7e1a15bbcc16e46e35dbb3bea Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:07:51 2021 -0500 wrapper for recipe_scrapers to parse text input commit d4f85f3440bd047dd8abdc19af37905d1b4c6dd2 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:17:46 2021 -0500 fixed broken tab commit 7563b104d271c8aadea77781bc617122dc7d6308 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:11:54 2021 -0500 delete bookmarklet on import commit 2429cc097d00f1ebc64f53dce85ac9889954c82d Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:53:06 2021 -0500 removed console message commit 079a2fdf2abef9bb168b7bd6e27c534f589725cf Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:51:14 2021 -0500 fixed ingredient display on preview commit d51ec991133eccf62a1f81ab4f3fbe943b2bb1e8 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 11:49:56 2021 -0500 redirect to import url for processing commit 2f4e7f17479e631f49929a02a7cd2def5918bd8a Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 06:39:44 2021 -0500 added hack to fix scopes & CORS for bookmarklet commit 77bc53016b1495ba514cfdb789587891ded8c525 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 28 18:39:20 2021 -0500 added CORS middleware commit de62ea8159eca98f296cc160654d63c601654730 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 26 14:47:24 2021 -0500 added bookmarklet model and api commit 43b09efd17f9bc1028f020857711d356a8fc950c Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 17:48:32 2021 -0500 bookmarklet passing data to form commit 5e97533a792627c639113e57f7ca30ea691287a7 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 14:02:57 2021 -0500 added bookmarklet that doesn't work yet commit c0bd70f9cc0e9e0f4e18288dea2fe099300e5533 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 14:14:56 2021 -0500 Squashed commit of the following: commit81a8734fac
Merge:abcef54
f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:41:13 2021 +0100 Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support Add iOS webclip icon support commitabcef54e72
Merge:e15c92c
7527646
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:30:43 2021 +0100 Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1 Bump recipe-scrapers from 12.2.0 to 12.2.1 commite15c92cda5
Merge:58fc269
45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:26:06 2021 +0100 Merge pull request #501 from smilerz/main_fork fix json direct import when wrapped in @graph commit45dba6fad2
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:23:55 2021 -0500 fix json direct import when wrapped in @graph commitf67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 15:49:12 2021 +0100 Add generated icons from icongenerator. commit53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 12:48:58 2021 +0100 Fix errors in favicon SVG. commit7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Mar 19 05:51:22 2021 +0000 Bump recipe-scrapers from 12.2.0 to 12.2.1 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1) Signed-off-by: dependabot[bot] <support@github.com> commit 663ee33835e086182cbe3aa1af07937b754136b6 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 13:58:16 2021 -0500 updated links to import recipes commit 24971705b434f50586e48a4f238b2755f61bf21b Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:54:41 2021 -0500 added collapsable cards commit 1a2fcb28a7dd281c6892d7287eba6710dd18acb0 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:32:55 2021 -0500 cosmetic cleanup commit e3bddd5025234676fcea18c585088b22034f7ada Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:15:57 2021 -0500 added image import commit a1cbeb15374a5d7cf38bc9e204f1aff3056daf3e Author: smilerz <smilerz@gmail.com> Date: Mon Mar 22 15:13:01 2021 -0500 consolidated integration imports into url_import commit 49a0b66d9cb9a65d824d9479776d23c7bf88d066 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:49 2021 -0500 staged app import tabs commit e3901d4946122b43143e26200459234289f6bb75 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:16 2021 -0500 fixed missing space in keyword when adding recipe commit 8728a74700a79b94840368e3f7f90bed699de7a3 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:08:51 2021 -0500 removed unused templates commit 22c1f205d5e56404e98192fb964801c59bb6f6ed Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 13:13:56 2021 -0500 combined json import and source import commit d99972a9341bddeac937b92f1a79e85f3bec4d9d Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 16:06:02 2021 -0500 more fix from super ugly merge commit 1b02262f29065c9e16b7fa51f5deca2082aa6104 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:17:10 2021 -0500 more cleanup from ugly merge commit b969e5ac8091bab00d1b9ce163d41c1350cfc229 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 11:24:23 2021 -0500 fixed ugly merge commit b2e735eeee503b099689370d2b0e667795f45c4c Author: smilerz <smilerz@gmail.com> Date: Thu Mar 18 12:09:53 2021 -0500 added drag and drop to ingredients commit 26beec9ddef729954cd7684923fc526aa8bc753f Author: smilerz <smilerz@gmail.com> Date: Mon Mar 15 15:56:44 2021 -0500 manually parse json commit bc503b211d589eca00a5cbe599995f39ae4368f1 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:33:07 2021 -0600 update urls.py commit 73cd61e826155e3eff75f4cc435af21150df988d Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:32:47 2021 -0600 commit merge from Patralos/recipes commit 70b20681089a34005d6b44f1733908395bb79483 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 15:34:47 2021 -0600 updated URL import page with tab interface commit 0c1336cbd36d32699a9b48cbe18177134cf4428d Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 11:29:10 2021 -0600 import raw json/html commit 22630f95b0bffdfc53c791379560ee044e9e1459 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 7 14:28:29 2021 -0600 refactored json parser to create functions for each sub parser commit 6ef12e1cd244ee062b33980758e0a1e72e8ff88b Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 21:37:39 2021 +0100 Allow recipes to be imported from json directly commit 1093cb07647f06434fea0bee68057679f4347b01 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 14:09:10 2021 -0500 corrected api import workflow commit 960ccf509450df025d060fed81b9ba66642b792a Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 11:26:26 2021 -0500 restored missing manual url scrape commit 585bb0fb8fdaa61efa92c73d1ff2a39cb5ca0162 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 09:02:27 2021 -0500 Fix after rebase commit c57e8d9ee0f8498945d014b1a5039db3e8e7f086 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 18:39:44 2021 -0500 catch attibute error when scrape missing schema commit 38a4bd82816aab44cbb35c9e1b96a559bd9b9810 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:47:35 2021 -0500 convert servings to number on import commit e1594fe6f4543810185deee24d9fc2f66f060d8b Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 13:17:15 2021 -0500 custom scraper fails safe commit b30a1622c845ef5c18c228983ba157c514093905 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 12:48:26 2021 -0500 added name parser commit d220e169c115285088a5df67a89ad5a50f7da852 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:31:47 2021 -0500 updated tests to handle html decoding commit 30998dbb768ef3487176954b43cb9bfaa26c0543 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:55:07 2021 -0500 flake commit 542e5eabfcf954945b3c6db83b0d42b5176fe066 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:53:45 2021 -0500 decode url strings in text_parser commit 0b74753a55aee05611105e5b4405f8cdc55d4620 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:32:33 2021 -0500 catch error on scrape.image() commit 3a3c2c090be5098f49700501ca320feadb5ba224 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:28:46 2021 -0500 trap error on scrape.title() commit abfa622cc04be3b9db001cc3230088c0ac644e59 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:05:28 2021 -0500 updated tests commit 569289c8af9810a0b719876d532bee05c3c97f1e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:42:31 2021 -0500 remove html tags from description commit 3500edb71bddaabebfe9f17a3beb2360067fb30b Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commit 9c4e41cd6645b1a42056e075caa2f02a8f1476ec Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commit 52ea9b0aebbda4145932c3e40b5d682c5b0d2cfc Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:20:03 2021 -0500 added missing bookmarklet commit 55deb77f5fccbf45178de0bd057272167c1b05e5 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:18:14 2021 -0500 Revert "bug fix url import" This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23. commit 313af2771ba4e201ebf2a08885e660e67a4a4114 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 13 16:44:05 2021 -0500 removed extra string normalization commit 4e50afd0b91d4c959ec637df6edef91b02b6296b Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 21:22:56 2021 -0500 updated migration commit 437090adb418cde0e8206e2e81b520706ffca73e Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:14:50 2021 -0500 updated recipe targets in tests to reflect html decoding commit 6089303155edfc1e944664935af7827daaa2af42 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 13:28:35 2021 -0500 fixes #527 commit 708d0e9e7b930db49e3105efcc43ec2cec0212ce Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 10:57:13 2021 -0500 bug fix url import commit 67450189ae88798140746e7459cc26a25e7e4e7c Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 07:02:43 2021 -0500 url import bug fixes commit f51d6bb8a1fc1cb0dd884af8dbb1b6686c7fcad7 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:43:33 2021 -0500 bug fix tests commit 66488a16c18a87747a396ada20dcfd4d9b55b332 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:41:00 2021 -0500 bug fix url import commit b12239dd2586505a805fe65d4b2c58435c8aa240 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:26:29 2021 -0500 recipe import tests commit 82a0fd041e773872ff14b4fee9c9c516e0b6fd19 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 12:32:11 2021 -0500 simplified url import commit 5fc1d6139bd771e567ab82bcc3e776b735e75b18 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 09:20:15 2021 -0500 add data for url_import test commit 5fdc7a7cbb613a4213276170cb25f5a6ee7815b0 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:43:36 2021 -0500 added all ATK sites to custom scraper commit 6fa1dda1006b1a4b2dc88369321935f7b943468c Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:23 2021 -0500 added cooksillustrated custom scraper commit c59bc6ad2cd339478878d1f589decba19e257bc7 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:01 2021 -0500 ensure time is always a number commit b59cbe0d2f3fbb5d2d04ddff34eb63102ff2e156 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 2 15:19:20 2021 -0500 added ability to create custom scrapers commit add4f2eb6871f91537b88efeb99c886422ced7b9 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:21:28 2021 -0500 removed old json importer commit 85f04976e897f6c0118478f07c89f67b7144c9bf Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:19:18 2021 -0500 updated import from source to use text scraper commit 1883f48cc90ac1454a576030ccf23eca4b4bb12c Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:08:56 2021 -0500 remove old html_import function commit b05819944dea3291c960bdf8651f200f17cb8126 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:07:51 2021 -0500 wrapper for recipe_scrapers to parse text input commit 5a8317579624c3732983d3f9971dc4a6c5203297 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:17:46 2021 -0500 fixed broken tab commit ffc2913017f6624a162cf4a36b6301e739cdb855 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:11:54 2021 -0500 delete bookmarklet on import commit b190c50967f99835f79979dc364042945e127b2d Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:53:06 2021 -0500 removed console message commit 24db6e9bafdd4d3f6138ee5cb37ca0eb9e299291 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:51:14 2021 -0500 fixed ingredient display on preview commit 31e92c211c682829fd695f07b15e1ea76b3868eb Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 11:49:56 2021 -0500 redirect to import url for processing commit e840cfd3d19570748b1431725c4e8f409da2dfd2 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 06:39:44 2021 -0500 added hack to fix scopes & CORS for bookmarklet commit adc5104a1c712a104543af425fd3a3833c659a54 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 28 18:39:20 2021 -0500 added CORS middleware commit e007cbfc35032fd2c3813f545bb2f5d3646ab529 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 26 14:47:24 2021 -0500 added bookmarklet model and api commit e4aa407bdcbd2c19ceed7897ea4e0c0603cf898f Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 17:48:32 2021 -0500 bookmarklet passing data to form commit 59de87f184ba87ee4fd5a44e42afe7f497f7efc9 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 14:02:57 2021 -0500 added bookmarklet that doesn't work yet commit ff8f7e1fb2c87478919b8c38d2e80e8bcc53be2a Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 14:14:56 2021 -0500 Squashed commit of the following: commit81a8734fac
Merge:abcef54
f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:41:13 2021 +0100 Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support Add iOS webclip icon support commitabcef54e72
Merge:e15c92c
7527646
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:30:43 2021 +0100 Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1 Bump recipe-scrapers from 12.2.0 to 12.2.1 commite15c92cda5
Merge:58fc269
45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:26:06 2021 +0100 Merge pull request #501 from smilerz/main_fork fix json direct import when wrapped in @graph commit45dba6fad2
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:23:55 2021 -0500 fix json direct import when wrapped in @graph commitf67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 15:49:12 2021 +0100 Add generated icons from icongenerator. commit53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 12:48:58 2021 +0100 Fix errors in favicon SVG. commit7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Mar 19 05:51:22 2021 +0000 Bump recipe-scrapers from 12.2.0 to 12.2.1 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1) Signed-off-by: dependabot[bot] <support@github.com> commit 80d8900eb5cfaf5f34093cc846120db257cbecca Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 13:58:16 2021 -0500 updated links to import recipes commit 56fcb1f078f9ad6361dc03521f05bc14503c86ea Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:54:41 2021 -0500 added collapsable cards commit e54bd52df2b1ab8a84968a79c00f6d78b718965f Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:32:55 2021 -0500 cosmetic cleanup commit 061272e43cf09e6c487540921d7c9a11d580af77 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:15:57 2021 -0500 added image import commit 4c0069d6441bd1910c4fd0592c7615174a759c3f Author: smilerz <smilerz@gmail.com> Date: Mon Mar 22 15:13:01 2021 -0500 consolidated integration imports into url_import commit 48a247ee5483f44ce85ca064d68ef6fb05b68fba Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:49 2021 -0500 staged app import tabs commit 2ec0be18bd9c1d44d900b4d810da6499eb66fc19 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:16 2021 -0500 fixed missing space in keyword when adding recipe commit 2cad7302913ad33e663083fe2fdbd5624a8a6cc6 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:08:51 2021 -0500 removed unused templates commit 94c4968b1a9c9a8496283d08cd2505f87e54a905 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 13:13:56 2021 -0500 combined json import and source import commit 0ef791b22332713d26410a0eaa0d9bad3e508d1d Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 16:06:02 2021 -0500 more fix from super ugly merge commit 875d587237ad9ffa568f4f69f7993b72376b24f7 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:17:10 2021 -0500 more cleanup from ugly merge commit 9c9e6c7d558d11d59b65934755708ba5c1531144 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 11:24:23 2021 -0500 fixed ugly merge commit 47151a379eecfd7b76655a4d89759600ce23a37f Author: smilerz <smilerz@gmail.com> Date: Thu Mar 18 12:09:53 2021 -0500 added drag and drop to ingredients commit 95ad3a7dbfa4dece076ec8767f9a5ee2582bba14 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 15 15:56:44 2021 -0500 manually parse json commit 3445c5d2c29d3ccb78df2c23279caf029b0e09ec Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:33:07 2021 -0600 update urls.py commit a4ef6b328e8acb0226ea4be87939a200718b2319 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:32:47 2021 -0600 commit merge from Patralos/recipes commit df48db7b9976cf4bc25c7bd84890ae08acab8cc9 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 15:34:47 2021 -0600 updated URL import page with tab interface commit d70f7be6d18019c9458ba5c7c4e205424610fb7e Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 11:29:10 2021 -0600 import raw json/html commit 1dd814e8eb8f2ef8fe5e0a21d8662df3af2474f9 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 7 14:28:29 2021 -0600 refactored json parser to create functions for each sub parser commit dddd25fb577fbba14c104d25203b49387088b87d Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 21:37:39 2021 +0100 Allow recipes to be imported from json directly commit 4f2ddbfd37d3d6826a4b48186f7f47065e2b09c3 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 30 16:22:34 2021 -0500 cleanup after rebase commit 1febc42cc9628fae70ceef1149449103a4558f0a Author: smilerz <smilerz@gmail.com> Date: Fri Apr 30 16:03:30 2021 -0500 Fix after rebase commit 8fb38a4351a0b40329897a2fb166254f13640e0b Author: smilerz <smilerz@gmail.com> Date: Thu Apr 22 11:26:44 2021 -0500 truncate query params on url commit 2b2bbad8a6075270bf9757d1e978052074801b7e Author: smilerz <smilerz@gmail.com> Date: Thu Apr 22 10:07:24 2021 -0500 bookmarklet includes url script_name commit 038a371a73712695cc0ca564ded11b70fba31e01 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 19:00:20 2021 -0500 add trigram to rank commit 50eba1d40115f5012b767c82c6b655e4e612178e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 18:46:35 2021 -0500 Squashed commit of the following: commit 1c5f74bd182eb502e27d03cc7f93e5e0db8c3362 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 20 12:24:05 2021 -0500 change markdown link from hard-coded to reverse commit 76c56e2a063ec45f97b4d898e106a2b378b95b96 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 14:16:17 2021 -0500 missing '/' commit 47a13811a3a6e47e5f6f1c3ccd515c1989bd4617 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:41:26 2021 -0500 yarn build commit 0d2c1fabe9f982179ec9d26cbb79bc0cebfef9c5 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:31:48 2021 -0500 Squashed commit of the following: commit e03f626fd08a3e048dbd968d623ee58b7f865929 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:04:39 2021 -0500 yarn build commit b511f929ffcc7a670bd7955269982e05c591783a Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 21:17:31 2021 -0500 update service worker with base path commit f13f02d481618583017c71fb654adaa86585ef0b Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:54:17 2021 -0500 WIP commit f2f927c16f52baa6b9a31cd9992e8c7c8739d666 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:40:59 2021 -0500 default value if localStorage fails commit 424e8a9b93d8aa9962a3b6f963fff5c6e23dfa56 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:30:38 2021 -0500 fixed missing '/' commit d49a206ddf5952036b295804f9e31e52a1b45af6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:13:04 2021 -0500 updated .env.template commit ac94ea7afac36f65e1658f3d29f4e2b8f0475ba6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 15:31:37 2021 -0500 WIP commit c9a687df1b21ac6584d0f958e65c5cfc040406ca Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 10:19:02 2021 -0500 WIP commit 7fe8c7fbe52c96f1ccd4128db256656e43af3fa0 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 08:10:08 2021 -0500 added nginx config commit b5540d85872d9d69bda3787db7ecccfce893236f Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 08:03:09 2021 -0500 allow subfolder config on NGINX commit92c65ec1e8
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 21:21:41 2021 +0200 fixed test meal plan commita376c3a5b6
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:55:48 2021 +0200 meal plan random fix commit058d705170
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:19:11 2021 +0200 meal plan in search commit4ad5d6ef2f
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 15:01:39 2021 +0200 fixed test + added api doc for new search commite676b4bac3
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 14:05:19 2021 +0200 added api pagination for recipes commit04488741c4
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:11:19 2021 +0200 adv search mobile styling commit99004ad34b
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:03:15 2021 +0200 new search and setting commitf78f7dfc14
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 02:55:50 2021 +0200 search ui improvements and filter commit880db58d38
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 21:28:29 2021 +0200 v2 search filtering commitd1d65d878c
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 14:11:10 2021 +0200 v2 search progress commit3194a7580d
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 12:57:02 2021 +0200 basics of v2 search working commit dcba8100a64031a699bcfdd0673d2af0df03493b Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 18:20:57 2021 -0500 removed trigram commit aa13db2e38f7e3f0a1e80f2bca4556f8743245a1 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 16:05:53 2021 -0500 add trigram search to v2 commit d1547f2cefdd63cf31da2384e4cfb412751807bb Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 15:27:50 2021 -0500 Squashed commit of the following: commit a5d1c400efccdd3ad47807c4a2f990b983243d06 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 15:19:37 2021 -0500 simplified code commit 15261536c8ebab7156c366dcd4e21c5330550fde Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 14:42:10 2021 -0500 updated search v2 with full text search commit 51f4af6487bfbccc66998160e0ba3e4318dc6621 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 13:23:09 2021 -0500 rebase commit 2df9fc9d33a2b558b82cc8e614f18d0ebc409b83 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 13:22:48 2021 -0500 filter.py commit f90f3186d95ae64c7f88bad5fccb003d7d3f44a6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 20:17:54 2021 -0500 added multi-language support to FTS commit 3cfe14bdae4a4d8995e9d7bf3daacbe05544b0a7 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 19:42:22 2021 -0500 rebuild recipe index from admin site commit ef17ce2d57e869ddb84e4af8a37c2081cbf41e65 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 19:07:50 2021 -0500 command line to rebuild index commit 306c662f0b8dc39dee3cc6011d5d9f4c1ac2f325 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 17:01:18 2021 -0500 updated to handle sqlite commit 8c049697a55fd328a1e93607991c9160db80b6cc Author: smilerz <smilerz@gmail.com> Date: Fri Apr 9 12:47:17 2021 -0500 fixed smalltable commit c6f8d199efeb5d8b0f5b63a0113afbd856398857 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 9 12:46:07 2021 -0500 working proof of concept commit92c65ec1e8
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 21:21:41 2021 +0200 fixed test meal plan commita376c3a5b6
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:55:48 2021 +0200 meal plan random fix commit058d705170
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:19:11 2021 +0200 meal plan in search commit4ad5d6ef2f
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 15:01:39 2021 +0200 fixed test + added api doc for new search commite676b4bac3
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 14:05:19 2021 +0200 added api pagination for recipes commit04488741c4
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:11:19 2021 +0200 adv search mobile styling commit99004ad34b
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:03:15 2021 +0200 new search and setting commitf78f7dfc14
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 02:55:50 2021 +0200 search ui improvements and filter commit880db58d38
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 21:28:29 2021 +0200 v2 search filtering commitd1d65d878c
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 14:11:10 2021 +0200 v2 search progress commit3194a7580d
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 12:57:02 2021 +0200 basics of v2 search working commit 6449d13d0ab79276f3ebab880ff07d07da68143c Author: smilerz <smilerz@gmail.com> Date: Tue Apr 20 12:21:58 2021 -0500 changed hardlink markdown link to reverse commit ddca1a77f80a9e773415049dadd97c97f95ea00a Author: smilerz <smilerz@gmail.com> Date: Tue Apr 20 09:15:57 2021 -0500 changed keyword to get_or_create commit f4e7f04bd79d87d09ada225e16e3ef23de23832c Author: smilerz <smilerz@gmail.com> Date: Tue Apr 20 08:08:13 2021 -0500 strip food and keywords on url import commit 0e8ae902bf0e4d0aae703e84ec5e24579bc169a8 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 17:34:43 2021 -0500 strip spaces from units, keywords and food commit a1e6b24c42b21eb608c64bd946762267a6d98f1d Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 15:31:49 2021 -0500 fix bookmarklet loading commit 03fb725b6e3679efa7276475c33f8e5f855db8ed Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 14:36:52 2021 -0500 WIP commit c90abcf7c4a188990ed4b623b1b058c71ee4615a Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 14:15:17 2021 -0500 missing / commit 58e97b0f18b2d1cc53e7a5d9ef47e2bacc45a95c Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:44:54 2021 -0500 Squashed commit of the following: commit 47a13811a3a6e47e5f6f1c3ccd515c1989bd4617 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:41:26 2021 -0500 yarn build commit 0d2c1fabe9f982179ec9d26cbb79bc0cebfef9c5 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:31:48 2021 -0500 Squashed commit of the following: commit e03f626fd08a3e048dbd968d623ee58b7f865929 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:04:39 2021 -0500 yarn build commit b511f929ffcc7a670bd7955269982e05c591783a Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 21:17:31 2021 -0500 update service worker with base path commit f13f02d481618583017c71fb654adaa86585ef0b Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:54:17 2021 -0500 WIP commit f2f927c16f52baa6b9a31cd9992e8c7c8739d666 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:40:59 2021 -0500 default value if localStorage fails commit 424e8a9b93d8aa9962a3b6f963fff5c6e23dfa56 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:30:38 2021 -0500 fixed missing '/' commit d49a206ddf5952036b295804f9e31e52a1b45af6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:13:04 2021 -0500 updated .env.template commit ac94ea7afac36f65e1658f3d29f4e2b8f0475ba6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 15:31:37 2021 -0500 WIP commit c9a687df1b21ac6584d0f958e65c5cfc040406ca Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 10:19:02 2021 -0500 WIP commit 7fe8c7fbe52c96f1ccd4128db256656e43af3fa0 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 08:10:08 2021 -0500 added nginx config commit b5540d85872d9d69bda3787db7ecccfce893236f Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 08:03:09 2021 -0500 allow subfolder config on NGINX commit92c65ec1e8
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 21:21:41 2021 +0200 fixed test meal plan commita376c3a5b6
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:55:48 2021 +0200 meal plan random fix commit058d705170
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:19:11 2021 +0200 meal plan in search commit4ad5d6ef2f
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 15:01:39 2021 +0200 fixed test + added api doc for new search commite676b4bac3
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 14:05:19 2021 +0200 added api pagination for recipes commit04488741c4
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:11:19 2021 +0200 adv search mobile styling commit99004ad34b
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:03:15 2021 +0200 new search and setting commitf78f7dfc14
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 02:55:50 2021 +0200 search ui improvements and filter commit880db58d38
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 21:28:29 2021 +0200 v2 search filtering commitd1d65d878c
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 14:11:10 2021 +0200 v2 search progress commit3194a7580d
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 12:57:02 2021 +0200 basics of v2 search working commit 10fff576a1bf3f8801ec6919f348665c2c3e6319 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:05:43 2021 -0500 yarn build commit 9ccf4ed92ca27fa892ed16b2e5ddc5d50a1afdfd Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 12:58:44 2021 -0500 updated base_path in api-generator commit 3eef0a783ac66478ad0aafce605c16de84c09296 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 21:18:08 2021 -0500 updated service worker with base path commit a9477230689c92454c74aa5eba5c3a0d4111eb67 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:53:30 2021 -0500 WIP commit 130c56fa6611e7d46e703daab25834b65aaa3670 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:39:33 2021 -0500 added default window location in case local storage failed commit 1622268e4470734e1445de2a6981696d0e61622c Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:33:19 2021 -0500 added trailing '/' commit 54b906c44e3251bfca2c31bbf3f61f20a64fd40d Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:06:18 2021 -0500 dynamically set api-generator path commit 64ef82123c7bbb1983fd2081a82441495e5280b6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 16:27:24 2021 -0500 WIP commit cff93fd4abc7e4b96025921d02ba4e41be554b65 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 15:50:41 2021 -0500 WIP commit 87c968decdfe0b0974d1e3a4e5ce94cfac818fc1 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 15:43:07 2021 -0500 Squashed commit of the following: commit ac94ea7afac36f65e1658f3d29f4e2b8f0475ba6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 15:31:37 2021 -0500 WIP commit c9a687df1b21ac6584d0f958e65c5cfc040406ca Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 10:19:02 2021 -0500 WIP commit 7fe8c7fbe52c96f1ccd4128db256656e43af3fa0 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 08:10:08 2021 -0500 added nginx config commit b5540d85872d9d69bda3787db7ecccfce893236f Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 08:03:09 2021 -0500 allow subfolder config on NGINX commit92c65ec1e8
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 21:21:41 2021 +0200 fixed test meal plan commita376c3a5b6
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:55:48 2021 +0200 meal plan random fix commit058d705170
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:19:11 2021 +0200 meal plan in search commit4ad5d6ef2f
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 15:01:39 2021 +0200 fixed test + added api doc for new search commite676b4bac3
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 14:05:19 2021 +0200 added api pagination for recipes commit04488741c4
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:11:19 2021 +0200 adv search mobile styling commit99004ad34b
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:03:15 2021 +0200 new search and setting commitf78f7dfc14
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 02:55:50 2021 +0200 search ui improvements and filter commit880db58d38
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 21:28:29 2021 +0200 v2 search filtering commitd1d65d878c
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 14:11:10 2021 +0200 v2 search progress commit3194a7580d
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 12:57:02 2021 +0200 basics of v2 search working commit 6f6ea0bbab9e62907e10b9a359b1b97e0d86487e Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 10:28:55 2021 -0500 wip commit 8cb55aa7986021435de4baaad85344cbc8569adb Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 10:28:26 2021 -0500 settings for nginx subfolder commit 62fe7f323db80c57b8c3c02c7cf31bed7b197368 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 07:57:28 2021 -0500 WIP commit d38ba8c146e55162bba9ad012ac082ccbd76789c Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 22:29:21 2021 -0500 allow app to be served at proxy subfolder commit 614acd578a31f421594d7b5486de0a0462e1cce0 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 20:16:28 2021 -0500 Squashed commit of the following: commit f03456411939b9f09704c057e20a970f9545dc0b Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 18:28:45 2021 -0500 no_perm commit 0262d1630dfcae204848a9fa6c41dc36958414d6 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:29:11 2021 -0500 removed unnecessary console message commit 069a02e67a99805ea04b3f2248d48584e146eadd Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:25:23 2021 -0500 removed commented out settings commit 1be713ff9db5e94fc68cfa25f4b8a219edff39b2 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:24:27 2021 -0500 removed unused cors_headers commit 5c9e1f015a6ff667968e6421341061af09d1b34a Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:22:15 2021 -0500 removed line breaks commit 0e92b029d46bbaaf2a5bf2526165d3a4075581f1 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:21:21 2021 -0500 removed console.log() commit e435325e66a1dc25fb9d24391eec5ed76503d969 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 11:17:00 2021 -0500 Fix after rebase commit c6e1add18be6e9791c7142a78129a879020c6f17 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 07:44:53 2021 -0500 updated model commit c52cd0b177da20cbed9a9d606ee4ec54ab865f38 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:46:38 2021 -0500 convert servings to number on import commit a3cf59c7a47dc39bec74b772f789e1c052884550 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:15:59 2021 -0500 update tests to handle url decoding commit 7ff1783578c90e2c6ae931b345d580279daeedf0 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:57:10 2021 -0500 bring parser inline with json_import branch commit 204f3ddf845a91c50d54d8dbd2f1d754d3076d25 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 08:50:00 2021 -0500 unescape html document commit 28291f96afdb70c8259104997000fe9544e0d134 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 11:29:35 2021 -0500 updated bookmarklet to work with updated import process commit e7c7823916febeb0adbe7e548633b737125ad3b7 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:52 2021 -0500 Squashed commit of the following: commit 707d862e01a7497a1f22879d314b865a35e0e85b Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:00 2021 -0500 works now commit 3942a445ed4f2ccec57de25eacd86ea4e4dd6bdb Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:25:24 2021 -0500 updated serializer and api commit 10dc746eb175c7f805a8a8ffa7ce49977a7ce97e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:20:19 2021 -0500 fixed bookmarklet commit 9779104902d3be0258c95cd2eeebcba0d5d48892 Merge: bb8262c 0cb3928 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:56:27 2021 -0500 Merge branch 'bookmarklet' into json_import commit 0cb39284bb835ffc6cfee3e4306aadc4a64a25be Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commit e89e0218de684d40b2e2bfb6ba833891206c828e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commit bb8262ccabb93c56fbc18c407d5a0653b8b3ca79 Merge: b1e73aa35a7f62
Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 20:35:57 2021 -0500 Merge branch 'main_fork' into json_import commit e01efbbf764bbe6b0e1cefac6c0311dd18a0d503 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:20:03 2021 -0500 added missing bookmarklet commit 3e5f3a36a48cdca0087a551a9a6b4d942d81bf19 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:18:14 2021 -0500 Revert "bug fix url import" This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23. commit 22135c7d40a399fafef994372e7ba128fc37c596 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 13 16:44:05 2021 -0500 removed extra string normalization commit 7ab59c55ac75f50997156f8808c18d12ef7ac8f3 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 21:22:56 2021 -0500 updated migration commit 0f6f8c9eeb642a2824c6952a69c2a2a12e628d24 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:14:50 2021 -0500 updated recipe targets in tests to reflect html decoding commit c56add95a4627f5ed874bbce3cb7b0f4d8adbb9f Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 13:28:35 2021 -0500 fixes #527 commit 09993a71515b9b977f074e14e11cf9e4b5c72b96 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 10:57:13 2021 -0500 bug fix url import commit 625d23d994b84be082f20ef1f6527d1d742a7157 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 07:02:43 2021 -0500 url import bug fixes commit df4b2adf7dcd8099871167ed8bab779e976002a4 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:43:33 2021 -0500 bug fix tests commit 0a61c9f9def1da5841031e39ced99a08a2536958 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:41:00 2021 -0500 bug fix url import commit afbf1153bfcc29baa80a07019f337a9c02b66a63 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:26:29 2021 -0500 recipe import tests commit 5857ed171e3b667764f2882d3ee7b73c15bdab8b Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 12:32:11 2021 -0500 simplified url import commit 33cc780cfd8001a0293951f25fd19b3db8ce0461 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 09:20:15 2021 -0500 add data for url_import test commit 322552a1f1434e7ca52f75886e752f31ea5915f3 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:43:36 2021 -0500 added all ATK sites to custom scraper commit 6455e597fbc2a394f217fe8c11d2bc89e8add1a4 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:23 2021 -0500 added cooksillustrated custom scraper commit 1c6ad94a2d8bf466e35c56a1cd82dff9039371c6 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:01 2021 -0500 ensure time is always a number commit fbbc057a8a2964eb6a4ac7d2324adacc679db2d6 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 2 15:19:20 2021 -0500 added ability to create custom scrapers commit fd293f150e959f67b3e8260061f8a72898e0990c Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:21:28 2021 -0500 removed old json importer commit 86b330583a6f5946b5743df8b447dccc1db3ade0 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:19:18 2021 -0500 updated import from source to use text scraper commit c4be53661293bc54c9069c2604d8fe1a61dceddf Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:08:56 2021 -0500 remove old html_import function commit 6a6314e09be06d17cc11bf55e95992f0a10b54ed Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:07:51 2021 -0500 wrapper for recipe_scrapers to parse text input commit 64524c01c8da795269bd2dbdfb5e6a02d47e8904 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:17:46 2021 -0500 fixed broken tab commit 4701d62739550754960e6d1eac437f0d2cea004f Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:11:54 2021 -0500 delete bookmarklet on import commit 4233980dd9df8e0e961363d464b41c61ad1c6288 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:53:06 2021 -0500 removed console message commit 16e34fe3b134bf31bc84c6f7584662a171fa9748 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:51:14 2021 -0500 fixed ingredient display on preview commit c51d715cfee7a787dcd7b1c3dd0beb24a14962d3 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 11:49:56 2021 -0500 redirect to import url for processing commit 29c199320502711a3197eade37f6021064c7dcb0 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 06:39:44 2021 -0500 added hack to fix scopes & CORS for bookmarklet commit 958faf9972d26ad9f78eaaa1126af51d7a3b333b Author: smilerz <smilerz@gmail.com> Date: Sun Mar 28 18:39:20 2021 -0500 added CORS middleware commit c284f830dc7e7339cd2f54185f2ff8ea6866ef19 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 26 14:47:24 2021 -0500 added bookmarklet model and api commit cbfc5fa973c002bc1ce75d3d2671986007b6a3a7 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 17:48:32 2021 -0500 bookmarklet passing data to form commit d9815e445828293bb2965c7c98ab6acf3afe3833 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 14:02:57 2021 -0500 added bookmarklet that doesn't work yet commit 0e327f3bf865a99e95368bf4b74ee9545d9a2b1a Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 14:14:56 2021 -0500 Squashed commit of the following: commit81a8734fac
Merge:abcef54
f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:41:13 2021 +0100 Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support Add iOS webclip icon support commitabcef54e72
Merge:e15c92c
7527646
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:30:43 2021 +0100 Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1 Bump recipe-scrapers from 12.2.0 to 12.2.1 commite15c92cda5
Merge:58fc269
45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:26:06 2021 +0100 Merge pull request #501 from smilerz/main_fork fix json direct import when wrapped in @graph commit45dba6fad2
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:23:55 2021 -0500 fix json direct import when wrapped in @graph commitf67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 15:49:12 2021 +0100 Add generated icons from icongenerator. commit53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 12:48:58 2021 +0100 Fix errors in favicon SVG. commit7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Mar 19 05:51:22 2021 +0000 Bump recipe-scrapers from 12.2.0 to 12.2.1 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1) Signed-off-by: dependabot[bot] <support@github.com> commit 18c5bf8a3eb7dd22504bbd2e40acab9269cc6804 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 13:58:16 2021 -0500 updated links to import recipes commit 9f643b0b85cc89a36a86681e20c68c177959e1a1 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:54:41 2021 -0500 added collapsable cards commit b37594eb84988043afa450de871a036f72a811ee Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:32:55 2021 -0500 cosmetic cleanup commit e5f76034dfc174d3ce307de1c0c5683a159733a9 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:15:57 2021 -0500 added image import commit 792cfb0791c2e682589995ccd1b85eca0a04061c Author: smilerz <smilerz@gmail.com> Date: Mon Mar 22 15:13:01 2021 -0500 consolidated integration imports into url_import commit aa6c9430bce1a63e46ff0325f13e4f4d7369cc00 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:49 2021 -0500 staged app import tabs commit 3dd92d811c140d925b153f30db29e11e4c8a18cc Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:16 2021 -0500 fixed missing space in keyword when adding recipe commit d79283ccabdd014c62dc820f382830421908cf0a Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:08:51 2021 -0500 removed unused templates commit 3f95eb2f3db42628994f1ea80fd5010fa1b247ba Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 13:13:56 2021 -0500 combined json import and source import commit 5016314ab57102454a95e48f0ba50b6031cc5400 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 16:06:02 2021 -0500 more fix from super ugly merge commit 27a489c45a5b169818e36c79591757f99f64c637 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:17:10 2021 -0500 more cleanup from ugly merge commit f7517d51dd9aad61b1e80ec20947c4f597834691 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 11:24:23 2021 -0500 fixed ugly merge commit 7095b6ef89fe350d591f1103c4c1a2d27c60d28f Author: smilerz <smilerz@gmail.com> Date: Thu Mar 18 12:09:53 2021 -0500 added drag and drop to ingredients commit bdadc7168f37eede0f91a2bfa060200273e440a9 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 15 15:56:44 2021 -0500 manually parse json commit 4bcd7e462db760d00483a90883028e5404f33299 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:33:07 2021 -0600 update urls.py commit 794d2798bfe56a27af5e8786e5f3b9701be7fe81 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:32:47 2021 -0600 commit merge from Patralos/recipes commit e97bc6ea89d8c366104d08ce561dd3d3c17c1578 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 15:34:47 2021 -0600 updated URL import page with tab interface commit 7732bc44b83c23901873bce1075b7ac2e68cee07 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 11:29:10 2021 -0600 import raw json/html commit 368d2211efa86e1146e95e3ddd1192b81f0422c2 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 7 14:28:29 2021 -0600 refactored json parser to create functions for each sub parser commit 3ddff8b468e0c85d1a4ff61b565b78c5be0f77ea Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 22:27:32 2021 +0100 replace common fractions with their concrete value (else parsing is not possible) commit 083048e125f63463edca6f4855f6a8e974f61a21 Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 21:37:39 2021 +0100 Allow recipes to be imported from json directly commit 79932c2b5772dea2a06af31bb2aff34585f23b98 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 20:15:41 2021 -0500 Squashed commit of the following: commit7930c2417c
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 17:12:43 2021 -0500 update ATK scrape to handle empty headnote commit2f27413c0a
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 14:12:24 2021 -0500 parse multiple ingredientGroups previous version assumed only a single item in a list - this loops through each item commit5869a8ad1b
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 13:43:34 2021 -0500 fixes to pass tests commit0640a265fc
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 13:42:56 2021 -0500 added test for spruce eats commitd449fc8fd8
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 12:49:42 2021 -0500 updated normalization to skip removing line breaks commitb9ee77709b
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 12:49:06 2021 -0500 updated ATK scraper to include header notes in instructions commit b75a143f5394daf967ee599768f460937169a74f Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 15:57:20 2021 -0500 updated message commit 50e3fd062f99ba26860fa7dc27e59c9db25b4dc0 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 14:17:16 2021 -0500 fixed ATK scraper commit f7b91e697d48c1a82ced60b1b48514b2d99d975f Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 13:44:29 2021 -0500 Squashed commit of the following: commit5869a8ad1b
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 13:43:34 2021 -0500 fixes to pass tests commit0640a265fc
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 13:42:56 2021 -0500 added test for spruce eats commitd449fc8fd8
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 12:49:42 2021 -0500 updated normalization to skip removing line breaks commitb9ee77709b
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 12:49:06 2021 -0500 updated ATK scraper to include header notes in instructions commit 8dfab43ceb6d63b9e2dfc02d91f4034420eeb03e Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 11:58:40 2021 -0500 added upcoming features commit 5c9c2e51028a494c4f33dbedfd6974d0f87116d1 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 17:45:42 2021 -0500 Squashed commit of the following: commitba061df1b6
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 17:30:59 2021 -0500 catch attribute error on cooktime commit7cc515bcdf
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 17:08:25 2021 -0500 fix manual url import commit724748d38a
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 14:09:10 2021 -0500 corrected api import workflow commitb2c1c6e301
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 11:26:26 2021 -0500 restored missing manual url scrape commit987be4b04d
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 09:02:27 2021 -0500 Fix after rebase commitca84da68c4
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 18:39:44 2021 -0500 catch attibute error when scrape missing schema commitd75e39fbcd
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 16:27:18 2021 -0500 set persistent connections to db commiteb2593aacd
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 16:08:04 2021 -0500 handle text in cook times during import commit496e04cfc8
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:47:35 2021 -0500 convert servings to number on import commitd814d13d54
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 13:17:15 2021 -0500 custom scraper fails safe commitd0cedaf7a1
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 12:48:26 2021 -0500 added name parser commit01f504f7b1
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:31:47 2021 -0500 updated tests to handle html decoding commitc716346f1f
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:55:07 2021 -0500 flake commitfef5236931
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:53:45 2021 -0500 decode url strings in text_parser commitb115c37eb8
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:32:33 2021 -0500 catch error on scrape.image() commit1e17f3703a
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:28:46 2021 -0500 trap error on scrape.title() commit468b986314
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:05:28 2021 -0500 updated tests commita531d135b5
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:42:31 2021 -0500 remove html tags from description commit7524609cd0
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commita28f8e65d5
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commitd193637091
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:20:03 2021 -0500 added missing bookmarklet commit0953af05fc
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:18:14 2021 -0500 Revert "bug fix url import" This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23. commit19e8e5cb5b
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 13 16:44:05 2021 -0500 removed extra string normalization commit43c808380d
Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 21:22:56 2021 -0500 updated migration commit7ab8b84044
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:14:50 2021 -0500 updated recipe targets in tests to reflect html decoding commitd739fe6752
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 13:28:35 2021 -0500 fixes #527 commita84c41e29f
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 10:57:13 2021 -0500 bug fix url import commit393aba1f31
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 07:02:43 2021 -0500 url import bug fixes commit436a070730
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:43:33 2021 -0500 bug fix tests commit2fe6788ce5
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:41:00 2021 -0500 bug fix url import commit747d146389
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:26:29 2021 -0500 recipe import tests commitefe4c4043d
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 12:32:11 2021 -0500 simplified url import commitc6739ba8e0
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 09:20:15 2021 -0500 add data for url_import test commit50140db668
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:43:36 2021 -0500 added all ATK sites to custom scraper commit028b2dfb22
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:23 2021 -0500 added cooksillustrated custom scraper commitec6a10ca0a
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:01 2021 -0500 ensure time is always a number commit3cf949bf8d
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 2 15:19:20 2021 -0500 added ability to create custom scrapers commit0a62225797
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:21:28 2021 -0500 removed old json importer commita54f4e1367
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:19:18 2021 -0500 updated import from source to use text scraper commitbf3c30a8fb
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:08:56 2021 -0500 remove old html_import function commitf811f5996e
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:07:51 2021 -0500 wrapper for recipe_scrapers to parse text input commita3490240f4
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:17:46 2021 -0500 fixed broken tab commitb26aea96f4
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:11:54 2021 -0500 delete bookmarklet on import commit4d4af5fdf2
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:53:06 2021 -0500 removed console message commit3da74505d6
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:51:14 2021 -0500 fixed ingredient display on preview commitc8a4861df8
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 11:49:56 2021 -0500 redirect to import url for processing commit5e27cd606e
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 06:39:44 2021 -0500 added hack to fix scopes & CORS for bookmarklet commita341fd8ebe
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 28 18:39:20 2021 -0500 added CORS middleware commit9a62b6e4e7
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 26 14:47:24 2021 -0500 added bookmarklet model and api commitf80c44bca3
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 17:48:32 2021 -0500 bookmarklet passing data to form commit09d2e9f831
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 14:02:57 2021 -0500 added bookmarklet that doesn't work yet commit4d5a9e446f
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 14:14:56 2021 -0500 Squashed commit of the following: commit81a8734fac
Merge:abcef54
f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:41:13 2021 +0100 Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support Add iOS webclip icon support commitabcef54e72
Merge:e15c92c
7527646
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:30:43 2021 +0100 Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1 Bump recipe-scrapers from 12.2.0 to 12.2.1 commite15c92cda5
Merge:58fc269
45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:26:06 2021 +0100 Merge pull request #501 from smilerz/main_fork fix json direct import when wrapped in @graph commit45dba6fad2
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:23:55 2021 -0500 fix json direct import when wrapped in @graph commitf67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 15:49:12 2021 +0100 Add generated icons from icongenerator. commit53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 12:48:58 2021 +0100 Fix errors in favicon SVG. commit7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Mar 19 05:51:22 2021 +0000 Bump recipe-scrapers from 12.2.0 to 12.2.1 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1) Signed-off-by: dependabot[bot] <support@github.com> commit6a2c27749f
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 13:58:16 2021 -0500 updated links to import recipes commitde60e12073
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:54:41 2021 -0500 added collapsable cards commit1188ed9227
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:32:55 2021 -0500 cosmetic cleanup commitcb708e7e47
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:15:57 2021 -0500 added image import commit215eadb4a0
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 22 15:13:01 2021 -0500 consolidated integration imports into url_import commit4ffc54f720
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:49 2021 -0500 staged app import tabs commit21f6c7a21f
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:16 2021 -0500 fixed missing space in keyword when adding recipe commitce7c6939d2
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:08:51 2021 -0500 removed unused templates commit40a2f7ff90
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 13:13:56 2021 -0500 combined json import and source import commit4015517c0a
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 16:06:02 2021 -0500 more fix from super ugly merge commit7c8d41753c
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:17:10 2021 -0500 more cleanup from ugly merge commit90670613c5
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 11:24:23 2021 -0500 fixed ugly merge commit647c1678f1
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 18 12:09:53 2021 -0500 added drag and drop to ingredients commit44dee16e0a
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 15 15:56:44 2021 -0500 manually parse json commitf8fedcac82
Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:33:07 2021 -0600 update urls.py commit3a48d0e580
Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:32:47 2021 -0600 commit merge from Patralos/recipes commit9930789aa8
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 15:34:47 2021 -0600 updated URL import page with tab interface commit83fce6461a
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 11:29:10 2021 -0600 import raw json/html commitf0d37244b6
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 7 14:28:29 2021 -0600 refactored json parser to create functions for each sub parser commit386834f409
Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 21:37:39 2021 +0100 Allow recipes to be imported from json directly commit 2972b23ad88365c4c00856fe570dc630a5656022 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 17:30:59 2021 -0500 catch attribute error on cooktime commit af88e35c0446997e9b1f71ce742acc6776f286d6 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 17:08:25 2021 -0500 fix manual url import commit 7a177d55ff2e8aa5aa15ba73a594cefdb71024ad Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:33:51 2021 -0500 Squashed commit of the following: commit 8e2a15aff203cacd8956c947eecf3967f5b66015 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:29:11 2021 -0500 removed unnecessary console message commit 436d5b3165340772a859899578f7386edfcd587f Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:25:23 2021 -0500 removed commented out settings commit ba6b58b198d2e9260544d64e107afee9420ae340 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:24:27 2021 -0500 removed unused cors_headers commit c7690c391f341d8d92500276f243e99f8700528e Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:22:15 2021 -0500 removed line breaks commit 3259f86ff8b911fa8489922eee43c4465ea81d61 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:21:21 2021 -0500 removed console.log() commit 24552a2d9b644c86dee900322989fb3306ca1b4e Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 14:58:48 2021 -0500 fix after rebase commit bdf8ce1c3357609013c84d2661371ede815cd700 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 11:17:00 2021 -0500 Fix after rebase commit 58cd295e7ae8caa9be588508eb1795fd4a00e810 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 07:44:53 2021 -0500 updated model commit ec786ef8a19f9459cd4c890c60330bcadafb0247 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:46:38 2021 -0500 convert servings to number on import commit 90cc1711b185290778e973821b17a7574c6d3428 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:15:59 2021 -0500 update tests to handle url decoding commit 466eae617cace3b662fe480427018b0ac7a7ab1d Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:57:10 2021 -0500 bring parser inline with json_import branch commit 2668406d4625f747305482ede28e256c94aefcf9 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 08:50:00 2021 -0500 unescape html document commit f765347aec15b7765eaec830dd8dfda1f17b7597 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 11:29:35 2021 -0500 updated bookmarklet to work with updated import process commit 60d95ebf3d4e1c8af7f3b6832adfb28ce13a51aa Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:52 2021 -0500 Squashed commit of the following: commit 707d862e01a7497a1f22879d314b865a35e0e85b Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:00 2021 -0500 works now commit 3942a445ed4f2ccec57de25eacd86ea4e4dd6bdb Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:25:24 2021 -0500 updated serializer and api commit 10dc746eb175c7f805a8a8ffa7ce49977a7ce97e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:20:19 2021 -0500 fixed bookmarklet commit 9779104902d3be0258c95cd2eeebcba0d5d48892 Merge: bb8262c 0cb3928 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:56:27 2021 -0500 Merge branch 'bookmarklet' into json_import commit 0cb39284bb835ffc6cfee3e4306aadc4a64a25be Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commit e89e0218de684d40b2e2bfb6ba833891206c828e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commit bb8262ccabb93c56fbc18c407d5a0653b8b3ca79 Merge: b1e73aa35a7f62
Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 20:35:57 2021 -0500 Merge branch 'main_fork' into json_import commit f50d33a9b2658f6bf27797f645fbd842528a716c Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:20:03 2021 -0500 added missing bookmarklet commit cd482ae8451d3b920d7bb7a2b76044645f6a2e0b Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:18:14 2021 -0500 Revert "bug fix url import" This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23. commit 7032c7cc990af5790073348c3039d907d3469a7e Author: smilerz <smilerz@gmail.com> Date: Tue Apr 13 16:44:05 2021 -0500 removed extra string normalization commit 04b4aeecb9b13ae0023636f65dec8fc0ca1b8e0f Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 21:22:56 2021 -0500 updated migration commit 8b4059d0beed9ae8da9a6943ed550b0a82e12e03 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:14:50 2021 -0500 updated recipe targets in tests to reflect html decoding commit 7388f30ef333315736a8614c2009db37404f4916 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 13:28:35 2021 -0500 fixes #527 commit 6d811738535a81cab737b10f006f50c32cc32f13 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 10:57:13 2021 -0500 bug fix url import commit cbe400cdaccb0fcbebeafea199cf14be3deeb150 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 07:02:43 2021 -0500 url import bug fixes commit f4e33a830b826d1930639f552a2e32882c14d2ba Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:43:33 2021 -0500 bug fix tests commit 1d1cbbe965a5255bd9cabb138a2f1432956a4c6e Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:41:00 2021 -0500 bug fix url import commit 31cf4da8f3dcface57399976679379d11ca6d81e Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:26:29 2021 -0500 recipe import tests commit 1d1b5b545ab35626636ec4d9e1ce020fe508e520 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 12:32:11 2021 -0500 simplified url import commit 25140fa64e9306421956b90e40f53c00429e7c5e Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 09:20:15 2021 -0500 add data for url_import test commit 14d97f671ad356c8212ffc7fdd5b15fce8b5a7c1 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:43:36 2021 -0500 added all ATK sites to custom scraper commit 10975665626ae958f45e4c76b5125978e4776c41 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:23 2021 -0500 added cooksillustrated custom scraper commit 9ea33ec10bc32aa6ffed0c8cd6d5a4b4e123eff1 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:01 2021 -0500 ensure time is always a number commit ceb85137dd25a2cc6192165af9ac9b515cd5cfee Author: smilerz <smilerz@gmail.com> Date: Fri Apr 2 15:19:20 2021 -0500 added ability to create custom scrapers commit cc53a8debe36e65f9f487ac8c31cf3235bad5370 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:21:28 2021 -0500 removed old json importer commit d2233df427cc577fd6ea87458d821ac37c4def48 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:19:18 2021 -0500 updated import from source to use text scraper commit 9a0fcf9d2b6d35f01c16aa1c1a1074bb42577a3e Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:08:56 2021 -0500 remove old html_import function commit 2bc5fbbdcc5d395b7ed7aa1879449e16da0ee2d1 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:07:51 2021 -0500 wrapper for recipe_scrapers to parse text input commit 4a3c1a94a97ec18109ba43a5bbe90a6aa8e622c4 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:17:46 2021 -0500 fixed broken tab commit 6b92f8c325dd4a3c43fec0efe9b20181eaea0951 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:11:54 2021 -0500 delete bookmarklet on import commit dcd12899fd361868d4542e882d413292ef37a92b Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:53:06 2021 -0500 removed console message commit 3e58d79a9279e63af66356d14c7204121f6055dd Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:51:14 2021 -0500 fixed ingredient display on preview commit 1eb6ba707c41f52711ed2d68e3758ce9c70465ec Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 11:49:56 2021 -0500 redirect to import url for processing commit 95b50edc0f33afc1557b6a766e610a6c74b2e8a0 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 06:39:44 2021 -0500 added hack to fix scopes & CORS for bookmarklet commit bdc85694309fb79b9c214f0330848be82c372156 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 28 18:39:20 2021 -0500 added CORS middleware commit c1f5ec44c3f45dd403cc600ed5e38b814fedd138 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 26 14:47:24 2021 -0500 added bookmarklet model and api commit cc9a6fe14adbca88dc8753a7271ed4d47e638822 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 17:48:32 2021 -0500 bookmarklet passing data to form commit 3bf58f633610caa266e210fcdbecdedd0edf2465 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 14:02:57 2021 -0500 added bookmarklet that doesn't work yet commit 9a11ebc7746f2acdd156a574703ea05a0aba0a9b Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 14:14:56 2021 -0500 Squashed commit of the following: commit81a8734fac
Merge:abcef54
f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:41:13 2021 +0100 Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support Add iOS webclip icon support commitabcef54e72
Merge:e15c92c
7527646
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:30:43 2021 +0100 Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1 Bump recipe-scrapers from 12.2.0 to 12.2.1 commite15c92cda5
Merge:58fc269
45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:26:06 2021 +0100 Merge pull request #501 from smilerz/main_fork fix json direct import when wrapped in @graph commit45dba6fad2
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:23:55 2021 -0500 fix json direct import when wrapped in @graph commitf67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 15:49:12 2021 +0100 Add generated icons from icongenerator. commit53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 12:48:58 2021 +0100 Fix errors in favicon SVG. commit7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Mar 19 05:51:22 2021 +0000 Bump recipe-scrapers from 12.2.0 to 12.2.1 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1) Signed-off-by: dependabot[bot] <support@github.com> commit 9307226d777d5648d1cacc0107241dfaec3a4405 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 13:58:16 2021 -0500 updated links to import recipes commit bec00d05898c074b893df7338248b7803f8272c1 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:54:41 2021 -0500 added collapsable cards commit 2d647a2f6aa1afacb6651a6294bba571fafc3190 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:32:55 2021 -0500 cosmetic cleanup commit 48cd8ce5f1c5c3ea2372b0f3fcdb2a9491be52f4 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:15:57 2021 -0500 added image import commit 12e82211ace004c93726b8f6327adee1d1a58f78 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 22 15:13:01 2021 -0500 consolidated integration imports into url_import commit 8cf5dae5482d7b28e386760ca039c60efdfbdb9a Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:49 2021 -0500 staged app import tabs commit a255450fad53f9482711a252ec98b353b66a15df Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:16 2021 -0500 fixed missing space in keyword when adding recipe commit 2bb4dd9954c4913c6b4bd9e23f60315ed0c46552 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:08:51 2021 -0500 removed unused templates commit cddbebbc85377227ba9d753cf9d58db03e7f5ee2 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 13:13:56 2021 -0500 combined json import and source import commit b929bd9ae3a061dc2660602cb2ffb036b7e6cac7 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 16:06:02 2021 -0500 more fix from super ugly merge commit 558eb25faee2f8362a9af1380b40b11a3c05b6fa Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:17:10 2021 -0500 more cleanup from ugly merge commit 8906345e107096a657fac8cdff497548dbaa9ffd Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 11:24:23 2021 -0500 fixed ugly merge commit 966edebfedf89a7976f47dd0526e0aeb41aa0feb Author: smilerz <smilerz@gmail.com> Date: Thu Mar 18 12:09:53 2021 -0500 added drag and drop to ingredients commit a9b24c9f03a223bbf59613a10f000ce1b421383f Author: smilerz <smilerz@gmail.com> Date: Mon Mar 15 15:56:44 2021 -0500 manually parse json commit 908ae04ef98d629da0cd74e94d1401fa6c5ac654 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:33:07 2021 -0600 update urls.py commit e3828f96e6d2db5877789b5bd9be9cc4eb151d5f Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:32:47 2021 -0600 commit merge from Patralos/recipes commit a21fe044ed527dae2ea9a8bce854c628b1a39910 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 15:34:47 2021 -0600 updated URL import page with tab interface commit 59a30f579a25758ec58a938e8a315dd986e62cbf Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 11:29:10 2021 -0600 import raw json/html commit 299194409d9c0a395aaf5d69106c2f35baa1d402 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 7 14:28:29 2021 -0600 refactored json parser to create functions for each sub parser commit 0e480ba82f25a3fa705a9adc2cf82f5234797b44 Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 22:27:32 2021 +0100 replace common fractions with their concrete value (else parsing is not possible) commit 40fb268d2d2cfe5250b1a900eafb4819fd85572b Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 21:37:39 2021 +0100 Allow recipes to be imported from json directly commit987be4b04d
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 09:02:27 2021 -0500 Fix after rebase commitca84da68c4
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 18:39:44 2021 -0500 catch attibute error when scrape missing schema commitd75e39fbcd
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 16:27:18 2021 -0500 set persistent connections to db commiteb2593aacd
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 16:08:04 2021 -0500 handle text in cook times during import commit496e04cfc8
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:47:35 2021 -0500 convert servings to number on import commitd814d13d54
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 13:17:15 2021 -0500 custom scraper fails safe commitd0cedaf7a1
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 12:48:26 2021 -0500 added name parser commit01f504f7b1
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:31:47 2021 -0500 updated tests to handle html decoding commitc716346f1f
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:55:07 2021 -0500 flake commitfef5236931
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:53:45 2021 -0500 decode url strings in text_parser commitb115c37eb8
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:32:33 2021 -0500 catch error on scrape.image() commit1e17f3703a
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:28:46 2021 -0500 trap error on scrape.title() commit468b986314
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:05:28 2021 -0500 updated tests commita531d135b5
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:42:31 2021 -0500 remove html tags from description commit7524609cd0
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commita28f8e65d5
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commitd193637091
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:20:03 2021 -0500 added missing bookmarklet commit0953af05fc
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:18:14 2021 -0500 Revert "bug fix url import" This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23. commit19e8e5cb5b
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 13 16:44:05 2021 -0500 removed extra string normalization commit43c808380d
Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 21:22:56 2021 -0500 updated migration commit7ab8b84044
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:14:50 2021 -0500 updated recipe targets in tests to reflect html decoding commitd739fe6752
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 13:28:35 2021 -0500 fixes #527 commita84c41e29f
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 10:57:13 2021 -0500 bug fix url import commit393aba1f31
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 07:02:43 2021 -0500 url import bug fixes commit436a070730
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:43:33 2021 -0500 bug fix tests commit2fe6788ce5
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:41:00 2021 -0500 bug fix url import commit747d146389
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:26:29 2021 -0500 recipe import tests commitefe4c4043d
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 12:32:11 2021 -0500 simplified url import commitc6739ba8e0
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 09:20:15 2021 -0500 add data for url_import test commit50140db668
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:43:36 2021 -0500 added all ATK sites to custom scraper commit028b2dfb22
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:23 2021 -0500 added cooksillustrated custom scraper commitec6a10ca0a
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:01 2021 -0500 ensure time is always a number commit3cf949bf8d
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 2 15:19:20 2021 -0500 added ability to create custom scrapers commit0a62225797
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:21:28 2021 -0500 removed old json importer commita54f4e1367
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:19:18 2021 -0500 updated import from source to use text scraper commitbf3c30a8fb
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:08:56 2021 -0500 remove old html_import function commitf811f5996e
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:07:51 2021 -0500 wrapper for recipe_scrapers to parse text input commita3490240f4
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:17:46 2021 -0500 fixed broken tab commitb26aea96f4
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:11:54 2021 -0500 delete bookmarklet on import commit4d4af5fdf2
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:53:06 2021 -0500 removed console message commit3da74505d6
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:51:14 2021 -0500 fixed ingredient display on preview commitc8a4861df8
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 11:49:56 2021 -0500 redirect to import url for processing commit5e27cd606e
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 06:39:44 2021 -0500 added hack to fix scopes & CORS for bookmarklet commita341fd8ebe
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 28 18:39:20 2021 -0500 added CORS middleware commit9a62b6e4e7
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 26 14:47:24 2021 -0500 added bookmarklet model and api commitf80c44bca3
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 17:48:32 2021 -0500 bookmarklet passing data to form commit09d2e9f831
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 14:02:57 2021 -0500 added bookmarklet that doesn't work yet commit4d5a9e446f
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 14:14:56 2021 -0500 Squashed commit of the following: commit81a8734fac
Merge:abcef54
f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:41:13 2021 +0100 Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support Add iOS webclip icon support commitabcef54e72
Merge:e15c92c
7527646
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:30:43 2021 +0100 Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1 Bump recipe-scrapers from 12.2.0 to 12.2.1 commite15c92cda5
Merge:58fc269
45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:26:06 2021 +0100 Merge pull request #501 from smilerz/main_fork fix json direct import when wrapped in @graph commit45dba6fad2
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:23:55 2021 -0500 fix json direct import when wrapped in @graph commitf67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 15:49:12 2021 +0100 Add generated icons from icongenerator. commit53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 12:48:58 2021 +0100 Fix errors in favicon SVG. commit7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Mar 19 05:51:22 2021 +0000 Bump recipe-scrapers from 12.2.0 to 12.2.1 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1) Signed-off-by: dependabot[bot] <support@github.com> commit6a2c27749f
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 13:58:16 2021 -0500 updated links to import recipes commitde60e12073
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:54:41 2021 -0500 added collapsable cards commit1188ed9227
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:32:55 2021 -0500 cosmetic cleanup commitcb708e7e47
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:15:57 2021 -0500 added image import commit215eadb4a0
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 22 15:13:01 2021 -0500 consolidated integration imports into url_import commit4ffc54f720
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:49 2021 -0500 staged app import tabs commit21f6c7a21f
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:16 2021 -0500 fixed missing space in keyword when adding recipe commitce7c6939d2
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:08:51 2021 -0500 removed unused templates commit40a2f7ff90
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 13:13:56 2021 -0500 combined json import and source import commit4015517c0a
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 16:06:02 2021 -0500 more fix from super ugly merge commit7c8d41753c
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:17:10 2021 -0500 more cleanup from ugly merge commit90670613c5
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 11:24:23 2021 -0500 fixed ugly merge commit647c1678f1
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 18 12:09:53 2021 -0500 added drag and drop to ingredients commit44dee16e0a
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 15 15:56:44 2021 -0500 manually parse json commitf8fedcac82
Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:33:07 2021 -0600 update urls.py commit3a48d0e580
Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:32:47 2021 -0600 commit merge from Patralos/recipes commit9930789aa8
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 15:34:47 2021 -0600 updated URL import page with tab interface commit83fce6461a
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 11:29:10 2021 -0600 import raw json/html commitf0d37244b6
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 7 14:28:29 2021 -0600 refactored json parser to create functions for each sub parser commit386834f409
Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 21:37:39 2021 +0100 Allow recipes to be imported from json directly commit 78b71014daf001aeede02dae30522b530af4e1a6 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:08:08 2021 -0500 Fix after rebase commit a66466f75f4dc014e23694e18f6d97fbeaafc364 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 07:48:52 2021 -0500 Squashed commit of the following: commit 7642ac66b4d679fb3bd40d783d8c00e969e48413 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 07:44:53 2021 -0500 updated model commit c887fae3a2b85ad23772944d311761b85bd67031 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:46:38 2021 -0500 convert servings to number on import commit 34966bcef2993f4d0a1309362b0648f2096db996 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:15:59 2021 -0500 update tests to handle url decoding commit 86676772676395482901c195888898e7eaafc015 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:57:10 2021 -0500 bring parser inline with json_import branch commit 2b547f67cd180ca457691e15bc9edc1ae033ecc8 Merge: e5ada34 51d4ffe Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:43:27 2021 -0500 Merge branch 'bookmarklet' of github.com:smilerz/recipes into bookmarklet commit 51d4ffef18d359f75d377eee27bd15816957ac53 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 08:50:00 2021 -0500 unescape html document commit e5ada345d869409b240fd0746a88f269b6c28c2c Merge: 5b7df0a8d02cad
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 12:39:37 2021 -0500 Merge branch 'deprecation-fixes' into bookmarklet commit8d02cad7d9
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 12 14:12:04 2021 -0500 resolved deprecation warnings introduced in django 3.2 commit c94f55d058e7512854d30f7992825d041a90f7a7 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 18:38:46 2021 -0500 removed cors_header import - unused commit cfb1f83a766f64bd30c2dfe95407c651e4dd6122 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 18:38:00 2021 -0500 catch attribute error when scrape has no schema commit 0689b7faefb2abae3735bb6fe04ca1b3ca41bfd2 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 16:03:56 2021 -0500 handle text cook times on import commit a734e9e4f54ad36721e7d3445d5a630fd8ff165b Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:45:34 2021 -0500 convert servings to number on import commit 1bc89a791a7bc58e3c47ee8c10a27bed60bc9f91 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 13:10:23 2021 -0500 name parser handles list commit 1950c47f3d280a2ee2ed27c53c8733b48a629337 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:52:34 2021 -0500 updated docs for personal beta commit 4c0366667396059cb0e76389dce3d9373f818e0b Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 08:57:35 2021 -0500 decode html data when passing bookmarklet commit dd2934a7752c4de55de6632f588fa4e36d1815bf Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:39:30 2021 -0500 extra error catching commit 7a3a1febefbcebb0dbc648025da77ddc52eb5e20 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 18:48:45 2021 -0500 more shenanigans commit ac367fe4d99a74e04e632a112891c0fba3951580 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 18:25:24 2021 -0500 add debugpy to requirements commit 8327c425f195573e27de274b084717cdbd393387 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 18:24:24 2021 -0500 remote debug commit 0bd7879e05b71e428d32bc103fe6e6cf81fc4e41 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 18:03:15 2021 -0500 remote debug in container commit adead0cd112e1d43e1a245aa8cfa88cf85bd311b Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 16:48:09 2021 -0500 nope, this one works commit bfb9ff8f6df7f9f2783922e4b54e5b349e6eb18e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 16:28:31 2021 -0500 it finally works commit 0869e65f9461935bcaffd0df38b9a41458006a27 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 15:40:36 2021 -0500 fix test again commit 40270945ed1b5d33f5c1b19c9577204ac5b521da Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 15:02:57 2021 -0500 add bookmarklet back commit 9226eba7126c55c6c4c835d807cbec43d6765904 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 14:40:13 2021 -0500 extra docker tags commit 61ff736c5c2c5a4e81dd609c08ba24d05d08af49 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 14:29:52 2021 -0500 build hook commit 0ed57e77673e8f84df1d63dccae98ff8ec107eef Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:44:03 2021 -0500 fixed workflow commit 5f0b2fc62cb12fb0bea5c24f60753191ebe6bc47 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:42:00 2021 -0500 fixed branch reference commit e61fa241240140fe4d371b3bbcb9b55683dbfd0c Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:39:08 2021 -0500 personalized build commit ccdb251103468d903fcd07c1885f4466dac736b8 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:05:28 2021 -0500 updated tests commit 1ba63ad5a06545d8f93bf7eceab7d7c6628eeedb Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 11:52:06 2021 -0500 fixed admin commit 0796f957a690c43515fb77a7c5f2153e02687810 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 11:29:35 2021 -0500 updated bookmarklet to work with updated import process commit 7e3a3a80e60de0a529e88ed50a129873cf8bba6b Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:42:31 2021 -0500 remove html tags from description commit 9803d869bc532fef1119880ac9da41ae3d60c3a3 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:52 2021 -0500 Squashed commit of the following: commit 707d862e01a7497a1f22879d314b865a35e0e85b Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:00 2021 -0500 works now commit 3942a445ed4f2ccec57de25eacd86ea4e4dd6bdb Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:25:24 2021 -0500 updated serializer and api commit 10dc746eb175c7f805a8a8ffa7ce49977a7ce97e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:20:19 2021 -0500 fixed bookmarklet commit 9779104902d3be0258c95cd2eeebcba0d5d48892 Merge: bb8262c 0cb3928 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:56:27 2021 -0500 Merge branch 'bookmarklet' into json_import commit 0cb39284bb835ffc6cfee3e4306aadc4a64a25be Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commit e89e0218de684d40b2e2bfb6ba833891206c828e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commit bb8262ccabb93c56fbc18c407d5a0653b8b3ca79 Merge: b1e73aa35a7f62
Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 20:35:57 2021 -0500 Merge branch 'main_fork' into json_import commit f99e58f588d662b5a31982057b134ee02cd9ec1a Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commit 74d82b7048fa948e01c8a217ffa8e19b22bb8920 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commit 893b037d7f03871f390d17156cd9119ebef1e76c Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:20:03 2021 -0500 added missing bookmarklet commit 139152a82a3a06b9a28ae80e1c408d7be32d3b5a Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:18:14 2021 -0500 Revert "bug fix url import" This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23. commit b733b716df5d0f22938acc0ccb34ace7da82512e Author: smilerz <smilerz@gmail.com> Date: Tue Apr 13 16:44:05 2021 -0500 removed extra string normalization commit 3a9968a33c3d4aa3377e572f6b7aa4e61a75a821 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 21:22:56 2021 -0500 updated migration commit 1ddace4a235fdaa9c29830c85254a8b28cda7e8e Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:14:50 2021 -0500 updated recipe targets in tests to reflect html decoding commit d82dfb19a30f508250acf52d65d0e04cb41867ff Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 13:28:35 2021 -0500 fixes #527 commit d1a318cae1849f8aae06c5064671f262a5efbf2e Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 10:57:13 2021 -0500 bug fix url import commit cdf5dc8052e2313a3144a1b6f523df1248930fe1 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 07:02:43 2021 -0500 url import bug fixes commit 52ad8d20e10230ddfa4ee8035f541094c6ae165f Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:43:33 2021 -0500 bug fix tests commit 81fbef7f32da9145764ca0992e19c04bdc0207c2 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:41:00 2021 -0500 bug fix url import commit 437098f6858a01c8bb4ebaaa47eaadf9b174da59 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:26:29 2021 -0500 recipe import tests commit 3f303a828349e1bd1e7473a703c15b2c4d66eaf2 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 12:32:11 2021 -0500 simplified url import commit 9b98257e59fe7f727bd03d4cda24169a5b15cf5d Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 09:20:15 2021 -0500 add data for url_import test commit 19a009bf270aacc5a8e972e8f31b945e95de4afb Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:43:36 2021 -0500 added all ATK sites to custom scraper commit 82a7334e325578b1c32d3b77d5795fcf5a456bcb Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:23 2021 -0500 added cooksillustrated custom scraper commit f37ddbf06254c93f0b717f29f3ea535f1d2e627d Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:01 2021 -0500 ensure time is always a number commit 2c2e0144cfd75abb1937da68988d76101ea3668a Author: smilerz <smilerz@gmail.com> Date: Fri Apr 2 15:19:20 2021 -0500 added ability to create custom scrapers commit 75fa67829787606c27a184e240c1a101b40fddd1 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:21:28 2021 -0500 removed old json importer commit 9f567c663724359ac47798e27dd1ff1cd3d6f2db Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:19:18 2021 -0500 updated import from source to use text scraper commit e5955d19ade00be2f9cbdcd23fbf705d71fd3e0f Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:08:56 2021 -0500 remove old html_import function commit 1335a276c7ad498edad91f79157a17d67f8afc6e Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:07:51 2021 -0500 wrapper for recipe_scrapers to parse text input commit 717768ac8a82de879c1eab3934c32173e9d24318 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:17:46 2021 -0500 fixed broken tab commit 93756911199dbc3c7e32ffa81d43d594ceb51090 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:11:54 2021 -0500 delete bookmarklet on import commit 41c69b885636941ca0a3291e7d2277ba9eae9880 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:51:14 2021 -0500 fixed ingredient display on preview commit b30f4531db075488c21ff7cdfece3f35f0c79c40 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 11:49:56 2021 -0500 redirect to import url for processing commit 6faa2a4e161c2b34e4bf647513cd1039320dc80a Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 06:39:44 2021 -0500 added hack to fix scopes & CORS for bookmarklet commit eaef2b899d31b3f75b35347822a7d6a12cc83ccd Author: smilerz <smilerz@gmail.com> Date: Sun Mar 28 18:39:20 2021 -0500 added CORS middleware commit 1bdfccbca1913334290e3e67b8daa04089c17b70 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 26 14:47:24 2021 -0500 added bookmarklet model and api commit 9e315b4ac40042b4e615ffece30077dda6bfd29a Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 17:48:32 2021 -0500 bookmarklet passing data to form commit 83f39292b569f335fa1d8a7016b0c74c8cd7d467 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 14:02:57 2021 -0500 added bookmarklet that doesn't work yet commit f8f78a8d4eba11b1523f520eb74adf079d8758e7 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 14:14:56 2021 -0500 Squashed commit of the following: commit81a8734fac
Merge:abcef54
f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:41:13 2021 +0100 Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support Add iOS webclip icon support commitabcef54e72
Merge:e15c92c
7527646
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:30:43 2021 +0100 Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1 Bump recipe-scrapers from 12.2.0 to 12.2.1 commite15c92cda5
Merge:58fc269
45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:26:06 2021 +0100 Merge pull request #501 from smilerz/main_fork fix json direct import when wrapped in @graph commit45dba6fad2
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:23:55 2021 -0500 fix json direct import when wrapped in @graph commitf67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 15:49:12 2021 +0100 Add generated icons from icongenerator. commit53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 12:48:58 2021 +0100 Fix errors in favicon SVG. commit7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Mar 19 05:51:22 2021 +0000 Bump recipe-scrapers from 12.2.0 to 12.2.1 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1) Signed-off-by: dependabot[bot] <support@github.com> commit ba7852e92bc8ed2f0ccd3a4555c9f53407c1d747 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 13:58:16 2021 -0500 updated links to import recipes commit f0a3708c0dbe3ecf2c677967e6e66223a5a7d53a Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:54:41 2021 -0500 added collapsable cards commit a23da56b25d4bc7a72546ea4ee9223202a3419ea Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:32:55 2021 -0500 cosmetic cleanup commit dcc6507d5f01b456b000dbafb740505eea7f5bff Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:15:57 2021 -0500 added image import commit 4a56df8c61d8e4cbe24acd81f9acafef7f149734 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 22 15:13:01 2021 -0500 consolidated integration imports into url_import commit be63a59e164233d1c69197c1d2ef8f4c622c4de3 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:49 2021 -0500 staged app import tabs commit f35be1b107ae298fc4f0d585c4b88e6848bec1bd Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:16 2021 -0500 fixed missing space in keyword when adding recipe commit eb66f2a0a68ee909e3441ab9aa296d5dea2654f0 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:08:51 2021 -0500 removed unused templates commit 9a68e1fc5b5e2db6242fd50f83699e3f40de0403 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 13:13:56 2021 -0500 combined json import and source import commit bd5f6cafe748bd399eb2a378403cb5f08e29cc69 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 16:06:02 2021 -0500 more fix from super ugly merge commit 934d50dce099ee944c5da475de1e91539c9f84ea Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:17:10 2021 -0500 more cleanup from ugly merge commit 5dce44686bce133669081d5ad41df62884315250 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 11:24:23 2021 -0500 fixed ugly merge commit 978b746c18a3378dce8481c4a562884aff2e6da0 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 18 12:09:53 2021 -0500 added drag and drop to ingredients commit bb6495f055fcfed5d33df6812089f70b7a310fa8 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 15 15:56:44 2021 -0500 manually parse json commit 826027a1bd80742304d19b5a6848606367d1b6dc Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:33:07 2021 -0600 update urls.py commit 54f8048bd3dceafe96b80c20c78869db2df04863 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:32:47 2021 -0600 commit merge from Patralos/recipes commit c4df69439b00728a7d7a799792f4247a4241a48c Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 15:34:47 2021 -0600 updated URL import page with tab interface commit 29c9fc2dc2b88249433eae8287f6af58a1edffff Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 11:29:10 2021 -0600 import raw json/html commit 6bced1a0a4833fcdf4933b97c4a9427e1c329066 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 7 14:28:29 2021 -0600 refactored json parser to create functions for each sub parser commit 393204663e34ec221ec2d017b3ca252a0efce704 Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 21:37:39 2021 +0100 Allow recipes to be imported from json directly commit ff995f6a034648dc780f52deb4a325646da42946 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 14:09:10 2021 -0500 corrected api import workflow commit a9b6eb2aa3a8c6493cc9b1d6776737a2b5354453 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 11:26:26 2021 -0500 restored missing manual url scrape commit c82255196903f237fd9c122125b6e3f4c8a5a3ee Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 09:02:27 2021 -0500 Fix after rebase commit 689582f4ac5d1d3d358d43f471968b24abaf378d Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 18:39:44 2021 -0500 catch attibute error when scrape missing schema commit 108c29a98975f50668407a5c0dd64f98ee2f2ffc Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:47:35 2021 -0500 convert servings to number on import commit 5177c56d0332701064f464696ccdc8b8c4c34c30 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 13:17:15 2021 -0500 custom scraper fails safe commit 03063e8d1ef723c4ab277678f31f72b496626ff8 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 12:48:26 2021 -0500 added name parser commit 0a9d244c0da3e5425927e1d4a6c388bf8ca84970 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:31:47 2021 -0500 updated tests to handle html decoding commit 120359572b6ee9b54ec64a91d141d3d189e487dc Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:55:07 2021 -0500 flake commit b429dbccdf351c10a8dc02b270f4d88c29fb03fc Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:53:45 2021 -0500 decode url strings in text_parser commit f85f5504966d24372604a19b24081aa8469f7f53 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:32:33 2021 -0500 catch error on scrape.image() commit 13e306db07656f171bbca4ddb8d95694fe509874 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:28:46 2021 -0500 trap error on scrape.title() commit 600dc8e6f07584b4082a0d723bf79aebff6bb459 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:05:28 2021 -0500 updated tests commit af5bc725d228b616389f9bfe164d0a5adbae2a94 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:42:31 2021 -0500 remove html tags from description commit a925992f0a7b02d807cb51d287452f0448efcc58 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commit def989768f70767428908ba7e0f50ec93df4af30 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commit 0f6b176049fc17ad9536f660506a57f225b1d303 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:20:03 2021 -0500 added missing bookmarklet commit 17e2bcfe9cb3d8ce14a8b9d30ab82f0dc5f6943d Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:18:14 2021 -0500 Revert "bug fix url import" This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23. commit f0db2d152ee58733267443e485e5b831d0735d59 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 13 16:44:05 2021 -0500 removed extra string normalization commit 49ea06736f804152ce44fbc5608421c7837bdbe4 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 21:22:56 2021 -0500 updated migration commit 0320163b7ee3b59a516572f25bf2e01c72e9998f Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:14:50 2021 -0500 updated recipe targets in tests to reflect html decoding commit 45739616a9aa294a085e6666517d1463667ed4f0 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 13:28:35 2021 -0500 fixes #527 commit 4fc2571e808e13abd32d2864bb884ae4af1f463c Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 10:57:13 2021 -0500 bug fix url import commit ea7b0d7189fc4eb73236c319530a59a1cdf7384e Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 07:02:43 2021 -0500 url import bug fixes commit d0460e7dcbe9f9f480e29fbb4847e193a7263ebc Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:43:33 2021 -0500 bug fix tests commit d9dfe905c14b16478e4bb48148767f26cd096ec5 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:41:00 2021 -0500 bug fix url import commit 8125252bad982397ff74c6a790decc3155e0924c Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:26:29 2021 -0500 recipe import tests commit fa769d4d97ec4d0a878ecdf961d5f4f369647d9d Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 12:32:11 2021 -0500 simplified url import commit decd0cfa7b11ab809c70873832da1a7226db115b Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 09:20:15 2021 -0500 add data for url_import test commit c7a66f9b68495a41608207a6814fe5a32c3a7afd Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:43:36 2021 -0500 added all ATK sites to custom scraper commit 0041c833d31f1ca7ba3aba55c7a0831a1be6cb26 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:23 2021 -0500 added cooksillustrated custom scraper commit ef47962ca5589385ddaec52c9e1a1ff9f1c4d7f6 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:01 2021 -0500 ensure time is always a number commit 4dea0f084093f69f26954dfffeba815dd9c65e3c Author: smilerz <smilerz@gmail.com> Date: Fri Apr 2 15:19:20 2021 -0500 added ability to create custom scrapers commit 24395662584987ba7136ac07ba16c741cf000f6c Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:21:28 2021 -0500 removed old json importer commit c2e1fd4396a09f8d3d3776c292d32a2dc61788da Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:19:18 2021 -0500 updated import from source to use text scraper commit a10643ed8a7131fa316b627e93c4fda34bdd7d40 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:08:56 2021 -0500 remove old html_import function commit 6108f9592e920df3041ea7904d240f16ca7d6db9 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:07:51 2021 -0500 wrapper for recipe_scrapers to parse text input commit e96ece021ab8cf561f290f43e3aca856eca12692 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:17:46 2021 -0500 fixed broken tab commit 0479eb23c281fbe4608a43f0e937bc8cde54e742 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:11:54 2021 -0500 delete bookmarklet on import commit 42ea46a482fdd5445e8f5e375d6f6f93e897b13c Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:51:14 2021 -0500 fixed ingredient display on preview commit 430c99343ba5a91d261592663c8eb6249c6ebe25 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 11:49:56 2021 -0500 redirect to import url for processing commit 3c71cf95aa0f0af00b54e93435a9448d6f3a10c4 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 06:39:44 2021 -0500 added hack to fix scopes & CORS for bookmarklet commit 0a9db4503c48cd046ab33f0ac1433a5617bcd431 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 28 18:39:20 2021 -0500 added CORS middleware commit a0d1c01d1e2747a9c9f25fb6d8a63eed06884a1f Author: smilerz <smilerz@gmail.com> Date: Fri Mar 26 14:47:24 2021 -0500 added bookmarklet model and api commit e848a03edcec3cc97612964f4b0a9c7cff74300c Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 17:48:32 2021 -0500 bookmarklet passing data to form commit a753fe81b2f854d30969dcf441b6c73e03ebb231 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 14:02:57 2021 -0500 added bookmarklet that doesn't work yet commit afdfd82b367239e41a0a8f00d91ab7f048e829c3 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 14:14:56 2021 -0500 Squashed commit of the following: commit81a8734fac
Merge:abcef54
f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:41:13 2021 +0100 Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support Add iOS webclip icon support commitabcef54e72
Merge:e15c92c
7527646
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:30:43 2021 +0100 Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1 Bump recipe-scrapers from 12.2.0 to 12.2.1 commite15c92cda5
Merge:58fc269
45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:26:06 2021 +0100 Merge pull request #501 from smilerz/main_fork fix json direct import when wrapped in @graph commit45dba6fad2
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:23:55 2021 -0500 fix json direct import when wrapped in @graph commitf67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 15:49:12 2021 +0100 Add generated icons from icongenerator. commit53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 12:48:58 2021 +0100 Fix errors in favicon SVG. commit7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Mar 19 05:51:22 2021 +0000 Bump recipe-scrapers from 12.2.0 to 12.2.1 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1) Signed-off-by: dependabot[bot] <support@github.com> commit 03baed508e81bd95bcdb70f82d01bf64b8f593da Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 13:58:16 2021 -0500 updated links to import recipes commit ba6d15a2b0d1590fa5a24b31713d250acd263c80 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:54:41 2021 -0500 added collapsable cards commit 324d1b646ede9a6922795b9b02341ea32750fd81 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:32:55 2021 -0500 cosmetic cleanup commit dc92ab34bdb3837c258734b9af66937295bd3175 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:15:57 2021 -0500 added image import commit fff25209c5f00f1489e9f365c47f8a095397c60f Author: smilerz <smilerz@gmail.com> Date: Mon Mar 22 15:13:01 2021 -0500 consolidated integration imports into url_import commit 7c3c22aad790a653f697b58d0bde90a3e500830f Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:49 2021 -0500 staged app import tabs commit cc15f4ca29f57c262855878e435f27f406da6b6d Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:16 2021 -0500 fixed missing space in keyword when adding recipe commit 243d725ac572fc2be4e5a9dca5ef92a4f43f3b2f Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:08:51 2021 -0500 removed unused templates commit 5407de28b48c156f5ab5e534c253b25bf87ba551 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 13:13:56 2021 -0500 combined json import and source import commit 62750f299e9109c9f95b2e7b1bd85e95caf04dc4 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 16:06:02 2021 -0500 more fix from super ugly merge commit e555713d08fc0c0a9c1c809b6bec83aa8cfe918b Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:17:10 2021 -0500 more cleanup from ugly merge commit 546d6941768907f96db912af9281cfe2180e5a97 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 11:24:23 2021 -0500 fixed ugly merge commit 84e555bd5c59d1a31de58a8ed6210d9c07e099dc Author: smilerz <smilerz@gmail.com> Date: Thu Mar 18 12:09:53 2021 -0500 added drag and drop to ingredients commit e12519cd1fabbdd43a1947432166d93502ad62a5 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 15 15:56:44 2021 -0500 manually parse json commit be8171ccd45441706e1309d3b380a2adfb2fa6f9 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:33:07 2021 -0600 update urls.py commit b7215e85021d3b81c003ec908c782897ced63849 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:32:47 2021 -0600 commit merge from Patralos/recipes commit ba893f2e89d44fbea781b3a38075c68029f028ca Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 15:34:47 2021 -0600 updated URL import page with tab interface commit 3cb135a643cc780055c39540e168598fd902af05 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 11:29:10 2021 -0600 import raw json/html commit 88dc078a01919d7057aef6791279f2f8bacde8b4 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 7 14:28:29 2021 -0600 refactored json parser to create functions for each sub parser commit 6427a63985c67906e97b980c0d13dda1ea7f49c9 Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 21:37:39 2021 +0100 Allow recipes to be imported from json directly commit d832d071a8683c18652733ac8ba29a1e96c420f2 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 30 15:11:53 2021 -0500 stubbed out move keyword commit 798167329e55ee8e9e7f7ff317eebfa60c08389f Author: smilerz <smilerz@gmail.com> Date: Thu Apr 29 14:52:22 2021 -0500 WIP commit b7a4c27569a25ea71b80503666728e5f9bca2171 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 28 19:11:32 2021 -0500 new and edit keyword modals commit dca6fdc659576072de85ec3e7dbda9b292c480ab Author: smilerz <smilerz@gmail.com> Date: Wed Apr 28 12:06:46 2021 -0500 removed conficting migration commit 1b0746241fb4f9bc02aac6c66b4d3e8c4f7c51d0 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 28 11:42:43 2021 -0500 added new keyword modal commit d67410f6f02bccdec27e8846addcdb12e93c56c3 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 27 12:42:17 2021 -0500 added delete modal commit a625b4676e0ac16426dfbc93f6960950e613e4a6 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 26 11:30:31 2021 -0500 keyword card layout commit d4ab2638c1aed8f9d1b50765424e10e34dc0cc80 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 26 08:33:32 2021 -0500 WIP commit e8a7a120eb55dbb733f852305c177722b90e4aba Author: smilerz <smilerz@gmail.com> Date: Sun Apr 25 20:26:55 2021 -0500 filter by keyword commit b51baf50b4bbb4984e8d8ddbd569d338e221e967 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 25 19:54:00 2021 -0500 Squashed commit of the following: commit 33d084f201502377f672bfa78e334069bfadab29 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 25 19:50:51 2021 -0500 add trigrams to full text search commit 199a75d4b0ab924f896e8e53a5e5e55917c2a540 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 25 19:35:17 2021 -0500 add unaccent to full text search vectors commit db13383614700f60f29d80ff24a71f4aaeb3f200 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 25 19:09:54 2021 -0500 WIP commit ca06f6cf7936df0bdc633f1bbf9c2a5cfa84066d Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 19:01:20 2021 -0500 add trigrams to search rank commit a5d1c400efccdd3ad47807c4a2f990b983243d06 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 15:19:37 2021 -0500 simplified code commit 15261536c8ebab7156c366dcd4e21c5330550fde Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 14:42:10 2021 -0500 updated search v2 with full text search commit 51f4af6487bfbccc66998160e0ba3e4318dc6621 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 13:23:09 2021 -0500 rebase commit 2df9fc9d33a2b558b82cc8e614f18d0ebc409b83 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 13:22:48 2021 -0500 filter.py commit f90f3186d95ae64c7f88bad5fccb003d7d3f44a6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 20:17:54 2021 -0500 added multi-language support to FTS commit 3cfe14bdae4a4d8995e9d7bf3daacbe05544b0a7 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 19:42:22 2021 -0500 rebuild recipe index from admin site commit ef17ce2d57e869ddb84e4af8a37c2081cbf41e65 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 19:07:50 2021 -0500 command line to rebuild index commit 306c662f0b8dc39dee3cc6011d5d9f4c1ac2f325 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 17:01:18 2021 -0500 updated to handle sqlite commit 8c049697a55fd328a1e93607991c9160db80b6cc Author: smilerz <smilerz@gmail.com> Date: Fri Apr 9 12:47:17 2021 -0500 fixed smalltable commit c6f8d199efeb5d8b0f5b63a0113afbd856398857 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 9 12:46:07 2021 -0500 working proof of concept commit92c65ec1e8
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 21:21:41 2021 +0200 fixed test meal plan commita376c3a5b6
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:55:48 2021 +0200 meal plan random fix commit058d705170
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:19:11 2021 +0200 meal plan in search commit4ad5d6ef2f
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 15:01:39 2021 +0200 fixed test + added api doc for new search commite676b4bac3
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 14:05:19 2021 +0200 added api pagination for recipes commit04488741c4
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:11:19 2021 +0200 adv search mobile styling commit99004ad34b
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:03:15 2021 +0200 new search and setting commitf78f7dfc14
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 02:55:50 2021 +0200 search ui improvements and filter commit880db58d38
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 21:28:29 2021 +0200 v2 search filtering commitd1d65d878c
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 14:11:10 2021 +0200 v2 search progress commit3194a7580d
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 12:57:02 2021 +0200 basics of v2 search working commit 88f546bd2ebb607ec737c59f514b85ce8c3dc0db Author: smilerz <smilerz@gmail.com> Date: Sun Apr 25 18:03:37 2021 -0500 WIP commit b85dedae0ed410ba86249fb43b6361b8c8be8eeb Author: smilerz <smilerz@gmail.com> Date: Sun Apr 25 17:47:38 2021 -0500 stubbed out Keyword Card commit d31cb7d736976b8d8e67a85db7515ac6b03dff4a Author: smilerz <smilerz@gmail.com> Date: Fri Apr 23 17:16:23 2021 -0500 create split screen for keywords commit fe9b4f6f162797adabf63191a53bcb8b08f23804 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 23 15:29:23 2021 -0500 stubbed out new keyword view commit 37dd46bf478115bc968fc3a530ac60f1ea568aa1 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 23 15:28:48 2021 -0500 enhanced keyword api to include child/parent capability commit 495937aefd0d94e475563dfa9a08dab511dfccd2 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 23 12:00:47 2021 -0500 removed space from keyword form commit 6fd14c2a0e6ae3efcdbc7c1d8ff3ef7c749f13e6 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 23 11:09:38 2021 -0500 expanded keyword tests and fixed failures commit 8a11e8ea7c0440407ef02446dcbdba6e1028905c Author: smilerz <smilerz@gmail.com> Date: Thu Apr 22 18:02:15 2021 -0500 moved get_or_create to keyword model commit 499ffdc72c7d1b749039cb5cc8101570767d4eed Author: smilerz <smilerz@gmail.com> Date: Thu Apr 22 16:35:42 2021 -0500 squash keyword commit d15e6095484b7282176b73a8a0b4e1f8d3b833eb Author: smilerz <smilerz@gmail.com> Date: Thu Apr 22 16:35:31 2021 -0500 Squashed commit of the following: commit e766d4de6825efad3ec55823196f2872fab025c5 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:39:57 2021 -0500 updated migrate commit cb94109a31d3c63dc22c7f22ac7a990a11e39f33 Merge: d16ad580862c0f
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:37:54 2021 -0500 Merge branch 'main_fork' into keywords commit d16ad58ed60c75077a0e8cce0295c4fb3e241493 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 31 20:12:59 2021 -0500 fixed keyword serializer to pass tests commit 189c2fc647702dca4f6744df85eda3cf287cdbe5 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 31 18:03:23 2021 -0500 updated keyword test to create tree nodes commit f716a20549f706f7427b9162ace6fab1a28e85c9 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 31 14:46:57 2021 -0500 fixed api to accept all fields commit 1677042993dc74cca412a1ebb89648d5581f6eef Author: smilerz <smilerz@gmail.com> Date: Wed Mar 31 09:45:17 2021 -0500 restore delete in keyword api commit 3f08cb33195aeeaf1c731f959c57975deb84b9f0 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 31 09:41:19 2021 -0500 allow delete of keyword parent commit 74a842a283729ad11f7177476920ff1bb472bde5 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 31 09:37:26 2021 -0500 scopes and MP_Node work together on keywords commit 145dff4e096537d06524dab9f745ab600222766c Author: smilerz <smilerz@gmail.com> Date: Wed Mar 31 09:36:48 2021 -0500 safely delete keyword parent commit 69eb2481f57e18ceb499a73d26f8f9220eb575f8 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 31 09:36:26 2021 -0500 cosmetic updates commit 6925ef3333bfee8c8e59ac6d2324e84dd1d2533d Author: smilerz <smilerz@gmail.com> Date: Tue Mar 30 16:46:36 2021 -0500 removed space from Keyword commit e029ecd18501817f4f6350cb98793628fba049c8 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 30 16:25:02 2021 -0500 fixed sort order commit 2b47da0c92f8d813e93d6e65c5a26d06f5b60582 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 30 14:39:59 2021 -0500 delete migrations commit 20492167298c7f284f9df0d7308a75cc93fd4c6d Author: smilerz <smilerz@gmail.com> Date: Tue Mar 30 14:39:43 2021 -0500 recreate keywored migration commit ff71eb857683abc2db088ced5ca8890e3e313b5e Author: smilerz <smilerz@gmail.com> Date: Tue Mar 30 12:52:37 2021 -0500 db migration for keyword tree commit 071b3e0650bede75c73a5dd198c5ccdcbd0f483b Author: smilerz <smilerz@gmail.com> Date: Tue Mar 30 12:38:45 2021 -0500 initial attempt at merge with upstream commit 6b7c9b4287413841681ebc630036e587cf10a813 Merge: 7078994d16d77f
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 30 12:36:06 2021 -0500 Merge branch 'main_fork' into keywords commit 70789940520e220f0c2e168b0ec295e412b42462 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 3 09:57:36 2021 -0600 finished tree_template commit 8dd2e7da9e99c4005de19ad6d16dcce02154d2dc Author: smilerz <smilerz@gmail.com> Date: Mon Mar 1 16:25:15 2021 -0600 added tests for move_keyword api commit 5d52e3bff0504f6ce596d38e15fdad67b294321b Author: smilerz <smilerz@gmail.com> Date: Mon Mar 1 14:47:28 2021 -0600 added api to move keyword nodes commit 0f13ba84b957ff9f9eb7e95b921a607c6138b700 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 1 11:31:39 2021 -0600 convert Keyword from list to tree commit 05b9a85371613a31e53d7f2742f863edff8b1f43 Author: smilerz <smilerz@gmail.com> Date: Wed Feb 24 16:57:20 2021 -0600 update tests to reflect changes in Keyword commit c833a8b0928ce4f84b072c75de1d4b2c0ab057bd Author: smilerz <smilerz@gmail.com> Date: Wed Feb 24 16:56:55 2021 -0600 remove DELETE method from keyword API commit a4136dc849227a6c7b60db120778eb618e8501dc Author: smilerz <smilerz@gmail.com> Date: Wed Feb 24 12:09:55 2021 -0600 fixed adding keyword in new recipe form commit 17c5b6bf92b95e63ae671dd107bae6d2d0c7f503 Author: smilerz <smilerz@gmail.com> Date: Wed Feb 24 11:59:54 2021 -0600 fixed adding keyword during recipe import commit 3ade4c6412f1b86b9c8a04d260d954f9307794d5 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 22 16:08:52 2021 -0500 new branch commit 281002958a605162b1ed3625dce9fd30532b85b0 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 22 11:26:44 2021 -0500 truncate query params on url commit 520967220debf9fd53c74aa7fe236262e9e7b776 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 22 10:07:24 2021 -0500 bookmarklet includes url script_name commit f7cb11ec6484ad28e2b6e602f19331cc1b694e14 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 19:00:20 2021 -0500 add trigram to rank commit a2370ac8a998f002a2c036c980893e0cb95c5f9d Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 18:46:35 2021 -0500 Squashed commit of the following: commit 1c5f74bd182eb502e27d03cc7f93e5e0db8c3362 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 20 12:24:05 2021 -0500 change markdown link from hard-coded to reverse commit 76c56e2a063ec45f97b4d898e106a2b378b95b96 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 14:16:17 2021 -0500 missing '/' commit 47a13811a3a6e47e5f6f1c3ccd515c1989bd4617 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:41:26 2021 -0500 yarn build commit 0d2c1fabe9f982179ec9d26cbb79bc0cebfef9c5 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:31:48 2021 -0500 Squashed commit of the following: commit e03f626fd08a3e048dbd968d623ee58b7f865929 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:04:39 2021 -0500 yarn build commit b511f929ffcc7a670bd7955269982e05c591783a Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 21:17:31 2021 -0500 update service worker with base path commit f13f02d481618583017c71fb654adaa86585ef0b Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:54:17 2021 -0500 WIP commit f2f927c16f52baa6b9a31cd9992e8c7c8739d666 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:40:59 2021 -0500 default value if localStorage fails commit 424e8a9b93d8aa9962a3b6f963fff5c6e23dfa56 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:30:38 2021 -0500 fixed missing '/' commit d49a206ddf5952036b295804f9e31e52a1b45af6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:13:04 2021 -0500 updated .env.template commit ac94ea7afac36f65e1658f3d29f4e2b8f0475ba6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 15:31:37 2021 -0500 WIP commit c9a687df1b21ac6584d0f958e65c5cfc040406ca Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 10:19:02 2021 -0500 WIP commit 7fe8c7fbe52c96f1ccd4128db256656e43af3fa0 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 08:10:08 2021 -0500 added nginx config commit b5540d85872d9d69bda3787db7ecccfce893236f Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 08:03:09 2021 -0500 allow subfolder config on NGINX commit92c65ec1e8
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 21:21:41 2021 +0200 fixed test meal plan commita376c3a5b6
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:55:48 2021 +0200 meal plan random fix commit058d705170
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:19:11 2021 +0200 meal plan in search commit4ad5d6ef2f
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 15:01:39 2021 +0200 fixed test + added api doc for new search commite676b4bac3
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 14:05:19 2021 +0200 added api pagination for recipes commit04488741c4
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:11:19 2021 +0200 adv search mobile styling commit99004ad34b
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:03:15 2021 +0200 new search and setting commitf78f7dfc14
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 02:55:50 2021 +0200 search ui improvements and filter commit880db58d38
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 21:28:29 2021 +0200 v2 search filtering commitd1d65d878c
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 14:11:10 2021 +0200 v2 search progress commit3194a7580d
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 12:57:02 2021 +0200 basics of v2 search working commit 81a4e106d37030111beb1852737df05b5e7b1bfc Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 18:20:57 2021 -0500 removed trigram commit 0b8572e3eda9c7cab267f946ff0c704bc8f816db Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 16:05:53 2021 -0500 add trigram search to v2 commit 7bae185a3f6f459824e1da3a276f96dca6144262 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 15:27:50 2021 -0500 Squashed commit of the following: commit a5d1c400efccdd3ad47807c4a2f990b983243d06 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 15:19:37 2021 -0500 simplified code commit 15261536c8ebab7156c366dcd4e21c5330550fde Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 14:42:10 2021 -0500 updated search v2 with full text search commit 51f4af6487bfbccc66998160e0ba3e4318dc6621 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 13:23:09 2021 -0500 rebase commit 2df9fc9d33a2b558b82cc8e614f18d0ebc409b83 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 13:22:48 2021 -0500 filter.py commit f90f3186d95ae64c7f88bad5fccb003d7d3f44a6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 20:17:54 2021 -0500 added multi-language support to FTS commit 3cfe14bdae4a4d8995e9d7bf3daacbe05544b0a7 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 19:42:22 2021 -0500 rebuild recipe index from admin site commit ef17ce2d57e869ddb84e4af8a37c2081cbf41e65 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 19:07:50 2021 -0500 command line to rebuild index commit 306c662f0b8dc39dee3cc6011d5d9f4c1ac2f325 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 17:01:18 2021 -0500 updated to handle sqlite commit 8c049697a55fd328a1e93607991c9160db80b6cc Author: smilerz <smilerz@gmail.com> Date: Fri Apr 9 12:47:17 2021 -0500 fixed smalltable commit c6f8d199efeb5d8b0f5b63a0113afbd856398857 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 9 12:46:07 2021 -0500 working proof of concept commit92c65ec1e8
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 21:21:41 2021 +0200 fixed test meal plan commita376c3a5b6
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:55:48 2021 +0200 meal plan random fix commit058d705170
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:19:11 2021 +0200 meal plan in search commit4ad5d6ef2f
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 15:01:39 2021 +0200 fixed test + added api doc for new search commite676b4bac3
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 14:05:19 2021 +0200 added api pagination for recipes commit04488741c4
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:11:19 2021 +0200 adv search mobile styling commit99004ad34b
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:03:15 2021 +0200 new search and setting commitf78f7dfc14
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 02:55:50 2021 +0200 search ui improvements and filter commit880db58d38
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 21:28:29 2021 +0200 v2 search filtering commitd1d65d878c
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 14:11:10 2021 +0200 v2 search progress commit3194a7580d
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 12:57:02 2021 +0200 basics of v2 search working commit f79faf30b555ee31ea579b33be5906e8f13cd877 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 20 12:21:58 2021 -0500 changed hardlink markdown link to reverse commit e106b58d2a8fbf20d15c4ced1cfcefd95cfb84f5 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 20 09:15:57 2021 -0500 changed keyword to get_or_create commit d475ad8d75e6edf1677d8bd180a3e1b479130ebd Author: smilerz <smilerz@gmail.com> Date: Tue Apr 20 08:08:13 2021 -0500 strip food and keywords on url import commit 50bf8a8a992137a84b419f5d24f71d6275b7f848 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 15:31:49 2021 -0500 fix bookmarklet loading commit 0d7d03120c3bb7bf5460c3287ce382ece5f4d083 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 14:36:52 2021 -0500 WIP commit 3b3efd4984323d54d666d829cb23ea060aa4f6a1 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 14:15:17 2021 -0500 missing / commit 53ff2ca424e6419368d1e1d4331fde6958429673 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:44:54 2021 -0500 Squashed commit of the following: commit 47a13811a3a6e47e5f6f1c3ccd515c1989bd4617 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:41:26 2021 -0500 yarn build commit 0d2c1fabe9f982179ec9d26cbb79bc0cebfef9c5 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:31:48 2021 -0500 Squashed commit of the following: commit e03f626fd08a3e048dbd968d623ee58b7f865929 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:04:39 2021 -0500 yarn build commit b511f929ffcc7a670bd7955269982e05c591783a Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 21:17:31 2021 -0500 update service worker with base path commit f13f02d481618583017c71fb654adaa86585ef0b Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:54:17 2021 -0500 WIP commit f2f927c16f52baa6b9a31cd9992e8c7c8739d666 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:40:59 2021 -0500 default value if localStorage fails commit 424e8a9b93d8aa9962a3b6f963fff5c6e23dfa56 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:30:38 2021 -0500 fixed missing '/' commit d49a206ddf5952036b295804f9e31e52a1b45af6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:13:04 2021 -0500 updated .env.template commit ac94ea7afac36f65e1658f3d29f4e2b8f0475ba6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 15:31:37 2021 -0500 WIP commit c9a687df1b21ac6584d0f958e65c5cfc040406ca Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 10:19:02 2021 -0500 WIP commit 7fe8c7fbe52c96f1ccd4128db256656e43af3fa0 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 08:10:08 2021 -0500 added nginx config commit b5540d85872d9d69bda3787db7ecccfce893236f Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 08:03:09 2021 -0500 allow subfolder config on NGINX commit92c65ec1e8
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 21:21:41 2021 +0200 fixed test meal plan commita376c3a5b6
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:55:48 2021 +0200 meal plan random fix commit058d705170
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:19:11 2021 +0200 meal plan in search commit4ad5d6ef2f
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 15:01:39 2021 +0200 fixed test + added api doc for new search commite676b4bac3
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 14:05:19 2021 +0200 added api pagination for recipes commit04488741c4
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:11:19 2021 +0200 adv search mobile styling commit99004ad34b
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:03:15 2021 +0200 new search and setting commitf78f7dfc14
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 02:55:50 2021 +0200 search ui improvements and filter commit880db58d38
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 21:28:29 2021 +0200 v2 search filtering commitd1d65d878c
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 14:11:10 2021 +0200 v2 search progress commit3194a7580d
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 12:57:02 2021 +0200 basics of v2 search working commit 37ebbeb4f9ec9fe008a5ecaaad0d31d724256ff4 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:05:43 2021 -0500 yarn build commit b3c0589e3b52c89cce4a87abe681a4bbec761bce Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 12:58:44 2021 -0500 updated base_path in api-generator commit b4d05ef7580f4e72dc305f8423324f3eb8edef10 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 21:18:08 2021 -0500 updated service worker with base path commit a559a8c22c2d2e88d06fb390e1ca9f52e6df1b08 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:53:30 2021 -0500 WIP commit ce7f1f16c0c4a3eca206b00058dce947b7d67c33 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:39:33 2021 -0500 added default window location in case local storage failed commit 72d023f5a9351471dc1a15ddf1e12ce76b879e3d Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:33:19 2021 -0500 added trailing '/' commit bd8ea4a0406c0abbdec763705db58ef268ca7557 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:06:18 2021 -0500 dynamically set api-generator path commit 22e8564e40fbf00b82d7418c888009e953eec5a8 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 16:27:24 2021 -0500 WIP commit 21ee14c42b97fb17c736232a4564b5598524d68b Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 15:50:41 2021 -0500 WIP commit fe50bf3e2d6ea4d7cdc654f2b0182fdb0e1263a5 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 15:43:07 2021 -0500 Squashed commit of the following: commit ac94ea7afac36f65e1658f3d29f4e2b8f0475ba6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 15:31:37 2021 -0500 WIP commit c9a687df1b21ac6584d0f958e65c5cfc040406ca Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 10:19:02 2021 -0500 WIP commit 7fe8c7fbe52c96f1ccd4128db256656e43af3fa0 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 08:10:08 2021 -0500 added nginx config commit b5540d85872d9d69bda3787db7ecccfce893236f Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 08:03:09 2021 -0500 allow subfolder config on NGINX commit92c65ec1e8
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 21:21:41 2021 +0200 fixed test meal plan commita376c3a5b6
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:55:48 2021 +0200 meal plan random fix commit058d705170
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:19:11 2021 +0200 meal plan in search commit4ad5d6ef2f
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 15:01:39 2021 +0200 fixed test + added api doc for new search commite676b4bac3
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 14:05:19 2021 +0200 added api pagination for recipes commit04488741c4
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:11:19 2021 +0200 adv search mobile styling commit99004ad34b
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:03:15 2021 +0200 new search and setting commitf78f7dfc14
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 02:55:50 2021 +0200 search ui improvements and filter commit880db58d38
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 21:28:29 2021 +0200 v2 search filtering commitd1d65d878c
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 14:11:10 2021 +0200 v2 search progress commit3194a7580d
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 12:57:02 2021 +0200 basics of v2 search working commit 721dbda1cc7f7cf8fec39d149a3788ea3eecedd9 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 10:28:55 2021 -0500 wip commit d746e0326f2316d7c5edf0a17d2bf0f72f5728eb Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 10:28:26 2021 -0500 settings for nginx subfolder commit 49a8eb7032a3d45f54111fe395d01ce987518671 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 07:57:28 2021 -0500 WIP commit e6f865d4438900d22bd5e0c40caccedbe690b87e Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 22:29:21 2021 -0500 allow app to be served at proxy subfolder commit b023044ece62bc85e99b893c00615c611f933f88 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 20:16:28 2021 -0500 Squashed commit of the following: commit f03456411939b9f09704c057e20a970f9545dc0b Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 18:28:45 2021 -0500 no_perm commit 0262d1630dfcae204848a9fa6c41dc36958414d6 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:29:11 2021 -0500 removed unnecessary console message commit 069a02e67a99805ea04b3f2248d48584e146eadd Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:25:23 2021 -0500 removed commented out settings commit 1be713ff9db5e94fc68cfa25f4b8a219edff39b2 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:24:27 2021 -0500 removed unused cors_headers commit 5c9e1f015a6ff667968e6421341061af09d1b34a Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:22:15 2021 -0500 removed line breaks commit 0e92b029d46bbaaf2a5bf2526165d3a4075581f1 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:21:21 2021 -0500 removed console.log() commit e435325e66a1dc25fb9d24391eec5ed76503d969 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 11:17:00 2021 -0500 Fix after rebase commit c6e1add18be6e9791c7142a78129a879020c6f17 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 07:44:53 2021 -0500 updated model commit c52cd0b177da20cbed9a9d606ee4ec54ab865f38 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:46:38 2021 -0500 convert servings to number on import commit a3cf59c7a47dc39bec74b772f789e1c052884550 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:15:59 2021 -0500 update tests to handle url decoding commit 7ff1783578c90e2c6ae931b345d580279daeedf0 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:57:10 2021 -0500 bring parser inline with json_import branch commit 204f3ddf845a91c50d54d8dbd2f1d754d3076d25 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 08:50:00 2021 -0500 unescape html document commit 28291f96afdb70c8259104997000fe9544e0d134 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 11:29:35 2021 -0500 updated bookmarklet to work with updated import process commit e7c7823916febeb0adbe7e548633b737125ad3b7 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:52 2021 -0500 Squashed commit of the following: commit 707d862e01a7497a1f22879d314b865a35e0e85b Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:00 2021 -0500 works now commit 3942a445ed4f2ccec57de25eacd86ea4e4dd6bdb Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:25:24 2021 -0500 updated serializer and api commit 10dc746eb175c7f805a8a8ffa7ce49977a7ce97e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:20:19 2021 -0500 fixed bookmarklet commit 9779104902d3be0258c95cd2eeebcba0d5d48892 Merge: bb8262c 0cb3928 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:56:27 2021 -0500 Merge branch 'bookmarklet' into json_import commit 0cb39284bb835ffc6cfee3e4306aadc4a64a25be Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commit e89e0218de684d40b2e2bfb6ba833891206c828e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commit bb8262ccabb93c56fbc18c407d5a0653b8b3ca79 Merge: b1e73aa35a7f62
Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 20:35:57 2021 -0500 Merge branch 'main_fork' into json_import commit e01efbbf764bbe6b0e1cefac6c0311dd18a0d503 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:20:03 2021 -0500 added missing bookmarklet commit 3e5f3a36a48cdca0087a551a9a6b4d942d81bf19 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:18:14 2021 -0500 Revert "bug fix url import" This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23. commit 22135c7d40a399fafef994372e7ba128fc37c596 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 13 16:44:05 2021 -0500 removed extra string normalization commit 7ab59c55ac75f50997156f8808c18d12ef7ac8f3 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 21:22:56 2021 -0500 updated migration commit 0f6f8c9eeb642a2824c6952a69c2a2a12e628d24 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:14:50 2021 -0500 updated recipe targets in tests to reflect html decoding commit c56add95a4627f5ed874bbce3cb7b0f4d8adbb9f Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 13:28:35 2021 -0500 fixes #527 commit 09993a71515b9b977f074e14e11cf9e4b5c72b96 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 10:57:13 2021 -0500 bug fix url import commit 625d23d994b84be082f20ef1f6527d1d742a7157 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 07:02:43 2021 -0500 url import bug fixes commit df4b2adf7dcd8099871167ed8bab779e976002a4 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:43:33 2021 -0500 bug fix tests commit 0a61c9f9def1da5841031e39ced99a08a2536958 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:41:00 2021 -0500 bug fix url import commit afbf1153bfcc29baa80a07019f337a9c02b66a63 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:26:29 2021 -0500 recipe import tests commit 5857ed171e3b667764f2882d3ee7b73c15bdab8b Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 12:32:11 2021 -0500 simplified url import commit 33cc780cfd8001a0293951f25fd19b3db8ce0461 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 09:20:15 2021 -0500 add data for url_import test commit 322552a1f1434e7ca52f75886e752f31ea5915f3 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:43:36 2021 -0500 added all ATK sites to custom scraper commit 6455e597fbc2a394f217fe8c11d2bc89e8add1a4 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:23 2021 -0500 added cooksillustrated custom scraper commit 1c6ad94a2d8bf466e35c56a1cd82dff9039371c6 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:01 2021 -0500 ensure time is always a number commit fbbc057a8a2964eb6a4ac7d2324adacc679db2d6 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 2 15:19:20 2021 -0500 added ability to create custom scrapers commit fd293f150e959f67b3e8260061f8a72898e0990c Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:21:28 2021 -0500 removed old json importer commit 86b330583a6f5946b5743df8b447dccc1db3ade0 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:19:18 2021 -0500 updated import from source to use text scraper commit c4be53661293bc54c9069c2604d8fe1a61dceddf Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:08:56 2021 -0500 remove old html_import function commit 6a6314e09be06d17cc11bf55e95992f0a10b54ed Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:07:51 2021 -0500 wrapper for recipe_scrapers to parse text input commit 64524c01c8da795269bd2dbdfb5e6a02d47e8904 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:17:46 2021 -0500 fixed broken tab commit 4701d62739550754960e6d1eac437f0d2cea004f Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:11:54 2021 -0500 delete bookmarklet on import commit 4233980dd9df8e0e961363d464b41c61ad1c6288 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:53:06 2021 -0500 removed console message commit 16e34fe3b134bf31bc84c6f7584662a171fa9748 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:51:14 2021 -0500 fixed ingredient display on preview commit c51d715cfee7a787dcd7b1c3dd0beb24a14962d3 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 11:49:56 2021 -0500 redirect to import url for processing commit 29c199320502711a3197eade37f6021064c7dcb0 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 06:39:44 2021 -0500 added hack to fix scopes & CORS for bookmarklet commit 958faf9972d26ad9f78eaaa1126af51d7a3b333b Author: smilerz <smilerz@gmail.com> Date: Sun Mar 28 18:39:20 2021 -0500 added CORS middleware commit c284f830dc7e7339cd2f54185f2ff8ea6866ef19 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 26 14:47:24 2021 -0500 added bookmarklet model and api commit cbfc5fa973c002bc1ce75d3d2671986007b6a3a7 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 17:48:32 2021 -0500 bookmarklet passing data to form commit d9815e445828293bb2965c7c98ab6acf3afe3833 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 14:02:57 2021 -0500 added bookmarklet that doesn't work yet commit 0e327f3bf865a99e95368bf4b74ee9545d9a2b1a Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 14:14:56 2021 -0500 Squashed commit of the following: commit81a8734fac
Merge:abcef54
f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:41:13 2021 +0100 Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support Add iOS webclip icon support commitabcef54e72
Merge:e15c92c
7527646
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:30:43 2021 +0100 Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1 Bump recipe-scrapers from 12.2.0 to 12.2.1 commite15c92cda5
Merge:58fc269
45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:26:06 2021 +0100 Merge pull request #501 from smilerz/main_fork fix json direct import when wrapped in @graph commit45dba6fad2
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:23:55 2021 -0500 fix json direct import when wrapped in @graph commitf67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 15:49:12 2021 +0100 Add generated icons from icongenerator. commit53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 12:48:58 2021 +0100 Fix errors in favicon SVG. commit7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Mar 19 05:51:22 2021 +0000 Bump recipe-scrapers from 12.2.0 to 12.2.1 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1) Signed-off-by: dependabot[bot] <support@github.com> commit 18c5bf8a3eb7dd22504bbd2e40acab9269cc6804 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 13:58:16 2021 -0500 updated links to import recipes commit 9f643b0b85cc89a36a86681e20c68c177959e1a1 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:54:41 2021 -0500 added collapsable cards commit b37594eb84988043afa450de871a036f72a811ee Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:32:55 2021 -0500 cosmetic cleanup commit e5f76034dfc174d3ce307de1c0c5683a159733a9 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:15:57 2021 -0500 added image import commit 792cfb0791c2e682589995ccd1b85eca0a04061c Author: smilerz <smilerz@gmail.com> Date: Mon Mar 22 15:13:01 2021 -0500 consolidated integration imports into url_import commit aa6c9430bce1a63e46ff0325f13e4f4d7369cc00 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:49 2021 -0500 staged app import tabs commit 3dd92d811c140d925b153f30db29e11e4c8a18cc Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:16 2021 -0500 fixed missing space in keyword when adding recipe commit d79283ccabdd014c62dc820f382830421908cf0a Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:08:51 2021 -0500 removed unused templates commit 3f95eb2f3db42628994f1ea80fd5010fa1b247ba Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 13:13:56 2021 -0500 combined json import and source import commit 5016314ab57102454a95e48f0ba50b6031cc5400 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 16:06:02 2021 -0500 more fix from super ugly merge commit 27a489c45a5b169818e36c79591757f99f64c637 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:17:10 2021 -0500 more cleanup from ugly merge commit f7517d51dd9aad61b1e80ec20947c4f597834691 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 11:24:23 2021 -0500 fixed ugly merge commit 7095b6ef89fe350d591f1103c4c1a2d27c60d28f Author: smilerz <smilerz@gmail.com> Date: Thu Mar 18 12:09:53 2021 -0500 added drag and drop to ingredients commit bdadc7168f37eede0f91a2bfa060200273e440a9 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 15 15:56:44 2021 -0500 manually parse json commit 4bcd7e462db760d00483a90883028e5404f33299 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:33:07 2021 -0600 update urls.py commit 794d2798bfe56a27af5e8786e5f3b9701be7fe81 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:32:47 2021 -0600 commit merge from Patralos/recipes commit e97bc6ea89d8c366104d08ce561dd3d3c17c1578 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 15:34:47 2021 -0600 updated URL import page with tab interface commit 7732bc44b83c23901873bce1075b7ac2e68cee07 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 11:29:10 2021 -0600 import raw json/html commit 368d2211efa86e1146e95e3ddd1192b81f0422c2 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 7 14:28:29 2021 -0600 refactored json parser to create functions for each sub parser commit 3ddff8b468e0c85d1a4ff61b565b78c5be0f77ea Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 22:27:32 2021 +0100 replace common fractions with their concrete value (else parsing is not possible) commit 083048e125f63463edca6f4855f6a8e974f61a21 Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 21:37:39 2021 +0100 Allow recipes to be imported from json directly commit 8117f646343fb3b8c26050e8ed1c07eca62dd148 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 20:15:41 2021 -0500 Squashed commit of the following: commit7930c2417c
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 17:12:43 2021 -0500 update ATK scrape to handle empty headnote commit2f27413c0a
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 14:12:24 2021 -0500 parse multiple ingredientGroups previous version assumed only a single item in a list - this loops through each item commit5869a8ad1b
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 13:43:34 2021 -0500 fixes to pass tests commit0640a265fc
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 13:42:56 2021 -0500 added test for spruce eats commitd449fc8fd8
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 12:49:42 2021 -0500 updated normalization to skip removing line breaks commitb9ee77709b
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 12:49:06 2021 -0500 updated ATK scraper to include header notes in instructions commit ec15998c0be0068f3c521554fdb57833ac7e407d Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 15:57:20 2021 -0500 updated message commit 04ead0e273786b1692867d7b68391c41e3f6d2e7 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 14:17:16 2021 -0500 fixed ATK scraper commit 641cb4cb0d41ec065a25aee26d6a213976b560e4 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 13:44:29 2021 -0500 Squashed commit of the following: commit5869a8ad1b
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 13:43:34 2021 -0500 fixes to pass tests commit0640a265fc
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 13:42:56 2021 -0500 added test for spruce eats commitd449fc8fd8
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 12:49:42 2021 -0500 updated normalization to skip removing line breaks commitb9ee77709b
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 12:49:06 2021 -0500 updated ATK scraper to include header notes in instructions commit 45b366fac5f8ae78ecde10261ec088067b9f45d4 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 11:58:40 2021 -0500 added upcoming features commit 305402566d12a8715df1aa2ef826de25ed1c205d Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 17:45:42 2021 -0500 Squashed commit of the following: commitba061df1b6
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 17:30:59 2021 -0500 catch attribute error on cooktime commit7cc515bcdf
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 17:08:25 2021 -0500 fix manual url import commit724748d38a
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 14:09:10 2021 -0500 corrected api import workflow commitb2c1c6e301
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 11:26:26 2021 -0500 restored missing manual url scrape commit987be4b04d
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 09:02:27 2021 -0500 Fix after rebase commitca84da68c4
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 18:39:44 2021 -0500 catch attibute error when scrape missing schema commitd75e39fbcd
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 16:27:18 2021 -0500 set persistent connections to db commiteb2593aacd
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 16:08:04 2021 -0500 handle text in cook times during import commit496e04cfc8
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:47:35 2021 -0500 convert servings to number on import commitd814d13d54
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 13:17:15 2021 -0500 custom scraper fails safe commitd0cedaf7a1
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 12:48:26 2021 -0500 added name parser commit01f504f7b1
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:31:47 2021 -0500 updated tests to handle html decoding commitc716346f1f
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:55:07 2021 -0500 flake commitfef5236931
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:53:45 2021 -0500 decode url strings in text_parser commitb115c37eb8
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:32:33 2021 -0500 catch error on scrape.image() commit1e17f3703a
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:28:46 2021 -0500 trap error on scrape.title() commit468b986314
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:05:28 2021 -0500 updated tests commita531d135b5
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:42:31 2021 -0500 remove html tags from description commit7524609cd0
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commita28f8e65d5
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commitd193637091
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:20:03 2021 -0500 added missing bookmarklet commit0953af05fc
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:18:14 2021 -0500 Revert "bug fix url import" This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23. commit19e8e5cb5b
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 13 16:44:05 2021 -0500 removed extra string normalization commit43c808380d
Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 21:22:56 2021 -0500 updated migration commit7ab8b84044
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:14:50 2021 -0500 updated recipe targets in tests to reflect html decoding commitd739fe6752
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 13:28:35 2021 -0500 fixes #527 commita84c41e29f
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 10:57:13 2021 -0500 bug fix url import commit393aba1f31
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 07:02:43 2021 -0500 url import bug fixes commit436a070730
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:43:33 2021 -0500 bug fix tests commit2fe6788ce5
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:41:00 2021 -0500 bug fix url import commit747d146389
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:26:29 2021 -0500 recipe import tests commitefe4c4043d
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 12:32:11 2021 -0500 simplified url import commitc6739ba8e0
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 09:20:15 2021 -0500 add data for url_import test commit50140db668
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:43:36 2021 -0500 added all ATK sites to custom scraper commit028b2dfb22
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:23 2021 -0500 added cooksillustrated custom scraper commitec6a10ca0a
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:01 2021 -0500 ensure time is always a number commit3cf949bf8d
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 2 15:19:20 2021 -0500 added ability to create custom scrapers commit0a62225797
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:21:28 2021 -0500 removed old json importer commita54f4e1367
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:19:18 2021 -0500 updated import from source to use text scraper commitbf3c30a8fb
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:08:56 2021 -0500 remove old html_import function commitf811f5996e
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:07:51 2021 -0500 wrapper for recipe_scrapers to parse text input commita3490240f4
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:17:46 2021 -0500 fixed broken tab commitb26aea96f4
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:11:54 2021 -0500 delete bookmarklet on import commit4d4af5fdf2
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:53:06 2021 -0500 removed console message commit3da74505d6
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:51:14 2021 -0500 fixed ingredient display on preview commitc8a4861df8
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 11:49:56 2021 -0500 redirect to import url for processing commit5e27cd606e
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 06:39:44 2021 -0500 added hack to fix scopes & CORS for bookmarklet commita341fd8ebe
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 28 18:39:20 2021 -0500 added CORS middleware commit9a62b6e4e7
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 26 14:47:24 2021 -0500 added bookmarklet model and api commitf80c44bca3
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 17:48:32 2021 -0500 bookmarklet passing data to form commit09d2e9f831
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 14:02:57 2021 -0500 added bookmarklet that doesn't work yet commit4d5a9e446f
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 14:14:56 2021 -0500 Squashed commit of the following: commit81a8734fac
Merge:abcef54
f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:41:13 2021 +0100 Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support Add iOS webclip icon support commitabcef54e72
Merge:e15c92c
7527646
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:30:43 2021 +0100 Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1 Bump recipe-scrapers from 12.2.0 to 12.2.1 commite15c92cda5
Merge:58fc269
45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:26:06 2021 +0100 Merge pull request #501 from smilerz/main_fork fix json direct import when wrapped in @graph commit45dba6fad2
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:23:55 2021 -0500 fix json direct import when wrapped in @graph commitf67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 15:49:12 2021 +0100 Add generated icons from icongenerator. commit53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 12:48:58 2021 +0100 Fix errors in favicon SVG. commit7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Mar 19 05:51:22 2021 +0000 Bump recipe-scrapers from 12.2.0 to 12.2.1 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1) Signed-off-by: dependabot[bot] <support@github.com> commit6a2c27749f
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 13:58:16 2021 -0500 updated links to import recipes commitde60e12073
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:54:41 2021 -0500 added collapsable cards commit1188ed9227
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:32:55 2021 -0500 cosmetic cleanup commitcb708e7e47
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:15:57 2021 -0500 added image import commit215eadb4a0
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 22 15:13:01 2021 -0500 consolidated integration imports into url_import commit4ffc54f720
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:49 2021 -0500 staged app import tabs commit21f6c7a21f
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:16 2021 -0500 fixed missing space in keyword when adding recipe commitce7c6939d2
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:08:51 2021 -0500 removed unused templates commit40a2f7ff90
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 13:13:56 2021 -0500 combined json import and source import commit4015517c0a
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 16:06:02 2021 -0500 more fix from super ugly merge commit7c8d41753c
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:17:10 2021 -0500 more cleanup from ugly merge commit90670613c5
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 11:24:23 2021 -0500 fixed ugly merge commit647c1678f1
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 18 12:09:53 2021 -0500 added drag and drop to ingredients commit44dee16e0a
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 15 15:56:44 2021 -0500 manually parse json commitf8fedcac82
Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:33:07 2021 -0600 update urls.py commit3a48d0e580
Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:32:47 2021 -0600 commit merge from Patralos/recipes commit9930789aa8
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 15:34:47 2021 -0600 updated URL import page with tab interface commit83fce6461a
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 11:29:10 2021 -0600 import raw json/html commitf0d37244b6
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 7 14:28:29 2021 -0600 refactored json parser to create functions for each sub parser commit386834f409
Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 21:37:39 2021 +0100 Allow recipes to be imported from json directly commit b1aba669e6e06d3b5d677f8210f88a64eaa2bafc Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 17:40:57 2021 -0500 Squashed commit of the following: commit 0262d1630dfcae204848a9fa6c41dc36958414d6 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:29:11 2021 -0500 removed unnecessary console message commit 069a02e67a99805ea04b3f2248d48584e146eadd Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:25:23 2021 -0500 removed commented out settings commit 1be713ff9db5e94fc68cfa25f4b8a219edff39b2 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:24:27 2021 -0500 removed unused cors_headers commit 5c9e1f015a6ff667968e6421341061af09d1b34a Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:22:15 2021 -0500 removed line breaks commit 0e92b029d46bbaaf2a5bf2526165d3a4075581f1 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:21:21 2021 -0500 removed console.log() commit e435325e66a1dc25fb9d24391eec5ed76503d969 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 11:17:00 2021 -0500 Fix after rebase commit c6e1add18be6e9791c7142a78129a879020c6f17 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 07:44:53 2021 -0500 updated model commit c52cd0b177da20cbed9a9d606ee4ec54ab865f38 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:46:38 2021 -0500 convert servings to number on import commit a3cf59c7a47dc39bec74b772f789e1c052884550 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:15:59 2021 -0500 update tests to handle url decoding commit 7ff1783578c90e2c6ae931b345d580279daeedf0 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:57:10 2021 -0500 bring parser inline with json_import branch commit 204f3ddf845a91c50d54d8dbd2f1d754d3076d25 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 08:50:00 2021 -0500 unescape html document commit 28291f96afdb70c8259104997000fe9544e0d134 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 11:29:35 2021 -0500 updated bookmarklet to work with updated import process commit e7c7823916febeb0adbe7e548633b737125ad3b7 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:52 2021 -0500 Squashed commit of the following: commit 707d862e01a7497a1f22879d314b865a35e0e85b Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:00 2021 -0500 works now commit 3942a445ed4f2ccec57de25eacd86ea4e4dd6bdb Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:25:24 2021 -0500 updated serializer and api commit 10dc746eb175c7f805a8a8ffa7ce49977a7ce97e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:20:19 2021 -0500 fixed bookmarklet commit 9779104902d3be0258c95cd2eeebcba0d5d48892 Merge: bb8262c 0cb3928 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:56:27 2021 -0500 Merge branch 'bookmarklet' into json_import commit 0cb39284bb835ffc6cfee3e4306aadc4a64a25be Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commit e89e0218de684d40b2e2bfb6ba833891206c828e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commit bb8262ccabb93c56fbc18c407d5a0653b8b3ca79 Merge: b1e73aa35a7f62
Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 20:35:57 2021 -0500 Merge branch 'main_fork' into json_import commit e01efbbf764bbe6b0e1cefac6c0311dd18a0d503 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:20:03 2021 -0500 added missing bookmarklet commit 3e5f3a36a48cdca0087a551a9a6b4d942d81bf19 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:18:14 2021 -0500 Revert "bug fix url import" This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23. commit 22135c7d40a399fafef994372e7ba128fc37c596 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 13 16:44:05 2021 -0500 removed extra string normalization commit 7ab59c55ac75f50997156f8808c18d12ef7ac8f3 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 21:22:56 2021 -0500 updated migration commit 0f6f8c9eeb642a2824c6952a69c2a2a12e628d24 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:14:50 2021 -0500 updated recipe targets in tests to reflect html decoding commit c56add95a4627f5ed874bbce3cb7b0f4d8adbb9f Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 13:28:35 2021 -0500 fixes #527 commit 09993a71515b9b977f074e14e11cf9e4b5c72b96 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 10:57:13 2021 -0500 bug fix url import commit 625d23d994b84be082f20ef1f6527d1d742a7157 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 07:02:43 2021 -0500 url import bug fixes commit df4b2adf7dcd8099871167ed8bab779e976002a4 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:43:33 2021 -0500 bug fix tests commit 0a61c9f9def1da5841031e39ced99a08a2536958 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:41:00 2021 -0500 bug fix url import commit afbf1153bfcc29baa80a07019f337a9c02b66a63 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:26:29 2021 -0500 recipe import tests commit 5857ed171e3b667764f2882d3ee7b73c15bdab8b Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 12:32:11 2021 -0500 simplified url import commit 33cc780cfd8001a0293951f25fd19b3db8ce0461 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 09:20:15 2021 -0500 add data for url_import test commit 322552a1f1434e7ca52f75886e752f31ea5915f3 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:43:36 2021 -0500 added all ATK sites to custom scraper commit 6455e597fbc2a394f217fe8c11d2bc89e8add1a4 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:23 2021 -0500 added cooksillustrated custom scraper commit 1c6ad94a2d8bf466e35c56a1cd82dff9039371c6 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:01 2021 -0500 ensure time is always a number commit fbbc057a8a2964eb6a4ac7d2324adacc679db2d6 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 2 15:19:20 2021 -0500 added ability to create custom scrapers commit fd293f150e959f67b3e8260061f8a72898e0990c Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:21:28 2021 -0500 removed old json importer commit 86b330583a6f5946b5743df8b447dccc1db3ade0 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:19:18 2021 -0500 updated import from source to use text scraper commit c4be53661293bc54c9069c2604d8fe1a61dceddf Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:08:56 2021 -0500 remove old html_import function commit 6a6314e09be06d17cc11bf55e95992f0a10b54ed Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:07:51 2021 -0500 wrapper for recipe_scrapers to parse text input commit 64524c01c8da795269bd2dbdfb5e6a02d47e8904 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:17:46 2021 -0500 fixed broken tab commit 4701d62739550754960e6d1eac437f0d2cea004f Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:11:54 2021 -0500 delete bookmarklet on import commit 4233980dd9df8e0e961363d464b41c61ad1c6288 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:53:06 2021 -0500 removed console message commit 16e34fe3b134bf31bc84c6f7584662a171fa9748 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:51:14 2021 -0500 fixed ingredient display on preview commit c51d715cfee7a787dcd7b1c3dd0beb24a14962d3 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 11:49:56 2021 -0500 redirect to import url for processing commit 29c199320502711a3197eade37f6021064c7dcb0 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 06:39:44 2021 -0500 added hack to fix scopes & CORS for bookmarklet commit 958faf9972d26ad9f78eaaa1126af51d7a3b333b Author: smilerz <smilerz@gmail.com> Date: Sun Mar 28 18:39:20 2021 -0500 added CORS middleware commit c284f830dc7e7339cd2f54185f2ff8ea6866ef19 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 26 14:47:24 2021 -0500 added bookmarklet model and api commit cbfc5fa973c002bc1ce75d3d2671986007b6a3a7 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 17:48:32 2021 -0500 bookmarklet passing data to form commit d9815e445828293bb2965c7c98ab6acf3afe3833 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 14:02:57 2021 -0500 added bookmarklet that doesn't work yet commit 0e327f3bf865a99e95368bf4b74ee9545d9a2b1a Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 14:14:56 2021 -0500 Squashed commit of the following: commit81a8734fac
Merge:abcef54
f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:41:13 2021 +0100 Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support Add iOS webclip icon support commitabcef54e72
Merge:e15c92c
7527646
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:30:43 2021 +0100 Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1 Bump recipe-scrapers from 12.2.0 to 12.2.1 commite15c92cda5
Merge:58fc269
45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:26:06 2021 +0100 Merge pull request #501 from smilerz/main_fork fix json direct import when wrapped in @graph commit45dba6fad2
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:23:55 2021 -0500 fix json direct import when wrapped in @graph commitf67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 15:49:12 2021 +0100 Add generated icons from icongenerator. commit53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 12:48:58 2021 +0100 Fix errors in favicon SVG. commit7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Mar 19 05:51:22 2021 +0000 Bump recipe-scrapers from 12.2.0 to 12.2.1 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1) Signed-off-by: dependabot[bot] <support@github.com> commit 18c5bf8a3eb7dd22504bbd2e40acab9269cc6804 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 13:58:16 2021 -0500 updated links to import recipes commit 9f643b0b85cc89a36a86681e20c68c177959e1a1 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:54:41 2021 -0500 added collapsable cards commit b37594eb84988043afa450de871a036f72a811ee Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:32:55 2021 -0500 cosmetic cleanup commit e5f76034dfc174d3ce307de1c0c5683a159733a9 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:15:57 2021 -0500 added image import commit 792cfb0791c2e682589995ccd1b85eca0a04061c Author: smilerz <smilerz@gmail.com> Date: Mon Mar 22 15:13:01 2021 -0500 consolidated integration imports into url_import commit aa6c9430bce1a63e46ff0325f13e4f4d7369cc00 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:49 2021 -0500 staged app import tabs commit 3dd92d811c140d925b153f30db29e11e4c8a18cc Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:16 2021 -0500 fixed missing space in keyword when adding recipe commit d79283ccabdd014c62dc820f382830421908cf0a Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:08:51 2021 -0500 removed unused templates commit 3f95eb2f3db42628994f1ea80fd5010fa1b247ba Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 13:13:56 2021 -0500 combined json import and source import commit 5016314ab57102454a95e48f0ba50b6031cc5400 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 16:06:02 2021 -0500 more fix from super ugly merge commit 27a489c45a5b169818e36c79591757f99f64c637 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:17:10 2021 -0500 more cleanup from ugly merge commit f7517d51dd9aad61b1e80ec20947c4f597834691 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 11:24:23 2021 -0500 fixed ugly merge commit 7095b6ef89fe350d591f1103c4c1a2d27c60d28f Author: smilerz <smilerz@gmail.com> Date: Thu Mar 18 12:09:53 2021 -0500 added drag and drop to ingredients commit bdadc7168f37eede0f91a2bfa060200273e440a9 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 15 15:56:44 2021 -0500 manually parse json commit 4bcd7e462db760d00483a90883028e5404f33299 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:33:07 2021 -0600 update urls.py commit 794d2798bfe56a27af5e8786e5f3b9701be7fe81 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:32:47 2021 -0600 commit merge from Patralos/recipes commit e97bc6ea89d8c366104d08ce561dd3d3c17c1578 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 15:34:47 2021 -0600 updated URL import page with tab interface commit 7732bc44b83c23901873bce1075b7ac2e68cee07 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 11:29:10 2021 -0600 import raw json/html commit 368d2211efa86e1146e95e3ddd1192b81f0422c2 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 7 14:28:29 2021 -0600 refactored json parser to create functions for each sub parser commit 3ddff8b468e0c85d1a4ff61b565b78c5be0f77ea Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 22:27:32 2021 +0100 replace common fractions with their concrete value (else parsing is not possible) commit 083048e125f63463edca6f4855f6a8e974f61a21 Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 21:37:39 2021 +0100 Allow recipes to be imported from json directly commitba061df1b6
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 17:30:59 2021 -0500 catch attribute error on cooktime commit7cc515bcdf
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 17:08:25 2021 -0500 fix manual url import commit724748d38a
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 14:09:10 2021 -0500 corrected api import workflow commitb2c1c6e301
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 11:26:26 2021 -0500 restored missing manual url scrape commit987be4b04d
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 09:02:27 2021 -0500 Fix after rebase commitca84da68c4
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 18:39:44 2021 -0500 catch attibute error when scrape missing schema commitd75e39fbcd
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 16:27:18 2021 -0500 set persistent connections to db commiteb2593aacd
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 16:08:04 2021 -0500 handle text in cook times during import commit496e04cfc8
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:47:35 2021 -0500 convert servings to number on import commitd814d13d54
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 13:17:15 2021 -0500 custom scraper fails safe commitd0cedaf7a1
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 12:48:26 2021 -0500 added name parser commit01f504f7b1
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:31:47 2021 -0500 updated tests to handle html decoding commitc716346f1f
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:55:07 2021 -0500 flake commitfef5236931
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:53:45 2021 -0500 decode url strings in text_parser commitb115c37eb8
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:32:33 2021 -0500 catch error on scrape.image() commit1e17f3703a
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:28:46 2021 -0500 trap error on scrape.title() commit468b986314
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:05:28 2021 -0500 updated tests commita531d135b5
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:42:31 2021 -0500 remove html tags from description commit7524609cd0
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commita28f8e65d5
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commitd193637091
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:20:03 2021 -0500 added missing bookmarklet commit0953af05fc
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:18:14 2021 -0500 Revert "bug fix url import" This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23. commit19e8e5cb5b
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 13 16:44:05 2021 -0500 removed extra string normalization commit43c808380d
Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 21:22:56 2021 -0500 updated migration commit7ab8b84044
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:14:50 2021 -0500 updated recipe targets in tests to reflect html decoding commitd739fe6752
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 13:28:35 2021 -0500 fixes #527 commita84c41e29f
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 10:57:13 2021 -0500 bug fix url import commit393aba1f31
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 07:02:43 2021 -0500 url import bug fixes commit436a070730
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:43:33 2021 -0500 bug fix tests commit2fe6788ce5
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:41:00 2021 -0500 bug fix url import commit747d146389
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:26:29 2021 -0500 recipe import tests commitefe4c4043d
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 12:32:11 2021 -0500 simplified url import commitc6739ba8e0
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 09:20:15 2021 -0500 add data for url_import test commit50140db668
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:43:36 2021 -0500 added all ATK sites to custom scraper commit028b2dfb22
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:23 2021 -0500 added cooksillustrated custom scraper commitec6a10ca0a
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:01 2021 -0500 ensure time is always a number commit3cf949bf8d
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 2 15:19:20 2021 -0500 added ability to create custom scrapers commit0a62225797
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:21:28 2021 -0500 removed old json importer commita54f4e1367
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:19:18 2021 -0500 updated import from source to use text scraper commitbf3c30a8fb
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:08:56 2021 -0500 remove old html_import function commitf811f5996e
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:07:51 2021 -0500 wrapper for recipe_scrapers to parse text input commita3490240f4
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:17:46 2021 -0500 fixed broken tab commitb26aea96f4
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:11:54 2021 -0500 delete bookmarklet on import commit4d4af5fdf2
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:53:06 2021 -0500 removed console message commit3da74505d6
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:51:14 2021 -0500 fixed ingredient display on preview commitc8a4861df8
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 11:49:56 2021 -0500 redirect to import url for processing commit5e27cd606e
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 06:39:44 2021 -0500 added hack to fix scopes & CORS for bookmarklet commita341fd8ebe
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 28 18:39:20 2021 -0500 added CORS middleware commit9a62b6e4e7
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 26 14:47:24 2021 -0500 added bookmarklet model and api commitf80c44bca3
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 17:48:32 2021 -0500 bookmarklet passing data to form commit09d2e9f831
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 14:02:57 2021 -0500 added bookmarklet that doesn't work yet commit4d5a9e446f
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 14:14:56 2021 -0500 Squashed commit of the following: commit81a8734fac
Merge:abcef54
f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:41:13 2021 +0100 Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support Add iOS webclip icon support commitabcef54e72
Merge:e15c92c
7527646
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:30:43 2021 +0100 Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1 Bump recipe-scrapers from 12.2.0 to 12.2.1 commite15c92cda5
Merge:58fc269
45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:26:06 2021 +0100 Merge pull request #501 from smilerz/main_fork fix json direct import when wrapped in @graph commit45dba6fad2
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:23:55 2021 -0500 fix json direct import when wrapped in @graph commitf67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 15:49:12 2021 +0100 Add generated icons from icongenerator. commit53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 12:48:58 2021 +0100 Fix errors in favicon SVG. commit7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Mar 19 05:51:22 2021 +0000 Bump recipe-scrapers from 12.2.0 to 12.2.1 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1) Signed-off-by: dependabot[bot] <support@github.com> commit6a2c27749f
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 13:58:16 2021 -0500 updated links to import recipes commitde60e12073
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:54:41 2021 -0500 added collapsable cards commit1188ed9227
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:32:55 2021 -0500 cosmetic cleanup commitcb708e7e47
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:15:57 2021 -0500 added image import commit215eadb4a0
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 22 15:13:01 2021 -0500 consolidated integration imports into url_import commit4ffc54f720
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:49 2021 -0500 staged app import tabs commit21f6c7a21f
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:16 2021 -0500 fixed missing space in keyword when adding recipe commitce7c6939d2
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:08:51 2021 -0500 removed unused templates commit40a2f7ff90
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 13:13:56 2021 -0500 combined json import and source import commit4015517c0a
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 16:06:02 2021 -0500 more fix from super ugly merge commit7c8d41753c
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:17:10 2021 -0500 more cleanup from ugly merge commit90670613c5
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 11:24:23 2021 -0500 fixed ugly merge commit647c1678f1
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 18 12:09:53 2021 -0500 added drag and drop to ingredients commit44dee16e0a
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 15 15:56:44 2021 -0500 manually parse json commitf8fedcac82
Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:33:07 2021 -0600 update urls.py commit3a48d0e580
Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:32:47 2021 -0600 commit merge from Patralos/recipes commit9930789aa8
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 15:34:47 2021 -0600 updated URL import page with tab interface commit83fce6461a
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 11:29:10 2021 -0600 import raw json/html commitf0d37244b6
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 7 14:28:29 2021 -0600 refactored json parser to create functions for each sub parser commit386834f409
Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 21:37:39 2021 +0100 Allow recipes to be imported from json directly commit 6d72b000157ff5892853ce5fb554e368f4024c8f Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:33:51 2021 -0500 Squashed commit of the following: commit 8e2a15aff203cacd8956c947eecf3967f5b66015 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:29:11 2021 -0500 removed unnecessary console message commit 436d5b3165340772a859899578f7386edfcd587f Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:25:23 2021 -0500 removed commented out settings commit ba6b58b198d2e9260544d64e107afee9420ae340 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:24:27 2021 -0500 removed unused cors_headers commit c7690c391f341d8d92500276f243e99f8700528e Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:22:15 2021 -0500 removed line breaks commit 3259f86ff8b911fa8489922eee43c4465ea81d61 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:21:21 2021 -0500 removed console.log() commit 24552a2d9b644c86dee900322989fb3306ca1b4e Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 14:58:48 2021 -0500 fix after rebase commit bdf8ce1c3357609013c84d2661371ede815cd700 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 11:17:00 2021 -0500 Fix after rebase commit 58cd295e7ae8caa9be588508eb1795fd4a00e810 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 07:44:53 2021 -0500 updated model commit ec786ef8a19f9459cd4c890c60330bcadafb0247 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:46:38 2021 -0500 convert servings to number on import commit 90cc1711b185290778e973821b17a7574c6d3428 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:15:59 2021 -0500 update tests to handle url decoding commit 466eae617cace3b662fe480427018b0ac7a7ab1d Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:57:10 2021 -0500 bring parser inline with json_import branch commit 2668406d4625f747305482ede28e256c94aefcf9 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 08:50:00 2021 -0500 unescape html document commit f765347aec15b7765eaec830dd8dfda1f17b7597 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 11:29:35 2021 -0500 updated bookmarklet to work with updated import process commit 60d95ebf3d4e1c8af7f3b6832adfb28ce13a51aa Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:52 2021 -0500 Squashed commit of the following: commit 707d862e01a7497a1f22879d314b865a35e0e85b Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:00 2021 -0500 works now commit 3942a445ed4f2ccec57de25eacd86ea4e4dd6bdb Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:25:24 2021 -0500 updated serializer and api commit 10dc746eb175c7f805a8a8ffa7ce49977a7ce97e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:20:19 2021 -0500 fixed bookmarklet commit 9779104902d3be0258c95cd2eeebcba0d5d48892 Merge: bb8262c 0cb3928 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:56:27 2021 -0500 Merge branch 'bookmarklet' into json_import commit 0cb39284bb835ffc6cfee3e4306aadc4a64a25be Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commit e89e0218de684d40b2e2bfb6ba833891206c828e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commit bb8262ccabb93c56fbc18c407d5a0653b8b3ca79 Merge: b1e73aa35a7f62
Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 20:35:57 2021 -0500 Merge branch 'main_fork' into json_import commit f50d33a9b2658f6bf27797f645fbd842528a716c Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:20:03 2021 -0500 added missing bookmarklet commit cd482ae8451d3b920d7bb7a2b76044645f6a2e0b Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:18:14 2021 -0500 Revert "bug fix url import" This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23. commit 7032c7cc990af5790073348c3039d907d3469a7e Author: smilerz <smilerz@gmail.com> Date: Tue Apr 13 16:44:05 2021 -0500 removed extra string normalization commit 04b4aeecb9b13ae0023636f65dec8fc0ca1b8e0f Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 21:22:56 2021 -0500 updated migration commit 8b4059d0beed9ae8da9a6943ed550b0a82e12e03 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:14:50 2021 -0500 updated recipe targets in tests to reflect html decoding commit 7388f30ef333315736a8614c2009db37404f4916 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 13:28:35 2021 -0500 fixes #527 commit 6d811738535a81cab737b10f006f50c32cc32f13 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 10:57:13 2021 -0500 bug fix url import commit cbe400cdaccb0fcbebeafea199cf14be3deeb150 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 07:02:43 2021 -0500 url import bug fixes commit f4e33a830b826d1930639f552a2e32882c14d2ba Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:43:33 2021 -0500 bug fix tests commit 1d1cbbe965a5255bd9cabb138a2f1432956a4c6e Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:41:00 2021 -0500 bug fix url import commit 31cf4da8f3dcface57399976679379d11ca6d81e Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:26:29 2021 -0500 recipe import tests commit 1d1b5b545ab35626636ec4d9e1ce020fe508e520 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 12:32:11 2021 -0500 simplified url import commit 25140fa64e9306421956b90e40f53c00429e7c5e Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 09:20:15 2021 -0500 add data for url_import test commit 14d97f671ad356c8212ffc7fdd5b15fce8b5a7c1 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:43:36 2021 -0500 added all ATK sites to custom scraper commit 10975665626ae958f45e4c76b5125978e4776c41 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:23 2021 -0500 added cooksillustrated custom scraper commit 9ea33ec10bc32aa6ffed0c8cd6d5a4b4e123eff1 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:01 2021 -0500 ensure time is always a number commit ceb85137dd25a2cc6192165af9ac9b515cd5cfee Author: smilerz <smilerz@gmail.com> Date: Fri Apr 2 15:19:20 2021 -0500 added ability to create custom scrapers commit cc53a8debe36e65f9f487ac8c31cf3235bad5370 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:21:28 2021 -0500 removed old json importer commit d2233df427cc577fd6ea87458d821ac37c4def48 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:19:18 2021 -0500 updated import from source to use text scraper commit 9a0fcf9d2b6d35f01c16aa1c1a1074bb42577a3e Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:08:56 2021 -0500 remove old html_import function commit 2bc5fbbdcc5d395b7ed7aa1879449e16da0ee2d1 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:07:51 2021 -0500 wrapper for recipe_scrapers to parse text input commit 4a3c1a94a97ec18109ba43a5bbe90a6aa8e622c4 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:17:46 2021 -0500 fixed broken tab commit 6b92f8c325dd4a3c43fec0efe9b20181eaea0951 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:11:54 2021 -0500 delete bookmarklet on import commit dcd12899fd361868d4542e882d413292ef37a92b Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:53:06 2021 -0500 removed console message commit 3e58d79a9279e63af66356d14c7204121f6055dd Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:51:14 2021 -0500 fixed ingredient display on preview commit 1eb6ba707c41f52711ed2d68e3758ce9c70465ec Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 11:49:56 2021 -0500 redirect to import url for processing commit 95b50edc0f33afc1557b6a766e610a6c74b2e8a0 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 06:39:44 2021 -0500 added hack to fix scopes & CORS for bookmarklet commit bdc85694309fb79b9c214f0330848be82c372156 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 28 18:39:20 2021 -0500 added CORS middleware commit c1f5ec44c3f45dd403cc600ed5e38b814fedd138 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 26 14:47:24 2021 -0500 added bookmarklet model and api commit cc9a6fe14adbca88dc8753a7271ed4d47e638822 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 17:48:32 2021 -0500 bookmarklet passing data to form commit 3bf58f633610caa266e210fcdbecdedd0edf2465 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 14:02:57 2021 -0500 added bookmarklet that doesn't work yet commit 9a11ebc7746f2acdd156a574703ea05a0aba0a9b Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 14:14:56 2021 -0500 Squashed commit of the following: commit81a8734fac
Merge:abcef54
f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:41:13 2021 +0100 Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support Add iOS webclip icon support commitabcef54e72
Merge:e15c92c
7527646
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:30:43 2021 +0100 Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1 Bump recipe-scrapers from 12.2.0 to 12.2.1 commite15c92cda5
Merge:58fc269
45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:26:06 2021 +0100 Merge pull request #501 from smilerz/main_fork fix json direct import when wrapped in @graph commit45dba6fad2
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:23:55 2021 -0500 fix json direct import when wrapped in @graph commitf67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 15:49:12 2021 +0100 Add generated icons from icongenerator. commit53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 12:48:58 2021 +0100 Fix errors in favicon SVG. commit7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Mar 19 05:51:22 2021 +0000 Bump recipe-scrapers from 12.2.0 to 12.2.1 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1) Signed-off-by: dependabot[bot] <support@github.com> commit 9307226d777d5648d1cacc0107241dfaec3a4405 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 13:58:16 2021 -0500 updated links to import recipes commit bec00d05898c074b893df7338248b7803f8272c1 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:54:41 2021 -0500 added collapsable cards commit 2d647a2f6aa1afacb6651a6294bba571fafc3190 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:32:55 2021 -0500 cosmetic cleanup commit 48cd8ce5f1c5c3ea2372b0f3fcdb2a9491be52f4 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:15:57 2021 -0500 added image import commit 12e82211ace004c93726b8f6327adee1d1a58f78 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 22 15:13:01 2021 -0500 consolidated integration imports into url_import commit 8cf5dae5482d7b28e386760ca039c60efdfbdb9a Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:49 2021 -0500 staged app import tabs commit a255450fad53f9482711a252ec98b353b66a15df Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:16 2021 -0500 fixed missing space in keyword when adding recipe commit 2bb4dd9954c4913c6b4bd9e23f60315ed0c46552 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:08:51 2021 -0500 removed unused templates commit cddbebbc85377227ba9d753cf9d58db03e7f5ee2 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 13:13:56 2021 -0500 combined json import and source import commit b929bd9ae3a061dc2660602cb2ffb036b7e6cac7 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 16:06:02 2021 -0500 more fix from super ugly merge commit 558eb25faee2f8362a9af1380b40b11a3c05b6fa Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:17:10 2021 -0500 more cleanup from ugly merge commit 8906345e107096a657fac8cdff497548dbaa9ffd Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 11:24:23 2021 -0500 fixed ugly merge commit 966edebfedf89a7976f47dd0526e0aeb41aa0feb Author: smilerz <smilerz@gmail.com> Date: Thu Mar 18 12:09:53 2021 -0500 added drag and drop to ingredients commit a9b24c9f03a223bbf59613a10f000ce1b421383f Author: smilerz <smilerz@gmail.com> Date: Mon Mar 15 15:56:44 2021 -0500 manually parse json commit 908ae04ef98d629da0cd74e94d1401fa6c5ac654 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:33:07 2021 -0600 update urls.py commit e3828f96e6d2db5877789b5bd9be9cc4eb151d5f Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:32:47 2021 -0600 commit merge from Patralos/recipes commit a21fe044ed527dae2ea9a8bce854c628b1a39910 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 15:34:47 2021 -0600 updated URL import page with tab interface commit 59a30f579a25758ec58a938e8a315dd986e62cbf Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 11:29:10 2021 -0600 import raw json/html commit 299194409d9c0a395aaf5d69106c2f35baa1d402 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 7 14:28:29 2021 -0600 refactored json parser to create functions for each sub parser commit 0e480ba82f25a3fa705a9adc2cf82f5234797b44 Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 22:27:32 2021 +0100 replace common fractions with their concrete value (else parsing is not possible) commit 40fb268d2d2cfe5250b1a900eafb4819fd85572b Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 21:37:39 2021 +0100 Allow recipes to be imported from json directly commit987be4b04d
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 09:02:27 2021 -0500 Fix after rebase commitca84da68c4
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 18:39:44 2021 -0500 catch attibute error when scrape missing schema commitd75e39fbcd
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 16:27:18 2021 -0500 set persistent connections to db commiteb2593aacd
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 16:08:04 2021 -0500 handle text in cook times during import commit496e04cfc8
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:47:35 2021 -0500 convert servings to number on import commitd814d13d54
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 13:17:15 2021 -0500 custom scraper fails safe commitd0cedaf7a1
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 12:48:26 2021 -0500 added name parser commit01f504f7b1
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:31:47 2021 -0500 updated tests to handle html decoding commitc716346f1f
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:55:07 2021 -0500 flake commitfef5236931
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:53:45 2021 -0500 decode url strings in text_parser commitb115c37eb8
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:32:33 2021 -0500 catch error on scrape.image() commit1e17f3703a
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:28:46 2021 -0500 trap error on scrape.title() commit468b986314
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:05:28 2021 -0500 updated tests commita531d135b5
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:42:31 2021 -0500 remove html tags from description commit7524609cd0
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commita28f8e65d5
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commitd193637091
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:20:03 2021 -0500 added missing bookmarklet commit0953af05fc
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:18:14 2021 -0500 Revert "bug fix url import" This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23. commit19e8e5cb5b
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 13 16:44:05 2021 -0500 removed extra string normalization commit43c808380d
Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 21:22:56 2021 -0500 updated migration commit7ab8b84044
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:14:50 2021 -0500 updated recipe targets in tests to reflect html decoding commitd739fe6752
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 13:28:35 2021 -0500 fixes #527 commita84c41e29f
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 10:57:13 2021 -0500 bug fix url import commit393aba1f31
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 07:02:43 2021 -0500 url import bug fixes commit436a070730
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:43:33 2021 -0500 bug fix tests commit2fe6788ce5
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:41:00 2021 -0500 bug fix url import commit747d146389
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:26:29 2021 -0500 recipe import tests commitefe4c4043d
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 12:32:11 2021 -0500 simplified url import commitc6739ba8e0
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 09:20:15 2021 -0500 add data for url_import test commit50140db668
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:43:36 2021 -0500 added all ATK sites to custom scraper commit028b2dfb22
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:23 2021 -0500 added cooksillustrated custom scraper commitec6a10ca0a
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:01 2021 -0500 ensure time is always a number commit3cf949bf8d
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 2 15:19:20 2021 -0500 added ability to create custom scrapers commit0a62225797
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:21:28 2021 -0500 removed old json importer commita54f4e1367
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:19:18 2021 -0500 updated import from source to use text scraper commitbf3c30a8fb
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:08:56 2021 -0500 remove old html_import function commitf811f5996e
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:07:51 2021 -0500 wrapper for recipe_scrapers to parse text input commita3490240f4
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:17:46 2021 -0500 fixed broken tab commitb26aea96f4
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:11:54 2021 -0500 delete bookmarklet on import commit4d4af5fdf2
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:53:06 2021 -0500 removed console message commit3da74505d6
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:51:14 2021 -0500 fixed ingredient display on preview commitc8a4861df8
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 11:49:56 2021 -0500 redirect to import url for processing commit5e27cd606e
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 06:39:44 2021 -0500 added hack to fix scopes & CORS for bookmarklet commita341fd8ebe
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 28 18:39:20 2021 -0500 added CORS middleware commit9a62b6e4e7
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 26 14:47:24 2021 -0500 added bookmarklet model and api commitf80c44bca3
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 17:48:32 2021 -0500 bookmarklet passing data to form commit09d2e9f831
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 14:02:57 2021 -0500 added bookmarklet that doesn't work yet commit4d5a9e446f
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 14:14:56 2021 -0500 Squashed commit of the following: commit81a8734fac
Merge:abcef54
f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:41:13 2021 +0100 Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support Add iOS webclip icon support commitabcef54e72
Merge:e15c92c
7527646
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:30:43 2021 +0100 Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1 Bump recipe-scrapers from 12.2.0 to 12.2.1 commite15c92cda5
Merge:58fc269
45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:26:06 2021 +0100 Merge pull request #501 from smilerz/main_fork fix json direct import when wrapped in @graph commit45dba6fad2
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:23:55 2021 -0500 fix json direct import when wrapped in @graph commitf67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 15:49:12 2021 +0100 Add generated icons from icongenerator. commit53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 12:48:58 2021 +0100 Fix errors in favicon SVG. commit7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Mar 19 05:51:22 2021 +0000 Bump recipe-scrapers from 12.2.0 to 12.2.1 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1) Signed-off-by: dependabot[bot] <support@github.com> commit6a2c27749f
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 13:58:16 2021 -0500 updated links to import recipes commitde60e12073
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:54:41 2021 -0500 added collapsable cards commit1188ed9227
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:32:55 2021 -0500 cosmetic cleanup commitcb708e7e47
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:15:57 2021 -0500 added image import commit215eadb4a0
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 22 15:13:01 2021 -0500 consolidated integration imports into url_import commit4ffc54f720
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:49 2021 -0500 staged app import tabs commit21f6c7a21f
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:16 2021 -0500 fixed missing space in keyword when adding recipe commitce7c6939d2
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:08:51 2021 -0500 removed unused templates commit40a2f7ff90
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 13:13:56 2021 -0500 combined json import and source import commit4015517c0a
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 16:06:02 2021 -0500 more fix from super ugly merge commit7c8d41753c
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:17:10 2021 -0500 more cleanup from ugly merge commit90670613c5
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 11:24:23 2021 -0500 fixed ugly merge commit647c1678f1
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 18 12:09:53 2021 -0500 added drag and drop to ingredients commit44dee16e0a
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 15 15:56:44 2021 -0500 manually parse json commitf8fedcac82
Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:33:07 2021 -0600 update urls.py commit3a48d0e580
Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:32:47 2021 -0600 commit merge from Patralos/recipes commit9930789aa8
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 15:34:47 2021 -0600 updated URL import page with tab interface commit83fce6461a
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 11:29:10 2021 -0600 import raw json/html commitf0d37244b6
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 7 14:28:29 2021 -0600 refactored json parser to create functions for each sub parser commit386834f409
Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 21:37:39 2021 +0100 Allow recipes to be imported from json directly commit 4e51b434c36f59a3034bd7012e4bea20a3b158c0 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:08:08 2021 -0500 Fix after rebase commit b7183219816558bd6f01b2aec0b47b5ad30ae056 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 07:48:52 2021 -0500 Squashed commit of the following: commit 7642ac66b4d679fb3bd40d783d8c00e969e48413 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 07:44:53 2021 -0500 updated model commit c887fae3a2b85ad23772944d311761b85bd67031 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:46:38 2021 -0500 convert servings to number on import commit 34966bcef2993f4d0a1309362b0648f2096db996 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:15:59 2021 -0500 update tests to handle url decoding commit 86676772676395482901c195888898e7eaafc015 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:57:10 2021 -0500 bring parser inline with json_import branch commit 2b547f67cd180ca457691e15bc9edc1ae033ecc8 Merge: e5ada34 51d4ffe Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:43:27 2021 -0500 Merge branch 'bookmarklet' of github.com:smilerz/recipes into bookmarklet commit 51d4ffef18d359f75d377eee27bd15816957ac53 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 08:50:00 2021 -0500 unescape html document commit e5ada345d869409b240fd0746a88f269b6c28c2c Merge: 5b7df0a8d02cad
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 12:39:37 2021 -0500 Merge branch 'deprecation-fixes' into bookmarklet commit8d02cad7d9
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 12 14:12:04 2021 -0500 resolved deprecation warnings introduced in django 3.2 commit 2e57675c530aadb0ddef9918e967b165280f136c Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 18:38:46 2021 -0500 removed cors_header import - unused commit 375167db80aa96a95850cafab77f4f7f872b3954 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 18:38:00 2021 -0500 catch attribute error when scrape has no schema commit 2acf95fe08399c5eab75140d8ebbddb5cf139943 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 16:03:56 2021 -0500 handle text cook times on import commit ef88b0ccce9960e04bee92dc53839fb514051c05 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:45:34 2021 -0500 convert servings to number on import commit 6a414904f35208aa4dccbf14176d373ab158791f Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 13:10:23 2021 -0500 name parser handles list commit 041829764fc10aeb914bbb47098ad721b3e642fd Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:52:34 2021 -0500 updated docs for personal beta commit c148665f09effd84bd2a9fec868a8e36cdd1d8bc Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 08:57:35 2021 -0500 decode html data when passing bookmarklet commit 2f92d804e2bd955e4f3e52e9484e0538a9aac74c Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:39:30 2021 -0500 extra error catching commit f67955281a2cbacae3bb1bb4091e56daf45831f2 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 18:48:45 2021 -0500 more shenanigans commit 2b2bb77576c7d96ab74d1bfadb96e18e69214ee7 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 18:25:24 2021 -0500 add debugpy to requirements commit da8acf52b75d19e87454e2ea5261da0ee77dcbe6 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 18:24:24 2021 -0500 remote debug commit 178f9664200959941609abb051e0c49a540ee626 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 18:03:15 2021 -0500 remote debug in container commit a13bbca21babf0d725e085ebcd768b75df5a386c Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 16:48:09 2021 -0500 nope, this one works commit 6431e4db1782322994c54acc18f31e3d57495bac Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 16:28:31 2021 -0500 it finally works commit e06d41aa16ea53ff5d10f68ebddcf8e8018e4b8f Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 15:40:36 2021 -0500 fix test again commit d39e39408c781a153b6693985dbbd5de63e15bc3 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 15:02:57 2021 -0500 add bookmarklet back commit f58e71b30a8c7575e4853e54c9e9f91450aab748 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 14:40:13 2021 -0500 extra docker tags commit 9002cff57ebdf6ee797b8fcc4f2daded61d52bd5 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 14:29:52 2021 -0500 build hook commit a9ac3a6f634a48deb123845665c110d08e2df03a Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:44:03 2021 -0500 fixed workflow commit 2bf5623d716f5dbbea63fc9a519c15e0aa581ff8 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:42:00 2021 -0500 fixed branch reference commit 119df621a7d4d6074e1ed3888329500dc1fc984c Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:39:08 2021 -0500 personalized build commit 93a31e67290ca6e8fbc36c3a09ea8ad7f7d321c0 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:05:28 2021 -0500 updated tests commit 0e0a5766d55bf44f613d7c917c26061d0ce9552e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 11:52:06 2021 -0500 fixed admin commit 94399927cd8ea5cc634ab079a6d9647025f68a2e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 11:29:35 2021 -0500 updated bookmarklet to work with updated import process commit a0065edd2d3f7a73be5b3aa43ab2b2b7f84d3340 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:42:31 2021 -0500 remove html tags from description commit af8f80c5f604ebed1f7fbb295fce268e6402eed8 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:52 2021 -0500 Squashed commit of the following: commit 707d862e01a7497a1f22879d314b865a35e0e85b Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:00 2021 -0500 works now commit 3942a445ed4f2ccec57de25eacd86ea4e4dd6bdb Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:25:24 2021 -0500 updated serializer and api commit 10dc746eb175c7f805a8a8ffa7ce49977a7ce97e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:20:19 2021 -0500 fixed bookmarklet commit 9779104902d3be0258c95cd2eeebcba0d5d48892 Merge: bb8262c 0cb3928 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:56:27 2021 -0500 Merge branch 'bookmarklet' into json_import commit 0cb39284bb835ffc6cfee3e4306aadc4a64a25be Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commit e89e0218de684d40b2e2bfb6ba833891206c828e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commit bb8262ccabb93c56fbc18c407d5a0653b8b3ca79 Merge: b1e73aa35a7f62
Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 20:35:57 2021 -0500 Merge branch 'main_fork' into json_import commit c05f3e88f056a3f8e6d2b510c647bf61a5a1da2b Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commit 60c76ac947272abb0761f2d6a5e0e98ce2ab2147 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commit 999fae645728250cf7148902d976f8f00ae7f6d8 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:20:03 2021 -0500 added missing bookmarklet commit 73f04880ad9062fff7b54cbd5bb6cdf40ad0957e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:18:14 2021 -0500 Revert "bug fix url import" This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23. commit 31864814d76d747b8d92c6193f0c90ce78e42658 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 13 16:44:05 2021 -0500 removed extra string normalization commit 5eb6b17669e9cc95210430a9f040a4697d06631a Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 21:22:56 2021 -0500 updated migration commit bb7d09e38ea7dea329c8595ca023bb64431055e3 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:14:50 2021 -0500 updated recipe targets in tests to reflect html decoding commit 971c96d7b8c6695fef501006eaded4d5807b7d57 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 13:28:35 2021 -0500 fixes #527 commit afa3a144df5f8334392d0f9975d4790f08a4bcc9 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 10:57:13 2021 -0500 bug fix url import commit 2b8c716f76c17e290f4a0527583887a7bf0d3ded Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 07:02:43 2021 -0500 url import bug fixes commit 8437d880b122c972bbbb04edf12c8d1d58faeccb Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:43:33 2021 -0500 bug fix tests commit 4f534e2914e179cf0dedaba06168ce1002f56ef2 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:41:00 2021 -0500 bug fix url import commit ff6ec5ddaff7ab0bde1e7ab8c186f167cddc3ceb Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:26:29 2021 -0500 recipe import tests commit b664a9739a8e63c8b51714a20a73f6be14aeb26e Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 12:32:11 2021 -0500 simplified url import commit c2897825036a6d7adb0e0f4c57593840bac0f005 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 09:20:15 2021 -0500 add data for url_import test commit c2b828b1ccac5a1147792f29e041927467649eab Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:43:36 2021 -0500 added all ATK sites to custom scraper commit 79caba5f0697a5458f3c4a969260df193be7fb65 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:23 2021 -0500 added cooksillustrated custom scraper commit 105eed6919f8bf2762d0f0140d2486bfa86732c7 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:01 2021 -0500 ensure time is always a number commit 617ab4675046575fa7382d93d9fa89f03b35a5c4 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 2 15:19:20 2021 -0500 added ability to create custom scrapers commit 97da19e2953a6609fa2ad3042e29744348a83f83 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:21:28 2021 -0500 removed old json importer commit cae3ddd0c47459e5cf42dc60834f8ed0f7fd1924 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:19:18 2021 -0500 updated import from source to use text scraper commit a8593f4e040f1e99683f92b19f312fe2a8df2a1c Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:08:56 2021 -0500 remove old html_import function commit 4afe6804b40e9b61a6930898de9f53c94971a0d3 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:07:51 2021 -0500 wrapper for recipe_scrapers to parse text input commit 79f7faa28f645b1677a70370fcb0c98e16cebea9 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:17:46 2021 -0500 fixed broken tab commit d1c58b9070ac66acf510029646f2ea25ea8859e4 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:11:54 2021 -0500 delete bookmarklet on import commit 0bc17fdb9106e113c94eaa9844bef4e24cc524e9 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:53:06 2021 -0500 removed console message commit 367f821193f7f10469e2456cacc4b0688d68b155 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:51:14 2021 -0500 fixed ingredient display on preview commit db59a9c029d5c425d1a2ab9388463fa76f4705eb Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 11:49:56 2021 -0500 redirect to import url for processing commit ab143527dd463f12fe6a6d81e91f7d0dd6cda7d5 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 06:39:44 2021 -0500 added hack to fix scopes & CORS for bookmarklet commit e4ecf94a521a3cdb7f629fac141406e25213c70d Author: smilerz <smilerz@gmail.com> Date: Sun Mar 28 18:39:20 2021 -0500 added CORS middleware commit 9554509c202e5c3f9e54f0ab90578d49016cd931 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 26 14:47:24 2021 -0500 added bookmarklet model and api commit d481785c8e83ae2ba261939f2e6f0baeb4a60612 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 17:48:32 2021 -0500 bookmarklet passing data to form commit ff6b550f763c8676cd801b27461699ff3f4c1b09 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 14:02:57 2021 -0500 added bookmarklet that doesn't work yet commit 71402c67598050fd2ac3c4436f2438788eacdbfd Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 14:14:56 2021 -0500 Squashed commit of the following: commit81a8734fac
Merge:abcef54
f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:41:13 2021 +0100 Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support Add iOS webclip icon support commitabcef54e72
Merge:e15c92c
7527646
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:30:43 2021 +0100 Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1 Bump recipe-scrapers from 12.2.0 to 12.2.1 commite15c92cda5
Merge:58fc269
45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:26:06 2021 +0100 Merge pull request #501 from smilerz/main_fork fix json direct import when wrapped in @graph commit45dba6fad2
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:23:55 2021 -0500 fix json direct import when wrapped in @graph commitf67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 15:49:12 2021 +0100 Add generated icons from icongenerator. commit53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 12:48:58 2021 +0100 Fix errors in favicon SVG. commit7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Mar 19 05:51:22 2021 +0000 Bump recipe-scrapers from 12.2.0 to 12.2.1 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1) Signed-off-by: dependabot[bot] <support@github.com> commit ddf8b024b50097414574e7a60a7d2284f01f9f0f Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 13:58:16 2021 -0500 updated links to import recipes commit 0b370319fff856ba60d6456740bb0b380d83654e Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:54:41 2021 -0500 added collapsable cards commit 2f5637ce52a058b5425fea423068693440ab79ed Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:32:55 2021 -0500 cosmetic cleanup commit 5b71f0e7a10fe027b227603f778f17d919db0da4 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:15:57 2021 -0500 added image import commit 3a5d564897db31e82d923a9b82a3261528b3683d Author: smilerz <smilerz@gmail.com> Date: Mon Mar 22 15:13:01 2021 -0500 consolidated integration imports into url_import commit 2a14ac03d8c851cb53e94988e73150e9aefa5898 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:49 2021 -0500 staged app import tabs commit b6360591dff02bac8099750719729659ca751ff6 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:16 2021 -0500 fixed missing space in keyword when adding recipe commit 5802f4983172abdcb74ae154be30761a77ed7c6a Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:08:51 2021 -0500 removed unused templates commit 8f5e93fa06ed07c98c959108d9b6f68527aad798 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 13:13:56 2021 -0500 combined json import and source import commit b59d1be03e92a8917acd40de849fe8af2c9c30e9 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 16:06:02 2021 -0500 more fix from super ugly merge commit 541136bf10c7961b51f5c7b18ac72e35aec835ef Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:17:10 2021 -0500 more cleanup from ugly merge commit db0125e272a90d15c5daad1b99888407e7b3da7f Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 11:24:23 2021 -0500 fixed ugly merge commit 4b2c6582244bdc29b77708162720dc1ef53807a9 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 18 12:09:53 2021 -0500 added drag and drop to ingredients commit c39b706adc995e75d1471ba416c166389737d434 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 15 15:56:44 2021 -0500 manually parse json commit 6d8d64a808657ccdbe2f668f72b573a4556f779a Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:33:07 2021 -0600 update urls.py commit 2bf65f60d8c1a9907a770dbd010afd17b83f9902 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:32:47 2021 -0600 commit merge from Patralos/recipes commit 0ef17801308621da4759bf73996e2185a99efa8c Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 15:34:47 2021 -0600 updated URL import page with tab interface commit ed1a82d78bec4a2250d287e6857e4eee1e6b1287 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 11:29:10 2021 -0600 import raw json/html commit 34757d32ccb49dc998a5522c677304ef54f1ecae Author: smilerz <smilerz@gmail.com> Date: Sun Mar 7 14:28:29 2021 -0600 refactored json parser to create functions for each sub parser commit 77f4f613c6d758e6760689646650ad5b59751fdd Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 21:37:39 2021 +0100 Allow recipes to be imported from json directly commit 09a4134e5a676706ff7f17fed091a34d92adaaa9 Author: smilerz <smilerz@gmail.com> Date: Sun May 2 19:57:30 2021 -0500 rebase commit 1b1d88b9818811baba1e15f234ea436044c0837a Author: smilerz <smilerz@gmail.com> Date: Fri Apr 30 16:22:34 2021 -0500 cleanup after rebase commit dab6b660d75b9ec7c4b728c5ab38c1062a763630 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 30 16:03:30 2021 -0500 Fix after rebase commit 2c782b75ef53b307254cd9a837efe1a5bce4e847 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 22 11:26:44 2021 -0500 truncate query params on url commit 7a1dbf1868c5acacb7619fc83ea77d43d5738e82 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 22 10:07:24 2021 -0500 bookmarklet includes url script_name commit 05143c7ad0f994d536e208da9c112bbc139d4cf5 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 19:00:20 2021 -0500 add trigram to rank commit 59a718e28960c9ed288dd294832f7f70877123cd Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 18:46:35 2021 -0500 Squashed commit of the following: commit 1c5f74bd182eb502e27d03cc7f93e5e0db8c3362 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 20 12:24:05 2021 -0500 change markdown link from hard-coded to reverse commit 76c56e2a063ec45f97b4d898e106a2b378b95b96 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 14:16:17 2021 -0500 missing '/' commit 47a13811a3a6e47e5f6f1c3ccd515c1989bd4617 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:41:26 2021 -0500 yarn build commit 0d2c1fabe9f982179ec9d26cbb79bc0cebfef9c5 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:31:48 2021 -0500 Squashed commit of the following: commit e03f626fd08a3e048dbd968d623ee58b7f865929 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:04:39 2021 -0500 yarn build commit b511f929ffcc7a670bd7955269982e05c591783a Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 21:17:31 2021 -0500 update service worker with base path commit f13f02d481618583017c71fb654adaa86585ef0b Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:54:17 2021 -0500 WIP commit f2f927c16f52baa6b9a31cd9992e8c7c8739d666 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:40:59 2021 -0500 default value if localStorage fails commit 424e8a9b93d8aa9962a3b6f963fff5c6e23dfa56 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:30:38 2021 -0500 fixed missing '/' commit d49a206ddf5952036b295804f9e31e52a1b45af6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:13:04 2021 -0500 updated .env.template commit ac94ea7afac36f65e1658f3d29f4e2b8f0475ba6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 15:31:37 2021 -0500 WIP commit c9a687df1b21ac6584d0f958e65c5cfc040406ca Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 10:19:02 2021 -0500 WIP commit 7fe8c7fbe52c96f1ccd4128db256656e43af3fa0 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 08:10:08 2021 -0500 added nginx config commit b5540d85872d9d69bda3787db7ecccfce893236f Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 08:03:09 2021 -0500 allow subfolder config on NGINX commit92c65ec1e8
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 21:21:41 2021 +0200 fixed test meal plan commita376c3a5b6
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:55:48 2021 +0200 meal plan random fix commit058d705170
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:19:11 2021 +0200 meal plan in search commit4ad5d6ef2f
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 15:01:39 2021 +0200 fixed test + added api doc for new search commite676b4bac3
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 14:05:19 2021 +0200 added api pagination for recipes commit04488741c4
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:11:19 2021 +0200 adv search mobile styling commit99004ad34b
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:03:15 2021 +0200 new search and setting commitf78f7dfc14
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 02:55:50 2021 +0200 search ui improvements and filter commit880db58d38
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 21:28:29 2021 +0200 v2 search filtering commitd1d65d878c
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 14:11:10 2021 +0200 v2 search progress commit3194a7580d
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 12:57:02 2021 +0200 basics of v2 search working commit 0979d828968680f24268268bcce7a5b31a7c71b5 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 18:20:57 2021 -0500 removed trigram commit 31a713362934a8cce13f7ae9f986582967d26b6a Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 16:05:53 2021 -0500 add trigram search to v2 commit f32749cb2dc8a391332930eedf3ce4a32c450a12 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 15:27:50 2021 -0500 Squashed commit of the following: commit a5d1c400efccdd3ad47807c4a2f990b983243d06 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 15:19:37 2021 -0500 simplified code commit 15261536c8ebab7156c366dcd4e21c5330550fde Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 14:42:10 2021 -0500 updated search v2 with full text search commit 51f4af6487bfbccc66998160e0ba3e4318dc6621 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 13:23:09 2021 -0500 rebase commit 2df9fc9d33a2b558b82cc8e614f18d0ebc409b83 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 13:22:48 2021 -0500 filter.py commit f90f3186d95ae64c7f88bad5fccb003d7d3f44a6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 20:17:54 2021 -0500 added multi-language support to FTS commit 3cfe14bdae4a4d8995e9d7bf3daacbe05544b0a7 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 19:42:22 2021 -0500 rebuild recipe index from admin site commit ef17ce2d57e869ddb84e4af8a37c2081cbf41e65 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 19:07:50 2021 -0500 command line to rebuild index commit 306c662f0b8dc39dee3cc6011d5d9f4c1ac2f325 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 17:01:18 2021 -0500 updated to handle sqlite commit 8c049697a55fd328a1e93607991c9160db80b6cc Author: smilerz <smilerz@gmail.com> Date: Fri Apr 9 12:47:17 2021 -0500 fixed smalltable commit c6f8d199efeb5d8b0f5b63a0113afbd856398857 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 9 12:46:07 2021 -0500 working proof of concept commit92c65ec1e8
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 21:21:41 2021 +0200 fixed test meal plan commita376c3a5b6
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:55:48 2021 +0200 meal plan random fix commit058d705170
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:19:11 2021 +0200 meal plan in search commit4ad5d6ef2f
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 15:01:39 2021 +0200 fixed test + added api doc for new search commite676b4bac3
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 14:05:19 2021 +0200 added api pagination for recipes commit04488741c4
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:11:19 2021 +0200 adv search mobile styling commit99004ad34b
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:03:15 2021 +0200 new search and setting commitf78f7dfc14
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 02:55:50 2021 +0200 search ui improvements and filter commit880db58d38
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 21:28:29 2021 +0200 v2 search filtering commitd1d65d878c
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 14:11:10 2021 +0200 v2 search progress commit3194a7580d
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 12:57:02 2021 +0200 basics of v2 search working commit cb30aec8126dc37e066fbfb5f5f6500f4eafc698 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 20 09:15:57 2021 -0500 changed keyword to get_or_create commit 2ce674432cd8b82109171d7bc007498303cbaa81 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 20 08:08:13 2021 -0500 strip food and keywords on url import commit 26733a6f68a6c805fc32a85e176a6e776d6739e6 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 15:31:49 2021 -0500 fix bookmarklet loading commit eed8a38f1e617eb8d1b910b76a079cf409bc29aa Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 14:36:52 2021 -0500 WIP commit 349926f6c529d470e21f63a67fe80745b770881d Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 14:15:17 2021 -0500 missing / commit b562f3d69481b40cab405ac2810620cc9919e75b Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:44:54 2021 -0500 Squashed commit of the following: commit 47a13811a3a6e47e5f6f1c3ccd515c1989bd4617 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:41:26 2021 -0500 yarn build commit 0d2c1fabe9f982179ec9d26cbb79bc0cebfef9c5 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:31:48 2021 -0500 Squashed commit of the following: commit e03f626fd08a3e048dbd968d623ee58b7f865929 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:04:39 2021 -0500 yarn build commit b511f929ffcc7a670bd7955269982e05c591783a Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 21:17:31 2021 -0500 update service worker with base path commit f13f02d481618583017c71fb654adaa86585ef0b Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:54:17 2021 -0500 WIP commit f2f927c16f52baa6b9a31cd9992e8c7c8739d666 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:40:59 2021 -0500 default value if localStorage fails commit 424e8a9b93d8aa9962a3b6f963fff5c6e23dfa56 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:30:38 2021 -0500 fixed missing '/' commit d49a206ddf5952036b295804f9e31e52a1b45af6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:13:04 2021 -0500 updated .env.template commit ac94ea7afac36f65e1658f3d29f4e2b8f0475ba6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 15:31:37 2021 -0500 WIP commit c9a687df1b21ac6584d0f958e65c5cfc040406ca Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 10:19:02 2021 -0500 WIP commit 7fe8c7fbe52c96f1ccd4128db256656e43af3fa0 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 08:10:08 2021 -0500 added nginx config commit b5540d85872d9d69bda3787db7ecccfce893236f Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 08:03:09 2021 -0500 allow subfolder config on NGINX commit92c65ec1e8
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 21:21:41 2021 +0200 fixed test meal plan commita376c3a5b6
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:55:48 2021 +0200 meal plan random fix commit058d705170
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:19:11 2021 +0200 meal plan in search commit4ad5d6ef2f
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 15:01:39 2021 +0200 fixed test + added api doc for new search commite676b4bac3
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 14:05:19 2021 +0200 added api pagination for recipes commit04488741c4
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:11:19 2021 +0200 adv search mobile styling commit99004ad34b
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:03:15 2021 +0200 new search and setting commitf78f7dfc14
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 02:55:50 2021 +0200 search ui improvements and filter commit880db58d38
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 21:28:29 2021 +0200 v2 search filtering commitd1d65d878c
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 14:11:10 2021 +0200 v2 search progress commit3194a7580d
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 12:57:02 2021 +0200 basics of v2 search working commit d9fea7de66d9b438a8546f65f64e66e114655f03 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:05:43 2021 -0500 yarn build commit fb9275958e6649df3f5b27d6dba58d164a90ec88 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 12:58:44 2021 -0500 updated base_path in api-generator commit d54528f05d204f52cecb3fdd91e28563f28898dd Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 21:18:08 2021 -0500 updated service worker with base path commit 5c07010f77e40209734e1619e57040553744ca55 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:53:30 2021 -0500 WIP commit f95655a8037727a4a8eb73ee2f0ad70b2a5d0ba4 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:39:33 2021 -0500 added default window location in case local storage failed commit 3efd0fd58245887abd6c6e70f78d38740b3da8b8 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:33:19 2021 -0500 added trailing '/' commit 2b8ce75f14c802cff545054eaa3eddc72fb9afd0 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:06:18 2021 -0500 dynamically set api-generator path commit 6c4c2711744f7662d5236c103fc579dd076c1597 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 16:27:24 2021 -0500 WIP commit d3fdc835be0134bbbaa44f72992983b9d453619f Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 15:50:41 2021 -0500 WIP commit 395778caa00132c6f4b19805979b3d80c9b1220f Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 15:43:07 2021 -0500 Squashed commit of the following: commit ac94ea7afac36f65e1658f3d29f4e2b8f0475ba6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 15:31:37 2021 -0500 WIP commit c9a687df1b21ac6584d0f958e65c5cfc040406ca Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 10:19:02 2021 -0500 WIP commit 7fe8c7fbe52c96f1ccd4128db256656e43af3fa0 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 08:10:08 2021 -0500 added nginx config commit b5540d85872d9d69bda3787db7ecccfce893236f Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 08:03:09 2021 -0500 allow subfolder config on NGINX commit92c65ec1e8
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 21:21:41 2021 +0200 fixed test meal plan commita376c3a5b6
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:55:48 2021 +0200 meal plan random fix commit058d705170
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:19:11 2021 +0200 meal plan in search commit4ad5d6ef2f
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 15:01:39 2021 +0200 fixed test + added api doc for new search commite676b4bac3
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 14:05:19 2021 +0200 added api pagination for recipes commit04488741c4
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:11:19 2021 +0200 adv search mobile styling commit99004ad34b
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:03:15 2021 +0200 new search and setting commitf78f7dfc14
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 02:55:50 2021 +0200 search ui improvements and filter commit880db58d38
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 21:28:29 2021 +0200 v2 search filtering commitd1d65d878c
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 14:11:10 2021 +0200 v2 search progress commit3194a7580d
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 12:57:02 2021 +0200 basics of v2 search working commit 93b7845d68073e81415e5a42076d9b7c336c0f99 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 10:28:55 2021 -0500 wip commit 6c9f9839ba3769fd37b0256561f266f930158a67 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 10:28:26 2021 -0500 settings for nginx subfolder commit 5013f257342dd83b484090f71b4068ab5893a565 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 07:57:28 2021 -0500 WIP commit c4714456d675a0f865cf1769c7ba58206a7055e4 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 22:29:21 2021 -0500 allow app to be served at proxy subfolder commit 626e79ecdc219906bce42ea8591f6022dcd9f4a6 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 20:16:28 2021 -0500 Squashed commit of the following: commit f03456411939b9f09704c057e20a970f9545dc0b Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 18:28:45 2021 -0500 no_perm commit 0262d1630dfcae204848a9fa6c41dc36958414d6 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:29:11 2021 -0500 removed unnecessary console message commit 069a02e67a99805ea04b3f2248d48584e146eadd Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:25:23 2021 -0500 removed commented out settings commit 1be713ff9db5e94fc68cfa25f4b8a219edff39b2 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:24:27 2021 -0500 removed unused cors_headers commit 5c9e1f015a6ff667968e6421341061af09d1b34a Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:22:15 2021 -0500 removed line breaks commit 0e92b029d46bbaaf2a5bf2526165d3a4075581f1 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:21:21 2021 -0500 removed console.log() commit e435325e66a1dc25fb9d24391eec5ed76503d969 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 11:17:00 2021 -0500 Fix after rebase commit c6e1add18be6e9791c7142a78129a879020c6f17 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 07:44:53 2021 -0500 updated model commit c52cd0b177da20cbed9a9d606ee4ec54ab865f38 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:46:38 2021 -0500 convert servings to number on import commit a3cf59c7a47dc39bec74b772f789e1c052884550 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:15:59 2021 -0500 update tests to handle url decoding commit 7ff1783578c90e2c6ae931b345d580279daeedf0 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:57:10 2021 -0500 bring parser inline with json_import branch commit 204f3ddf845a91c50d54d8dbd2f1d754d3076d25 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 08:50:00 2021 -0500 unescape html document commit 28291f96afdb70c8259104997000fe9544e0d134 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 11:29:35 2021 -0500 updated bookmarklet to work with updated import process commit e7c7823916febeb0adbe7e548633b737125ad3b7 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:52 2021 -0500 Squashed commit of the following: commit 707d862e01a7497a1f22879d314b865a35e0e85b Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:00 2021 -0500 works now commit 3942a445ed4f2ccec57de25eacd86ea4e4dd6bdb Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:25:24 2021 -0500 updated serializer and api commit 10dc746eb175c7f805a8a8ffa7ce49977a7ce97e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:20:19 2021 -0500 fixed bookmarklet commit 9779104902d3be0258c95cd2eeebcba0d5d48892 Merge: bb8262c 0cb3928 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:56:27 2021 -0500 Merge branch 'bookmarklet' into json_import commit 0cb39284bb835ffc6cfee3e4306aadc4a64a25be Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commit e89e0218de684d40b2e2bfb6ba833891206c828e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commit bb8262ccabb93c56fbc18c407d5a0653b8b3ca79 Merge: b1e73aa35a7f62
Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 20:35:57 2021 -0500 Merge branch 'main_fork' into json_import commit e01efbbf764bbe6b0e1cefac6c0311dd18a0d503 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:20:03 2021 -0500 added missing bookmarklet commit 3e5f3a36a48cdca0087a551a9a6b4d942d81bf19 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:18:14 2021 -0500 Revert "bug fix url import" This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23. commit 22135c7d40a399fafef994372e7ba128fc37c596 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 13 16:44:05 2021 -0500 removed extra string normalization commit 7ab59c55ac75f50997156f8808c18d12ef7ac8f3 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 21:22:56 2021 -0500 updated migration commit 0f6f8c9eeb642a2824c6952a69c2a2a12e628d24 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:14:50 2021 -0500 updated recipe targets in tests to reflect html decoding commit c56add95a4627f5ed874bbce3cb7b0f4d8adbb9f Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 13:28:35 2021 -0500 fixes #527 commit 09993a71515b9b977f074e14e11cf9e4b5c72b96 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 10:57:13 2021 -0500 bug fix url import commit 625d23d994b84be082f20ef1f6527d1d742a7157 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 07:02:43 2021 -0500 url import bug fixes commit df4b2adf7dcd8099871167ed8bab779e976002a4 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:43:33 2021 -0500 bug fix tests commit 0a61c9f9def1da5841031e39ced99a08a2536958 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:41:00 2021 -0500 bug fix url import commit afbf1153bfcc29baa80a07019f337a9c02b66a63 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:26:29 2021 -0500 recipe import tests commit 5857ed171e3b667764f2882d3ee7b73c15bdab8b Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 12:32:11 2021 -0500 simplified url import commit 33cc780cfd8001a0293951f25fd19b3db8ce0461 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 09:20:15 2021 -0500 add data for url_import test commit 322552a1f1434e7ca52f75886e752f31ea5915f3 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:43:36 2021 -0500 added all ATK sites to custom scraper commit 6455e597fbc2a394f217fe8c11d2bc89e8add1a4 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:23 2021 -0500 added cooksillustrated custom scraper commit 1c6ad94a2d8bf466e35c56a1cd82dff9039371c6 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:01 2021 -0500 ensure time is always a number commit fbbc057a8a2964eb6a4ac7d2324adacc679db2d6 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 2 15:19:20 2021 -0500 added ability to create custom scrapers commit fd293f150e959f67b3e8260061f8a72898e0990c Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:21:28 2021 -0500 removed old json importer commit 86b330583a6f5946b5743df8b447dccc1db3ade0 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:19:18 2021 -0500 updated import from source to use text scraper commit c4be53661293bc54c9069c2604d8fe1a61dceddf Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:08:56 2021 -0500 remove old html_import function commit 6a6314e09be06d17cc11bf55e95992f0a10b54ed Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:07:51 2021 -0500 wrapper for recipe_scrapers to parse text input commit 64524c01c8da795269bd2dbdfb5e6a02d47e8904 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:17:46 2021 -0500 fixed broken tab commit 4701d62739550754960e6d1eac437f0d2cea004f Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:11:54 2021 -0500 delete bookmarklet on import commit 4233980dd9df8e0e961363d464b41c61ad1c6288 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:53:06 2021 -0500 removed console message commit 16e34fe3b134bf31bc84c6f7584662a171fa9748 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:51:14 2021 -0500 fixed ingredient display on preview commit c51d715cfee7a787dcd7b1c3dd0beb24a14962d3 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 11:49:56 2021 -0500 redirect to import url for processing commit 29c199320502711a3197eade37f6021064c7dcb0 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 06:39:44 2021 -0500 added hack to fix scopes & CORS for bookmarklet commit 958faf9972d26ad9f78eaaa1126af51d7a3b333b Author: smilerz <smilerz@gmail.com> Date: Sun Mar 28 18:39:20 2021 -0500 added CORS middleware commit c284f830dc7e7339cd2f54185f2ff8ea6866ef19 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 26 14:47:24 2021 -0500 added bookmarklet model and api commit cbfc5fa973c002bc1ce75d3d2671986007b6a3a7 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 17:48:32 2021 -0500 bookmarklet passing data to form commit d9815e445828293bb2965c7c98ab6acf3afe3833 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 14:02:57 2021 -0500 added bookmarklet that doesn't work yet commit 0e327f3bf865a99e95368bf4b74ee9545d9a2b1a Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 14:14:56 2021 -0500 Squashed commit of the following: commit81a8734fac
Merge:abcef54
f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:41:13 2021 +0100 Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support Add iOS webclip icon support commitabcef54e72
Merge:e15c92c
7527646
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:30:43 2021 +0100 Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1 Bump recipe-scrapers from 12.2.0 to 12.2.1 commite15c92cda5
Merge:58fc269
45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:26:06 2021 +0100 Merge pull request #501 from smilerz/main_fork fix json direct import when wrapped in @graph commit45dba6fad2
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:23:55 2021 -0500 fix json direct import when wrapped in @graph commitf67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 15:49:12 2021 +0100 Add generated icons from icongenerator. commit53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 12:48:58 2021 +0100 Fix errors in favicon SVG. commit7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Mar 19 05:51:22 2021 +0000 Bump recipe-scrapers from 12.2.0 to 12.2.1 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1) Signed-off-by: dependabot[bot] <support@github.com> commit 18c5bf8a3eb7dd22504bbd2e40acab9269cc6804 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 13:58:16 2021 -0500 updated links to import recipes commit 9f643b0b85cc89a36a86681e20c68c177959e1a1 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:54:41 2021 -0500 added collapsable cards commit b37594eb84988043afa450de871a036f72a811ee Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:32:55 2021 -0500 cosmetic cleanup commit e5f76034dfc174d3ce307de1c0c5683a159733a9 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:15:57 2021 -0500 added image import commit 792cfb0791c2e682589995ccd1b85eca0a04061c Author: smilerz <smilerz@gmail.com> Date: Mon Mar 22 15:13:01 2021 -0500 consolidated integration imports into url_import commit aa6c9430bce1a63e46ff0325f13e4f4d7369cc00 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:49 2021 -0500 staged app import tabs commit 3dd92d811c140d925b153f30db29e11e4c8a18cc Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:16 2021 -0500 fixed missing space in keyword when adding recipe commit d79283ccabdd014c62dc820f382830421908cf0a Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:08:51 2021 -0500 removed unused templates commit 3f95eb2f3db42628994f1ea80fd5010fa1b247ba Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 13:13:56 2021 -0500 combined json import and source import commit 5016314ab57102454a95e48f0ba50b6031cc5400 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 16:06:02 2021 -0500 more fix from super ugly merge commit 27a489c45a5b169818e36c79591757f99f64c637 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:17:10 2021 -0500 more cleanup from ugly merge commit f7517d51dd9aad61b1e80ec20947c4f597834691 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 11:24:23 2021 -0500 fixed ugly merge commit 7095b6ef89fe350d591f1103c4c1a2d27c60d28f Author: smilerz <smilerz@gmail.com> Date: Thu Mar 18 12:09:53 2021 -0500 added drag and drop to ingredients commit bdadc7168f37eede0f91a2bfa060200273e440a9 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 15 15:56:44 2021 -0500 manually parse json commit 4bcd7e462db760d00483a90883028e5404f33299 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:33:07 2021 -0600 update urls.py commit 794d2798bfe56a27af5e8786e5f3b9701be7fe81 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:32:47 2021 -0600 commit merge from Patralos/recipes commit e97bc6ea89d8c366104d08ce561dd3d3c17c1578 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 15:34:47 2021 -0600 updated URL import page with tab interface commit 7732bc44b83c23901873bce1075b7ac2e68cee07 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 11:29:10 2021 -0600 import raw json/html commit 368d2211efa86e1146e95e3ddd1192b81f0422c2 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 7 14:28:29 2021 -0600 refactored json parser to create functions for each sub parser commit 3ddff8b468e0c85d1a4ff61b565b78c5be0f77ea Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 22:27:32 2021 +0100 replace common fractions with their concrete value (else parsing is not possible) commit 083048e125f63463edca6f4855f6a8e974f61a21 Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 21:37:39 2021 +0100 Allow recipes to be imported from json directly commit 647263ed079f29d41a584767efcf6114a8832e75 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 20:15:41 2021 -0500 Squashed commit of the following: commit7930c2417c
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 17:12:43 2021 -0500 update ATK scrape to handle empty headnote commit2f27413c0a
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 14:12:24 2021 -0500 parse multiple ingredientGroups previous version assumed only a single item in a list - this loops through each item commit5869a8ad1b
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 13:43:34 2021 -0500 fixes to pass tests commit0640a265fc
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 13:42:56 2021 -0500 added test for spruce eats commitd449fc8fd8
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 12:49:42 2021 -0500 updated normalization to skip removing line breaks commitb9ee77709b
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 12:49:06 2021 -0500 updated ATK scraper to include header notes in instructions commit 3e0adeb46e003abebfa79c9891629195025fdce1 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 15:57:20 2021 -0500 updated message commit 45ae7cc99e77275b59f683daee11b0a440df4cc0 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 14:17:16 2021 -0500 fixed ATK scraper commit f255d8af768c328922c04ba04fedc84b99b63d1a Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 13:44:29 2021 -0500 Squashed commit of the following: commit5869a8ad1b
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 13:43:34 2021 -0500 fixes to pass tests commit0640a265fc
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 13:42:56 2021 -0500 added test for spruce eats commitd449fc8fd8
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 12:49:42 2021 -0500 updated normalization to skip removing line breaks commitb9ee77709b
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 12:49:06 2021 -0500 updated ATK scraper to include header notes in instructions commit 1fa9644fffd5a7c97eea403d4c08519acfb37052 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 11:58:40 2021 -0500 added upcoming features commit 99050976c6f0da5fcaaf76bab01ddb7ef46bc8f2 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 17:45:42 2021 -0500 Squashed commit of the following: commitba061df1b6
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 17:30:59 2021 -0500 catch attribute error on cooktime commit7cc515bcdf
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 17:08:25 2021 -0500 fix manual url import commit724748d38a
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 14:09:10 2021 -0500 corrected api import workflow commitb2c1c6e301
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 11:26:26 2021 -0500 restored missing manual url scrape commit987be4b04d
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 09:02:27 2021 -0500 Fix after rebase commitca84da68c4
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 18:39:44 2021 -0500 catch attibute error when scrape missing schema commitd75e39fbcd
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 16:27:18 2021 -0500 set persistent connections to db commiteb2593aacd
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 16:08:04 2021 -0500 handle text in cook times during import commit496e04cfc8
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:47:35 2021 -0500 convert servings to number on import commitd814d13d54
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 13:17:15 2021 -0500 custom scraper fails safe commitd0cedaf7a1
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 12:48:26 2021 -0500 added name parser commit01f504f7b1
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:31:47 2021 -0500 updated tests to handle html decoding commitc716346f1f
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:55:07 2021 -0500 flake commitfef5236931
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:53:45 2021 -0500 decode url strings in text_parser commitb115c37eb8
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:32:33 2021 -0500 catch error on scrape.image() commit1e17f3703a
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:28:46 2021 -0500 trap error on scrape.title() commit468b986314
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:05:28 2021 -0500 updated tests commita531d135b5
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:42:31 2021 -0500 remove html tags from description commit7524609cd0
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commita28f8e65d5
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commitd193637091
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:20:03 2021 -0500 added missing bookmarklet commit0953af05fc
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:18:14 2021 -0500 Revert "bug fix url import" This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23. commit19e8e5cb5b
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 13 16:44:05 2021 -0500 removed extra string normalization commit43c808380d
Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 21:22:56 2021 -0500 updated migration commit7ab8b84044
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:14:50 2021 -0500 updated recipe targets in tests to reflect html decoding commitd739fe6752
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 13:28:35 2021 -0500 fixes #527 commita84c41e29f
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 10:57:13 2021 -0500 bug fix url import commit393aba1f31
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 07:02:43 2021 -0500 url import bug fixes commit436a070730
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:43:33 2021 -0500 bug fix tests commit2fe6788ce5
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:41:00 2021 -0500 bug fix url import commit747d146389
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:26:29 2021 -0500 recipe import tests commitefe4c4043d
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 12:32:11 2021 -0500 simplified url import commitc6739ba8e0
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 09:20:15 2021 -0500 add data for url_import test commit50140db668
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:43:36 2021 -0500 added all ATK sites to custom scraper commit028b2dfb22
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:23 2021 -0500 added cooksillustrated custom scraper commitec6a10ca0a
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:01 2021 -0500 ensure time is always a number commit3cf949bf8d
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 2 15:19:20 2021 -0500 added ability to create custom scrapers commit0a62225797
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:21:28 2021 -0500 removed old json importer commita54f4e1367
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:19:18 2021 -0500 updated import from source to use text scraper commitbf3c30a8fb
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:08:56 2021 -0500 remove old html_import function commitf811f5996e
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:07:51 2021 -0500 wrapper for recipe_scrapers to parse text input commita3490240f4
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:17:46 2021 -0500 fixed broken tab commitb26aea96f4
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:11:54 2021 -0500 delete bookmarklet on import commit4d4af5fdf2
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:53:06 2021 -0500 removed console message commit3da74505d6
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:51:14 2021 -0500 fixed ingredient display on preview commitc8a4861df8
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 11:49:56 2021 -0500 redirect to import url for processing commit5e27cd606e
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 06:39:44 2021 -0500 added hack to fix scopes & CORS for bookmarklet commita341fd8ebe
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 28 18:39:20 2021 -0500 added CORS middleware commit9a62b6e4e7
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 26 14:47:24 2021 -0500 added bookmarklet model and api commitf80c44bca3
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 17:48:32 2021 -0500 bookmarklet passing data to form commit09d2e9f831
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 14:02:57 2021 -0500 added bookmarklet that doesn't work yet commit4d5a9e446f
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 14:14:56 2021 -0500 Squashed commit of the following: commit81a8734fac
Merge:abcef54
f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:41:13 2021 +0100 Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support Add iOS webclip icon support commitabcef54e72
Merge:e15c92c
7527646
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:30:43 2021 +0100 Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1 Bump recipe-scrapers from 12.2.0 to 12.2.1 commite15c92cda5
Merge:58fc269
45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:26:06 2021 +0100 Merge pull request #501 from smilerz/main_fork fix json direct import when wrapped in @graph commit45dba6fad2
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:23:55 2021 -0500 fix json direct import when wrapped in @graph commitf67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 15:49:12 2021 +0100 Add generated icons from icongenerator. commit53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 12:48:58 2021 +0100 Fix errors in favicon SVG. commit7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Mar 19 05:51:22 2021 +0000 Bump recipe-scrapers from 12.2.0 to 12.2.1 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1) Signed-off-by: dependabot[bot] <support@github.com> commit6a2c27749f
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 13:58:16 2021 -0500 updated links to import recipes commitde60e12073
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:54:41 2021 -0500 added collapsable cards commit1188ed9227
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:32:55 2021 -0500 cosmetic cleanup commitcb708e7e47
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:15:57 2021 -0500 added image import commit215eadb4a0
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 22 15:13:01 2021 -0500 consolidated integration imports into url_import commit4ffc54f720
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:49 2021 -0500 staged app import tabs commit21f6c7a21f
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:16 2021 -0500 fixed missing space in keyword when adding recipe commitce7c6939d2
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:08:51 2021 -0500 removed unused templates commit40a2f7ff90
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 13:13:56 2021 -0500 combined json import and source import commit4015517c0a
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 16:06:02 2021 -0500 more fix from super ugly merge commit7c8d41753c
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:17:10 2021 -0500 more cleanup from ugly merge commit90670613c5
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 11:24:23 2021 -0500 fixed ugly merge commit647c1678f1
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 18 12:09:53 2021 -0500 added drag and drop to ingredients commit44dee16e0a
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 15 15:56:44 2021 -0500 manually parse json commitf8fedcac82
Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:33:07 2021 -0600 update urls.py commit3a48d0e580
Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:32:47 2021 -0600 commit merge from Patralos/recipes commit9930789aa8
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 15:34:47 2021 -0600 updated URL import page with tab interface commit83fce6461a
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 11:29:10 2021 -0600 import raw json/html commitf0d37244b6
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 7 14:28:29 2021 -0600 refactored json parser to create functions for each sub parser commit386834f409
Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 21:37:39 2021 +0100 Allow recipes to be imported from json directly commit f3b2682817b02f105f92f2d55ed3d4937add2432 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 17:30:59 2021 -0500 catch attribute error on cooktime commit 1bdf1534abea68382b8d0cf3dfe3dc6eda551368 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 17:08:25 2021 -0500 fix manual url import commit e9ed1c59362d274f22259b85499a3311468cdbd7 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:33:51 2021 -0500 Squashed commit of the following: commit 8e2a15aff203cacd8956c947eecf3967f5b66015 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:29:11 2021 -0500 removed unnecessary console message commit 436d5b3165340772a859899578f7386edfcd587f Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:25:23 2021 -0500 removed commented out settings commit ba6b58b198d2e9260544d64e107afee9420ae340 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:24:27 2021 -0500 removed unused cors_headers commit c7690c391f341d8d92500276f243e99f8700528e Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:22:15 2021 -0500 removed line breaks commit 3259f86ff8b911fa8489922eee43c4465ea81d61 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:21:21 2021 -0500 removed console.log() commit 24552a2d9b644c86dee900322989fb3306ca1b4e Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 14:58:48 2021 -0500 fix after rebase commit bdf8ce1c3357609013c84d2661371ede815cd700 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 11:17:00 2021 -0500 Fix after rebase commit 58cd295e7ae8caa9be588508eb1795fd4a00e810 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 07:44:53 2021 -0500 updated model commit ec786ef8a19f9459cd4c890c60330bcadafb0247 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:46:38 2021 -0500 convert servings to number on import commit 90cc1711b185290778e973821b17a7574c6d3428 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:15:59 2021 -0500 update tests to handle url decoding commit 466eae617cace3b662fe480427018b0ac7a7ab1d Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:57:10 2021 -0500 bring parser inline with json_import branch commit 2668406d4625f747305482ede28e256c94aefcf9 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 08:50:00 2021 -0500 unescape html document commit f765347aec15b7765eaec830dd8dfda1f17b7597 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 11:29:35 2021 -0500 updated bookmarklet to work with updated import process commit 60d95ebf3d4e1c8af7f3b6832adfb28ce13a51aa Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:52 2021 -0500 Squashed commit of the following: commit 707d862e01a7497a1f22879d314b865a35e0e85b Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:00 2021 -0500 works now commit 3942a445ed4f2ccec57de25eacd86ea4e4dd6bdb Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:25:24 2021 -0500 updated serializer and api commit 10dc746eb175c7f805a8a8ffa7ce49977a7ce97e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:20:19 2021 -0500 fixed bookmarklet commit 9779104902d3be0258c95cd2eeebcba0d5d48892 Merge: bb8262c 0cb3928 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:56:27 2021 -0500 Merge branch 'bookmarklet' into json_import commit 0cb39284bb835ffc6cfee3e4306aadc4a64a25be Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commit e89e0218de684d40b2e2bfb6ba833891206c828e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commit bb8262ccabb93c56fbc18c407d5a0653b8b3ca79 Merge: b1e73aa35a7f62
Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 20:35:57 2021 -0500 Merge branch 'main_fork' into json_import commit f50d33a9b2658f6bf27797f645fbd842528a716c Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:20:03 2021 -0500 added missing bookmarklet commit cd482ae8451d3b920d7bb7a2b76044645f6a2e0b Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:18:14 2021 -0500 Revert "bug fix url import" This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23. commit 7032c7cc990af5790073348c3039d907d3469a7e Author: smilerz <smilerz@gmail.com> Date: Tue Apr 13 16:44:05 2021 -0500 removed extra string normalization commit 04b4aeecb9b13ae0023636f65dec8fc0ca1b8e0f Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 21:22:56 2021 -0500 updated migration commit 8b4059d0beed9ae8da9a6943ed550b0a82e12e03 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:14:50 2021 -0500 updated recipe targets in tests to reflect html decoding commit 7388f30ef333315736a8614c2009db37404f4916 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 13:28:35 2021 -0500 fixes #527 commit 6d811738535a81cab737b10f006f50c32cc32f13 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 10:57:13 2021 -0500 bug fix url import commit cbe400cdaccb0fcbebeafea199cf14be3deeb150 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 07:02:43 2021 -0500 url import bug fixes commit f4e33a830b826d1930639f552a2e32882c14d2ba Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:43:33 2021 -0500 bug fix tests commit 1d1cbbe965a5255bd9cabb138a2f1432956a4c6e Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:41:00 2021 -0500 bug fix url import commit 31cf4da8f3dcface57399976679379d11ca6d81e Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:26:29 2021 -0500 recipe import tests commit 1d1b5b545ab35626636ec4d9e1ce020fe508e520 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 12:32:11 2021 -0500 simplified url import commit 25140fa64e9306421956b90e40f53c00429e7c5e Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 09:20:15 2021 -0500 add data for url_import test commit 14d97f671ad356c8212ffc7fdd5b15fce8b5a7c1 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:43:36 2021 -0500 added all ATK sites to custom scraper commit 10975665626ae958f45e4c76b5125978e4776c41 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:23 2021 -0500 added cooksillustrated custom scraper commit 9ea33ec10bc32aa6ffed0c8cd6d5a4b4e123eff1 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:01 2021 -0500 ensure time is always a number commit ceb85137dd25a2cc6192165af9ac9b515cd5cfee Author: smilerz <smilerz@gmail.com> Date: Fri Apr 2 15:19:20 2021 -0500 added ability to create custom scrapers commit cc53a8debe36e65f9f487ac8c31cf3235bad5370 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:21:28 2021 -0500 removed old json importer commit d2233df427cc577fd6ea87458d821ac37c4def48 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:19:18 2021 -0500 updated import from source to use text scraper commit 9a0fcf9d2b6d35f01c16aa1c1a1074bb42577a3e Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:08:56 2021 -0500 remove old html_import function commit 2bc5fbbdcc5d395b7ed7aa1879449e16da0ee2d1 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:07:51 2021 -0500 wrapper for recipe_scrapers to parse text input commit 4a3c1a94a97ec18109ba43a5bbe90a6aa8e622c4 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:17:46 2021 -0500 fixed broken tab commit 6b92f8c325dd4a3c43fec0efe9b20181eaea0951 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:11:54 2021 -0500 delete bookmarklet on import commit dcd12899fd361868d4542e882d413292ef37a92b Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:53:06 2021 -0500 removed console message commit 3e58d79a9279e63af66356d14c7204121f6055dd Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:51:14 2021 -0500 fixed ingredient display on preview commit 1eb6ba707c41f52711ed2d68e3758ce9c70465ec Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 11:49:56 2021 -0500 redirect to import url for processing commit 95b50edc0f33afc1557b6a766e610a6c74b2e8a0 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 06:39:44 2021 -0500 added hack to fix scopes & CORS for bookmarklet commit bdc85694309fb79b9c214f0330848be82c372156 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 28 18:39:20 2021 -0500 added CORS middleware commit c1f5ec44c3f45dd403cc600ed5e38b814fedd138 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 26 14:47:24 2021 -0500 added bookmarklet model and api commit cc9a6fe14adbca88dc8753a7271ed4d47e638822 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 17:48:32 2021 -0500 bookmarklet passing data to form commit 3bf58f633610caa266e210fcdbecdedd0edf2465 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 14:02:57 2021 -0500 added bookmarklet that doesn't work yet commit 9a11ebc7746f2acdd156a574703ea05a0aba0a9b Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 14:14:56 2021 -0500 Squashed commit of the following: commit81a8734fac
Merge:abcef54
f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:41:13 2021 +0100 Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support Add iOS webclip icon support commitabcef54e72
Merge:e15c92c
7527646
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:30:43 2021 +0100 Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1 Bump recipe-scrapers from 12.2.0 to 12.2.1 commite15c92cda5
Merge:58fc269
45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:26:06 2021 +0100 Merge pull request #501 from smilerz/main_fork fix json direct import when wrapped in @graph commit45dba6fad2
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:23:55 2021 -0500 fix json direct import when wrapped in @graph commitf67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 15:49:12 2021 +0100 Add generated icons from icongenerator. commit53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 12:48:58 2021 +0100 Fix errors in favicon SVG. commit7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Mar 19 05:51:22 2021 +0000 Bump recipe-scrapers from 12.2.0 to 12.2.1 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1) Signed-off-by: dependabot[bot] <support@github.com> commit 9307226d777d5648d1cacc0107241dfaec3a4405 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 13:58:16 2021 -0500 updated links to import recipes commit bec00d05898c074b893df7338248b7803f8272c1 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:54:41 2021 -0500 added collapsable cards commit 2d647a2f6aa1afacb6651a6294bba571fafc3190 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:32:55 2021 -0500 cosmetic cleanup commit 48cd8ce5f1c5c3ea2372b0f3fcdb2a9491be52f4 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:15:57 2021 -0500 added image import commit 12e82211ace004c93726b8f6327adee1d1a58f78 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 22 15:13:01 2021 -0500 consolidated integration imports into url_import commit 8cf5dae5482d7b28e386760ca039c60efdfbdb9a Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:49 2021 -0500 staged app import tabs commit a255450fad53f9482711a252ec98b353b66a15df Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:16 2021 -0500 fixed missing space in keyword when adding recipe commit 2bb4dd9954c4913c6b4bd9e23f60315ed0c46552 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:08:51 2021 -0500 removed unused templates commit cddbebbc85377227ba9d753cf9d58db03e7f5ee2 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 13:13:56 2021 -0500 combined json import and source import commit b929bd9ae3a061dc2660602cb2ffb036b7e6cac7 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 16:06:02 2021 -0500 more fix from super ugly merge commit 558eb25faee2f8362a9af1380b40b11a3c05b6fa Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:17:10 2021 -0500 more cleanup from ugly merge commit 8906345e107096a657fac8cdff497548dbaa9ffd Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 11:24:23 2021 -0500 fixed ugly merge commit 966edebfedf89a7976f47dd0526e0aeb41aa0feb Author: smilerz <smilerz@gmail.com> Date: Thu Mar 18 12:09:53 2021 -0500 added drag and drop to ingredients commit a9b24c9f03a223bbf59613a10f000ce1b421383f Author: smilerz <smilerz@gmail.com> Date: Mon Mar 15 15:56:44 2021 -0500 manually parse json commit 908ae04ef98d629da0cd74e94d1401fa6c5ac654 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:33:07 2021 -0600 update urls.py commit e3828f96e6d2db5877789b5bd9be9cc4eb151d5f Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:32:47 2021 -0600 commit merge from Patralos/recipes commit a21fe044ed527dae2ea9a8bce854c628b1a39910 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 15:34:47 2021 -0600 updated URL import page with tab interface commit 59a30f579a25758ec58a938e8a315dd986e62cbf Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 11:29:10 2021 -0600 import raw json/html commit 299194409d9c0a395aaf5d69106c2f35baa1d402 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 7 14:28:29 2021 -0600 refactored json parser to create functions for each sub parser commit 0e480ba82f25a3fa705a9adc2cf82f5234797b44 Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 22:27:32 2021 +0100 replace common fractions with their concrete value (else parsing is not possible) commit 40fb268d2d2cfe5250b1a900eafb4819fd85572b Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 21:37:39 2021 +0100 Allow recipes to be imported from json directly commit987be4b04d
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 09:02:27 2021 -0500 Fix after rebase commitca84da68c4
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 18:39:44 2021 -0500 catch attibute error when scrape missing schema commitd75e39fbcd
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 16:27:18 2021 -0500 set persistent connections to db commiteb2593aacd
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 16:08:04 2021 -0500 handle text in cook times during import commit496e04cfc8
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:47:35 2021 -0500 convert servings to number on import commitd814d13d54
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 13:17:15 2021 -0500 custom scraper fails safe commitd0cedaf7a1
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 12:48:26 2021 -0500 added name parser commit01f504f7b1
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:31:47 2021 -0500 updated tests to handle html decoding commitc716346f1f
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:55:07 2021 -0500 flake commitfef5236931
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:53:45 2021 -0500 decode url strings in text_parser commitb115c37eb8
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:32:33 2021 -0500 catch error on scrape.image() commit1e17f3703a
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:28:46 2021 -0500 trap error on scrape.title() commit468b986314
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:05:28 2021 -0500 updated tests commita531d135b5
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:42:31 2021 -0500 remove html tags from description commit7524609cd0
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commita28f8e65d5
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commitd193637091
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:20:03 2021 -0500 added missing bookmarklet commit0953af05fc
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:18:14 2021 -0500 Revert "bug fix url import" This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23. commit19e8e5cb5b
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 13 16:44:05 2021 -0500 removed extra string normalization commit43c808380d
Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 21:22:56 2021 -0500 updated migration commit7ab8b84044
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:14:50 2021 -0500 updated recipe targets in tests to reflect html decoding commitd739fe6752
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 13:28:35 2021 -0500 fixes #527 commita84c41e29f
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 10:57:13 2021 -0500 bug fix url import commit393aba1f31
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 07:02:43 2021 -0500 url import bug fixes commit436a070730
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:43:33 2021 -0500 bug fix tests commit2fe6788ce5
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:41:00 2021 -0500 bug fix url import commit747d146389
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:26:29 2021 -0500 recipe import tests commitefe4c4043d
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 12:32:11 2021 -0500 simplified url import commitc6739ba8e0
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 09:20:15 2021 -0500 add data for url_import test commit50140db668
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:43:36 2021 -0500 added all ATK sites to custom scraper commit028b2dfb22
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:23 2021 -0500 added cooksillustrated custom scraper commitec6a10ca0a
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:01 2021 -0500 ensure time is always a number commit3cf949bf8d
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 2 15:19:20 2021 -0500 added ability to create custom scrapers commit0a62225797
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:21:28 2021 -0500 removed old json importer commita54f4e1367
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:19:18 2021 -0500 updated import from source to use text scraper commitbf3c30a8fb
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:08:56 2021 -0500 remove old html_import function commitf811f5996e
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:07:51 2021 -0500 wrapper for recipe_scrapers to parse text input commita3490240f4
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:17:46 2021 -0500 fixed broken tab commitb26aea96f4
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:11:54 2021 -0500 delete bookmarklet on import commit4d4af5fdf2
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:53:06 2021 -0500 removed console message commit3da74505d6
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:51:14 2021 -0500 fixed ingredient display on preview commitc8a4861df8
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 11:49:56 2021 -0500 redirect to import url for processing commit5e27cd606e
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 06:39:44 2021 -0500 added hack to fix scopes & CORS for bookmarklet commita341fd8ebe
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 28 18:39:20 2021 -0500 added CORS middleware commit9a62b6e4e7
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 26 14:47:24 2021 -0500 added bookmarklet model and api commitf80c44bca3
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 17:48:32 2021 -0500 bookmarklet passing data to form commit09d2e9f831
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 14:02:57 2021 -0500 added bookmarklet that doesn't work yet commit4d5a9e446f
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 14:14:56 2021 -0500 Squashed commit of the following: commit81a8734fac
Merge:abcef54
f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:41:13 2021 +0100 Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support Add iOS webclip icon support commitabcef54e72
Merge:e15c92c
7527646
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:30:43 2021 +0100 Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1 Bump recipe-scrapers from 12.2.0 to 12.2.1 commite15c92cda5
Merge:58fc269
45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:26:06 2021 +0100 Merge pull request #501 from smilerz/main_fork fix json direct import when wrapped in @graph commit45dba6fad2
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:23:55 2021 -0500 fix json direct import when wrapped in @graph commitf67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 15:49:12 2021 +0100 Add generated icons from icongenerator. commit53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 12:48:58 2021 +0100 Fix errors in favicon SVG. commit7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Mar 19 05:51:22 2021 +0000 Bump recipe-scrapers from 12.2.0 to 12.2.1 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1) Signed-off-by: dependabot[bot] <support@github.com> commit6a2c27749f
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 13:58:16 2021 -0500 updated links to import recipes commitde60e12073
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:54:41 2021 -0500 added collapsable cards commit1188ed9227
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:32:55 2021 -0500 cosmetic cleanup commitcb708e7e47
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:15:57 2021 -0500 added image import commit215eadb4a0
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 22 15:13:01 2021 -0500 consolidated integration imports into url_import commit4ffc54f720
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:49 2021 -0500 staged app import tabs commit21f6c7a21f
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:16 2021 -0500 fixed missing space in keyword when adding recipe commitce7c6939d2
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:08:51 2021 -0500 removed unused templates commit40a2f7ff90
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 13:13:56 2021 -0500 combined json import and source import commit4015517c0a
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 16:06:02 2021 -0500 more fix from super ugly merge commit7c8d41753c
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:17:10 2021 -0500 more cleanup from ugly merge commit90670613c5
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 11:24:23 2021 -0500 fixed ugly merge commit647c1678f1
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 18 12:09:53 2021 -0500 added drag and drop to ingredients commit44dee16e0a
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 15 15:56:44 2021 -0500 manually parse json commitf8fedcac82
Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:33:07 2021 -0600 update urls.py commit3a48d0e580
Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:32:47 2021 -0600 commit merge from Patralos/recipes commit9930789aa8
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 15:34:47 2021 -0600 updated URL import page with tab interface commit83fce6461a
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 11:29:10 2021 -0600 import raw json/html commitf0d37244b6
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 7 14:28:29 2021 -0600 refactored json parser to create functions for each sub parser commit386834f409
Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 21:37:39 2021 +0100 Allow recipes to be imported from json directly commit b702f71e8aac114d195412ec1a8b5b20943537ea Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:08:08 2021 -0500 Fix after rebase commit 2cb024c02a21bb0e57ae9f02acf3acfc6f8d347e Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 07:48:52 2021 -0500 Squashed commit of the following: commit 7642ac66b4d679fb3bd40d783d8c00e969e48413 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 07:44:53 2021 -0500 updated model commit c887fae3a2b85ad23772944d311761b85bd67031 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:46:38 2021 -0500 convert servings to number on import commit 34966bcef2993f4d0a1309362b0648f2096db996 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:15:59 2021 -0500 update tests to handle url decoding commit 86676772676395482901c195888898e7eaafc015 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:57:10 2021 -0500 bring parser inline with json_import branch commit 2b547f67cd180ca457691e15bc9edc1ae033ecc8 Merge: e5ada34 51d4ffe Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:43:27 2021 -0500 Merge branch 'bookmarklet' of github.com:smilerz/recipes into bookmarklet commit 51d4ffef18d359f75d377eee27bd15816957ac53 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 08:50:00 2021 -0500 unescape html document commit e5ada345d869409b240fd0746a88f269b6c28c2c Merge: 5b7df0a8d02cad
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 12:39:37 2021 -0500 Merge branch 'deprecation-fixes' into bookmarklet commit8d02cad7d9
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 12 14:12:04 2021 -0500 resolved deprecation warnings introduced in django 3.2 commit 4134a8a7825d3fcb4b35cc60fa962dce1ac4e086 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 18:38:46 2021 -0500 removed cors_header import - unused commit 28e1d2ed2152aba3468bd7788b529ad94c15044b Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 18:38:00 2021 -0500 catch attribute error when scrape has no schema commit 58e34509ce8df7dea130ee948cb1acd3e3add0e9 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 13:10:23 2021 -0500 name parser handles list commit 3540e42933eb683cf42ca0eff3d8dccef9e17f19 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:52:34 2021 -0500 updated docs for personal beta commit 659d68e7ff477ccb3360caf3f9023c071887fdb5 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 08:57:35 2021 -0500 decode html data when passing bookmarklet commit 0fd31e348d424a39a2811c8441e674aa26e51a28 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:39:30 2021 -0500 extra error catching commit 89ee36fa3172a7faa9cc250b5b030da35816fd20 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 18:48:45 2021 -0500 more shenanigans commit 9862becff6df48a1a7239cba76c3528e777a4e2f Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 18:25:24 2021 -0500 add debugpy to requirements commit 478dd3f054bf73eec2e80dedc4354f9c23b9c6a2 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 18:24:24 2021 -0500 remote debug commit 1eb523b7fde950fc5135baa02c977ef51bc5d1cf Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 18:03:15 2021 -0500 remote debug in container commit 12df29813d606f38c3f299402d17e91e192059c8 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 16:48:09 2021 -0500 nope, this one works commit cde1f9763ddf194df082f77150e1f52f751268e6 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 16:28:31 2021 -0500 it finally works commit 868a114f9a67fbc7326beb9bd44d356ea2493c5d Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 15:40:36 2021 -0500 fix test again commit 35485e3991dcd56b34f911805d0389e7148769cf Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 15:02:57 2021 -0500 add bookmarklet back commit 91c79b037cb276f22740bb0b9d968aef05eb347d Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 14:40:13 2021 -0500 extra docker tags commit 9de174215bfa4d8bdf2bc06e71141b7ead61f296 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 14:29:52 2021 -0500 build hook commit 8ecacca4978567dc193fc1c67c29f173f9d33931 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:39:08 2021 -0500 personalized build commit be4eaee03f426dedfb0a60c6b6c9dba39d8a3b68 Author: smilerz <smilerz@gmail.com> Date: Thu May 20 14:11:36 2021 -0500 Fix after rebase commit cfb877dea3b8137488e87424e923f60080100cb0 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:05:28 2021 -0500 updated tests commit b86e6446175ba27faf4889c9cf7b01bf45b24f1c Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 11:52:06 2021 -0500 fixed admin commit 82fdc060da4b53c5ee8344dff32421c0ded09a60 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 11:29:35 2021 -0500 updated bookmarklet to work with updated import process commit f9cdbf3cde9db58abcd3acd1c2d19d33d2a41617 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:42:31 2021 -0500 remove html tags from description commit 7fed3c755c9de6bf4f9743f58cab9414813e4925 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:52 2021 -0500 Squashed commit of the following: commit 707d862e01a7497a1f22879d314b865a35e0e85b Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:00 2021 -0500 works now commit 3942a445ed4f2ccec57de25eacd86ea4e4dd6bdb Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:25:24 2021 -0500 updated serializer and api commit 10dc746eb175c7f805a8a8ffa7ce49977a7ce97e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:20:19 2021 -0500 fixed bookmarklet commit 9779104902d3be0258c95cd2eeebcba0d5d48892 Merge: bb8262c 0cb3928 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:56:27 2021 -0500 Merge branch 'bookmarklet' into json_import commit 0cb39284bb835ffc6cfee3e4306aadc4a64a25be Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commit e89e0218de684d40b2e2bfb6ba833891206c828e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commit bb8262ccabb93c56fbc18c407d5a0653b8b3ca79 Merge: b1e73aa35a7f62
Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 20:35:57 2021 -0500 Merge branch 'main_fork' into json_import commit e428c770631f9238ba3610ca0f1826ab40e890b6 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commit 39c70406ccd4b4be2e4c24ea761da6feafd2f04c Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commit c31fd681ce9f99ae81d146a3402c2381e9dbf677 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:20:03 2021 -0500 added missing bookmarklet commit 38dd33837859e2e278ef5326d0e2ea31cb13d87a Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:18:14 2021 -0500 Revert "bug fix url import" This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23. commit 21e44f5b42fbbac7dfaeecc489f054131b6dfdce Author: smilerz <smilerz@gmail.com> Date: Tue Apr 13 16:44:05 2021 -0500 removed extra string normalization commit 0d5e8de3b666a036b967349224dcce3cd3680982 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 21:22:56 2021 -0500 updated migration commit 4f54ca64b63d536624d313dcbe04a7552c3cfc15 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:14:50 2021 -0500 updated recipe targets in tests to reflect html decoding commit 7aeea3ec582a0ac69435e0be575aedcbe0e37372 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 13:28:35 2021 -0500 fixes #527 commit 7f3ff32903ab9a2faa977fc4db429d46e1dba2e7 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 10:57:13 2021 -0500 bug fix url import commit 77e452fcab96ee56c2427bda87b1f3d70e392286 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 07:02:43 2021 -0500 url import bug fixes commit eb60ae7c6c25b2736f2ed86e6f08c154fbb509f9 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:43:33 2021 -0500 bug fix tests commit 0bfd301c62c2942ef3c2e4ea159e0d4842f96ed6 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:41:00 2021 -0500 bug fix url import commit 0d705a7f0eea619883eb2c6dda6036064ffa8847 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:26:29 2021 -0500 recipe import tests commit b4d6be7db0c4730093f6125ad4261647175ee450 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 12:32:11 2021 -0500 simplified url import commit 339fc5aa99ad1642608a99928b6eafcfc3c9d37b Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 09:20:15 2021 -0500 add data for url_import test commit 38d234e65de21fc5241e52f6022512398d807f6f Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:43:36 2021 -0500 added all ATK sites to custom scraper commit c3b504e2c71ed451a1f19ccd457f54ac38732ce1 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:23 2021 -0500 added cooksillustrated custom scraper commit 2106d2d02d713cca42b0b0356cb50935ec6fe3b9 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:01 2021 -0500 ensure time is always a number commit 3b379b2a2c2b8022ffb67d40db7529b9b2f0fe8e Author: smilerz <smilerz@gmail.com> Date: Fri Apr 2 15:19:20 2021 -0500 added ability to create custom scrapers commit effca3baa762fb11be12c22de0f42f804df8ac2b Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:21:28 2021 -0500 removed old json importer commit 98efcc20d20bd88b90a6211dbec4edbcaac59624 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:19:18 2021 -0500 updated import from source to use text scraper commit 0941e7dadcb7ad459acc53dd3dd4ce2518ba589e Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:08:56 2021 -0500 remove old html_import function commit 7ebd47695c7e5089700def9afec31ad1887a4b41 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:07:51 2021 -0500 wrapper for recipe_scrapers to parse text input commit da113693d59751626332dff1a4dadccadb7175d1 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:17:46 2021 -0500 fixed broken tab commit ebb7d28eb140099fd0b732919783189dab380c7e Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:11:54 2021 -0500 delete bookmarklet on import commit b1845e86ed35b3bba5e8e4fa3c32068ec176abfa Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:53:06 2021 -0500 removed console message commit 66862e0d5bee2eddb9b7076b2e727c02bce076da Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:51:14 2021 -0500 fixed ingredient display on preview commit bc1def67205624b0eeb6de8d5ea7403b7e0d4545 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 11:49:56 2021 -0500 redirect to import url for processing commit 1ec18cf76b701d7c201d800b87cc6f64a2c5ee19 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 06:39:44 2021 -0500 added hack to fix scopes & CORS for bookmarklet commit 3a1069dfc25bb9be0c86bf3632a72090cb56f425 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 28 18:39:20 2021 -0500 added CORS middleware commit 5f88b2199df429cede066203b29b952addf0e105 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 26 14:47:24 2021 -0500 added bookmarklet model and api commit 38617985b0a3787fbf144485947579b4013e4446 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 17:48:32 2021 -0500 bookmarklet passing data to form commit 9e535186efbb7ec3d504a773f272853792a55bd2 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 14:02:57 2021 -0500 added bookmarklet that doesn't work yet commit 2a4fb41ceef26cf17cc64e0fe274df12bf2733e9 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 14:14:56 2021 -0500 Squashed commit of the following: commit81a8734fac
Merge:abcef54
f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:41:13 2021 +0100 Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support Add iOS webclip icon support commitabcef54e72
Merge:e15c92c
7527646
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:30:43 2021 +0100 Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1 Bump recipe-scrapers from 12.2.0 to 12.2.1 commite15c92cda5
Merge:58fc269
45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:26:06 2021 +0100 Merge pull request #501 from smilerz/main_fork fix json direct import when wrapped in @graph commit45dba6fad2
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:23:55 2021 -0500 fix json direct import when wrapped in @graph commitf67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 15:49:12 2021 +0100 Add generated icons from icongenerator. commit53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 12:48:58 2021 +0100 Fix errors in favicon SVG. commit7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Mar 19 05:51:22 2021 +0000 Bump recipe-scrapers from 12.2.0 to 12.2.1 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1) Signed-off-by: dependabot[bot] <support@github.com> commit 731225ab8822a7706115d2705320180db76f0663 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 13:58:16 2021 -0500 updated links to import recipes commit 0129b9e3baa4362dcec2da95b86c7463c66b0896 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:54:41 2021 -0500 added collapsable cards commit 0be58da5787d8ec61ea324869b344cc2235cadf5 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:32:55 2021 -0500 cosmetic cleanup commit aa730cbf56ab95fda7755e31065cc74638a4b309 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:15:57 2021 -0500 added image import commit b52347751870da2002860b2dbb80abdb29eafd4b Author: smilerz <smilerz@gmail.com> Date: Mon Mar 22 15:13:01 2021 -0500 consolidated integration imports into url_import commit f9defbae0088216e45a8990105e6c20dc8cfdefe Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:49 2021 -0500 staged app import tabs commit d4fc776aa967faa68b8a7b4b1ebbae832bd1827a Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:16 2021 -0500 fixed missing space in keyword when adding recipe commit 6aff9d0390cb0ac0e406aba1a2dbe5e9d8075717 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:08:51 2021 -0500 removed unused templates commit a798447097270ed36037da5e463f7067216ddf6b Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 13:13:56 2021 -0500 combined json import and source import commit 53af0e1d80b6f05b0ce43d355efaafb1da974290 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 16:06:02 2021 -0500 more fix from super ugly merge commit d752d9d13415d1a0b1d154094138d507f4f43879 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:17:10 2021 -0500 more cleanup from ugly merge commit 6990d8f3d912c6b1d8979e55a0db0dce7609a4fc Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 11:24:23 2021 -0500 fixed ugly merge commit 6cbd5852d80a4f7177c41cdac5a1ff5be2c8994f Author: smilerz <smilerz@gmail.com> Date: Thu Mar 18 12:09:53 2021 -0500 added drag and drop to ingredients commit d99d36c994051f64c7c9d805fa8374f72537e479 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 15 15:56:44 2021 -0500 manually parse json commit 7eef1d7e933e535db271956aa9a8bc01c4ad16ed Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:33:07 2021 -0600 update urls.py commit e8793be4f715feab0503fc39b3bb38229b7cd9cb Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:32:47 2021 -0600 commit merge from Patralos/recipes commit 97f266f5ca1a8f0e7a7c21e1fdf5061fd8b0f6cb Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 15:34:47 2021 -0600 updated URL import page with tab interface commit 5f5a2fe6d838f02a77479ce3fc54eafb6bf08681 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 11:29:10 2021 -0600 import raw json/html commit 5518d25f2d380051659ba490db0d6223ad596846 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 7 14:28:29 2021 -0600 refactored json parser to create functions for each sub parser commit 1ed2a4fa28462698f8353d52e52a180f3a3a6322 Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 21:37:39 2021 +0100 Allow recipes to be imported from json directly commit 50e6fcdd8ce593608b0b409ea15edd2c18f20503 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 14:09:10 2021 -0500 corrected api import workflow commit 1dfd8ec2258e0b5b7bf4e743321e82815466d7a8 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 11:26:26 2021 -0500 restored missing manual url scrape commit 30e59ff7e33e6032f416843adfe93c599cdbc35b Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 09:02:27 2021 -0500 Fix after rebase commit 535642ce0a176f6132936e30cf64ba4a9ed2d369 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 18:39:44 2021 -0500 catch attibute error when scrape missing schema commit 69de2cb9e71cd02edfa316a13f21b32a058a9156 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:47:35 2021 -0500 convert servings to number on import commit 2e9d0733649336e5d441ec92d366994750203f8d Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 13:17:15 2021 -0500 custom scraper fails safe commit 069a0bde837993359c1eb845e0e1bc6d9d9a1923 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 12:48:26 2021 -0500 added name parser commit cd5d8f292911ff6440308769ebf2d55a0d9ee967 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:31:47 2021 -0500 updated tests to handle html decoding commit 3aaa5e073f8b634114a00352639b4f1266f473f2 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:55:07 2021 -0500 flake commit 8aa569896fec0c13cadd21b3d2b9721de7be4b84 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:53:45 2021 -0500 decode url strings in text_parser commit d6d8d495b22a70cdb5b10a7ae1fdc497d6a4c3b0 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:32:33 2021 -0500 catch error on scrape.image() commit 7c1bf4293431a20377fc5bcf871616142c2ae486 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:28:46 2021 -0500 trap error on scrape.title() commit 7b81c92d2b478d0103c43e604efc1967d330cf73 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:05:28 2021 -0500 updated tests commit feb62f93ce5d4f80bbed321f9ec295a3ad394495 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:42:31 2021 -0500 remove html tags from description commit e0995fcec6cb94b47434cbbbd3cef7a4fc4e061a Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commit 7c7e532a03d0ff39a9faea49f5208042d0534067 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commit c7f91b46c72e9a36367a13bcea7e37b6bbdfe3e0 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:20:03 2021 -0500 added missing bookmarklet commit dcc61d52b4c59512ea9e91f026f7517272fe258d Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:18:14 2021 -0500 Revert "bug fix url import" This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23. commit 8f9d5deb27a2708e47ffaa77e131dfed5dc72b83 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 13 16:44:05 2021 -0500 removed extra string normalization commit 7190c9d4a45fea25a3a879e118c86bfb35220fc6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 21:22:56 2021 -0500 updated migration commit 7d7a9aad6513355de21c438730b5ee407e5ef3e4 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:14:50 2021 -0500 updated recipe targets in tests to reflect html decoding commit c327236b37441fc5ec553e3618e29f0ef8c3d2a9 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 13:28:35 2021 -0500 fixes #527 commit aee6f3f4e56a80e4500e73fe716d6e592740b122 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 10:57:13 2021 -0500 bug fix url import commit 5811d1312af4570e34a093a725e691eb3a162edf Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 07:02:43 2021 -0500 url import bug fixes commit cae45dcb60ef9a149e07ed1e21375d931311ec3d Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:43:33 2021 -0500 bug fix tests commit 459c18a7443147ecb4342ee221f3efb442f13720 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:41:00 2021 -0500 bug fix url import commit a397d617493aafb37edea240591948871b99f3f3 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:26:29 2021 -0500 recipe import tests commit 13956f2e9d9ad54bbcb5359761e299bc3e61c787 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 12:32:11 2021 -0500 simplified url import commit d5fb40ff9d0bd4f8af79187b63682b8256c787fa Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 09:20:15 2021 -0500 add data for url_import test commit 056343bec1876aa848828fcf97758fd721977f9c Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:43:36 2021 -0500 added all ATK sites to custom scraper commit 1bb0f9458a3479dc6bb4d5eda7870ac492a40e49 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:23 2021 -0500 added cooksillustrated custom scraper commit 818aeb9d456e05b93c0e5aad4ec72551646a9835 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:01 2021 -0500 ensure time is always a number commit 34ace104c441061c6773647a4ff35566eaa11059 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 2 15:19:20 2021 -0500 added ability to create custom scrapers commit b65bbef395365c675bb799c029924a4ae5fdec23 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:21:28 2021 -0500 removed old json importer commit a64074da85dacecd9dc8d9e4fd8fda2e8244ad8b Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:19:18 2021 -0500 updated import from source to use text scraper commit 1c163bb97ccefa53481722cbb446690adf308aab Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:08:56 2021 -0500 remove old html_import function commit 1333ff67a2232f1482537572cda6d6c27830e87f Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:07:51 2021 -0500 wrapper for recipe_scrapers to parse text input commit cee34e001d28d0054c7f2d04664cb95573dd9a2f Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:17:46 2021 -0500 fixed broken tab commit 1100fda34dd46b1eed0b2f4e432543c62e75b8e4 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:11:54 2021 -0500 delete bookmarklet on import commit a345d6f53a82233f7f9ffa9347a9509a232a0fd8 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:53:06 2021 -0500 removed console message commit 682164b95d87f5c16faff134aee53601f9944fbb Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:51:14 2021 -0500 fixed ingredient display on preview commit ce14b39cfd30dac7c7a104093668672cef786d82 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 11:49:56 2021 -0500 redirect to import url for processing commit ad9a7a52d530a656178f47259016fcc449a22747 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 06:39:44 2021 -0500 added hack to fix scopes & CORS for bookmarklet commit cb83c1e3800d31381394a657457b313cc6d4df34 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 28 18:39:20 2021 -0500 added CORS middleware commit 04ae072fdb315c41b7dbff8ece6e7f0d45c9646e Author: smilerz <smilerz@gmail.com> Date: Fri Mar 26 14:47:24 2021 -0500 added bookmarklet model and api commit 90045028e18405f6953abe4d7dd5250c3e499159 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 17:48:32 2021 -0500 bookmarklet passing data to form commit 40d0f0c6cd4dbc7f9bb4bf6ab90b849d2f0a5567 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 14:02:57 2021 -0500 added bookmarklet that doesn't work yet commit 2acd7f906be1d239ef03709746b70c01a75815d0 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 14:14:56 2021 -0500 Squashed commit of the following: commit81a8734fac
Merge:abcef54
f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:41:13 2021 +0100 Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support Add iOS webclip icon support commitabcef54e72
Merge:e15c92c
7527646
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:30:43 2021 +0100 Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1 Bump recipe-scrapers from 12.2.0 to 12.2.1 commite15c92cda5
Merge:58fc269
45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:26:06 2021 +0100 Merge pull request #501 from smilerz/main_fork fix json direct import when wrapped in @graph commit45dba6fad2
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:23:55 2021 -0500 fix json direct import when wrapped in @graph commitf67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 15:49:12 2021 +0100 Add generated icons from icongenerator. commit53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 12:48:58 2021 +0100 Fix errors in favicon SVG. commit7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Mar 19 05:51:22 2021 +0000 Bump recipe-scrapers from 12.2.0 to 12.2.1 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1) Signed-off-by: dependabot[bot] <support@github.com> commit 8ecd0de77899e0c3cd515a348c9de176eb408036 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 13:58:16 2021 -0500 updated links to import recipes commit df751eafb15fce5f2debd3615e37bb85b4925ec2 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:54:41 2021 -0500 added collapsable cards commit a7d4daffff20ba81ddde6301d99330b8ae4fdbda Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:32:55 2021 -0500 cosmetic cleanup commit 309f0c0f4b09aecd0ea1cd419dcd5454853942af Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:15:57 2021 -0500 added image import commit f7f4834d2d07a7617765b5cb951172636cbb0f96 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 22 15:13:01 2021 -0500 consolidated integration imports into url_import commit 956a8b9540aa3f870bd7f19508c697cee3e82b61 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:49 2021 -0500 staged app import tabs commit d0816ae03cc08b2a065893413af60ab6339ad636 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:16 2021 -0500 fixed missing space in keyword when adding recipe commit 470225a087f8909e2e5355c9b94ff4b04e6b9d28 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:08:51 2021 -0500 removed unused templates commit fd6cf0520faac736e34ab06f55663df46bb0bc68 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 13:13:56 2021 -0500 combined json import and source import commit fdb3dab81579f24f54c7b96a94c4ecefa391feb9 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 16:06:02 2021 -0500 more fix from super ugly merge commit 1af239bbb7d8bd9a6e2638f344484f836433f97c Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:17:10 2021 -0500 more cleanup from ugly merge commit 2b3ae1cb291b2bdb69fe04b6eaa8dae1771ae2a3 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 11:24:23 2021 -0500 fixed ugly merge commit 8e687638130e143654670ef7d16f356c764907c7 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 18 12:09:53 2021 -0500 added drag and drop to ingredients commit 976f6cf451370c7c40b3c98fa097f621611a0a66 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 15 15:56:44 2021 -0500 manually parse json commit 70746f391afafa1d6ea7cfd0a92e21946e1dd415 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:33:07 2021 -0600 update urls.py commit c0b322a0af566ce8dc1d2a5861fb5a641df06170 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:32:47 2021 -0600 commit merge from Patralos/recipes commit 28faf4a5287e6f3d83742cbc8e187f27aef46d05 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 15:34:47 2021 -0600 updated URL import page with tab interface commit c09690a018366174202ead88a77cc6d2bc717ea5 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 11:29:10 2021 -0600 import raw json/html commit f0dde49ff98b7a7064e7bd53384717ac3eb9a1b9 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 7 14:28:29 2021 -0600 refactored json parser to create functions for each sub parser commit 06f14ad12576278d5abb3c25d6cd47bd40880faf Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 21:37:39 2021 +0100 Allow recipes to be imported from json directly commit 203f23135d2fc1855add272393da077e7ba3fe90 Author: smilerz <smilerz@gmail.com> Date: Thu May 20 10:16:17 2021 -0500 Fix after rebase commit e1c4da58548bec97ddcdce38d9e6eeffff00f89a Author: smilerz <smilerz@gmail.com> Date: Thu May 20 08:33:09 2021 -0500 Fix after rebase commit bba7ad9b66fb40d996c2272f00de45ac4c0e8efe Author: smilerz <smilerz@gmail.com> Date: Wed May 5 08:01:06 2021 -0500 Update README.md commit 5dcc92edd782ba832705c2c73872d7432f10e353 Author: smilerz <smilerz@gmail.com> Date: Tue May 4 10:33:47 2021 -0500 recompile commit fad7c60dfe1377dd4ee4231d1e5518c4b8d71eda Author: smilerz <smilerz@gmail.com> Date: Mon May 3 08:39:19 2021 -0500 minor bug fix commit a19b0a3325ba8a2dc0d7f56a958ac74ac84d6161 Author: smilerz <smilerz@gmail.com> Date: Sun May 2 19:57:30 2021 -0500 rebase commit 2fa3b3b91d212b35c98d59c1504984fe7d807671 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 30 16:22:34 2021 -0500 cleanup after rebase commit b834cfaf59208dec192cb2a223fbfa275c4e3e09 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 30 16:03:30 2021 -0500 Fix after rebase commit 6d23ef61c01d0e3dbccc036b8dc6686348972a36 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 22 11:26:44 2021 -0500 truncate query params on url commit 291c853d3473da2be44d94976624a6c2978d7d44 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 22 10:07:24 2021 -0500 bookmarklet includes url script_name commit 957c21692c6fd8d0c4825e11a0605f3fe86fe9f5 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 19:00:20 2021 -0500 add trigram to rank commit 89da501dc381a160c1314f3f2409549f15c9f554 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 18:46:35 2021 -0500 Squashed commit of the following: commit 1c5f74bd182eb502e27d03cc7f93e5e0db8c3362 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 20 12:24:05 2021 -0500 change markdown link from hard-coded to reverse commit 76c56e2a063ec45f97b4d898e106a2b378b95b96 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 14:16:17 2021 -0500 missing '/' commit 47a13811a3a6e47e5f6f1c3ccd515c1989bd4617 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:41:26 2021 -0500 yarn build commit 0d2c1fabe9f982179ec9d26cbb79bc0cebfef9c5 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:31:48 2021 -0500 Squashed commit of the following: commit e03f626fd08a3e048dbd968d623ee58b7f865929 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:04:39 2021 -0500 yarn build commit b511f929ffcc7a670bd7955269982e05c591783a Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 21:17:31 2021 -0500 update service worker with base path commit f13f02d481618583017c71fb654adaa86585ef0b Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:54:17 2021 -0500 WIP commit f2f927c16f52baa6b9a31cd9992e8c7c8739d666 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:40:59 2021 -0500 default value if localStorage fails commit 424e8a9b93d8aa9962a3b6f963fff5c6e23dfa56 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:30:38 2021 -0500 fixed missing '/' commit d49a206ddf5952036b295804f9e31e52a1b45af6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:13:04 2021 -0500 updated .env.template commit ac94ea7afac36f65e1658f3d29f4e2b8f0475ba6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 15:31:37 2021 -0500 WIP commit c9a687df1b21ac6584d0f958e65c5cfc040406ca Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 10:19:02 2021 -0500 WIP commit 7fe8c7fbe52c96f1ccd4128db256656e43af3fa0 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 08:10:08 2021 -0500 added nginx config commit b5540d85872d9d69bda3787db7ecccfce893236f Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 08:03:09 2021 -0500 allow subfolder config on NGINX commit92c65ec1e8
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 21:21:41 2021 +0200 fixed test meal plan commita376c3a5b6
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:55:48 2021 +0200 meal plan random fix commit058d705170
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:19:11 2021 +0200 meal plan in search commit4ad5d6ef2f
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 15:01:39 2021 +0200 fixed test + added api doc for new search commite676b4bac3
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 14:05:19 2021 +0200 added api pagination for recipes commit04488741c4
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:11:19 2021 +0200 adv search mobile styling commit99004ad34b
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:03:15 2021 +0200 new search and setting commitf78f7dfc14
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 02:55:50 2021 +0200 search ui improvements and filter commit880db58d38
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 21:28:29 2021 +0200 v2 search filtering commitd1d65d878c
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 14:11:10 2021 +0200 v2 search progress commit3194a7580d
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 12:57:02 2021 +0200 basics of v2 search working commit 95563d6424cb29f172ef54247e3862ba37f020f5 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 18:20:57 2021 -0500 removed trigram commit f46852c34739f821a4f435d0c9aef014dc647885 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 16:05:53 2021 -0500 add trigram search to v2 commit 6083a58e43a3cda45ce5c2830935703d10c2425d Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 15:27:50 2021 -0500 Squashed commit of the following: commit a5d1c400efccdd3ad47807c4a2f990b983243d06 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 15:19:37 2021 -0500 simplified code commit 15261536c8ebab7156c366dcd4e21c5330550fde Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 14:42:10 2021 -0500 updated search v2 with full text search commit 51f4af6487bfbccc66998160e0ba3e4318dc6621 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 13:23:09 2021 -0500 rebase commit 2df9fc9d33a2b558b82cc8e614f18d0ebc409b83 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 13:22:48 2021 -0500 filter.py commit f90f3186d95ae64c7f88bad5fccb003d7d3f44a6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 20:17:54 2021 -0500 added multi-language support to FTS commit 3cfe14bdae4a4d8995e9d7bf3daacbe05544b0a7 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 19:42:22 2021 -0500 rebuild recipe index from admin site commit ef17ce2d57e869ddb84e4af8a37c2081cbf41e65 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 19:07:50 2021 -0500 command line to rebuild index commit 306c662f0b8dc39dee3cc6011d5d9f4c1ac2f325 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 17:01:18 2021 -0500 updated to handle sqlite commit 8c049697a55fd328a1e93607991c9160db80b6cc Author: smilerz <smilerz@gmail.com> Date: Fri Apr 9 12:47:17 2021 -0500 fixed smalltable commit c6f8d199efeb5d8b0f5b63a0113afbd856398857 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 9 12:46:07 2021 -0500 working proof of concept commit92c65ec1e8
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 21:21:41 2021 +0200 fixed test meal plan commita376c3a5b6
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:55:48 2021 +0200 meal plan random fix commit058d705170
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:19:11 2021 +0200 meal plan in search commit4ad5d6ef2f
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 15:01:39 2021 +0200 fixed test + added api doc for new search commite676b4bac3
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 14:05:19 2021 +0200 added api pagination for recipes commit04488741c4
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:11:19 2021 +0200 adv search mobile styling commit99004ad34b
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:03:15 2021 +0200 new search and setting commitf78f7dfc14
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 02:55:50 2021 +0200 search ui improvements and filter commit880db58d38
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 21:28:29 2021 +0200 v2 search filtering commitd1d65d878c
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 14:11:10 2021 +0200 v2 search progress commit3194a7580d
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 12:57:02 2021 +0200 basics of v2 search working commit 0cf4b0d7fabfcb0af8e21828f26f5f9ba0109036 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 20 12:21:58 2021 -0500 changed hardlink markdown link to reverse commit e34c5100299ee1e6c16d96295299d6b49e735f98 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 20 09:15:57 2021 -0500 changed keyword to get_or_create commit 6475953a683014cc654b71ae4c22b4a6b37567b2 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 20 08:08:13 2021 -0500 strip food and keywords on url import commit 0122bc864d252a483b7e356be6c5ebd39b2933ca Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 15:31:49 2021 -0500 fix bookmarklet loading commit 7b8e3b931ac8671db2139e95d1f6e79fb088bb23 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 14:36:52 2021 -0500 WIP commit 0d2acc6fc19260f3b023d2fb2ac875b9ad957544 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 14:15:17 2021 -0500 missing / commit f6943d677ae98640653e13505e45d7ec41009234 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:44:54 2021 -0500 Squashed commit of the following: commit 47a13811a3a6e47e5f6f1c3ccd515c1989bd4617 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:41:26 2021 -0500 yarn build commit 0d2c1fabe9f982179ec9d26cbb79bc0cebfef9c5 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:31:48 2021 -0500 Squashed commit of the following: commit e03f626fd08a3e048dbd968d623ee58b7f865929 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:04:39 2021 -0500 yarn build commit b511f929ffcc7a670bd7955269982e05c591783a Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 21:17:31 2021 -0500 update service worker with base path commit f13f02d481618583017c71fb654adaa86585ef0b Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:54:17 2021 -0500 WIP commit f2f927c16f52baa6b9a31cd9992e8c7c8739d666 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:40:59 2021 -0500 default value if localStorage fails commit 424e8a9b93d8aa9962a3b6f963fff5c6e23dfa56 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:30:38 2021 -0500 fixed missing '/' commit d49a206ddf5952036b295804f9e31e52a1b45af6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:13:04 2021 -0500 updated .env.template commit ac94ea7afac36f65e1658f3d29f4e2b8f0475ba6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 15:31:37 2021 -0500 WIP commit c9a687df1b21ac6584d0f958e65c5cfc040406ca Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 10:19:02 2021 -0500 WIP commit 7fe8c7fbe52c96f1ccd4128db256656e43af3fa0 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 08:10:08 2021 -0500 added nginx config commit b5540d85872d9d69bda3787db7ecccfce893236f Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 08:03:09 2021 -0500 allow subfolder config on NGINX commit92c65ec1e8
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 21:21:41 2021 +0200 fixed test meal plan commita376c3a5b6
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:55:48 2021 +0200 meal plan random fix commit058d705170
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:19:11 2021 +0200 meal plan in search commit4ad5d6ef2f
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 15:01:39 2021 +0200 fixed test + added api doc for new search commite676b4bac3
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 14:05:19 2021 +0200 added api pagination for recipes commit04488741c4
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:11:19 2021 +0200 adv search mobile styling commit99004ad34b
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:03:15 2021 +0200 new search and setting commitf78f7dfc14
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 02:55:50 2021 +0200 search ui improvements and filter commit880db58d38
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 21:28:29 2021 +0200 v2 search filtering commitd1d65d878c
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 14:11:10 2021 +0200 v2 search progress commit3194a7580d
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 12:57:02 2021 +0200 basics of v2 search working commit db2eb599f2f81ed8169d108d817c43166b5448b5 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:05:43 2021 -0500 yarn build commit cf84f954caa7f21ff5783df49bc040100903a98c Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 12:58:44 2021 -0500 updated base_path in api-generator commit d88568bcf615af4a2099cdf2bbd4b82f73c60724 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 21:18:08 2021 -0500 updated service worker with base path commit 184f36eb37da19bd3cda58bc3653916b9b2cf74d Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:53:30 2021 -0500 WIP commit 606997c598c2fcc02bf98cd8b8164a1de47fd150 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:39:33 2021 -0500 added default window location in case local storage failed commit 5f7bf2376b6910e84abace66384f5307cc906d4a Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:33:19 2021 -0500 added trailing '/' commit f28845753eca3f829607bd0162a0fec9d54c4354 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:06:18 2021 -0500 dynamically set api-generator path commit 2f02fb660d179e60780c09216646d1a91ad69461 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 16:27:24 2021 -0500 WIP commit 9f1e3534fdba1f88c75204996e0a2ffc58af2bad Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 15:50:41 2021 -0500 WIP commit d9b79bcdce32312a4a34b9306507c10fb9cb3f4d Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 15:43:07 2021 -0500 Squashed commit of the following: commit ac94ea7afac36f65e1658f3d29f4e2b8f0475ba6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 15:31:37 2021 -0500 WIP commit c9a687df1b21ac6584d0f958e65c5cfc040406ca Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 10:19:02 2021 -0500 WIP commit 7fe8c7fbe52c96f1ccd4128db256656e43af3fa0 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 08:10:08 2021 -0500 added nginx config commit b5540d85872d9d69bda3787db7ecccfce893236f Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 08:03:09 2021 -0500 allow subfolder config on NGINX commit92c65ec1e8
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 21:21:41 2021 +0200 fixed test meal plan commita376c3a5b6
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:55:48 2021 +0200 meal plan random fix commit058d705170
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:19:11 2021 +0200 meal plan in search commit4ad5d6ef2f
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 15:01:39 2021 +0200 fixed test + added api doc for new search commite676b4bac3
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 14:05:19 2021 +0200 added api pagination for recipes commit04488741c4
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:11:19 2021 +0200 adv search mobile styling commit99004ad34b
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:03:15 2021 +0200 new search and setting commitf78f7dfc14
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 02:55:50 2021 +0200 search ui improvements and filter commit880db58d38
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 21:28:29 2021 +0200 v2 search filtering commitd1d65d878c
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 14:11:10 2021 +0200 v2 search progress commit3194a7580d
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 12:57:02 2021 +0200 basics of v2 search working commit d448f5ac3f6211dc7d8f14a68082198a7e4e7d4a Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 10:28:55 2021 -0500 wip commit ec5c67b766e08bf5b65c938189a3e2f34e4e3fe1 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 10:28:26 2021 -0500 settings for nginx subfolder commit eab4ead9196c8e262bc41920b59e539666d6ba8f Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 07:57:28 2021 -0500 WIP commit 11c9658f356b578ebabab8799e7a5ab8e7a86862 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 22:29:21 2021 -0500 allow app to be served at proxy subfolder commit 532d780e6f6711a632eef9b21558cd15aac95c19 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 20:16:28 2021 -0500 Squashed commit of the following: commit f03456411939b9f09704c057e20a970f9545dc0b Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 18:28:45 2021 -0500 no_perm commit 0262d1630dfcae204848a9fa6c41dc36958414d6 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:29:11 2021 -0500 removed unnecessary console message commit 069a02e67a99805ea04b3f2248d48584e146eadd Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:25:23 2021 -0500 removed commented out settings commit 1be713ff9db5e94fc68cfa25f4b8a219edff39b2 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:24:27 2021 -0500 removed unused cors_headers commit 5c9e1f015a6ff667968e6421341061af09d1b34a Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:22:15 2021 -0500 removed line breaks commit 0e92b029d46bbaaf2a5bf2526165d3a4075581f1 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:21:21 2021 -0500 removed console.log() commit e435325e66a1dc25fb9d24391eec5ed76503d969 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 11:17:00 2021 -0500 Fix after rebase commit c6e1add18be6e9791c7142a78129a879020c6f17 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 07:44:53 2021 -0500 updated model commit c52cd0b177da20cbed9a9d606ee4ec54ab865f38 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:46:38 2021 -0500 convert servings to number on import commit a3cf59c7a47dc39bec74b772f789e1c052884550 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:15:59 2021 -0500 update tests to handle url decoding commit 7ff1783578c90e2c6ae931b345d580279daeedf0 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:57:10 2021 -0500 bring parser inline with json_import branch commit 204f3ddf845a91c50d54d8dbd2f1d754d3076d25 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 08:50:00 2021 -0500 unescape html document commit 28291f96afdb70c8259104997000fe9544e0d134 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 11:29:35 2021 -0500 updated bookmarklet to work with updated import process commit e7c7823916febeb0adbe7e548633b737125ad3b7 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:52 2021 -0500 Squashed commit of the following: commit 707d862e01a7497a1f22879d314b865a35e0e85b Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:00 2021 -0500 works now commit 3942a445ed4f2ccec57de25eacd86ea4e4dd6bdb Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:25:24 2021 -0500 updated serializer and api commit 10dc746eb175c7f805a8a8ffa7ce49977a7ce97e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:20:19 2021 -0500 fixed bookmarklet commit 9779104902d3be0258c95cd2eeebcba0d5d48892 Merge: bb8262c 0cb3928 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:56:27 2021 -0500 Merge branch 'bookmarklet' into json_import commit 0cb39284bb835ffc6cfee3e4306aadc4a64a25be Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commit e89e0218de684d40b2e2bfb6ba833891206c828e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commit bb8262ccabb93c56fbc18c407d5a0653b8b3ca79 Merge: b1e73aa35a7f62
Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 20:35:57 2021 -0500 Merge branch 'main_fork' into json_import commit e01efbbf764bbe6b0e1cefac6c0311dd18a0d503 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:20:03 2021 -0500 added missing bookmarklet commit 3e5f3a36a48cdca0087a551a9a6b4d942d81bf19 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:18:14 2021 -0500 Revert "bug fix url import" This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23. commit 22135c7d40a399fafef994372e7ba128fc37c596 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 13 16:44:05 2021 -0500 removed extra string normalization commit 7ab59c55ac75f50997156f8808c18d12ef7ac8f3 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 21:22:56 2021 -0500 updated migration commit 0f6f8c9eeb642a2824c6952a69c2a2a12e628d24 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:14:50 2021 -0500 updated recipe targets in tests to reflect html decoding commit c56add95a4627f5ed874bbce3cb7b0f4d8adbb9f Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 13:28:35 2021 -0500 fixes #527 commit 09993a71515b9b977f074e14e11cf9e4b5c72b96 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 10:57:13 2021 -0500 bug fix url import commit 625d23d994b84be082f20ef1f6527d1d742a7157 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 07:02:43 2021 -0500 url import bug fixes commit df4b2adf7dcd8099871167ed8bab779e976002a4 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:43:33 2021 -0500 bug fix tests commit 0a61c9f9def1da5841031e39ced99a08a2536958 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:41:00 2021 -0500 bug fix url import commit afbf1153bfcc29baa80a07019f337a9c02b66a63 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:26:29 2021 -0500 recipe import tests commit 5857ed171e3b667764f2882d3ee7b73c15bdab8b Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 12:32:11 2021 -0500 simplified url import commit 33cc780cfd8001a0293951f25fd19b3db8ce0461 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 09:20:15 2021 -0500 add data for url_import test commit 322552a1f1434e7ca52f75886e752f31ea5915f3 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:43:36 2021 -0500 added all ATK sites to custom scraper commit 6455e597fbc2a394f217fe8c11d2bc89e8add1a4 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:23 2021 -0500 added cooksillustrated custom scraper commit 1c6ad94a2d8bf466e35c56a1cd82dff9039371c6 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:01 2021 -0500 ensure time is always a number commit fbbc057a8a2964eb6a4ac7d2324adacc679db2d6 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 2 15:19:20 2021 -0500 added ability to create custom scrapers commit fd293f150e959f67b3e8260061f8a72898e0990c Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:21:28 2021 -0500 removed old json importer commit 86b330583a6f5946b5743df8b447dccc1db3ade0 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:19:18 2021 -0500 updated import from source to use text scraper commit c4be53661293bc54c9069c2604d8fe1a61dceddf Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:08:56 2021 -0500 remove old html_import function commit 6a6314e09be06d17cc11bf55e95992f0a10b54ed Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:07:51 2021 -0500 wrapper for recipe_scrapers to parse text input commit 64524c01c8da795269bd2dbdfb5e6a02d47e8904 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:17:46 2021 -0500 fixed broken tab commit 4701d62739550754960e6d1eac437f0d2cea004f Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:11:54 2021 -0500 delete bookmarklet on import commit 4233980dd9df8e0e961363d464b41c61ad1c6288 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:53:06 2021 -0500 removed console message commit 16e34fe3b134bf31bc84c6f7584662a171fa9748 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:51:14 2021 -0500 fixed ingredient display on preview commit c51d715cfee7a787dcd7b1c3dd0beb24a14962d3 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 11:49:56 2021 -0500 redirect to import url for processing commit 29c199320502711a3197eade37f6021064c7dcb0 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 06:39:44 2021 -0500 added hack to fix scopes & CORS for bookmarklet commit 958faf9972d26ad9f78eaaa1126af51d7a3b333b Author: smilerz <smilerz@gmail.com> Date: Sun Mar 28 18:39:20 2021 -0500 added CORS middleware commit c284f830dc7e7339cd2f54185f2ff8ea6866ef19 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 26 14:47:24 2021 -0500 added bookmarklet model and api commit cbfc5fa973c002bc1ce75d3d2671986007b6a3a7 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 17:48:32 2021 -0500 bookmarklet passing data to form commit d9815e445828293bb2965c7c98ab6acf3afe3833 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 14:02:57 2021 -0500 added bookmarklet that doesn't work yet commit 0e327f3bf865a99e95368bf4b74ee9545d9a2b1a Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 14:14:56 2021 -0500 Squashed commit of the following: commit81a8734fac
Merge:abcef54
f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:41:13 2021 +0100 Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support Add iOS webclip icon support commitabcef54e72
Merge:e15c92c
7527646
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:30:43 2021 +0100 Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1 Bump recipe-scrapers from 12.2.0 to 12.2.1 commite15c92cda5
Merge:58fc269
45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:26:06 2021 +0100 Merge pull request #501 from smilerz/main_fork fix json direct import when wrapped in @graph commit45dba6fad2
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:23:55 2021 -0500 fix json direct import when wrapped in @graph commitf67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 15:49:12 2021 +0100 Add generated icons from icongenerator. commit53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 12:48:58 2021 +0100 Fix errors in favicon SVG. commit7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Mar 19 05:51:22 2021 +0000 Bump recipe-scrapers from 12.2.0 to 12.2.1 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1) Signed-off-by: dependabot[bot] <support@github.com> commit 18c5bf8a3eb7dd22504bbd2e40acab9269cc6804 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 13:58:16 2021 -0500 updated links to import recipes commit 9f643b0b85cc89a36a86681e20c68c177959e1a1 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:54:41 2021 -0500 added collapsable cards commit b37594eb84988043afa450de871a036f72a811ee Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:32:55 2021 -0500 cosmetic cleanup commit e5f76034dfc174d3ce307de1c0c5683a159733a9 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:15:57 2021 -0500 added image import commit 792cfb0791c2e682589995ccd1b85eca0a04061c Author: smilerz <smilerz@gmail.com> Date: Mon Mar 22 15:13:01 2021 -0500 consolidated integration imports into url_import commit aa6c9430bce1a63e46ff0325f13e4f4d7369cc00 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:49 2021 -0500 staged app import tabs commit 3dd92d811c140d925b153f30db29e11e4c8a18cc Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:16 2021 -0500 fixed missing space in keyword when adding recipe commit d79283ccabdd014c62dc820f382830421908cf0a Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:08:51 2021 -0500 removed unused templates commit 3f95eb2f3db42628994f1ea80fd5010fa1b247ba Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 13:13:56 2021 -0500 combined json import and source import commit 5016314ab57102454a95e48f0ba50b6031cc5400 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 16:06:02 2021 -0500 more fix from super ugly merge commit 27a489c45a5b169818e36c79591757f99f64c637 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:17:10 2021 -0500 more cleanup from ugly merge commit f7517d51dd9aad61b1e80ec20947c4f597834691 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 11:24:23 2021 -0500 fixed ugly merge commit 7095b6ef89fe350d591f1103c4c1a2d27c60d28f Author: smilerz <smilerz@gmail.com> Date: Thu Mar 18 12:09:53 2021 -0500 added drag and drop to ingredients commit bdadc7168f37eede0f91a2bfa060200273e440a9 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 15 15:56:44 2021 -0500 manually parse json commit 4bcd7e462db760d00483a90883028e5404f33299 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:33:07 2021 -0600 update urls.py commit 794d2798bfe56a27af5e8786e5f3b9701be7fe81 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:32:47 2021 -0600 commit merge from Patralos/recipes commit e97bc6ea89d8c366104d08ce561dd3d3c17c1578 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 15:34:47 2021 -0600 updated URL import page with tab interface commit 7732bc44b83c23901873bce1075b7ac2e68cee07 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 11:29:10 2021 -0600 import raw json/html commit 368d2211efa86e1146e95e3ddd1192b81f0422c2 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 7 14:28:29 2021 -0600 refactored json parser to create functions for each sub parser commit 3ddff8b468e0c85d1a4ff61b565b78c5be0f77ea Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 22:27:32 2021 +0100 replace common fractions with their concrete value (else parsing is not possible) commit 083048e125f63463edca6f4855f6a8e974f61a21 Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 21:37:39 2021 +0100 Allow recipes to be imported from json directly commit ebba3d4ec18697d14b7d1de3cf1eef88e55c7683 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 20:15:41 2021 -0500 Squashed commit of the following: commit7930c2417c
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 17:12:43 2021 -0500 update ATK scrape to handle empty headnote commit2f27413c0a
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 14:12:24 2021 -0500 parse multiple ingredientGroups previous version assumed only a single item in a list - this loops through each item commit5869a8ad1b
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 13:43:34 2021 -0500 fixes to pass tests commit0640a265fc
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 13:42:56 2021 -0500 added test for spruce eats commitd449fc8fd8
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 12:49:42 2021 -0500 updated normalization to skip removing line breaks commitb9ee77709b
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 12:49:06 2021 -0500 updated ATK scraper to include header notes in instructions commit dfa777e23bdbb3aeb2f2d376a4c096f4e16177b4 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 15:57:20 2021 -0500 updated message commit 8e452455a48c2b2dd86cc4077b87fabb9e51986b Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 14:17:16 2021 -0500 fixed ATK scraper commit 494d469a6bef55a50e627be3360834e857bb2916 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 13:44:29 2021 -0500 Squashed commit of the following: commit5869a8ad1b
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 13:43:34 2021 -0500 fixes to pass tests commit0640a265fc
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 13:42:56 2021 -0500 added test for spruce eats commitd449fc8fd8
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 12:49:42 2021 -0500 updated normalization to skip removing line breaks commitb9ee77709b
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 12:49:06 2021 -0500 updated ATK scraper to include header notes in instructions commit bab00343380661e4d5fbe616ba23de0c07ebeb90 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 11:58:40 2021 -0500 added upcoming features commit 9747754720dab757e6156c121b867df5ecf1a66d Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 17:45:42 2021 -0500 Squashed commit of the following: commitba061df1b6
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 17:30:59 2021 -0500 catch attribute error on cooktime commit7cc515bcdf
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 17:08:25 2021 -0500 fix manual url import commit724748d38a
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 14:09:10 2021 -0500 corrected api import workflow commitb2c1c6e301
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 11:26:26 2021 -0500 restored missing manual url scrape commit987be4b04d
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 09:02:27 2021 -0500 Fix after rebase commitca84da68c4
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 18:39:44 2021 -0500 catch attibute error when scrape missing schema commitd75e39fbcd
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 16:27:18 2021 -0500 set persistent connections to db commiteb2593aacd
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 16:08:04 2021 -0500 handle text in cook times during import commit496e04cfc8
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:47:35 2021 -0500 convert servings to number on import commitd814d13d54
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 13:17:15 2021 -0500 custom scraper fails safe commitd0cedaf7a1
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 12:48:26 2021 -0500 added name parser commit01f504f7b1
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:31:47 2021 -0500 updated tests to handle html decoding commitc716346f1f
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:55:07 2021 -0500 flake commitfef5236931
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:53:45 2021 -0500 decode url strings in text_parser commitb115c37eb8
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:32:33 2021 -0500 catch error on scrape.image() commit1e17f3703a
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:28:46 2021 -0500 trap error on scrape.title() commit468b986314
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:05:28 2021 -0500 updated tests commita531d135b5
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:42:31 2021 -0500 remove html tags from description commit7524609cd0
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commita28f8e65d5
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commitd193637091
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:20:03 2021 -0500 added missing bookmarklet commit0953af05fc
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:18:14 2021 -0500 Revert "bug fix url import" This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23. commit19e8e5cb5b
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 13 16:44:05 2021 -0500 removed extra string normalization commit43c808380d
Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 21:22:56 2021 -0500 updated migration commit7ab8b84044
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:14:50 2021 -0500 updated recipe targets in tests to reflect html decoding commitd739fe6752
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 13:28:35 2021 -0500 fixes #527 commita84c41e29f
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 10:57:13 2021 -0500 bug fix url import commit393aba1f31
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 07:02:43 2021 -0500 url import bug fixes commit436a070730
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:43:33 2021 -0500 bug fix tests commit2fe6788ce5
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:41:00 2021 -0500 bug fix url import commit747d146389
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:26:29 2021 -0500 recipe import tests commitefe4c4043d
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 12:32:11 2021 -0500 simplified url import commitc6739ba8e0
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 09:20:15 2021 -0500 add data for url_import test commit50140db668
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:43:36 2021 -0500 added all ATK sites to custom scraper commit028b2dfb22
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:23 2021 -0500 added cooksillustrated custom scraper commitec6a10ca0a
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:01 2021 -0500 ensure time is always a number commit3cf949bf8d
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 2 15:19:20 2021 -0500 added ability to create custom scrapers commit0a62225797
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:21:28 2021 -0500 removed old json importer commita54f4e1367
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:19:18 2021 -0500 updated import from source to use text scraper commitbf3c30a8fb
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:08:56 2021 -0500 remove old html_import function commitf811f5996e
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:07:51 2021 -0500 wrapper for recipe_scrapers to parse text input commita3490240f4
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:17:46 2021 -0500 fixed broken tab commitb26aea96f4
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:11:54 2021 -0500 delete bookmarklet on import commit4d4af5fdf2
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:53:06 2021 -0500 removed console message commit3da74505d6
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:51:14 2021 -0500 fixed ingredient display on preview commitc8a4861df8
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 11:49:56 2021 -0500 redirect to import url for processing commit5e27cd606e
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 06:39:44 2021 -0500 added hack to fix scopes & CORS for bookmarklet commita341fd8ebe
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 28 18:39:20 2021 -0500 added CORS middleware commit9a62b6e4e7
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 26 14:47:24 2021 -0500 added bookmarklet model and api commitf80c44bca3
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 17:48:32 2021 -0500 bookmarklet passing data to form commit09d2e9f831
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 14:02:57 2021 -0500 added bookmarklet that doesn't work yet commit4d5a9e446f
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 14:14:56 2021 -0500 Squashed commit of the following: commit81a8734fac
Merge:abcef54
f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:41:13 2021 +0100 Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support Add iOS webclip icon support commitabcef54e72
Merge:e15c92c
7527646
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:30:43 2021 +0100 Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1 Bump recipe-scrapers from 12.2.0 to 12.2.1 commite15c92cda5
Merge:58fc269
45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:26:06 2021 +0100 Merge pull request #501 from smilerz/main_fork fix json direct import when wrapped in @graph commit45dba6fad2
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:23:55 2021 -0500 fix json direct import when wrapped in @graph commitf67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 15:49:12 2021 +0100 Add generated icons from icongenerator. commit53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 12:48:58 2021 +0100 Fix errors in favicon SVG. commit7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Mar 19 05:51:22 2021 +0000 Bump recipe-scrapers from 12.2.0 to 12.2.1 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1) Signed-off-by: dependabot[bot] <support@github.com> commit6a2c27749f
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 13:58:16 2021 -0500 updated links to import recipes commitde60e12073
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:54:41 2021 -0500 added collapsable cards commit1188ed9227
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:32:55 2021 -0500 cosmetic cleanup commitcb708e7e47
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:15:57 2021 -0500 added image import commit215eadb4a0
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 22 15:13:01 2021 -0500 consolidated integration imports into url_import commit4ffc54f720
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:49 2021 -0500 staged app import tabs commit21f6c7a21f
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:16 2021 -0500 fixed missing space in keyword when adding recipe commitce7c6939d2
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:08:51 2021 -0500 removed unused templates commit40a2f7ff90
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 13:13:56 2021 -0500 combined json import and source import commit4015517c0a
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 16:06:02 2021 -0500 more fix from super ugly merge commit7c8d41753c
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:17:10 2021 -0500 more cleanup from ugly merge commit90670613c5
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 11:24:23 2021 -0500 fixed ugly merge commit647c1678f1
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 18 12:09:53 2021 -0500 added drag and drop to ingredients commit44dee16e0a
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 15 15:56:44 2021 -0500 manually parse json commitf8fedcac82
Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:33:07 2021 -0600 update urls.py commit3a48d0e580
Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:32:47 2021 -0600 commit merge from Patralos/recipes commit9930789aa8
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 15:34:47 2021 -0600 updated URL import page with tab interface commit83fce6461a
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 11:29:10 2021 -0600 import raw json/html commitf0d37244b6
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 7 14:28:29 2021 -0600 refactored json parser to create functions for each sub parser commit386834f409
Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 21:37:39 2021 +0100 Allow recipes to be imported from json directly commit 5a66a1de24118e832e15d5bedb7d9b484db79ec9 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 17:30:59 2021 -0500 catch attribute error on cooktime commit 69bbdc90e5076420e74341b7358b1a73dfa63c58 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 17:08:25 2021 -0500 fix manual url import commit 731d80b31f84f5bfd0603606572649026bd04311 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:33:51 2021 -0500 Squashed commit of the following: commit 8e2a15aff203cacd8956c947eecf3967f5b66015 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:29:11 2021 -0500 removed unnecessary console message commit 436d5b3165340772a859899578f7386edfcd587f Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:25:23 2021 -0500 removed commented out settings commit ba6b58b198d2e9260544d64e107afee9420ae340 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:24:27 2021 -0500 removed unused cors_headers commit c7690c391f341d8d92500276f243e99f8700528e Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:22:15 2021 -0500 removed line breaks commit 3259f86ff8b911fa8489922eee43c4465ea81d61 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:21:21 2021 -0500 removed console.log() commit 24552a2d9b644c86dee900322989fb3306ca1b4e Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 14:58:48 2021 -0500 fix after rebase commit bdf8ce1c3357609013c84d2661371ede815cd700 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 11:17:00 2021 -0500 Fix after rebase commit 58cd295e7ae8caa9be588508eb1795fd4a00e810 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 07:44:53 2021 -0500 updated model commit ec786ef8a19f9459cd4c890c60330bcadafb0247 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:46:38 2021 -0500 convert servings to number on import commit 90cc1711b185290778e973821b17a7574c6d3428 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:15:59 2021 -0500 update tests to handle url decoding commit 466eae617cace3b662fe480427018b0ac7a7ab1d Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:57:10 2021 -0500 bring parser inline with json_import branch commit 2668406d4625f747305482ede28e256c94aefcf9 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 08:50:00 2021 -0500 unescape html document commit f765347aec15b7765eaec830dd8dfda1f17b7597 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 11:29:35 2021 -0500 updated bookmarklet to work with updated import process commit 60d95ebf3d4e1c8af7f3b6832adfb28ce13a51aa Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:52 2021 -0500 Squashed commit of the following: commit 707d862e01a7497a1f22879d314b865a35e0e85b Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:00 2021 -0500 works now commit 3942a445ed4f2ccec57de25eacd86ea4e4dd6bdb Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:25:24 2021 -0500 updated serializer and api commit 10dc746eb175c7f805a8a8ffa7ce49977a7ce97e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:20:19 2021 -0500 fixed bookmarklet commit 9779104902d3be0258c95cd2eeebcba0d5d48892 Merge: bb8262c 0cb3928 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:56:27 2021 -0500 Merge branch 'bookmarklet' into json_import commit 0cb39284bb835ffc6cfee3e4306aadc4a64a25be Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commit e89e0218de684d40b2e2bfb6ba833891206c828e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commit bb8262ccabb93c56fbc18c407d5a0653b8b3ca79 Merge: b1e73aa35a7f62
Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 20:35:57 2021 -0500 Merge branch 'main_fork' into json_import commit f50d33a9b2658f6bf27797f645fbd842528a716c Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:20:03 2021 -0500 added missing bookmarklet commit cd482ae8451d3b920d7bb7a2b76044645f6a2e0b Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:18:14 2021 -0500 Revert "bug fix url import" This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23. commit 7032c7cc990af5790073348c3039d907d3469a7e Author: smilerz <smilerz@gmail.com> Date: Tue Apr 13 16:44:05 2021 -0500 removed extra string normalization commit 04b4aeecb9b13ae0023636f65dec8fc0ca1b8e0f Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 21:22:56 2021 -0500 updated migration commit 8b4059d0beed9ae8da9a6943ed550b0a82e12e03 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:14:50 2021 -0500 updated recipe targets in tests to reflect html decoding commit 7388f30ef333315736a8614c2009db37404f4916 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 13:28:35 2021 -0500 fixes #527 commit 6d811738535a81cab737b10f006f50c32cc32f13 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 10:57:13 2021 -0500 bug fix url import commit cbe400cdaccb0fcbebeafea199cf14be3deeb150 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 07:02:43 2021 -0500 url import bug fixes commit f4e33a830b826d1930639f552a2e32882c14d2ba Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:43:33 2021 -0500 bug fix tests commit 1d1cbbe965a5255bd9cabb138a2f1432956a4c6e Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:41:00 2021 -0500 bug fix url import commit 31cf4da8f3dcface57399976679379d11ca6d81e Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:26:29 2021 -0500 recipe import tests commit 1d1b5b545ab35626636ec4d9e1ce020fe508e520 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 12:32:11 2021 -0500 simplified url import commit 25140fa64e9306421956b90e40f53c00429e7c5e Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 09:20:15 2021 -0500 add data for url_import test commit 14d97f671ad356c8212ffc7fdd5b15fce8b5a7c1 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:43:36 2021 -0500 added all ATK sites to custom scraper commit 10975665626ae958f45e4c76b5125978e4776c41 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:23 2021 -0500 added cooksillustrated custom scraper commit 9ea33ec10bc32aa6ffed0c8cd6d5a4b4e123eff1 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:01 2021 -0500 ensure time is always a number commit ceb85137dd25a2cc6192165af9ac9b515cd5cfee Author: smilerz <smilerz@gmail.com> Date: Fri Apr 2 15:19:20 2021 -0500 added ability to create custom scrapers commit cc53a8debe36e65f9f487ac8c31cf3235bad5370 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:21:28 2021 -0500 removed old json importer commit d2233df427cc577fd6ea87458d821ac37c4def48 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:19:18 2021 -0500 updated import from source to use text scraper commit 9a0fcf9d2b6d35f01c16aa1c1a1074bb42577a3e Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:08:56 2021 -0500 remove old html_import function commit 2bc5fbbdcc5d395b7ed7aa1879449e16da0ee2d1 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:07:51 2021 -0500 wrapper for recipe_scrapers to parse text input commit 4a3c1a94a97ec18109ba43a5bbe90a6aa8e622c4 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:17:46 2021 -0500 fixed broken tab commit 6b92f8c325dd4a3c43fec0efe9b20181eaea0951 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:11:54 2021 -0500 delete bookmarklet on import commit dcd12899fd361868d4542e882d413292ef37a92b Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:53:06 2021 -0500 removed console message commit 3e58d79a9279e63af66356d14c7204121f6055dd Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:51:14 2021 -0500 fixed ingredient display on preview commit 1eb6ba707c41f52711ed2d68e3758ce9c70465ec Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 11:49:56 2021 -0500 redirect to import url for processing commit 95b50edc0f33afc1557b6a766e610a6c74b2e8a0 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 06:39:44 2021 -0500 added hack to fix scopes & CORS for bookmarklet commit bdc85694309fb79b9c214f0330848be82c372156 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 28 18:39:20 2021 -0500 added CORS middleware commit c1f5ec44c3f45dd403cc600ed5e38b814fedd138 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 26 14:47:24 2021 -0500 added bookmarklet model and api commit cc9a6fe14adbca88dc8753a7271ed4d47e638822 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 17:48:32 2021 -0500 bookmarklet passing data to form commit 3bf58f633610caa266e210fcdbecdedd0edf2465 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 14:02:57 2021 -0500 added bookmarklet that doesn't work yet commit 9a11ebc7746f2acdd156a574703ea05a0aba0a9b Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 14:14:56 2021 -0500 Squashed commit of the following: commit81a8734fac
Merge:abcef54
f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:41:13 2021 +0100 Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support Add iOS webclip icon support commitabcef54e72
Merge:e15c92c
7527646
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:30:43 2021 +0100 Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1 Bump recipe-scrapers from 12.2.0 to 12.2.1 commite15c92cda5
Merge:58fc269
45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:26:06 2021 +0100 Merge pull request #501 from smilerz/main_fork fix json direct import when wrapped in @graph commit45dba6fad2
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:23:55 2021 -0500 fix json direct import when wrapped in @graph commitf67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 15:49:12 2021 +0100 Add generated icons from icongenerator. commit53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 12:48:58 2021 +0100 Fix errors in favicon SVG. commit7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Mar 19 05:51:22 2021 +0000 Bump recipe-scrapers from 12.2.0 to 12.2.1 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1) Signed-off-by: dependabot[bot] <support@github.com> commit 9307226d777d5648d1cacc0107241dfaec3a4405 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 13:58:16 2021 -0500 updated links to import recipes commit bec00d05898c074b893df7338248b7803f8272c1 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:54:41 2021 -0500 added collapsable cards commit 2d647a2f6aa1afacb6651a6294bba571fafc3190 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:32:55 2021 -0500 cosmetic cleanup commit 48cd8ce5f1c5c3ea2372b0f3fcdb2a9491be52f4 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:15:57 2021 -0500 added image import commit 12e82211ace004c93726b8f6327adee1d1a58f78 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 22 15:13:01 2021 -0500 consolidated integration imports into url_import commit 8cf5dae5482d7b28e386760ca039c60efdfbdb9a Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:49 2021 -0500 staged app import tabs commit a255450fad53f9482711a252ec98b353b66a15df Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:16 2021 -0500 fixed missing space in keyword when adding recipe commit 2bb4dd9954c4913c6b4bd9e23f60315ed0c46552 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:08:51 2021 -0500 removed unused templates commit cddbebbc85377227ba9d753cf9d58db03e7f5ee2 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 13:13:56 2021 -0500 combined json import and source import commit b929bd9ae3a061dc2660602cb2ffb036b7e6cac7 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 16:06:02 2021 -0500 more fix from super ugly merge commit 558eb25faee2f8362a9af1380b40b11a3c05b6fa Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:17:10 2021 -0500 more cleanup from ugly merge commit 8906345e107096a657fac8cdff497548dbaa9ffd Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 11:24:23 2021 -0500 fixed ugly merge commit 966edebfedf89a7976f47dd0526e0aeb41aa0feb Author: smilerz <smilerz@gmail.com> Date: Thu Mar 18 12:09:53 2021 -0500 added drag and drop to ingredients commit a9b24c9f03a223bbf59613a10f000ce1b421383f Author: smilerz <smilerz@gmail.com> Date: Mon Mar 15 15:56:44 2021 -0500 manually parse json commit 908ae04ef98d629da0cd74e94d1401fa6c5ac654 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:33:07 2021 -0600 update urls.py commit e3828f96e6d2db5877789b5bd9be9cc4eb151d5f Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:32:47 2021 -0600 commit merge from Patralos/recipes commit a21fe044ed527dae2ea9a8bce854c628b1a39910 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 15:34:47 2021 -0600 updated URL import page with tab interface commit 59a30f579a25758ec58a938e8a315dd986e62cbf Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 11:29:10 2021 -0600 import raw json/html commit 299194409d9c0a395aaf5d69106c2f35baa1d402 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 7 14:28:29 2021 -0600 refactored json parser to create functions for each sub parser commit 0e480ba82f25a3fa705a9adc2cf82f5234797b44 Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 22:27:32 2021 +0100 replace common fractions with their concrete value (else parsing is not possible) commit 40fb268d2d2cfe5250b1a900eafb4819fd85572b Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 21:37:39 2021 +0100 Allow recipes to be imported from json directly commit987be4b04d
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 09:02:27 2021 -0500 Fix after rebase commitca84da68c4
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 18:39:44 2021 -0500 catch attibute error when scrape missing schema commitd75e39fbcd
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 16:27:18 2021 -0500 set persistent connections to db commiteb2593aacd
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 16:08:04 2021 -0500 handle text in cook times during import commit496e04cfc8
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:47:35 2021 -0500 convert servings to number on import commitd814d13d54
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 13:17:15 2021 -0500 custom scraper fails safe commitd0cedaf7a1
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 12:48:26 2021 -0500 added name parser commit01f504f7b1
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:31:47 2021 -0500 updated tests to handle html decoding commitc716346f1f
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:55:07 2021 -0500 flake commitfef5236931
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:53:45 2021 -0500 decode url strings in text_parser commitb115c37eb8
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:32:33 2021 -0500 catch error on scrape.image() commit1e17f3703a
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:28:46 2021 -0500 trap error on scrape.title() commit468b986314
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:05:28 2021 -0500 updated tests commita531d135b5
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:42:31 2021 -0500 remove html tags from description commit7524609cd0
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commita28f8e65d5
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commitd193637091
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:20:03 2021 -0500 added missing bookmarklet commit0953af05fc
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:18:14 2021 -0500 Revert "bug fix url import" This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23. commit19e8e5cb5b
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 13 16:44:05 2021 -0500 removed extra string normalization commit43c808380d
Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 21:22:56 2021 -0500 updated migration commit7ab8b84044
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:14:50 2021 -0500 updated recipe targets in tests to reflect html decoding commitd739fe6752
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 13:28:35 2021 -0500 fixes #527 commita84c41e29f
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 10:57:13 2021 -0500 bug fix url import commit393aba1f31
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 07:02:43 2021 -0500 url import bug fixes commit436a070730
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:43:33 2021 -0500 bug fix tests commit2fe6788ce5
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:41:00 2021 -0500 bug fix url import commit747d146389
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:26:29 2021 -0500 recipe import tests commitefe4c4043d
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 12:32:11 2021 -0500 simplified url import commitc6739ba8e0
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 09:20:15 2021 -0500 add data for url_import test commit50140db668
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:43:36 2021 -0500 added all ATK sites to custom scraper commit028b2dfb22
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:23 2021 -0500 added cooksillustrated custom scraper commitec6a10ca0a
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:01 2021 -0500 ensure time is always a number commit3cf949bf8d
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 2 15:19:20 2021 -0500 added ability to create custom scrapers commit0a62225797
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:21:28 2021 -0500 removed old json importer commita54f4e1367
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:19:18 2021 -0500 updated import from source to use text scraper commitbf3c30a8fb
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:08:56 2021 -0500 remove old html_import function commitf811f5996e
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:07:51 2021 -0500 wrapper for recipe_scrapers to parse text input commita3490240f4
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:17:46 2021 -0500 fixed broken tab commitb26aea96f4
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:11:54 2021 -0500 delete bookmarklet on import commit4d4af5fdf2
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:53:06 2021 -0500 removed console message commit3da74505d6
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:51:14 2021 -0500 fixed ingredient display on preview commitc8a4861df8
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 11:49:56 2021 -0500 redirect to import url for processing commit5e27cd606e
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 06:39:44 2021 -0500 added hack to fix scopes & CORS for bookmarklet commita341fd8ebe
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 28 18:39:20 2021 -0500 added CORS middleware commit9a62b6e4e7
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 26 14:47:24 2021 -0500 added bookmarklet model and api commitf80c44bca3
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 17:48:32 2021 -0500 bookmarklet passing data to form commit09d2e9f831
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 14:02:57 2021 -0500 added bookmarklet that doesn't work yet commit4d5a9e446f
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 14:14:56 2021 -0500 Squashed commit of the following: commit81a8734fac
Merge:abcef54
f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:41:13 2021 +0100 Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support Add iOS webclip icon support commitabcef54e72
Merge:e15c92c
7527646
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:30:43 2021 +0100 Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1 Bump recipe-scrapers from 12.2.0 to 12.2.1 commite15c92cda5
Merge:58fc269
45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:26:06 2021 +0100 Merge pull request #501 from smilerz/main_fork fix json direct import when wrapped in @graph commit45dba6fad2
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:23:55 2021 -0500 fix json direct import when wrapped in @graph commitf67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 15:49:12 2021 +0100 Add generated icons from icongenerator. commit53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 12:48:58 2021 +0100 Fix errors in favicon SVG. commit7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Mar 19 05:51:22 2021 +0000 Bump recipe-scrapers from 12.2.0 to 12.2.1 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1) Signed-off-by: dependabot[bot] <support@github.com> commit6a2c27749f
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 13:58:16 2021 -0500 updated links to import recipes commitde60e12073
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:54:41 2021 -0500 added collapsable cards commit1188ed9227
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:32:55 2021 -0500 cosmetic cleanup commitcb708e7e47
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:15:57 2021 -0500 added image import commit215eadb4a0
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 22 15:13:01 2021 -0500 consolidated integration imports into url_import commit4ffc54f720
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:49 2021 -0500 staged app import tabs commit21f6c7a21f
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:16 2021 -0500 fixed missing space in keyword when adding recipe commitce7c6939d2
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:08:51 2021 -0500 removed unused templates commit40a2f7ff90
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 13:13:56 2021 -0500 combined json import and source import commit4015517c0a
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 16:06:02 2021 -0500 more fix from super ugly merge commit7c8d41753c
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:17:10 2021 -0500 more cleanup from ugly merge commit90670613c5
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 11:24:23 2021 -0500 fixed ugly merge commit647c1678f1
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 18 12:09:53 2021 -0500 added drag and drop to ingredients commit44dee16e0a
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 15 15:56:44 2021 -0500 manually parse json commitf8fedcac82
Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:33:07 2021 -0600 update urls.py commit3a48d0e580
Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:32:47 2021 -0600 commit merge from Patralos/recipes commit9930789aa8
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 15:34:47 2021 -0600 updated URL import page with tab interface commit83fce6461a
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 11:29:10 2021 -0600 import raw json/html commitf0d37244b6
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 7 14:28:29 2021 -0600 refactored json parser to create functions for each sub parser commit386834f409
Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 21:37:39 2021 +0100 Allow recipes to be imported from json directly commit 2fa4dbabdcbc4103c4fb9535678192aadc79c6be Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:08:08 2021 -0500 Fix after rebase commit 2410f57781140b5ac0f45e9bacb37dcdb09b4db0 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 07:48:52 2021 -0500 Squashed commit of the following: commit 7642ac66b4d679fb3bd40d783d8c00e969e48413 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 07:44:53 2021 -0500 updated model commit c887fae3a2b85ad23772944d311761b85bd67031 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:46:38 2021 -0500 convert servings to number on import commit 34966bcef2993f4d0a1309362b0648f2096db996 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:15:59 2021 -0500 update tests to handle url decoding commit 86676772676395482901c195888898e7eaafc015 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:57:10 2021 -0500 bring parser inline with json_import branch commit 2b547f67cd180ca457691e15bc9edc1ae033ecc8 Merge: e5ada34 51d4ffe Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:43:27 2021 -0500 Merge branch 'bookmarklet' of github.com:smilerz/recipes into bookmarklet commit 51d4ffef18d359f75d377eee27bd15816957ac53 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 08:50:00 2021 -0500 unescape html document commit e5ada345d869409b240fd0746a88f269b6c28c2c Merge: 5b7df0a8d02cad
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 12:39:37 2021 -0500 Merge branch 'deprecation-fixes' into bookmarklet commit8d02cad7d9
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 12 14:12:04 2021 -0500 resolved deprecation warnings introduced in django 3.2 commit fb235473139c8e08f0c63026b442a30b108e89a7 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 18:38:46 2021 -0500 removed cors_header import - unused commit f44ec3ee9a3a9bba67e623ae5c49cf52edcfb6a0 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 18:38:00 2021 -0500 catch attribute error when scrape has no schema commit dd54dbfd5c691fee092f1c0bd4689cfa85d85414 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 16:03:56 2021 -0500 handle text cook times on import commit 17405e88eb7216c9b67923a23f211bd7164363f7 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:45:34 2021 -0500 convert servings to number on import commit 024ad86dfc0e86937a1001c813ee50f917fb944b Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 13:10:23 2021 -0500 name parser handles list commit fabe9b0b5e4080dd0a8a1a81c336a17a3af2c2d0 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:52:34 2021 -0500 updated docs for personal beta commit e7678bad9cb8dcf8f0c49e5933c42c9f66edb76a Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 08:57:35 2021 -0500 decode html data when passing bookmarklet commit 7ba62f38249e1ced4d03f98db5805768f05f3f79 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:39:30 2021 -0500 extra error catching commit d16fa3a5d2bd9d28ceaeb05216e05c5e26efdd48 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 18:48:45 2021 -0500 more shenanigans commit 04cc8de27261a96d56c005976f8c59f01dbbea88 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 18:25:24 2021 -0500 add debugpy to requirements commit 3ba781ae07591521ad5a963066791a153fe90b36 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 18:24:24 2021 -0500 remote debug commit 0b5106f89305d043c9ecea4dfeb8b3a28fc87463 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 18:03:15 2021 -0500 remote debug in container commit 928aa59c0480ce894288008d21fcddd290fd0be9 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 16:48:09 2021 -0500 nope, this one works commit e38aa0071778001710d1dfab4ffa4403318f1933 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 16:28:31 2021 -0500 it finally works commit 4a01d3ab0a2ab8722453035fff5ca69989481253 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 15:40:36 2021 -0500 fix test again commit fe33e93e1d0f6b87944216189716084bb2f48425 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 15:02:57 2021 -0500 add bookmarklet back commit 16f46b44f564fe1a9ece1e9595776312465b6e1e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 14:40:13 2021 -0500 extra docker tags commit f14ecfe2434b67e5ebad6e7d20fc7eb046343100 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 14:29:52 2021 -0500 build hook commit 095da0121cd1e5f9466df4da3f74b09118f111df Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:39:08 2021 -0500 personalized build commit 5efd7c1938c95bd920a776b45efe10daf0a0e07d Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:05:28 2021 -0500 updated tests commit c3b156f454d79370f7e51ec05115d849cfa53a0e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 11:52:06 2021 -0500 fixed admin commit 9c073348590e8e418f3106e3214e5f839afa94e5 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 11:29:35 2021 -0500 updated bookmarklet to work with updated import process commit 70f72d54f6108f4ccac31b740bfd77144602fa36 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:42:31 2021 -0500 remove html tags from description commit 028f4be842d3ff5577718ff79fc999cbcde21acb Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:52 2021 -0500 Squashed commit of the following: commit 707d862e01a7497a1f22879d314b865a35e0e85b Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:00 2021 -0500 works now commit 3942a445ed4f2ccec57de25eacd86ea4e4dd6bdb Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:25:24 2021 -0500 updated serializer and api commit 10dc746eb175c7f805a8a8ffa7ce49977a7ce97e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:20:19 2021 -0500 fixed bookmarklet commit 9779104902d3be0258c95cd2eeebcba0d5d48892 Merge: bb8262c 0cb3928 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:56:27 2021 -0500 Merge branch 'bookmarklet' into json_import commit 0cb39284bb835ffc6cfee3e4306aadc4a64a25be Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commit e89e0218de684d40b2e2bfb6ba833891206c828e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commit bb8262ccabb93c56fbc18c407d5a0653b8b3ca79 Merge: b1e73aa35a7f62
Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 20:35:57 2021 -0500 Merge branch 'main_fork' into json_import commit accccbdf6924c7584ca6d45d9e6efff5e4009b0c Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commit 398282d8d73e3c4c737f2eaa15e1b1060951561b Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commit 6ab508577b9fff90c05f301206260e0d6f718f7f Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:20:03 2021 -0500 added missing bookmarklet commit 86e79e2389418694d420409e8d6f3078c93cd09a Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:18:14 2021 -0500 Revert "bug fix url import" This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23. commit 322a54b437ea0f68c5badf738d4679870eb3d7d5 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 13 16:44:05 2021 -0500 removed extra string normalization commit a06ffcdf7c2d1469f3a9ebb0c0f45deafda06d4c Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 21:22:56 2021 -0500 updated migration commit 6c9b9005b96dda483e8efce3205a8101c509288c Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:14:50 2021 -0500 updated recipe targets in tests to reflect html decoding commit 8892512f13f3f2636eec7e4efff7b213cd565d92 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 13:28:35 2021 -0500 fixes #527 commit 937acde9942e4d1a58065b7c0fda0f59391c007e Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 10:57:13 2021 -0500 bug fix url import commit 564215b47fec522dd8bcdd33bfc20d7cb8c7a4cc Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 07:02:43 2021 -0500 url import bug fixes commit 761af4a0947ea4a7b4ec75a983fabf6bd6dd6ae3 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:43:33 2021 -0500 bug fix tests commit b15f9393a4e212c608115499509e853a605bc1ad Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:41:00 2021 -0500 bug fix url import commit 35fd251fc6cd63a66b30f7577049276dc8e6d30d Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:26:29 2021 -0500 recipe import tests commit 671ae2aa182938d6920fbe3c27c56714711ad258 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 12:32:11 2021 -0500 simplified url import commit fb024c36139508b34caca42b7b6b11931c713ada Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 09:20:15 2021 -0500 add data for url_import test commit d2e8b92b75361858bfc0599fc0d0951257b21dac Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:43:36 2021 -0500 added all ATK sites to custom scraper commit db6a058f9a5412ef1d4227dc0662ab0f52bfb15d Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:23 2021 -0500 added cooksillustrated custom scraper commit c6a6454e6029a87e55548321de21303d12b0f90d Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:01 2021 -0500 ensure time is always a number commit 41684a3f0a0f168e9cd6ef31ee7148a1993a8471 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 2 15:19:20 2021 -0500 added ability to create custom scrapers commit 6847232f07e7033ebb88e73a09eb45e349b29ed4 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:21:28 2021 -0500 removed old json importer commit 8155c46a138209f78c75ccd5b622a72ae3eb3431 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:19:18 2021 -0500 updated import from source to use text scraper commit 217839b2a2f2a38f6510fe3ba418564c0bd7bf56 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:08:56 2021 -0500 remove old html_import function commit 65d8ce913d0d2db300d016cc6cbb508f86daf25f Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:07:51 2021 -0500 wrapper for recipe_scrapers to parse text input commit 59ce02eab25444a0f640e0354a4cec3e263a16a7 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:17:46 2021 -0500 fixed broken tab commit ff80939eb0d01d24e0958d2f0d8cbbf605477e0a Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:11:54 2021 -0500 delete bookmarklet on import commit e9a0abe42f93a4efc6329f2b425366470b539d64 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:53:06 2021 -0500 removed console message commit 2551d22f00422f4e3dbe13dc236af0232db838cd Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:51:14 2021 -0500 fixed ingredient display on preview commit 6fb931b7ae5f7a2b3dd7748446a2127648a2cdd9 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 11:49:56 2021 -0500 redirect to import url for processing commit 82f81a085a1ab772e9653c97a54a559cd2281095 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 06:39:44 2021 -0500 added hack to fix scopes & CORS for bookmarklet commit 3f8f2d0943b36e5583611cedc53264554891d628 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 28 18:39:20 2021 -0500 added CORS middleware commit d1449fb90e51e03fa1ab91216f1b6f3f7a91c8f0 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 26 14:47:24 2021 -0500 added bookmarklet model and api commit 1a83be752e16f4aec4d1ad1a6b7b6d3130b09dda Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 17:48:32 2021 -0500 bookmarklet passing data to form commit f0b1bf38ddd1b8a4e543cabd1c69a1bdc9a6edc3 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 14:02:57 2021 -0500 added bookmarklet that doesn't work yet commit df1e1557b41d42ec06391ee7ba1d0af1a67b9140 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 14:14:56 2021 -0500 Squashed commit of the following: commit81a8734fac
Merge:abcef54
f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:41:13 2021 +0100 Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support Add iOS webclip icon support commitabcef54e72
Merge:e15c92c
7527646
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:30:43 2021 +0100 Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1 Bump recipe-scrapers from 12.2.0 to 12.2.1 commite15c92cda5
Merge:58fc269
45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:26:06 2021 +0100 Merge pull request #501 from smilerz/main_fork fix json direct import when wrapped in @graph commit45dba6fad2
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:23:55 2021 -0500 fix json direct import when wrapped in @graph commitf67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 15:49:12 2021 +0100 Add generated icons from icongenerator. commit53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 12:48:58 2021 +0100 Fix errors in favicon SVG. commit7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Mar 19 05:51:22 2021 +0000 Bump recipe-scrapers from 12.2.0 to 12.2.1 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1) Signed-off-by: dependabot[bot] <support@github.com> commit fb42466b82a2157207a05c647335bcc81fa22ac2 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 13:58:16 2021 -0500 updated links to import recipes commit b74ecfb8c30a23fded300a67706e078dde9b9808 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:54:41 2021 -0500 added collapsable cards commit 9533360b9153c68abc2e75457ca07237ee1cc98c Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:32:55 2021 -0500 cosmetic cleanup commit 0bc25d0eff950a097ee1ec056513129a37bd9b82 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:15:57 2021 -0500 added image import commit 319ca270d011b9e98e37b5a87b4ad531311f13a2 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 22 15:13:01 2021 -0500 consolidated integration imports into url_import commit f35f6d3d263b5b011984f3aec839b8a2767c8b16 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:49 2021 -0500 staged app import tabs commit 982279738493d2a565278fa9675332730de4b0ed Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:16 2021 -0500 fixed missing space in keyword when adding recipe commit 0246069ee7e5bc40adfcd82fa6cf9bc2c6aea352 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:08:51 2021 -0500 removed unused templates commit 35303df77fe38c3ab5dd1ecca4ab20c2b828547c Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 13:13:56 2021 -0500 combined json import and source import commit 3064a4974fbd0b798d60419b8db4489eea83a417 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 16:06:02 2021 -0500 more fix from super ugly merge commit 7762ed3cd70020d102c124c6f11134f95a773246 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:17:10 2021 -0500 more cleanup from ugly merge commit d318eae41d559ef1b8a40ae07429683b0656da12 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 11:24:23 2021 -0500 fixed ugly merge commit a4aef418590c003f43710ed1908574b9148bf5de Author: smilerz <smilerz@gmail.com> Date: Thu Mar 18 12:09:53 2021 -0500 added drag and drop to ingredients commit 6984d4da02fe1e9ee0f613a848839c2103542588 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 15 15:56:44 2021 -0500 manually parse json commit 1f59df7c4faba48da0b94aadca3723f162bed67c Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:33:07 2021 -0600 update urls.py commit 60979173c4680cc2ff9e4230e17a9f736aa419c6 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:32:47 2021 -0600 commit merge from Patralos/recipes commit 4ce804e2c9d5e617a8a6c2cbff8a4a9ca6e49878 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 15:34:47 2021 -0600 updated URL import page with tab interface commit 4f371c4f4ac2e8f2b50195bfd15fefd7bfc71626 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 11:29:10 2021 -0600 import raw json/html commit 9718a047b1cb3a8e697c130bd2ae5675ecb29777 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 7 14:28:29 2021 -0600 refactored json parser to create functions for each sub parser commit 54d4a2fa6d3feaea6466a259d1d25a16ff9494b6 Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 21:37:39 2021 +0100 Allow recipes to be imported from json directly commit 3d9bd3596a6bf8de908b6864744ccb87d4f434ef Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 14:09:10 2021 -0500 corrected api import workflow commit ff930fb3662c8c78d9a64fbe43c115514d48315b Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 11:26:26 2021 -0500 restored missing manual url scrape commit 2d8f833871cde8ff179c19010d895ed82bbc8e8b Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 09:02:27 2021 -0500 Fix after rebase commit c2d5c358caeff0d213b12fcb34101c5edf2c28d2 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 18:39:44 2021 -0500 catch attibute error when scrape missing schema commit 7dcd2003905b286cb2db67e9f5cebeacdebd2919 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:47:35 2021 -0500 convert servings to number on import commit cf6c6f290331c1a29ab6c74b51bda35fbfdba07b Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 13:17:15 2021 -0500 custom scraper fails safe commit 37be78bad179f4c1629f151d98c26ce8c14e8627 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 12:48:26 2021 -0500 added name parser commit 519b89c3529d904a9ffc89ee5e3bb938de9665aa Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:31:47 2021 -0500 updated tests to handle html decoding commit adcdbda755dd0560a03aa02f29312e97c82ca900 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:55:07 2021 -0500 flake commit 55d772d7a834a5306f08be8f19df9c5ed9283d3e Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:53:45 2021 -0500 decode url strings in text_parser commit ce73b708f2de796e00cd67a7e157c7afbf5d03d7 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:32:33 2021 -0500 catch error on scrape.image() commit 451020d8c6004f060beb43f12f76b246ab8a3937 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:28:46 2021 -0500 trap error on scrape.title() commit 1326d946d0287ff3eb1cbf5f5080b4f53359e803 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:05:28 2021 -0500 updated tests commit cde02139cd463e0bad05f496c924951cac2e2e00 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:42:31 2021 -0500 remove html tags from description commit 5534b8ab2bb1914b09e0357252fffc3551ba67c2 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commit 4395230cce0cc6644033f9273177e94dfd23443e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commit d927b99da96c21894481c2805d374291b7e3188e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:20:03 2021 -0500 added missing bookmarklet commit 5d989bef091d49aa1c596c37aaa387a382b2d380 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:18:14 2021 -0500 Revert "bug fix url import" This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23. commit 13381b71d61a2f3999f6d6ca150e6efdbc786098 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 13 16:44:05 2021 -0500 removed extra string normalization commit dac72715d3ed3114bb0cd7afe3e41f2652f11cf9 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 21:22:56 2021 -0500 updated migration commit 5bed0a76407be2802b7893877b84496fb83105aa Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:14:50 2021 -0500 updated recipe targets in tests to reflect html decoding commit c5e5b1466dc73e87fc7096616fe0493315f18433 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 13:28:35 2021 -0500 fixes #527 commit 5c9da351b40bd8954169f9293ec604f4449aafc0 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 10:57:13 2021 -0500 bug fix url import commit 0701381dffaffcc0171bfcabc233a0275cb053a0 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 07:02:43 2021 -0500 url import bug fixes commit dadfad8f4ba80d9f231fb73145773f3e36315c3f Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:43:33 2021 -0500 bug fix tests commit a7b01cd9bb0310eb63f7de20e15cc3c157ecbbfb Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:41:00 2021 -0500 bug fix url import commit 713918858666b1be3a9daccb78ff58b3a79e189b Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:26:29 2021 -0500 recipe import tests commit bd89afa171357af2fd5e1a30020dcf037505120d Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 12:32:11 2021 -0500 simplified url import commit 158c1bc22549232f1cededddd4bf734748a6bce4 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 09:20:15 2021 -0500 add data for url_import test commit 55ec2db3d6c2223909b36147eeaa9e6be767e4ef Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:43:36 2021 -0500 added all ATK sites to custom scraper commit 5f506309812d195d7ec9556d7f5835de2bcf1de4 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:23 2021 -0500 added cooksillustrated custom scraper commit cd7da19ac58cc7c6a218b779c17e80c07bbd9db9 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:01 2021 -0500 ensure time is always a number commit fb9103c333452225a017aa8476bfc5f80365ecbf Author: smilerz <smilerz@gmail.com> Date: Fri Apr 2 15:19:20 2021 -0500 added ability to create custom scrapers commit a5ef5be23f28005e044fa3f5c3955e6c4c3cb2d4 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:21:28 2021 -0500 removed old json importer commit 5c005780ad34676e7ddf37e8bba77d001fcb6e5b Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:19:18 2021 -0500 updated import from source to use text scraper commit f59cfc32afa60b0ce0d3ee9c7d5e9ab6ae662ce0 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:08:56 2021 -0500 remove old html_import function commit f7f3f1fd416f87383f72c1eb5d9309581809d878 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:07:51 2021 -0500 wrapper for recipe_scrapers to parse text input commit 2627b87d2498f5aa6b242970bcfbca4e9e735c34 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:17:46 2021 -0500 fixed broken tab commit 32911f2d67f97e727f7243df02d8f20a6637800d Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:11:54 2021 -0500 delete bookmarklet on import commit 000e05cc6c31a570b5b38642dfa740387cecf2e8 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:53:06 2021 -0500 removed console message commit 46a4001eb62dea4207ee32ced25481a999200e64 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:51:14 2021 -0500 fixed ingredient display on preview commit e8361887029c956c92b2e203accab7168f9b89a4 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 11:49:56 2021 -0500 redirect to import url for processing commit 010036034619c31012113a89160b15678e4bfef1 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 06:39:44 2021 -0500 added hack to fix scopes & CORS for bookmarklet commit 8f33f37a23ec68fd160292f040d5123bf6b1dde4 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 28 18:39:20 2021 -0500 added CORS middleware commit 15fe8eeac8ae124acb1659f6546b1311f9c9035d Author: smilerz <smilerz@gmail.com> Date: Fri Mar 26 14:47:24 2021 -0500 added bookmarklet model and api commit 3e3304e5090d3db09bd49aab5bde70bacb4aa9cf Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 17:48:32 2021 -0500 bookmarklet passing data to form commit 06cc26e5594d54a87b78ec6c7f86e40edbcdd1be Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 14:02:57 2021 -0500 added bookmarklet that doesn't work yet commit 4b41ec2f9e554bd5748ceade817caf23a69f4c3e Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 14:14:56 2021 -0500 Squashed commit of the following: commit81a8734fac
Merge:abcef54
f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:41:13 2021 +0100 Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support Add iOS webclip icon support commitabcef54e72
Merge:e15c92c
7527646
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:30:43 2021 +0100 Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1 Bump recipe-scrapers from 12.2.0 to 12.2.1 commite15c92cda5
Merge:58fc269
45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:26:06 2021 +0100 Merge pull request #501 from smilerz/main_fork fix json direct import when wrapped in @graph commit45dba6fad2
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:23:55 2021 -0500 fix json direct import when wrapped in @graph commitf67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 15:49:12 2021 +0100 Add generated icons from icongenerator. commit53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 12:48:58 2021 +0100 Fix errors in favicon SVG. commit7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Mar 19 05:51:22 2021 +0000 Bump recipe-scrapers from 12.2.0 to 12.2.1 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1) Signed-off-by: dependabot[bot] <support@github.com> commit b9c4b10f5a8f2074cea455f4cafd6c5bccb2c8c4 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 13:58:16 2021 -0500 updated links to import recipes commit 442df551e2a4c5f4497bb28cd6452785cdb72d86 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:54:41 2021 -0500 added collapsable cards commit 50c40863073e3939359b5df947c12e766f0ff27e Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:32:55 2021 -0500 cosmetic cleanup commit 37a2bb0ddd5431a275b43849b92ed2cbc8912858 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:15:57 2021 -0500 added image import commit c8b4a424c3b473cc69a310123ac3ed1637a49783 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 22 15:13:01 2021 -0500 consolidated integration imports into url_import commit 7b1739ef6a95ded725b9db7214e48ce2e80de3ff Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:49 2021 -0500 staged app import tabs commit a5ce5efb0965774ad31c3bf8555c8fb29cf0602e Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:16 2021 -0500 fixed missing space in keyword when adding recipe commit 62a34ace7200a6a5ce74af523af141cc46e0a370 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:08:51 2021 -0500 removed unused templates commit a4646a63d679c8e78b9670bf421bbe4c1472eff7 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 13:13:56 2021 -0500 combined json import and source import commit d526450e9c945f0133352632bf9435d1ca05c42b Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 16:06:02 2021 -0500 more fix from super ugly merge commit 9d7e3a4eb6e4d2db59c66c7387a5452f5363c7fb Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:17:10 2021 -0500 more cleanup from ugly merge commit 4b39af00e8a0fc120a9040079d96af9074abdf23 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 11:24:23 2021 -0500 fixed ugly merge commit b550753c45694874ae0ab198a13e98a0b1cf50fc Author: smilerz <smilerz@gmail.com> Date: Thu Mar 18 12:09:53 2021 -0500 added drag and drop to ingredients commit b072d7d23390ad35f4bd02b09eb86deeb1eb7ff6 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 15 15:56:44 2021 -0500 manually parse json commit bb68b5dfde2f5f08bc12c93b5fa1f9cc71d20e4e Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:33:07 2021 -0600 update urls.py commit c0703db653d054f74fce60e43762d552e8659b8c Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:32:47 2021 -0600 commit merge from Patralos/recipes commit d62dbe5da83ac03492d1632b42e6d9d2227dc0a4 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 15:34:47 2021 -0600 updated URL import page with tab interface commit 96f0cefe7a632eb6f12e265b965b53e8b503fcde Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 11:29:10 2021 -0600 import raw json/html commit 4aab83d9359ea01e1bb02b213acbfedc90ff1ecc Author: smilerz <smilerz@gmail.com> Date: Sun Mar 7 14:28:29 2021 -0600 refactored json parser to create functions for each sub parser commit 4b5bdca51e8f76587a3cb06d84cf50606803457c Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 21:37:39 2021 +0100 Allow recipes to be imported from json directly commit 1ad7fdf10aabfade87662e98c2f9bab1a6597bde Author: smilerz <smilerz@gmail.com> Date: Sun Jun 6 15:37:57 2021 -0500 fix migrations commit b7bbf26fdc19a3610edb889c48b72cca92ec18af Author: smilerz <smilerz@gmail.com> Date: Sun Jun 6 15:17:11 2021 -0500 yarn build commit edca7a7b3ab961c3d56de8eeedc993c8ec9dccec Author: smilerz <smilerz@gmail.com> Date: Sun Jun 6 15:16:07 2021 -0500 Fix after rebase commit 8c6b91ac61ed36ac50368e817d230a0956f871ef Author: smilerz <smilerz@gmail.com> Date: Mon May 24 12:20:52 2021 -0500 yarn build commit b2a6d0f114fcf8657542679aa3d50a70def45568 Author: smilerz <smilerz@gmail.com> Date: Mon May 24 12:03:27 2021 -0500 WIP commit 56064eb050960dd63bed7d9e261835d84b438e9f Author: smilerz <smilerz@gmail.com> Date: Mon May 24 11:51:54 2021 -0500 send search results to console commit 1ed1b9071931d718cb6a9384c87c7232bf96526d Author: smilerz <smilerz@gmail.com> Date: Mon May 24 11:36:23 2021 -0500 debounce search commit cd9a0b7bd364568df7a37c68c56e27d556e1def0 Author: smilerz <smilerz@gmail.com> Date: Thu May 20 15:38:32 2021 -0500 updated signal commit 94748f41b75bec8e0d2e505ec36e85156ac137a4 Author: smilerz <smilerz@gmail.com> Date: Thu May 20 15:19:02 2021 -0500 WIP commit 085aeda61a7981e0a5163865724cd270a128c743 Author: smilerz <smilerz@gmail.com> Date: Thu May 20 15:02:49 2021 -0500 WIP commit 54b20419576d16bae1239dc4278b02787bc065b5 Author: smilerz <smilerz@gmail.com> Date: Thu May 20 10:16:17 2021 -0500 Fix after rebase commit f6a19670d8980cbae8ae889042f3cc5a772a1b7a Author: smilerz <smilerz@gmail.com> Date: Thu May 20 08:33:09 2021 -0500 Fix after rebase commit 4f515990330e98ab6bb072d19a7ca7626e1686b3 Author: smilerz <smilerz@gmail.com> Date: Wed May 5 08:01:06 2021 -0500 Update README.md commit f20e8e1b08f2fe0617cd1f1bf56188e27c3905d7 Author: smilerz <smilerz@gmail.com> Date: Tue May 4 10:33:47 2021 -0500 recompile commit 34e263ca0f855c5a0412f18d61d1f7c0b6d1de0b Author: smilerz <smilerz@gmail.com> Date: Mon May 3 08:39:19 2021 -0500 minor bug fix commit 7e1f8f5634551bd034fc3afe697a5daa878ee4dd Author: smilerz <smilerz@gmail.com> Date: Sun May 2 19:57:30 2021 -0500 rebase commit 479cf2b9d42134de341e9576cef5ffca8fbdb699 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 30 16:22:34 2021 -0500 cleanup after rebase commit efb5f1b93755a25090513d7445b02f2114045f0a Author: smilerz <smilerz@gmail.com> Date: Fri Apr 30 16:03:30 2021 -0500 Fix after rebase commit 953a24e701fc983d83c714f0c15c004342079b94 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 22 11:26:44 2021 -0500 truncate query params on url commit 54cd993e4f96c4620de5ef2504784205cb67df1b Author: smilerz <smilerz@gmail.com> Date: Thu Apr 22 10:07:24 2021 -0500 bookmarklet includes url script_name commit 71149c8c7791120199b9d65acda5eacfb82096b4 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 19:00:20 2021 -0500 add trigram to rank commit 735ddae1da95c03346072e4135d8209903b6676b Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 18:46:35 2021 -0500 Squashed commit of the following: commit 1c5f74bd182eb502e27d03cc7f93e5e0db8c3362 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 20 12:24:05 2021 -0500 change markdown link from hard-coded to reverse commit 76c56e2a063ec45f97b4d898e106a2b378b95b96 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 14:16:17 2021 -0500 missing '/' commit 47a13811a3a6e47e5f6f1c3ccd515c1989bd4617 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:41:26 2021 -0500 yarn build commit 0d2c1fabe9f982179ec9d26cbb79bc0cebfef9c5 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:31:48 2021 -0500 Squashed commit of the following: commit e03f626fd08a3e048dbd968d623ee58b7f865929 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:04:39 2021 -0500 yarn build commit b511f929ffcc7a670bd7955269982e05c591783a Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 21:17:31 2021 -0500 update service worker with base path commit f13f02d481618583017c71fb654adaa86585ef0b Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:54:17 2021 -0500 WIP commit f2f927c16f52baa6b9a31cd9992e8c7c8739d666 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:40:59 2021 -0500 default value if localStorage fails commit 424e8a9b93d8aa9962a3b6f963fff5c6e23dfa56 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:30:38 2021 -0500 fixed missing '/' commit d49a206ddf5952036b295804f9e31e52a1b45af6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:13:04 2021 -0500 updated .env.template commit ac94ea7afac36f65e1658f3d29f4e2b8f0475ba6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 15:31:37 2021 -0500 WIP commit c9a687df1b21ac6584d0f958e65c5cfc040406ca Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 10:19:02 2021 -0500 WIP commit 7fe8c7fbe52c96f1ccd4128db256656e43af3fa0 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 08:10:08 2021 -0500 added nginx config commit b5540d85872d9d69bda3787db7ecccfce893236f Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 08:03:09 2021 -0500 allow subfolder config on NGINX commit92c65ec1e8
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 21:21:41 2021 +0200 fixed test meal plan commita376c3a5b6
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:55:48 2021 +0200 meal plan random fix commit058d705170
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:19:11 2021 +0200 meal plan in search commit4ad5d6ef2f
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 15:01:39 2021 +0200 fixed test + added api doc for new search commite676b4bac3
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 14:05:19 2021 +0200 added api pagination for recipes commit04488741c4
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:11:19 2021 +0200 adv search mobile styling commit99004ad34b
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:03:15 2021 +0200 new search and setting commitf78f7dfc14
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 02:55:50 2021 +0200 search ui improvements and filter commit880db58d38
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 21:28:29 2021 +0200 v2 search filtering commitd1d65d878c
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 14:11:10 2021 +0200 v2 search progress commit3194a7580d
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 12:57:02 2021 +0200 basics of v2 search working commit 93130eeb694e2389079b88facb5cee9acb4ba9b2 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 18:20:57 2021 -0500 removed trigram commit 14a9b47fba4f57d7faa00e88573c29416b24c1ae Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 16:05:53 2021 -0500 add trigram search to v2 commit c54f98ab6f98603db6a35af9f45f59e032824b55 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 15:27:50 2021 -0500 Squashed commit of the following: commit a5d1c400efccdd3ad47807c4a2f990b983243d06 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 15:19:37 2021 -0500 simplified code commit 15261536c8ebab7156c366dcd4e21c5330550fde Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 14:42:10 2021 -0500 updated search v2 with full text search commit 51f4af6487bfbccc66998160e0ba3e4318dc6621 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 13:23:09 2021 -0500 rebase commit 2df9fc9d33a2b558b82cc8e614f18d0ebc409b83 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 13:22:48 2021 -0500 filter.py commit f90f3186d95ae64c7f88bad5fccb003d7d3f44a6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 20:17:54 2021 -0500 added multi-language support to FTS commit 3cfe14bdae4a4d8995e9d7bf3daacbe05544b0a7 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 19:42:22 2021 -0500 rebuild recipe index from admin site commit ef17ce2d57e869ddb84e4af8a37c2081cbf41e65 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 19:07:50 2021 -0500 command line to rebuild index commit 306c662f0b8dc39dee3cc6011d5d9f4c1ac2f325 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 17:01:18 2021 -0500 updated to handle sqlite commit 8c049697a55fd328a1e93607991c9160db80b6cc Author: smilerz <smilerz@gmail.com> Date: Fri Apr 9 12:47:17 2021 -0500 fixed smalltable commit c6f8d199efeb5d8b0f5b63a0113afbd856398857 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 9 12:46:07 2021 -0500 working proof of concept commit92c65ec1e8
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 21:21:41 2021 +0200 fixed test meal plan commita376c3a5b6
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:55:48 2021 +0200 meal plan random fix commit058d705170
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:19:11 2021 +0200 meal plan in search commit4ad5d6ef2f
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 15:01:39 2021 +0200 fixed test + added api doc for new search commite676b4bac3
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 14:05:19 2021 +0200 added api pagination for recipes commit04488741c4
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:11:19 2021 +0200 adv search mobile styling commit99004ad34b
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:03:15 2021 +0200 new search and setting commitf78f7dfc14
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 02:55:50 2021 +0200 search ui improvements and filter commit880db58d38
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 21:28:29 2021 +0200 v2 search filtering commitd1d65d878c
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 14:11:10 2021 +0200 v2 search progress commit3194a7580d
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 12:57:02 2021 +0200 basics of v2 search working commit a20e7762b37d9fd88b8f8c989b36f71ea764509b Author: smilerz <smilerz@gmail.com> Date: Tue Apr 20 12:21:58 2021 -0500 changed hardlink markdown link to reverse commit df9b571d5d9c24017e392d0de5fb6b4e9dd0fcff Author: smilerz <smilerz@gmail.com> Date: Tue Apr 20 09:15:57 2021 -0500 changed keyword to get_or_create commit 143e38dcdd1ccf2e9bd53e1095be76747022c201 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 20 08:08:13 2021 -0500 strip food and keywords on url import commit ec6251ebbeb4d7daafd8093385c943979d6e8df8 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 15:31:49 2021 -0500 fix bookmarklet loading commit 65d44e6612635f9cf99c57543cdad529e3f2cefd Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 14:36:52 2021 -0500 WIP commit 945d84fbcc271432b1d14e550e19c2cb098c2b2c Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 14:15:17 2021 -0500 missing / commit 0e1ac970643c1ebe6202a8140927f9b3da123cc7 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:44:54 2021 -0500 Squashed commit of the following: commit 47a13811a3a6e47e5f6f1c3ccd515c1989bd4617 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:41:26 2021 -0500 yarn build commit 0d2c1fabe9f982179ec9d26cbb79bc0cebfef9c5 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:31:48 2021 -0500 Squashed commit of the following: commit e03f626fd08a3e048dbd968d623ee58b7f865929 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:04:39 2021 -0500 yarn build commit b511f929ffcc7a670bd7955269982e05c591783a Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 21:17:31 2021 -0500 update service worker with base path commit f13f02d481618583017c71fb654adaa86585ef0b Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:54:17 2021 -0500 WIP commit f2f927c16f52baa6b9a31cd9992e8c7c8739d666 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:40:59 2021 -0500 default value if localStorage fails commit 424e8a9b93d8aa9962a3b6f963fff5c6e23dfa56 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:30:38 2021 -0500 fixed missing '/' commit d49a206ddf5952036b295804f9e31e52a1b45af6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:13:04 2021 -0500 updated .env.template commit ac94ea7afac36f65e1658f3d29f4e2b8f0475ba6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 15:31:37 2021 -0500 WIP commit c9a687df1b21ac6584d0f958e65c5cfc040406ca Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 10:19:02 2021 -0500 WIP commit 7fe8c7fbe52c96f1ccd4128db256656e43af3fa0 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 08:10:08 2021 -0500 added nginx config commit b5540d85872d9d69bda3787db7ecccfce893236f Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 08:03:09 2021 -0500 allow subfolder config on NGINX commit92c65ec1e8
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 21:21:41 2021 +0200 fixed test meal plan commita376c3a5b6
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:55:48 2021 +0200 meal plan random fix commit058d705170
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:19:11 2021 +0200 meal plan in search commit4ad5d6ef2f
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 15:01:39 2021 +0200 fixed test + added api doc for new search commite676b4bac3
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 14:05:19 2021 +0200 added api pagination for recipes commit04488741c4
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:11:19 2021 +0200 adv search mobile styling commit99004ad34b
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:03:15 2021 +0200 new search and setting commitf78f7dfc14
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 02:55:50 2021 +0200 search ui improvements and filter commit880db58d38
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 21:28:29 2021 +0200 v2 search filtering commitd1d65d878c
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 14:11:10 2021 +0200 v2 search progress commit3194a7580d
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 12:57:02 2021 +0200 basics of v2 search working commit a88e7d07343fd8906e5f7cdeb1bea7de2ebb7aac Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:05:43 2021 -0500 yarn build commit 573db7f254816109905343985319da4abb1c3ab7 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 12:58:44 2021 -0500 updated base_path in api-generator commit 606d4b004cf36baa51b35c3f957bf523e28ccf0e Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 21:18:08 2021 -0500 updated service worker with base path commit bb9a2872f48a067b402703d9876d597c2edc9891 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:53:30 2021 -0500 WIP commit ee9cbdb6ae9f1ddef50d57d25ae258b6d7b42fe7 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:39:33 2021 -0500 added default window location in case local storage failed commit af21ca5c013c11d57b4a5ac080f5b6e61923d39f Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:33:19 2021 -0500 added trailing '/' commit a988143559d200dc1c6821c1a5620681090fde8b Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:06:18 2021 -0500 dynamically set api-generator path commit bfb0b71ce6a7f5fa9e9eef8f79d140da653523a5 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 16:27:24 2021 -0500 WIP commit 0f2469221db1ecc8d51682e622f4c4ad3550a96a Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 15:50:41 2021 -0500 WIP commit d1434f9b8408885b7c16d5b003353811e8cdbd37 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 15:43:07 2021 -0500 Squashed commit of the following: commit ac94ea7afac36f65e1658f3d29f4e2b8f0475ba6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 15:31:37 2021 -0500 WIP commit c9a687df1b21ac6584d0f958e65c5cfc040406ca Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 10:19:02 2021 -0500 WIP commit 7fe8c7fbe52c96f1ccd4128db256656e43af3fa0 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 08:10:08 2021 -0500 added nginx config commit b5540d85872d9d69bda3787db7ecccfce893236f Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 08:03:09 2021 -0500 allow subfolder config on NGINX commit92c65ec1e8
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 21:21:41 2021 +0200 fixed test meal plan commita376c3a5b6
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:55:48 2021 +0200 meal plan random fix commit058d705170
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:19:11 2021 +0200 meal plan in search commit4ad5d6ef2f
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 15:01:39 2021 +0200 fixed test + added api doc for new search commite676b4bac3
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 14:05:19 2021 +0200 added api pagination for recipes commit04488741c4
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:11:19 2021 +0200 adv search mobile styling commit99004ad34b
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:03:15 2021 +0200 new search and setting commitf78f7dfc14
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 02:55:50 2021 +0200 search ui improvements and filter commit880db58d38
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 21:28:29 2021 +0200 v2 search filtering commitd1d65d878c
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 14:11:10 2021 +0200 v2 search progress commit3194a7580d
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 12:57:02 2021 +0200 basics of v2 search working commit fec66eeda119e7d46e58702cc1991e22c142e702 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 10:28:55 2021 -0500 wip commit d82b7ccd61d2ded528d01fc0d0de3ab5aca19f00 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 10:28:26 2021 -0500 settings for nginx subfolder commit 595891038785c4f7895ceba755429f006994997a Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 07:57:28 2021 -0500 WIP commit b8c4568cd33265c564c9615d4b8f1772a951e237 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 22:29:21 2021 -0500 allow app to be served at proxy subfolder commit 55004f0074e2c8256fffc7583f680511415d9064 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 20:16:28 2021 -0500 Squashed commit of the following: commit f03456411939b9f09704c057e20a970f9545dc0b Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 18:28:45 2021 -0500 no_perm commit 0262d1630dfcae204848a9fa6c41dc36958414d6 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:29:11 2021 -0500 removed unnecessary console message commit 069a02e67a99805ea04b3f2248d48584e146eadd Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:25:23 2021 -0500 removed commented out settings commit 1be713ff9db5e94fc68cfa25f4b8a219edff39b2 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:24:27 2021 -0500 removed unused cors_headers commit 5c9e1f015a6ff667968e6421341061af09d1b34a Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:22:15 2021 -0500 removed line breaks commit 0e92b029d46bbaaf2a5bf2526165d3a4075581f1 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:21:21 2021 -0500 removed console.log() commit e435325e66a1dc25fb9d24391eec5ed76503d969 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 11:17:00 2021 -0500 Fix after rebase commit c6e1add18be6e9791c7142a78129a879020c6f17 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 07:44:53 2021 -0500 updated model commit c52cd0b177da20cbed9a9d606ee4ec54ab865f38 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:46:38 2021 -0500 convert servings to number on import commit a3cf59c7a47dc39bec74b772f789e1c052884550 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:15:59 2021 -0500 update tests to handle url decoding commit 7ff1783578c90e2c6ae931b345d580279daeedf0 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:57:10 2021 -0500 bring parser inline with json_import branch commit 204f3ddf845a91c50d54d8dbd2f1d754d3076d25 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 08:50:00 2021 -0500 unescape html document commit 28291f96afdb70c8259104997000fe9544e0d134 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 11:29:35 2021 -0500 updated bookmarklet to work with updated import process commit e7c7823916febeb0adbe7e548633b737125ad3b7 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:52 2021 -0500 Squashed commit of the following: commit 707d862e01a7497a1f22879d314b865a35e0e85b Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:00 2021 -0500 works now commit 3942a445ed4f2ccec57de25eacd86ea4e4dd6bdb Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:25:24 2021 -0500 updated serializer and api commit 10dc746eb175c7f805a8a8ffa7ce49977a7ce97e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:20:19 2021 -0500 fixed bookmarklet commit 9779104902d3be0258c95cd2eeebcba0d5d48892 Merge: bb8262c 0cb3928 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:56:27 2021 -0500 Merge branch 'bookmarklet' into json_import commit 0cb39284bb835ffc6cfee3e4306aadc4a64a25be Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commit e89e0218de684d40b2e2bfb6ba833891206c828e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commit bb8262ccabb93c56fbc18c407d5a0653b8b3ca79 Merge: b1e73aa35a7f62
Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 20:35:57 2021 -0500 Merge branch 'main_fork' into json_import commit e01efbbf764bbe6b0e1cefac6c0311dd18a0d503 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:20:03 2021 -0500 added missing bookmarklet commit 3e5f3a36a48cdca0087a551a9a6b4d942d81bf19 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:18:14 2021 -0500 Revert "bug fix url import" This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23. commit 22135c7d40a399fafef994372e7ba128fc37c596 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 13 16:44:05 2021 -0500 removed extra string normalization commit 7ab59c55ac75f50997156f8808c18d12ef7ac8f3 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 21:22:56 2021 -0500 updated migration commit 0f6f8c9eeb642a2824c6952a69c2a2a12e628d24 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:14:50 2021 -0500 updated recipe targets in tests to reflect html decoding commit c56add95a4627f5ed874bbce3cb7b0f4d8adbb9f Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 13:28:35 2021 -0500 fixes #527 commit 09993a71515b9b977f074e14e11cf9e4b5c72b96 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 10:57:13 2021 -0500 bug fix url import commit 625d23d994b84be082f20ef1f6527d1d742a7157 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 07:02:43 2021 -0500 url import bug fixes commit df4b2adf7dcd8099871167ed8bab779e976002a4 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:43:33 2021 -0500 bug fix tests commit 0a61c9f9def1da5841031e39ced99a08a2536958 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:41:00 2021 -0500 bug fix url import commit afbf1153bfcc29baa80a07019f337a9c02b66a63 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:26:29 2021 -0500 recipe import tests commit 5857ed171e3b667764f2882d3ee7b73c15bdab8b Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 12:32:11 2021 -0500 simplified url import commit 33cc780cfd8001a0293951f25fd19b3db8ce0461 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 09:20:15 2021 -0500 add data for url_import test commit 322552a1f1434e7ca52f75886e752f31ea5915f3 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:43:36 2021 -0500 added all ATK sites to custom scraper commit 6455e597fbc2a394f217fe8c11d2bc89e8add1a4 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:23 2021 -0500 added cooksillustrated custom scraper commit 1c6ad94a2d8bf466e35c56a1cd82dff9039371c6 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:01 2021 -0500 ensure time is always a number commit fbbc057a8a2964eb6a4ac7d2324adacc679db2d6 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 2 15:19:20 2021 -0500 added ability to create custom scrapers commit fd293f150e959f67b3e8260061f8a72898e0990c Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:21:28 2021 -0500 removed old json importer commit 86b330583a6f5946b5743df8b447dccc1db3ade0 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:19:18 2021 -0500 updated import from source to use text scraper commit c4be53661293bc54c9069c2604d8fe1a61dceddf Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:08:56 2021 -0500 remove old html_import function commit 6a6314e09be06d17cc11bf55e95992f0a10b54ed Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:07:51 2021 -0500 wrapper for recipe_scrapers to parse text input commit 64524c01c8da795269bd2dbdfb5e6a02d47e8904 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:17:46 2021 -0500 fixed broken tab commit 4701d62739550754960e6d1eac437f0d2cea004f Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:11:54 2021 -0500 delete bookmarklet on import commit 4233980dd9df8e0e961363d464b41c61ad1c6288 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:53:06 2021 -0500 removed console message commit 16e34fe3b134bf31bc84c6f7584662a171fa9748 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:51:14 2021 -0500 fixed ingredient display on preview commit c51d715cfee7a787dcd7b1c3dd0beb24a14962d3 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 11:49:56 2021 -0500 redirect to import url for processing commit 29c199320502711a3197eade37f6021064c7dcb0 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 06:39:44 2021 -0500 added hack to fix scopes & CORS for bookmarklet commit 958faf9972d26ad9f78eaaa1126af51d7a3b333b Author: smilerz <smilerz@gmail.com> Date: Sun Mar 28 18:39:20 2021 -0500 added CORS middleware commit c284f830dc7e7339cd2f54185f2ff8ea6866ef19 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 26 14:47:24 2021 -0500 added bookmarklet model and api commit cbfc5fa973c002bc1ce75d3d2671986007b6a3a7 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 17:48:32 2021 -0500 bookmarklet passing data to form commit d9815e445828293bb2965c7c98ab6acf3afe3833 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 14:02:57 2021 -0500 added bookmarklet that doesn't work yet commit 0e327f3bf865a99e95368bf4b74ee9545d9a2b1a Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 14:14:56 2021 -0500 Squashed commit of the following: commit81a8734fac
Merge:abcef54
f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:41:13 2021 +0100 Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support Add iOS webclip icon support commitabcef54e72
Merge:e15c92c
7527646
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:30:43 2021 +0100 Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1 Bump recipe-scrapers from 12.2.0 to 12.2.1 commite15c92cda5
Merge:58fc269
45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:26:06 2021 +0100 Merge pull request #501 from smilerz/main_fork fix json direct import when wrapped in @graph commit45dba6fad2
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:23:55 2021 -0500 fix json direct import when wrapped in @graph commitf67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 15:49:12 2021 +0100 Add generated icons from icongenerator. commit53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 12:48:58 2021 +0100 Fix errors in favicon SVG. commit7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Mar 19 05:51:22 2021 +0000 Bump recipe-scrapers from 12.2.0 to 12.2.1 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1) Signed-off-by: dependabot[bot] <support@github.com> commit 18c5bf8a3eb7dd22504bbd2e40acab9269cc6804 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 13:58:16 2021 -0500 updated links to import recipes commit 9f643b0b85cc89a36a86681e20c68c177959e1a1 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:54:41 2021 -0500 added collapsable cards commit b37594eb84988043afa450de871a036f72a811ee Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:32:55 2021 -0500 cosmetic cleanup commit e5f76034dfc174d3ce307de1c0c5683a159733a9 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:15:57 2021 -0500 added image import commit 792cfb0791c2e682589995ccd1b85eca0a04061c Author: smilerz <smilerz@gmail.com> Date: Mon Mar 22 15:13:01 2021 -0500 consolidated integration imports into url_import commit aa6c9430bce1a63e46ff0325f13e4f4d7369cc00 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:49 2021 -0500 staged app import tabs commit 3dd92d811c140d925b153f30db29e11e4c8a18cc Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:16 2021 -0500 fixed missing space in keyword when adding recipe commit d79283ccabdd014c62dc820f382830421908cf0a Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:08:51 2021 -0500 removed unused templates commit 3f95eb2f3db42628994f1ea80fd5010fa1b247ba Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 13:13:56 2021 -0500 combined json import and source import commit 5016314ab57102454a95e48f0ba50b6031cc5400 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 16:06:02 2021 -0500 more fix from super ugly merge commit 27a489c45a5b169818e36c79591757f99f64c637 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:17:10 2021 -0500 more cleanup from ugly merge commit f7517d51dd9aad61b1e80ec20947c4f597834691 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 11:24:23 2021 -0500 fixed ugly merge commit 7095b6ef89fe350d591f1103c4c1a2d27c60d28f Author: smilerz <smilerz@gmail.com> Date: Thu Mar 18 12:09:53 2021 -0500 added drag and drop to ingredients commit bdadc7168f37eede0f91a2bfa060200273e440a9 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 15 15:56:44 2021 -0500 manually parse json commit 4bcd7e462db760d00483a90883028e5404f33299 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:33:07 2021 -0600 update urls.py commit 794d2798bfe56a27af5e8786e5f3b9701be7fe81 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:32:47 2021 -0600 commit merge from Patralos/recipes commit e97bc6ea89d8c366104d08ce561dd3d3c17c1578 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 15:34:47 2021 -0600 updated URL import page with tab interface commit 7732bc44b83c23901873bce1075b7ac2e68cee07 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 11:29:10 2021 -0600 import raw json/html commit 368d2211efa86e1146e95e3ddd1192b81f0422c2 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 7 14:28:29 2021 -0600 refactored json parser to create functions for each sub parser commit 3ddff8b468e0c85d1a4ff61b565b78c5be0f77ea Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 22:27:32 2021 +0100 replace common fractions with their concrete value (else parsing is not possible) commit 083048e125f63463edca6f4855f6a8e974f61a21 Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 21:37:39 2021 +0100 Allow recipes to be imported from json directly commit 61d1fabc379d6775544d5b0628909133915c7e14 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 20:15:41 2021 -0500 Squashed commit of the following: commit7930c2417c
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 17:12:43 2021 -0500 update ATK scrape to handle empty headnote commit2f27413c0a
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 14:12:24 2021 -0500 parse multiple ingredientGroups previous version assumed only a single item in a list - this loops through each item commit5869a8ad1b
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 13:43:34 2021 -0500 fixes to pass tests commit0640a265fc
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 13:42:56 2021 -0500 added test for spruce eats commitd449fc8fd8
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 12:49:42 2021 -0500 updated normalization to skip removing line breaks commitb9ee77709b
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 12:49:06 2021 -0500 updated ATK scraper to include header notes in instructions commit 8ec98cf658da1242010809bf4167e8f7fa4ac3b0 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 15:57:20 2021 -0500 updated message commit 0b496d3bf48a151646961132fa2a834f9c2cad3f Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 14:17:16 2021 -0500 fixed ATK scraper commit 48122cafeadfb55f21940c996dbb62f75ce5bb64 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 13:44:29 2021 -0500 Squashed commit of the following: commit5869a8ad1b
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 13:43:34 2021 -0500 fixes to pass tests commit0640a265fc
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 13:42:56 2021 -0500 added test for spruce eats commitd449fc8fd8
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 12:49:42 2021 -0500 updated normalization to skip removing line breaks commitb9ee77709b
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 12:49:06 2021 -0500 updated ATK scraper to include header notes in instructions commit ecb299b7e58ff2f0ab1c6ee14aeb768444800dd5 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 11:58:40 2021 -0500 added upcoming features commit fe880b172dc8c75bc1b841cd32651e3d543ea329 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 17:45:42 2021 -0500 Squashed commit of the following: commitba061df1b6
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 17:30:59 2021 -0500 catch attribute error on cooktime commit7cc515bcdf
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 17:08:25 2021 -0500 fix manual url import commit724748d38a
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 14:09:10 2021 -0500 corrected api import workflow commitb2c1c6e301
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 11:26:26 2021 -0500 restored missing manual url scrape commit987be4b04d
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 09:02:27 2021 -0500 Fix after rebase commitca84da68c4
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 18:39:44 2021 -0500 catch attibute error when scrape missing schema commitd75e39fbcd
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 16:27:18 2021 -0500 set persistent connections to db commiteb2593aacd
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 16:08:04 2021 -0500 handle text in cook times during import commit496e04cfc8
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:47:35 2021 -0500 convert servings to number on import commitd814d13d54
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 13:17:15 2021 -0500 custom scraper fails safe commitd0cedaf7a1
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 12:48:26 2021 -0500 added name parser commit01f504f7b1
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:31:47 2021 -0500 updated tests to handle html decoding commitc716346f1f
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:55:07 2021 -0500 flake commitfef5236931
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:53:45 2021 -0500 decode url strings in text_parser commitb115c37eb8
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:32:33 2021 -0500 catch error on scrape.image() commit1e17f3703a
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:28:46 2021 -0500 trap error on scrape.title() commit468b986314
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:05:28 2021 -0500 updated tests commita531d135b5
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:42:31 2021 -0500 remove html tags from description commit7524609cd0
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commita28f8e65d5
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commitd193637091
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:20:03 2021 -0500 added missing bookmarklet commit0953af05fc
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:18:14 2021 -0500 Revert "bug fix url import" This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23. commit19e8e5cb5b
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 13 16:44:05 2021 -0500 removed extra string normalization commit43c808380d
Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 21:22:56 2021 -0500 updated migration commit7ab8b84044
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:14:50 2021 -0500 updated recipe targets in tests to reflect html decoding commitd739fe6752
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 13:28:35 2021 -0500 fixes #527 commita84c41e29f
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 10:57:13 2021 -0500 bug fix url import commit393aba1f31
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 07:02:43 2021 -0500 url import bug fixes commit436a070730
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:43:33 2021 -0500 bug fix tests commit2fe6788ce5
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:41:00 2021 -0500 bug fix url import commit747d146389
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:26:29 2021 -0500 recipe import tests commitefe4c4043d
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 12:32:11 2021 -0500 simplified url import commitc6739ba8e0
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 09:20:15 2021 -0500 add data for url_import test commit50140db668
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:43:36 2021 -0500 added all ATK sites to custom scraper commit028b2dfb22
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:23 2021 -0500 added cooksillustrated custom scraper commitec6a10ca0a
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:01 2021 -0500 ensure time is always a number commit3cf949bf8d
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 2 15:19:20 2021 -0500 added ability to create custom scrapers commit0a62225797
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:21:28 2021 -0500 removed old json importer commita54f4e1367
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:19:18 2021 -0500 updated import from source to use text scraper commitbf3c30a8fb
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:08:56 2021 -0500 remove old html_import function commitf811f5996e
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:07:51 2021 -0500 wrapper for recipe_scrapers to parse text input commita3490240f4
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:17:46 2021 -0500 fixed broken tab commitb26aea96f4
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:11:54 2021 -0500 delete bookmarklet on import commit4d4af5fdf2
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:53:06 2021 -0500 removed console message commit3da74505d6
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:51:14 2021 -0500 fixed ingredient display on preview commitc8a4861df8
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 11:49:56 2021 -0500 redirect to import url for processing commit5e27cd606e
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 06:39:44 2021 -0500 added hack to fix scopes & CORS for bookmarklet commita341fd8ebe
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 28 18:39:20 2021 -0500 added CORS middleware commit9a62b6e4e7
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 26 14:47:24 2021 -0500 added bookmarklet model and api commitf80c44bca3
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 17:48:32 2021 -0500 bookmarklet passing data to form commit09d2e9f831
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 14:02:57 2021 -0500 added bookmarklet that doesn't work yet commit4d5a9e446f
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 14:14:56 2021 -0500 Squashed commit of the following: commit81a8734fac
Merge:abcef54
f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:41:13 2021 +0100 Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support Add iOS webclip icon support commitabcef54e72
Merge:e15c92c
7527646
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:30:43 2021 +0100 Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1 Bump recipe-scrapers from 12.2.0 to 12.2.1 commite15c92cda5
Merge:58fc269
45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:26:06 2021 +0100 Merge pull request #501 from smilerz/main_fork fix json direct import when wrapped in @graph commit45dba6fad2
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:23:55 2021 -0500 fix json direct import when wrapped in @graph commitf67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 15:49:12 2021 +0100 Add generated icons from icongenerator. commit53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 12:48:58 2021 +0100 Fix errors in favicon SVG. commit7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Mar 19 05:51:22 2021 +0000 Bump recipe-scrapers from 12.2.0 to 12.2.1 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1) Signed-off-by: dependabot[bot] <support@github.com> commit6a2c27749f
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 13:58:16 2021 -0500 updated links to import recipes commitde60e12073
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:54:41 2021 -0500 added collapsable cards commit1188ed9227
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:32:55 2021 -0500 cosmetic cleanup commitcb708e7e47
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:15:57 2021 -0500 added image import commit215eadb4a0
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 22 15:13:01 2021 -0500 consolidated integration imports into url_import commit4ffc54f720
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:49 2021 -0500 staged app import tabs commit21f6c7a21f
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:16 2021 -0500 fixed missing space in keyword when adding recipe commitce7c6939d2
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:08:51 2021 -0500 removed unused templates commit40a2f7ff90
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 13:13:56 2021 -0500 combined json import and source import commit4015517c0a
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 16:06:02 2021 -0500 more fix from super ugly merge commit7c8d41753c
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:17:10 2021 -0500 more cleanup from ugly merge commit90670613c5
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 11:24:23 2021 -0500 fixed ugly merge commit647c1678f1
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 18 12:09:53 2021 -0500 added drag and drop to ingredients commit44dee16e0a
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 15 15:56:44 2021 -0500 manually parse json commitf8fedcac82
Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:33:07 2021 -0600 update urls.py commit3a48d0e580
Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:32:47 2021 -0600 commit merge from Patralos/recipes commit9930789aa8
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 15:34:47 2021 -0600 updated URL import page with tab interface commit83fce6461a
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 11:29:10 2021 -0600 import raw json/html commitf0d37244b6
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 7 14:28:29 2021 -0600 refactored json parser to create functions for each sub parser commit386834f409
Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 21:37:39 2021 +0100 Allow recipes to be imported from json directly commit a5b5e0d16cefc29cbec33574acc872d8216e464e Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 17:30:59 2021 -0500 catch attribute error on cooktime commit 690e213939f94cf7ee7f4991687c95ea57155118 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 17:08:25 2021 -0500 fix manual url import commit 3b2001dde0051ae32aa9f615dcdd6f256e0b1816 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:33:51 2021 -0500 Squashed commit of the following: commit 8e2a15aff203cacd8956c947eecf3967f5b66015 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:29:11 2021 -0500 removed unnecessary console message commit 436d5b3165340772a859899578f7386edfcd587f Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:25:23 2021 -0500 removed commented out settings commit ba6b58b198d2e9260544d64e107afee9420ae340 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:24:27 2021 -0500 removed unused cors_headers commit c7690c391f341d8d92500276f243e99f8700528e Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:22:15 2021 -0500 removed line breaks commit 3259f86ff8b911fa8489922eee43c4465ea81d61 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:21:21 2021 -0500 removed console.log() commit 24552a2d9b644c86dee900322989fb3306ca1b4e Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 14:58:48 2021 -0500 fix after rebase commit bdf8ce1c3357609013c84d2661371ede815cd700 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 11:17:00 2021 -0500 Fix after rebase commit 58cd295e7ae8caa9be588508eb1795fd4a00e810 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 07:44:53 2021 -0500 updated model commit ec786ef8a19f9459cd4c890c60330bcadafb0247 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:46:38 2021 -0500 convert servings to number on import commit 90cc1711b185290778e973821b17a7574c6d3428 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:15:59 2021 -0500 update tests to handle url decoding commit 466eae617cace3b662fe480427018b0ac7a7ab1d Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:57:10 2021 -0500 bring parser inline with json_import branch commit 2668406d4625f747305482ede28e256c94aefcf9 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 08:50:00 2021 -0500 unescape html document commit f765347aec15b7765eaec830dd8dfda1f17b7597 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 11:29:35 2021 -0500 updated bookmarklet to work with updated import process commit 60d95ebf3d4e1c8af7f3b6832adfb28ce13a51aa Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:52 2021 -0500 Squashed commit of the following: commit 707d862e01a7497a1f22879d314b865a35e0e85b Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:00 2021 -0500 works now commit 3942a445ed4f2ccec57de25eacd86ea4e4dd6bdb Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:25:24 2021 -0500 updated serializer and api commit 10dc746eb175c7f805a8a8ffa7ce49977a7ce97e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:20:19 2021 -0500 fixed bookmarklet commit 9779104902d3be0258c95cd2eeebcba0d5d48892 Merge: bb8262c 0cb3928 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:56:27 2021 -0500 Merge branch 'bookmarklet' into json_import commit 0cb39284bb835ffc6cfee3e4306aadc4a64a25be Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commit e89e0218de684d40b2e2bfb6ba833891206c828e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commit bb8262ccabb93c56fbc18c407d5a0653b8b3ca79 Merge: b1e73aa35a7f62
Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 20:35:57 2021 -0500 Merge branch 'main_fork' into json_import commit f50d33a9b2658f6bf27797f645fbd842528a716c Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:20:03 2021 -0500 added missing bookmarklet commit cd482ae8451d3b920d7bb7a2b76044645f6a2e0b Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:18:14 2021 -0500 Revert "bug fix url import" This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23. commit 7032c7cc990af5790073348c3039d907d3469a7e Author: smilerz <smilerz@gmail.com> Date: Tue Apr 13 16:44:05 2021 -0500 removed extra string normalization commit 04b4aeecb9b13ae0023636f65dec8fc0ca1b8e0f Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 21:22:56 2021 -0500 updated migration commit 8b4059d0beed9ae8da9a6943ed550b0a82e12e03 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:14:50 2021 -0500 updated recipe targets in tests to reflect html decoding commit 7388f30ef333315736a8614c2009db37404f4916 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 13:28:35 2021 -0500 fixes #527 commit 6d811738535a81cab737b10f006f50c32cc32f13 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 10:57:13 2021 -0500 bug fix url import commit cbe400cdaccb0fcbebeafea199cf14be3deeb150 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 07:02:43 2021 -0500 url import bug fixes commit f4e33a830b826d1930639f552a2e32882c14d2ba Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:43:33 2021 -0500 bug fix tests commit 1d1cbbe965a5255bd9cabb138a2f1432956a4c6e Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:41:00 2021 -0500 bug fix url import commit 31cf4da8f3dcface57399976679379d11ca6d81e Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:26:29 2021 -0500 recipe import tests commit 1d1b5b545ab35626636ec4d9e1ce020fe508e520 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 12:32:11 2021 -0500 simplified url import commit 25140fa64e9306421956b90e40f53c00429e7c5e Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 09:20:15 2021 -0500 add data for url_import test commit 14d97f671ad356c8212ffc7fdd5b15fce8b5a7c1 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:43:36 2021 -0500 added all ATK sites to custom scraper commit 10975665626ae958f45e4c76b5125978e4776c41 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:23 2021 -0500 added cooksillustrated custom scraper commit 9ea33ec10bc32aa6ffed0c8cd6d5a4b4e123eff1 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:01 2021 -0500 ensure time is always a number commit ceb85137dd25a2cc6192165af9ac9b515cd5cfee Author: smilerz <smilerz@gmail.com> Date: Fri Apr 2 15:19:20 2021 -0500 added ability to create custom scrapers commit cc53a8debe36e65f9f487ac8c31cf3235bad5370 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:21:28 2021 -0500 removed old json importer commit d2233df427cc577fd6ea87458d821ac37c4def48 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:19:18 2021 -0500 updated import from source to use text scraper commit 9a0fcf9d2b6d35f01c16aa1c1a1074bb42577a3e Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:08:56 2021 -0500 remove old html_import function commit 2bc5fbbdcc5d395b7ed7aa1879449e16da0ee2d1 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:07:51 2021 -0500 wrapper for recipe_scrapers to parse text input commit 4a3c1a94a97ec18109ba43a5bbe90a6aa8e622c4 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:17:46 2021 -0500 fixed broken tab commit 6b92f8c325dd4a3c43fec0efe9b20181eaea0951 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:11:54 2021 -0500 delete bookmarklet on import commit dcd12899fd361868d4542e882d413292ef37a92b Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:53:06 2021 -0500 removed console message commit 3e58d79a9279e63af66356d14c7204121f6055dd Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:51:14 2021 -0500 fixed ingredient display on preview commit 1eb6ba707c41f52711ed2d68e3758ce9c70465ec Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 11:49:56 2021 -0500 redirect to import url for processing commit 95b50edc0f33afc1557b6a766e610a6c74b2e8a0 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 06:39:44 2021 -0500 added hack to fix scopes & CORS for bookmarklet commit bdc85694309fb79b9c214f0330848be82c372156 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 28 18:39:20 2021 -0500 added CORS middleware commit c1f5ec44c3f45dd403cc600ed5e38b814fedd138 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 26 14:47:24 2021 -0500 added bookmarklet model and api commit cc9a6fe14adbca88dc8753a7271ed4d47e638822 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 17:48:32 2021 -0500 bookmarklet passing data to form commit 3bf58f633610caa266e210fcdbecdedd0edf2465 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 14:02:57 2021 -0500 added bookmarklet that doesn't work yet commit 9a11ebc7746f2acdd156a574703ea05a0aba0a9b Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 14:14:56 2021 -0500 Squashed commit of the following: commit81a8734fac
Merge:abcef54
f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:41:13 2021 +0100 Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support Add iOS webclip icon support commitabcef54e72
Merge:e15c92c
7527646
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:30:43 2021 +0100 Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1 Bump recipe-scrapers from 12.2.0 to 12.2.1 commite15c92cda5
Merge:58fc269
45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:26:06 2021 +0100 Merge pull request #501 from smilerz/main_fork fix json direct import when wrapped in @graph commit45dba6fad2
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:23:55 2021 -0500 fix json direct import when wrapped in @graph commitf67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 15:49:12 2021 +0100 Add generated icons from icongenerator. commit53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 12:48:58 2021 +0100 Fix errors in favicon SVG. commit7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Mar 19 05:51:22 2021 +0000 Bump recipe-scrapers from 12.2.0 to 12.2.1 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1) Signed-off-by: dependabot[bot] <support@github.com> commit 9307226d777d5648d1cacc0107241dfaec3a4405 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 13:58:16 2021 -0500 updated links to import recipes commit bec00d05898c074b893df7338248b7803f8272c1 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:54:41 2021 -0500 added collapsable cards commit 2d647a2f6aa1afacb6651a6294bba571fafc3190 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:32:55 2021 -0500 cosmetic cleanup commit 48cd8ce5f1c5c3ea2372b0f3fcdb2a9491be52f4 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:15:57 2021 -0500 added image import commit 12e82211ace004c93726b8f6327adee1d1a58f78 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 22 15:13:01 2021 -0500 consolidated integration imports into url_import commit 8cf5dae5482d7b28e386760ca039c60efdfbdb9a Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:49 2021 -0500 staged app import tabs commit a255450fad53f9482711a252ec98b353b66a15df Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:16 2021 -0500 fixed missing space in keyword when adding recipe commit 2bb4dd9954c4913c6b4bd9e23f60315ed0c46552 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:08:51 2021 -0500 removed unused templates commit cddbebbc85377227ba9d753cf9d58db03e7f5ee2 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 13:13:56 2021 -0500 combined json import and source import commit b929bd9ae3a061dc2660602cb2ffb036b7e6cac7 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 16:06:02 2021 -0500 more fix from super ugly merge commit 558eb25faee2f8362a9af1380b40b11a3c05b6fa Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:17:10 2021 -0500 more cleanup from ugly merge commit 8906345e107096a657fac8cdff497548dbaa9ffd Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 11:24:23 2021 -0500 fixed ugly merge commit 966edebfedf89a7976f47dd0526e0aeb41aa0feb Author: smilerz <smilerz@gmail.com> Date: Thu Mar 18 12:09:53 2021 -0500 added drag and drop to ingredients commit a9b24c9f03a223bbf59613a10f000ce1b421383f Author: smilerz <smilerz@gmail.com> Date: Mon Mar 15 15:56:44 2021 -0500 manually parse json commit 908ae04ef98d629da0cd74e94d1401fa6c5ac654 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:33:07 2021 -0600 update urls.py commit e3828f96e6d2db5877789b5bd9be9cc4eb151d5f Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:32:47 2021 -0600 commit merge from Patralos/recipes commit a21fe044ed527dae2ea9a8bce854c628b1a39910 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 15:34:47 2021 -0600 updated URL import page with tab interface commit 59a30f579a25758ec58a938e8a315dd986e62cbf Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 11:29:10 2021 -0600 import raw json/html commit 299194409d9c0a395aaf5d69106c2f35baa1d402 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 7 14:28:29 2021 -0600 refactored json parser to create functions for each sub parser commit 0e480ba82f25a3fa705a9adc2cf82f5234797b44 Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 22:27:32 2021 +0100 replace common fractions with their concrete value (else parsing is not possible) commit 40fb268d2d2cfe5250b1a900eafb4819fd85572b Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 21:37:39 2021 +0100 Allow recipes to be imported from json directly commit987be4b04d
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 09:02:27 2021 -0500 Fix after rebase commitca84da68c4
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 18:39:44 2021 -0500 catch attibute error when scrape missing schema commitd75e39fbcd
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 16:27:18 2021 -0500 set persistent connections to db commiteb2593aacd
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 16:08:04 2021 -0500 handle text in cook times during import commit496e04cfc8
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:47:35 2021 -0500 convert servings to number on import commitd814d13d54
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 13:17:15 2021 -0500 custom scraper fails safe commitd0cedaf7a1
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 12:48:26 2021 -0500 added name parser commit01f504f7b1
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:31:47 2021 -0500 updated tests to handle html decoding commitc716346f1f
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:55:07 2021 -0500 flake commitfef5236931
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:53:45 2021 -0500 decode url strings in text_parser commitb115c37eb8
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:32:33 2021 -0500 catch error on scrape.image() commit1e17f3703a
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:28:46 2021 -0500 trap error on scrape.title() commit468b986314
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:05:28 2021 -0500 updated tests commita531d135b5
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:42:31 2021 -0500 remove html tags from description commit7524609cd0
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commita28f8e65d5
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commitd193637091
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:20:03 2021 -0500 added missing bookmarklet commit0953af05fc
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:18:14 2021 -0500 Revert "bug fix url import" This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23. commit19e8e5cb5b
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 13 16:44:05 2021 -0500 removed extra string normalization commit43c808380d
Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 21:22:56 2021 -0500 updated migration commit7ab8b84044
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:14:50 2021 -0500 updated recipe targets in tests to reflect html decoding commitd739fe6752
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 13:28:35 2021 -0500 fixes #527 commita84c41e29f
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 10:57:13 2021 -0500 bug fix url import commit393aba1f31
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 07:02:43 2021 -0500 url import bug fixes commit436a070730
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:43:33 2021 -0500 bug fix tests commit2fe6788ce5
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:41:00 2021 -0500 bug fix url import commit747d146389
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:26:29 2021 -0500 recipe import tests commitefe4c4043d
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 12:32:11 2021 -0500 simplified url import commitc6739ba8e0
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 09:20:15 2021 -0500 add data for url_import test commit50140db668
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:43:36 2021 -0500 added all ATK sites to custom scraper commit028b2dfb22
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:23 2021 -0500 added cooksillustrated custom scraper commitec6a10ca0a
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:01 2021 -0500 ensure time is always a number commit3cf949bf8d
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 2 15:19:20 2021 -0500 added ability to create custom scrapers commit0a62225797
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:21:28 2021 -0500 removed old json importer commita54f4e1367
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:19:18 2021 -0500 updated import from source to use text scraper commitbf3c30a8fb
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:08:56 2021 -0500 remove old html_import function commitf811f5996e
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:07:51 2021 -0500 wrapper for recipe_scrapers to parse text input commita3490240f4
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:17:46 2021 -0500 fixed broken tab commitb26aea96f4
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:11:54 2021 -0500 delete bookmarklet on import commit4d4af5fdf2
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:53:06 2021 -0500 removed console message commit3da74505d6
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:51:14 2021 -0500 fixed ingredient display on preview commitc8a4861df8
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 11:49:56 2021 -0500 redirect to import url for processing commit5e27cd606e
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 06:39:44 2021 -0500 added hack to fix scopes & CORS for bookmarklet commita341fd8ebe
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 28 18:39:20 2021 -0500 added CORS middleware commit9a62b6e4e7
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 26 14:47:24 2021 -0500 added bookmarklet model and api commitf80c44bca3
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 17:48:32 2021 -0500 bookmarklet passing data to form commit09d2e9f831
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 14:02:57 2021 -0500 added bookmarklet that doesn't work yet commit4d5a9e446f
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 14:14:56 2021 -0500 Squashed commit of the following: commit81a8734fac
Merge:abcef54
f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:41:13 2021 +0100 Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support Add iOS webclip icon support commitabcef54e72
Merge:e15c92c
7527646
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:30:43 2021 +0100 Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1 Bump recipe-scrapers from 12.2.0 to 12.2.1 commite15c92cda5
Merge:58fc269
45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:26:06 2021 +0100 Merge pull request #501 from smilerz/main_fork fix json direct import when wrapped in @graph commit45dba6fad2
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:23:55 2021 -0500 fix json direct import when wrapped in @graph commitf67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 15:49:12 2021 +0100 Add generated icons from icongenerator. commit53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 12:48:58 2021 +0100 Fix errors in favicon SVG. commit7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Mar 19 05:51:22 2021 +0000 Bump recipe-scrapers from 12.2.0 to 12.2.1 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1) Signed-off-by: dependabot[bot] <support@github.com> commit6a2c27749f
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 13:58:16 2021 -0500 updated links to import recipes commitde60e12073
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:54:41 2021 -0500 added collapsable cards commit1188ed9227
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:32:55 2021 -0500 cosmetic cleanup commitcb708e7e47
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:15:57 2021 -0500 added image import commit215eadb4a0
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 22 15:13:01 2021 -0500 consolidated integration imports into url_import commit4ffc54f720
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:49 2021 -0500 staged app import tabs commit21f6c7a21f
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:16 2021 -0500 fixed missing space in keyword when adding recipe commitce7c6939d2
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:08:51 2021 -0500 removed unused templates commit40a2f7ff90
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 13:13:56 2021 -0500 combined json import and source import commit4015517c0a
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 16:06:02 2021 -0500 more fix from super ugly merge commit7c8d41753c
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:17:10 2021 -0500 more cleanup from ugly merge commit90670613c5
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 11:24:23 2021 -0500 fixed ugly merge commit647c1678f1
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 18 12:09:53 2021 -0500 added drag and drop to ingredients commit44dee16e0a
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 15 15:56:44 2021 -0500 manually parse json commitf8fedcac82
Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:33:07 2021 -0600 update urls.py commit3a48d0e580
Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:32:47 2021 -0600 commit merge from Patralos/recipes commit9930789aa8
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 15:34:47 2021 -0600 updated URL import page with tab interface commit83fce6461a
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 11:29:10 2021 -0600 import raw json/html commitf0d37244b6
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 7 14:28:29 2021 -0600 refactored json parser to create functions for each sub parser commit386834f409
Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 21:37:39 2021 +0100 Allow recipes to be imported from json directly commit 2361570854d88cc30b32f2405ef4b011606fcf1b Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:08:08 2021 -0500 Fix after rebase commit 4bb75fe03a4abbc291377278b94fa3fa0c5d41b9 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 07:48:52 2021 -0500 Squashed commit of the following: commit 7642ac66b4d679fb3bd40d783d8c00e969e48413 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 07:44:53 2021 -0500 updated model commit c887fae3a2b85ad23772944d311761b85bd67031 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:46:38 2021 -0500 convert servings to number on import commit 34966bcef2993f4d0a1309362b0648f2096db996 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:15:59 2021 -0500 update tests to handle url decoding commit 86676772676395482901c195888898e7eaafc015 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:57:10 2021 -0500 bring parser inline with json_import branch commit 2b547f67cd180ca457691e15bc9edc1ae033ecc8 Merge: e5ada34 51d4ffe Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:43:27 2021 -0500 Merge branch 'bookmarklet' of github.com:smilerz/recipes into bookmarklet commit 51d4ffef18d359f75d377eee27bd15816957ac53 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 08:50:00 2021 -0500 unescape html document commit e5ada345d869409b240fd0746a88f269b6c28c2c Merge: 5b7df0a8d02cad
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 12:39:37 2021 -0500 Merge branch 'deprecation-fixes' into bookmarklet commit8d02cad7d9
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 12 14:12:04 2021 -0500 resolved deprecation warnings introduced in django 3.2 commit 7a9998f67f4c0a04ea44165924e9dca15f44c750 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 18:38:46 2021 -0500 removed cors_header import - unused commit fc9408dab2bd3e37d729086bb792b0ebe14aef06 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 18:38:00 2021 -0500 catch attribute error when scrape has no schema commit a56b4fc77ad31b509807c017f19c2e65e59ace26 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 16:03:56 2021 -0500 handle text cook times on import commit ec40f925d62be43c98dbf889d729d664b498b258 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:45:34 2021 -0500 convert servings to number on import commit 6d0ec1ac0b0267fa0959fe13cdbdb971d9a491fa Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 13:10:23 2021 -0500 name parser handles list commit 6ba6bd1942b5705d3e938beae48fdc9c257f3f71 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:52:34 2021 -0500 updated docs for personal beta commit be519152048bab1e37c171b3b7b439773e805071 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 08:57:35 2021 -0500 decode html data when passing bookmarklet commit 3743626f5596bc9fc1a8845e2e244459e117acdf Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:39:30 2021 -0500 extra error catching commit e01bc5cb58caaa207992be94315ada6bb737dc60 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 18:48:45 2021 -0500 more shenanigans commit 0f3c69813011d1b88d483c29fc156494a40df97c Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 18:25:24 2021 -0500 add debugpy to requirements commit 186ad152b44a03b1485d5209accc5b43d8b48f08 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 18:24:24 2021 -0500 remote debug commit a3b4621087d336e0ae17a510b3e868859724e86c Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 18:03:15 2021 -0500 remote debug in container commit 96404ab2cbb04cca654145144def3f520d332afd Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 16:48:09 2021 -0500 nope, this one works commit bb965e9e54059f009d591e85db2fc09ec018d501 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 16:28:31 2021 -0500 it finally works commit 4d065e1045b684234c94cf26155f4242a49c15ad Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 15:40:36 2021 -0500 fix test again commit f591d5eb3b45fe8aef4b3401ccc5cbd8a96f4719 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 15:02:57 2021 -0500 add bookmarklet back commit 26daaf24236a9dedd96d248a571a669cb11d4970 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 14:40:13 2021 -0500 extra docker tags commit b82897f90e768f0785dfc0d6178cac11795b4d66 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 14:29:52 2021 -0500 build hook commit 730ff0d826e7c28a6d97c462d9e8021489c66c87 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:44:03 2021 -0500 fixed workflow commit 362a01f983fdd3275a562a253d7543affc777eb4 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:42:00 2021 -0500 fixed branch reference commit 3464a23309beb7e76668f397f05ace099a6d0b32 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:39:08 2021 -0500 personalized build commit 779418fe93856212c30a48297457dc95ebaf7871 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:05:28 2021 -0500 updated tests commit 28c04c605c31d1ec8b437506d4cd30593bcff2b4 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 11:52:06 2021 -0500 fixed admin commit 33200e9d1ec649775efefc635a1c488d5b992793 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 11:29:35 2021 -0500 updated bookmarklet to work with updated import process commit 66f5422a948e78149284413dca88797749ae2682 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:42:31 2021 -0500 remove html tags from description commit e11bb16b1f8801c47814fc458909854e90783a59 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:52 2021 -0500 Squashed commit of the following: commit 707d862e01a7497a1f22879d314b865a35e0e85b Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:00 2021 -0500 works now commit 3942a445ed4f2ccec57de25eacd86ea4e4dd6bdb Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:25:24 2021 -0500 updated serializer and api commit 10dc746eb175c7f805a8a8ffa7ce49977a7ce97e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:20:19 2021 -0500 fixed bookmarklet commit 9779104902d3be0258c95cd2eeebcba0d5d48892 Merge: bb8262c 0cb3928 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:56:27 2021 -0500 Merge branch 'bookmarklet' into json_import commit 0cb39284bb835ffc6cfee3e4306aadc4a64a25be Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commit e89e0218de684d40b2e2bfb6ba833891206c828e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commit bb8262ccabb93c56fbc18c407d5a0653b8b3ca79 Merge: b1e73aa35a7f62
Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 20:35:57 2021 -0500 Merge branch 'main_fork' into json_import commit 9c37d9b474f49b0b7118adc553aaa513fab8744f Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commit d50a70524e787d1d1b6d2d930f80dfcc0f59daa4 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commit aabade4c9d5c42a6c942afe49c79190f6955a82f Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:20:03 2021 -0500 added missing bookmarklet commit 82854085e6aba2e136297c78e1c0f1b8c0ed58d9 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:18:14 2021 -0500 Revert "bug fix url import" This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23. commit 80332c7d871888ff5f19286289028632780c4361 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 13 16:44:05 2021 -0500 removed extra string normalization commit cf08828e6ac3aa217599c4ca6156eb0f1bbab7da Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 21:22:56 2021 -0500 updated migration commit 21f525a840cbbc379391216d7fed81c51e234da3 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:14:50 2021 -0500 updated recipe targets in tests to reflect html decoding commit 5c9fe04899e867406e467374722a423680e0dcb7 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 13:28:35 2021 -0500 fixes #527 commit 6f0cc35901bb00cfcb0a9a8d69baf860427618bb Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 10:57:13 2021 -0500 bug fix url import commit c75b33d33b74e46024736ab14df24299d260ac79 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 07:02:43 2021 -0500 url import bug fixes commit 1ad9e68d1fcbb429a06b91601b8317189ca77ec7 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:43:33 2021 -0500 bug fix tests commit ecf71c3af1b864f2a9583b86dcfadd713d7695a3 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:41:00 2021 -0500 bug fix url import commit e0b4630f4910b566dbd2b8e6e5aac5109b1c257f Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:26:29 2021 -0500 recipe import tests commit 968a1903c6e85e65f161d67067d5849ca97253b9 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 12:32:11 2021 -0500 simplified url import commit 3540f469bb53ce0ad54d08c4b8188c060f8d2646 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 09:20:15 2021 -0500 add data for url_import test commit 0ddb608cb9770c53cf6fe3415dcbd17642ab9cb8 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:43:36 2021 -0500 added all ATK sites to custom scraper commit ecdb56a25b0aa3dfde4132ed5816e29bf8a57a1d Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:23 2021 -0500 added cooksillustrated custom scraper commit 40de81d0e5f3a1622b44371e1c4c3e7766260d92 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:01 2021 -0500 ensure time is always a number commit 9ee9f5595e8c37e335da8c0d3aa9af295dbb571a Author: smilerz <smilerz@gmail.com> Date: Fri Apr 2 15:19:20 2021 -0500 added ability to create custom scrapers commit b99ea1fb5f9711320fbf34540d02bbcf8baa80c2 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:21:28 2021 -0500 removed old json importer commit bb88d0e624635a209e55c6568242e9759f204802 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:19:18 2021 -0500 updated import from source to use text scraper commit 9d7658a4c87bf7b9b9b9560eec3b36daaedd08d0 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:08:56 2021 -0500 remove old html_import function commit 64c2b09339bbcc88415b7f24d44602e6e5b0f73f Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:07:51 2021 -0500 wrapper for recipe_scrapers to parse text input commit eed7377905cb798f5e380a2ac28c7b363b8ccde9 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:17:46 2021 -0500 fixed broken tab commit 9be6b597845cbfdbf7da55e22639fa8e889fbd44 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:11:54 2021 -0500 delete bookmarklet on import commit 7380ab36af556562f5c810a6705aa691aa4ca21b Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:53:06 2021 -0500 removed console message commit 8758cd254ee845eba07fa1b8fc1317c8a4e1546e Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:51:14 2021 -0500 fixed ingredient display on preview commit f878f96267e17b17df7903b8981e446fa386e298 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 11:49:56 2021 -0500 redirect to import url for processing commit 04f56a864df2c1f515d6407bb2226a18e58787aa Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 06:39:44 2021 -0500 added hack to fix scopes & CORS for bookmarklet commit c6e9c8e5ee2bc35391ae1da88ea651a7fdacf82c Author: smilerz <smilerz@gmail.com> Date: Sun Mar 28 18:39:20 2021 -0500 added CORS middleware commit 8f1677536efdb78b80173ca8f81d0c03f410d3c7 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 26 14:47:24 2021 -0500 added bookmarklet model and api commit 4d79a26c790462209e7bf599ac70d2618047ee7d Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 17:48:32 2021 -0500 bookmarklet passing data to form commit a4855a40d9417739fd222d41dec6464567e6618f Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 14:02:57 2021 -0500 added bookmarklet that doesn't work yet commit 00e4d51038ab50d0342261ec24904e9b3299fd2d Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 14:14:56 2021 -0500 Squashed commit of the following: commit81a8734fac
Merge:abcef54
f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:41:13 2021 +0100 Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support Add iOS webclip icon support commitabcef54e72
Merge:e15c92c
7527646
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:30:43 2021 +0100 Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1 Bump recipe-scrapers from 12.2.0 to 12.2.1 commite15c92cda5
Merge:58fc269
45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:26:06 2021 +0100 Merge pull request #501 from smilerz/main_fork fix json direct import when wrapped in @graph commit45dba6fad2
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:23:55 2021 -0500 fix json direct import when wrapped in @graph commitf67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 15:49:12 2021 +0100 Add generated icons from icongenerator. commit53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 12:48:58 2021 +0100 Fix errors in favicon SVG. commit7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Mar 19 05:51:22 2021 +0000 Bump recipe-scrapers from 12.2.0 to 12.2.1 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1) Signed-off-by: dependabot[bot] <support@github.com> commit 2632443cabe11832a6c50933bdb4f23725c69df6 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 13:58:16 2021 -0500 updated links to import recipes commit 26f0b0e411a581ae2490e0c1832629ffbe9f5e8e Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:54:41 2021 -0500 added collapsable cards commit 19aa5b4f4eafb523227aee3d3085e4c2ee7d52e2 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:32:55 2021 -0500 cosmetic cleanup commit 1ec080aaf3d44ae700e9de2132fe4895f38d17e6 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:15:57 2021 -0500 added image import commit c7c6515585f5f05c8ecceef58f9da3af2a687b1c Author: smilerz <smilerz@gmail.com> Date: Mon Mar 22 15:13:01 2021 -0500 consolidated integration imports into url_import commit a1cade20bd21916d87543eefeb1f42ef77240b24 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:49 2021 -0500 staged app import tabs commit 99f23a0bbd202cdd1c9b37335a6b04230b1cdb02 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:16 2021 -0500 fixed missing space in keyword when adding recipe commit 4fbdc74570e11bbaa6b727577b3d0459f47b35ec Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:08:51 2021 -0500 removed unused templates commit ee4b1ff6436a95785248e3216473092620bf7c23 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 13:13:56 2021 -0500 combined json import and source import commit a07dd8aa227f607b38a45942e2d4f718fc67a2d3 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 16:06:02 2021 -0500 more fix from super ugly merge commit 4306423b6368a5173c214f7768a37947a4df7936 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:17:10 2021 -0500 more cleanup from ugly merge commit c9b6205aff7da16a46e825e42919bd4c544cdf48 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 11:24:23 2021 -0500 fixed ugly merge commit 053bbc88250871d4bdfcfac9d5bfaeceeafb13f8 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 18 12:09:53 2021 -0500 added drag and drop to ingredients commit 2248c54ef980661cf5705fa9881cc1814960833b Author: smilerz <smilerz@gmail.com> Date: Mon Mar 15 15:56:44 2021 -0500 manually parse json commit e0d19b7b5798b7c2b4915d5efe9ed93ca975ea43 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:33:07 2021 -0600 update urls.py commit d9b15f1153f043da725db51eb94baaf8e4ca0242 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:32:47 2021 -0600 commit merge from Patralos/recipes commit b42c730013227a04631425521ad931e943eacace Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 15:34:47 2021 -0600 updated URL import page with tab interface commit 10683b5bcd0a55481bdc35369c471d8b876f5f18 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 11:29:10 2021 -0600 import raw json/html commit 7ecca2c3ed7a99c93987a38446af58fa48ced658 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 7 14:28:29 2021 -0600 refactored json parser to create functions for each sub parser commit 228b26f566124123b101e638b351f651dcb2db68 Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 21:37:39 2021 +0100 Allow recipes to be imported from json directly commit 6c780758a6e0318f486b9edb05f10df12749b9b5 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 14:09:10 2021 -0500 corrected api import workflow commit cbca5d4d22a470449207f2e208dca9cecc9c35b9 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 11:26:26 2021 -0500 restored missing manual url scrape commit d7b6c05b24d632668495e0efcd39248e310c9830 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 09:02:27 2021 -0500 Fix after rebase commit 8d6a2bf3e6564a09e91e701261b44952a48f2bf6 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 18:39:44 2021 -0500 catch attibute error when scrape missing schema commit cae53a22f2568d34ea09cbdbe346ebf5ca1e1ef1 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:47:35 2021 -0500 convert servings to number on import commit e23b1168c39b104632734270f3aa7c5b872d7ab1 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 13:17:15 2021 -0500 custom scraper fails safe commit 630d7a7570c42627ca33515f365a7e0a3ddf7034 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 12:48:26 2021 -0500 added name parser commit 89e0c552c5c02ca4514fc8e91d8c357650c69f0a Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:31:47 2021 -0500 updated tests to handle html decoding commit 34b5f7940341fc8bf18140e7ce82ea64561661c3 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:55:07 2021 -0500 flake commit faf172b8daff00ddc3aef26b0af3f4ab1d68570b Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:53:45 2021 -0500 decode url strings in text_parser commit c918bf123d66f2b8f62ec89c10515de0485f0f4a Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:32:33 2021 -0500 catch error on scrape.image() commit 2b413415166f50ebaf6b747bc46449ca700e78a3 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:28:46 2021 -0500 trap error on scrape.title() commit 873d7bee5807595e1616605958d22c35f829e99d Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:05:28 2021 -0500 updated tests commit 2b2f906fdbdcb0fb87f6e7bf2fab2991208799e1 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:42:31 2021 -0500 remove html tags from description commit a11ecb8fec0fe7096e219fbcee2fb264bb7bdb27 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commit 66d2c5c75ea0d2b40de26796ff2cd9634d23bca5 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commit 0171a65bc6331ff760559d1326cb52c60aaa7c5a Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:20:03 2021 -0500 added missing bookmarklet commit d97f5cd7e96cb0ca6a8b14900a47dd83ab088a59 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:18:14 2021 -0500 Revert "bug fix url import" This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23. commit a4f85e1ac1c70d1b63bba4c9284d36a925246a52 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 13 16:44:05 2021 -0500 removed extra string normalization commit e534c41b2ca81187c4b97c5df8ff5ea9cf1d244e Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 21:22:56 2021 -0500 updated migration commit d4d4a6a834c7b022caebc72d1b4de975b82b6754 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:14:50 2021 -0500 updated recipe targets in tests to reflect html decoding commit a08ef25e5f23e3036ae3c37cf9de3f20cd61f329 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 13:28:35 2021 -0500 fixes #527 commit 1a26d3243cd3295756d268b56df7a6acf3c6d4b1 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 10:57:13 2021 -0500 bug fix url import commit 52519cfc44ad2e9a79ee1cae772db5724242efeb Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 07:02:43 2021 -0500 url import bug fixes commit 0e3e8cc3d8360d8815b9f4cdf2ff07601fa2446d Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:43:33 2021 -0500 bug fix tests commit a150502bbdd0b64c34cfe1c582c9bae426f41655 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:41:00 2021 -0500 bug fix url import commit 11580d17360b4d78c59d7ec29fceb07459703ac2 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:26:29 2021 -0500 recipe import tests commit 4b84caaeb7059c913a477173cbc1edf5d15f0902 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 12:32:11 2021 -0500 simplified url import commit 0c79b6f0dc12c36ce93c14fde94d5a5d69dcde83 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 09:20:15 2021 -0500 add data for url_import test commit 613a11a20aeb7aec7594b928df1053e4ed62d87b Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:43:36 2021 -0500 added all ATK sites to custom scraper commit 1fb29193e72db672824f712dcbdbf39a0a109149 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:23 2021 -0500 added cooksillustrated custom scraper commit 2b512e6d6e5158a082655cba665b9b69b01ab11d Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:01 2021 -0500 ensure time is always a number commit 5e0bfd0197d83ff734895a0cf7d71f734863d817 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 2 15:19:20 2021 -0500 added ability to create custom scrapers commit af093397b27cac111846b65b3df03e041c8cfb44 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:21:28 2021 -0500 removed old json importer commit 06c3a477cc127e4348bae2968b3a4469a903b63e Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:19:18 2021 -0500 updated import from source to use text scraper commit 4281c20b11317a092897c54e2c026f5b45bb8edc Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:08:56 2021 -0500 remove old html_import function commit 987d3f0731f7d4af1d762e8d831373c0c76572ef Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:07:51 2021 -0500 wrapper for recipe_scrapers to parse text input commit a3bfb99179173e1e189f37278a7296cab246e942 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:17:46 2021 -0500 fixed broken tab commit 0a198fe0c93e4f133598deb32f19253444bd6b54 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:11:54 2021 -0500 delete bookmarklet on import commit 4b216a59fd94196299659e91ed81f9f3c136f99e Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:53:06 2021 -0500 removed console message commit 04bbffa695dc36c33e2147c63676b220f6ad5247 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:51:14 2021 -0500 fixed ingredient display on preview commit e9436d96bd0932c3c17a8ef88cebeec092045936 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 11:49:56 2021 -0500 redirect to import url for processing commit 3456dac997e4c228e0b274f787ccb364d47aa392 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 06:39:44 2021 -0500 added hack to fix scopes & CORS for bookmarklet commit e32b6beee026b68d730c0ea672e14efd50f95668 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 28 18:39:20 2021 -0500 added CORS middleware commit 79d8d150831cb900f296d03cc284e956979e91c3 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 26 14:47:24 2021 -0500 added bookmarklet model and api commit 8c3a897ca22580c09ce9f1ba82d50f76605f5e71 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 17:48:32 2021 -0500 bookmarklet passing data to form commit e2dbde8fe0f4588e216580db2963031c76daed39 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 14:02:57 2021 -0500 added bookmarklet that doesn't work yet commit 269d687ffb5208b8dcd092e09de60165253adfe2 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 14:14:56 2021 -0500 Squashed commit of the following: commit81a8734fac
Merge:abcef54
f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:41:13 2021 +0100 Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support Add iOS webclip icon support commitabcef54e72
Merge:e15c92c
7527646
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:30:43 2021 +0100 Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1 Bump recipe-scrapers from 12.2.0 to 12.2.1 commite15c92cda5
Merge:58fc269
45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:26:06 2021 +0100 Merge pull request #501 from smilerz/main_fork fix json direct import when wrapped in @graph commit45dba6fad2
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:23:55 2021 -0500 fix json direct import when wrapped in @graph commitf67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 15:49:12 2021 +0100 Add generated icons from icongenerator. commit53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 12:48:58 2021 +0100 Fix errors in favicon SVG. commit7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Mar 19 05:51:22 2021 +0000 Bump recipe-scrapers from 12.2.0 to 12.2.1 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1) Signed-off-by: dependabot[bot] <support@github.com> commit fd4d16b8c04b030c6c23be70406a699a178fac24 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 13:58:16 2021 -0500 updated links to import recipes commit d1f483fc3660244ac4e09fb604f1d113b63c4d48 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:54:41 2021 -0500 added collapsable cards commit 20d3d5d8a11ec929ab799e24d94568c8bc1947cb Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:32:55 2021 -0500 cosmetic cleanup commit f57cef441574130b68770f58ed43efc4ff7fd72c Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:15:57 2021 -0500 added image import commit 63a3bdf2cd382a51777a1b1e339b554a29ecd6cf Author: smilerz <smilerz@gmail.com> Date: Mon Mar 22 15:13:01 2021 -0500 consolidated integration imports into url_import commit 873e61367563e744c5f014f4706a36e6903b6d39 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:49 2021 -0500 staged app import tabs commit 02c866d922ca8a315f2d8b17387f4dbd7426bf97 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:16 2021 -0500 fixed missing space in keyword when adding recipe commit df3d58ceeb27090ef2c1c0cdacc43afe69a1180d Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:08:51 2021 -0500 removed unused templates commit 49c08c8e56fa027f4d5fca1d02cfa7af5b065579 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 13:13:56 2021 -0500 combined json import and source import commit c7460cc5caa3cad8e5ba41519b0d75bc24aa40c1 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 16:06:02 2021 -0500 more fix from super ugly merge commit 8ae52d350a6cd6607a5fe49e9ca697ad446786e1 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:17:10 2021 -0500 more cleanup from ugly merge commit de39b470493d5a1ca6e0ff19eae19cfe3572e7c3 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 11:24:23 2021 -0500 fixed ugly merge commit 3cc0b6827289230e89848c9256416d87176b9e27 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 18 12:09:53 2021 -0500 added drag and drop to ingredients commit 1e647ed7c768b22199d22097cdc886356ce4922a Author: smilerz <smilerz@gmail.com> Date: Mon Mar 15 15:56:44 2021 -0500 manually parse json commit 5787ff769f91697e34696be52597e7f5d83618e4 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:33:07 2021 -0600 update urls.py commit 0ea86c1012ec94c99a94e1f26e134b7af8110df4 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:32:47 2021 -0600 commit merge from Patralos/recipes commit 7358745bd2085e7f1293d64fb2459abd025d866f Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 15:34:47 2021 -0600 updated URL import page with tab interface commit fcbcb7fff2b10062b831c32ba8344204be81eb50 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 11:29:10 2021 -0600 import raw json/html commit 2abe787709ce6db7d4125d5c15b2e161bb4892a6 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 7 14:28:29 2021 -0600 refactored json parser to create functions for each sub parser commit 5af2305eae8c0c47da3d1ab97b4c397e0910aad8 Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 21:37:39 2021 +0100 Allow recipes to be imported from json directly commit 615201c92d0c13b1ad41fb0683eb0fe505bcd478 Author: smilerz <smilerz@gmail.com> Date: Sun Jun 6 14:58:16 2021 -0500 fixed migrations commit 19034056f9d65ea48be331451ac958bf4698749e Author: smilerz <smilerz@gmail.com> Date: Sun Jun 6 14:25:14 2021 -0500 Fix after rebase commit 26ce37c47c1f7223ece73487ccf49efba28ac5e1 Author: smilerz <smilerz@gmail.com> Date: Sun Jun 6 14:12:19 2021 -0500 fuzzy match on lookups commit 9b31c174acb6da38bcb32307a4cdaa7cafa9e877 Author: smilerz <smilerz@gmail.com> Date: Sat Jun 5 17:56:48 2021 -0500 link to search settings in recipe search commit 7dad701ee4d2beaf460b13cce4e5090d6e3385ce Author: smilerz <smilerz@gmail.com> Date: Sat Jun 5 17:43:48 2021 -0500 search form and help doc commit bb7d05bd85695a957c6cb29c15d4abec1d6050f7 Author: smilerz <smilerz@gmail.com> Date: Fri Jun 4 13:33:02 2021 -0500 search preference settings commit db1d70c5d97fd8207fe9c732f3fd76ace036c8d5 Author: smilerz <smilerz@gmail.com> Date: Sun May 30 08:57:09 2021 -0500 create indexes commit 7ead157bfe0d0df69a5b5b2702ae5afddaa2c098 Author: smilerz <smilerz@gmail.com> Date: Sat May 29 20:14:35 2021 -0500 foundation for user configurable search paramaters commit fc2d19562d5bd20997983649de1a72d2a588b67d Author: smilerz <smilerz@gmail.com> Date: Fri May 28 11:37:16 2021 -0500 WIP commit 0c08826cc81830d3654bc15e1e384bf663153181 Author: smilerz <smilerz@gmail.com> Date: Fri May 28 11:37:07 2021 -0500 split search vectors for recipe name and description commit 459ca86f3604325b3ffd6697ce46a3eb74415e97 Author: smilerz <smilerz@gmail.com> Date: Mon May 24 11:35:16 2021 -0500 WIP commit c4f2d5fe246830ca62e9701960f70b783c53c736 Author: smilerz <smilerz@gmail.com> Date: Thu May 20 17:27:17 2021 -0500 Fix after rebase commit 46dae2c2a6f43d01baa535b25be593495e46c9c7 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 26 08:35:55 2021 -0500 updated comments, removed direct trigram search commit 5fdef6df17217fff639db635cc3c0b07dab79ff4 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 25 19:50:51 2021 -0500 add trigrams to full text search commit d8891e8fd1613007b6ab2a643a96f5b11e78f1a0 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 25 19:35:17 2021 -0500 add unaccent to full text search vectors commit c3fa49ccb3050a4684c7cfb489b4cbac99890ff2 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 25 19:09:54 2021 -0500 WIP commit 11e20330ab40296907817d98176886a2b07a97fd Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 19:01:20 2021 -0500 add trigrams to search rank commit 0090afe9235064e14ef8180c40ac6bb95860fda8 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 15:19:37 2021 -0500 simplified code commit ccc19f2a22262a5230f6f84dcb95c80602d6a59c Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 14:42:10 2021 -0500 updated search v2 with full text search commit 42bb1da652730a9cd253b1a7e109df6460adef9c Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 13:22:48 2021 -0500 filter.py commit 82cc5dd593c2b1acbd4a6a3d9613e4b262cd37e9 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 20:17:54 2021 -0500 added multi-language support to FTS commit b8a20c056bf298e488b29f27d22183e69e12edf0 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 19:42:22 2021 -0500 rebuild recipe index from admin site commit 2d1cbd311100d30064c53f5599d19ae6cd18187f Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 19:07:50 2021 -0500 command line to rebuild index commit a83396e179a6efa7ff94e2b784a0ccec206488b9 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 17:01:18 2021 -0500 updated to handle sqlite commit ae46f0b3df76458a618898900be4f721d5486d05 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 9 12:47:17 2021 -0500 fixed smalltable commit 53d3889f98531cac823c9e4a6652b234890bca76 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 9 12:46:07 2021 -0500 working proof of concept commit 506cbc73b10ccfe4b05d0961240b06dcabe0861c Author: smilerz <smilerz@gmail.com> Date: Tue Jun 8 16:08:50 2021 -0500 git commit d7fd5840ee35a783b1aca8f3a801f6da8cfbc36f Author: smilerz <smilerz@gmail.com> Date: Tue Jun 8 16:04:40 2021 -0500 update migrations commit 48ac4c7fc7112efb809202128fd38dbf1ef4cc2d Author: smilerz <smilerz@gmail.com> Date: Tue Jun 8 16:01:18 2021 -0500 Fix after rebase commit 404c923738224b40b4dc4a4d6bc5674e137f55a2 Author: smilerz <smilerz@gmail.com> Date: Sun Jun 6 15:37:57 2021 -0500 fix migrations commit 247b7b34d7ae75b209910792cd1729ae8b574341 Author: smilerz <smilerz@gmail.com> Date: Sun Jun 6 15:17:11 2021 -0500 yarn build commit f9ee94f7b61424c64422f5ec5bd1a723882f69fe Author: smilerz <smilerz@gmail.com> Date: Sun Jun 6 15:16:07 2021 -0500 Fix after rebase commit 70ca75db48aeea9959dd6c10556861afada97e4a Author: smilerz <smilerz@gmail.com> Date: Mon May 24 12:20:52 2021 -0500 yarn build commit 8bbad9f5bcb9d2089f7e4672ee77d54418a517e0 Author: smilerz <smilerz@gmail.com> Date: Mon May 24 12:03:27 2021 -0500 WIP commit 6d68d55ce8522d2b7e952f48d3bea96d7fbd6dd1 Author: smilerz <smilerz@gmail.com> Date: Mon May 24 11:51:54 2021 -0500 send search results to console commit 82a363daca71b7ea8d3e96261e104fc630b96c40 Author: smilerz <smilerz@gmail.com> Date: Mon May 24 11:36:23 2021 -0500 debounce search commit b2851cc0be449b95e91b76a1d63e86b7eb4435fe Author: smilerz <smilerz@gmail.com> Date: Thu May 20 15:38:32 2021 -0500 updated signal commit b62a8a12c1444c50f5777046f5b9b2d8f6c6824d Author: smilerz <smilerz@gmail.com> Date: Thu May 20 15:19:02 2021 -0500 WIP commit 5c404f115bc63364e19a56cac63a561553ca3ff2 Author: smilerz <smilerz@gmail.com> Date: Thu May 20 15:02:49 2021 -0500 WIP commit a3f9934410d3dd3f4eb3cc5ad1cb02631c963189 Author: smilerz <smilerz@gmail.com> Date: Thu May 20 10:16:17 2021 -0500 Fix after rebase commit 65d9b9b0484ecbaf03973eedfd8d76cba0fe6092 Author: smilerz <smilerz@gmail.com> Date: Thu May 20 08:33:09 2021 -0500 Fix after rebase commit 88c3f48f1244de6f1fe2594bba87aef6b3848f87 Author: smilerz <smilerz@gmail.com> Date: Wed May 5 08:01:06 2021 -0500 Update README.md commit e1f850778522cb3f89bab37e8d5644e9340fe8bb Author: smilerz <smilerz@gmail.com> Date: Tue May 4 10:33:47 2021 -0500 recompile commit 0e993373e848fb4962282b6ad78beaaeb3b20551 Author: smilerz <smilerz@gmail.com> Date: Mon May 3 08:39:19 2021 -0500 minor bug fix commit 519e0c2e17cafc2166afabfd2d0da1f513119319 Author: smilerz <smilerz@gmail.com> Date: Sun May 2 20:33:14 2021 -0500 yarn build commit cfa9fef42afc1920cac2a7cc3f32d3d74ff1b971 Author: smilerz <smilerz@gmail.com> Date: Sun May 2 19:57:30 2021 -0500 rebase commit ed1017a8af4ab4c28ef88c96d52531efbb62fb6c Author: smilerz <smilerz@gmail.com> Date: Fri Apr 30 16:22:34 2021 -0500 cleanup after rebase commit 7688d12b3c16b6bfba8f079d6cb0d593048bc8ad Author: smilerz <smilerz@gmail.com> Date: Fri Apr 30 16:03:30 2021 -0500 Fix after rebase commit 5a5b3ebe866d312ddff00eee9fb5680fdc0d043b Author: smilerz <smilerz@gmail.com> Date: Thu Apr 22 11:26:44 2021 -0500 truncate query params on url commit 08fa58e0f517a1d6e220ebfd8a9328d133ec78bc Author: smilerz <smilerz@gmail.com> Date: Thu Apr 22 10:07:24 2021 -0500 bookmarklet includes url script_name commit e9ec5f645a80728deb0676f4c93fe7bb43fe54ef Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 19:00:20 2021 -0500 add trigram to rank commit 7d6efabc020ab7b15e31e1fab97febc4ee3142fa Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 18:46:35 2021 -0500 Squashed commit of the following: commit 1c5f74bd182eb502e27d03cc7f93e5e0db8c3362 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 20 12:24:05 2021 -0500 change markdown link from hard-coded to reverse commit 76c56e2a063ec45f97b4d898e106a2b378b95b96 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 14:16:17 2021 -0500 missing '/' commit 47a13811a3a6e47e5f6f1c3ccd515c1989bd4617 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:41:26 2021 -0500 yarn build commit 0d2c1fabe9f982179ec9d26cbb79bc0cebfef9c5 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:31:48 2021 -0500 Squashed commit of the following: commit e03f626fd08a3e048dbd968d623ee58b7f865929 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:04:39 2021 -0500 yarn build commit b511f929ffcc7a670bd7955269982e05c591783a Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 21:17:31 2021 -0500 update service worker with base path commit f13f02d481618583017c71fb654adaa86585ef0b Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:54:17 2021 -0500 WIP commit f2f927c16f52baa6b9a31cd9992e8c7c8739d666 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:40:59 2021 -0500 default value if localStorage fails commit 424e8a9b93d8aa9962a3b6f963fff5c6e23dfa56 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:30:38 2021 -0500 fixed missing '/' commit d49a206ddf5952036b295804f9e31e52a1b45af6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:13:04 2021 -0500 updated .env.template commit ac94ea7afac36f65e1658f3d29f4e2b8f0475ba6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 15:31:37 2021 -0500 WIP commit c9a687df1b21ac6584d0f958e65c5cfc040406ca Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 10:19:02 2021 -0500 WIP commit 7fe8c7fbe52c96f1ccd4128db256656e43af3fa0 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 08:10:08 2021 -0500 added nginx config commit b5540d85872d9d69bda3787db7ecccfce893236f Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 08:03:09 2021 -0500 allow subfolder config on NGINX commit92c65ec1e8
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 21:21:41 2021 +0200 fixed test meal plan commita376c3a5b6
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:55:48 2021 +0200 meal plan random fix commit058d705170
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:19:11 2021 +0200 meal plan in search commit4ad5d6ef2f
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 15:01:39 2021 +0200 fixed test + added api doc for new search commite676b4bac3
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 14:05:19 2021 +0200 added api pagination for recipes commit04488741c4
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:11:19 2021 +0200 adv search mobile styling commit99004ad34b
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:03:15 2021 +0200 new search and setting commitf78f7dfc14
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 02:55:50 2021 +0200 search ui improvements and filter commit880db58d38
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 21:28:29 2021 +0200 v2 search filtering commitd1d65d878c
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 14:11:10 2021 +0200 v2 search progress commit3194a7580d
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 12:57:02 2021 +0200 basics of v2 search working commit 2d213a95fd63bc40c1c13cc6a4816dd146cf4cd9 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 18:20:57 2021 -0500 removed trigram commit b0f5445387548da3b6fb4ff3f026dd71e48c21d2 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 16:05:53 2021 -0500 add trigram search to v2 commit dad24a9354d94eef0101290b83f432d95b8a9155 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 15:27:50 2021 -0500 Squashed commit of the following: commit a5d1c400efccdd3ad47807c4a2f990b983243d06 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 15:19:37 2021 -0500 simplified code commit 15261536c8ebab7156c366dcd4e21c5330550fde Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 14:42:10 2021 -0500 updated search v2 with full text search commit 51f4af6487bfbccc66998160e0ba3e4318dc6621 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 13:23:09 2021 -0500 rebase commit 2df9fc9d33a2b558b82cc8e614f18d0ebc409b83 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 13:22:48 2021 -0500 filter.py commit f90f3186d95ae64c7f88bad5fccb003d7d3f44a6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 20:17:54 2021 -0500 added multi-language support to FTS commit 3cfe14bdae4a4d8995e9d7bf3daacbe05544b0a7 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 19:42:22 2021 -0500 rebuild recipe index from admin site commit ef17ce2d57e869ddb84e4af8a37c2081cbf41e65 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 19:07:50 2021 -0500 command line to rebuild index commit 306c662f0b8dc39dee3cc6011d5d9f4c1ac2f325 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 17:01:18 2021 -0500 updated to handle sqlite commit 8c049697a55fd328a1e93607991c9160db80b6cc Author: smilerz <smilerz@gmail.com> Date: Fri Apr 9 12:47:17 2021 -0500 fixed smalltable commit c6f8d199efeb5d8b0f5b63a0113afbd856398857 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 9 12:46:07 2021 -0500 working proof of concept commit92c65ec1e8
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 21:21:41 2021 +0200 fixed test meal plan commita376c3a5b6
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:55:48 2021 +0200 meal plan random fix commit058d705170
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:19:11 2021 +0200 meal plan in search commit4ad5d6ef2f
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 15:01:39 2021 +0200 fixed test + added api doc for new search commite676b4bac3
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 14:05:19 2021 +0200 added api pagination for recipes commit04488741c4
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:11:19 2021 +0200 adv search mobile styling commit99004ad34b
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:03:15 2021 +0200 new search and setting commitf78f7dfc14
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 02:55:50 2021 +0200 search ui improvements and filter commit880db58d38
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 21:28:29 2021 +0200 v2 search filtering commitd1d65d878c
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 14:11:10 2021 +0200 v2 search progress commit3194a7580d
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 12:57:02 2021 +0200 basics of v2 search working commit 20fb8e16f6ba221ca8ecc7865463b00a07e91777 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 20 12:21:58 2021 -0500 changed hardlink markdown link to reverse commit 8a9957754462e09108ba806d64d600a95fa70b81 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 20 09:15:57 2021 -0500 changed keyword to get_or_create commit 7f031c1951edcfbea4a430c3260baaf3c309d55a Author: smilerz <smilerz@gmail.com> Date: Tue Apr 20 08:08:13 2021 -0500 strip food and keywords on url import commit 334b375df15fd10a8e875ba21b5c43f6224bb40e Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 15:31:49 2021 -0500 fix bookmarklet loading commit ded3ee9438bc0ebb3bd8216524a904adbe2040a8 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 14:36:52 2021 -0500 WIP commit daeaf09d456b5aaede3b36e62a29fa83b9a1806f Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 14:15:17 2021 -0500 missing / commit 620ec929309611beb06b46112b7cb8379efdd72f Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:44:54 2021 -0500 Squashed commit of the following: commit 47a13811a3a6e47e5f6f1c3ccd515c1989bd4617 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:41:26 2021 -0500 yarn build commit 0d2c1fabe9f982179ec9d26cbb79bc0cebfef9c5 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:31:48 2021 -0500 Squashed commit of the following: commit e03f626fd08a3e048dbd968d623ee58b7f865929 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:04:39 2021 -0500 yarn build commit b511f929ffcc7a670bd7955269982e05c591783a Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 21:17:31 2021 -0500 update service worker with base path commit f13f02d481618583017c71fb654adaa86585ef0b Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:54:17 2021 -0500 WIP commit f2f927c16f52baa6b9a31cd9992e8c7c8739d666 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:40:59 2021 -0500 default value if localStorage fails commit 424e8a9b93d8aa9962a3b6f963fff5c6e23dfa56 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:30:38 2021 -0500 fixed missing '/' commit d49a206ddf5952036b295804f9e31e52a1b45af6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:13:04 2021 -0500 updated .env.template commit ac94ea7afac36f65e1658f3d29f4e2b8f0475ba6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 15:31:37 2021 -0500 WIP commit c9a687df1b21ac6584d0f958e65c5cfc040406ca Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 10:19:02 2021 -0500 WIP commit 7fe8c7fbe52c96f1ccd4128db256656e43af3fa0 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 08:10:08 2021 -0500 added nginx config commit b5540d85872d9d69bda3787db7ecccfce893236f Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 08:03:09 2021 -0500 allow subfolder config on NGINX commit92c65ec1e8
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 21:21:41 2021 +0200 fixed test meal plan commita376c3a5b6
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:55:48 2021 +0200 meal plan random fix commit058d705170
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:19:11 2021 +0200 meal plan in search commit4ad5d6ef2f
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 15:01:39 2021 +0200 fixed test + added api doc for new search commite676b4bac3
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 14:05:19 2021 +0200 added api pagination for recipes commit04488741c4
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:11:19 2021 +0200 adv search mobile styling commit99004ad34b
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:03:15 2021 +0200 new search and setting commitf78f7dfc14
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 02:55:50 2021 +0200 search ui improvements and filter commit880db58d38
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 21:28:29 2021 +0200 v2 search filtering commitd1d65d878c
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 14:11:10 2021 +0200 v2 search progress commit3194a7580d
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 12:57:02 2021 +0200 basics of v2 search working commit 58bcf33fb0a0fd71f7cee008e5233e3fe73de0a9 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 13:05:43 2021 -0500 yarn build commit 1131005e7a27e71d649b4182371a4f95a6c39422 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 19 12:58:44 2021 -0500 updated base_path in api-generator commit bb622bf821d0e4339f1a6d9d2523802d720948d3 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 21:18:08 2021 -0500 updated service worker with base path commit d4da468a921fbeaaee8a03357be92529cb931839 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:53:30 2021 -0500 WIP commit 77084378f0fa4720a10448d968cbaf836a4e81f1 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:39:33 2021 -0500 added default window location in case local storage failed commit 9ca3f730a269b607da4074279a32141ed50c12e8 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:33:19 2021 -0500 added trailing '/' commit 381fb5f2f12754e8a331bdf3831cbb8b36cf4787 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 20:06:18 2021 -0500 dynamically set api-generator path commit 0934b6d0fb4f094e637fad53008ca992c9dc4503 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 16:27:24 2021 -0500 WIP commit f378346481e9d7c5fe2b29970898945b8ab1913c Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 15:50:41 2021 -0500 WIP commit e0f2ebfe4208d5e695ee844283b15feaa486828c Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 15:43:07 2021 -0500 Squashed commit of the following: commit ac94ea7afac36f65e1658f3d29f4e2b8f0475ba6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 15:31:37 2021 -0500 WIP commit c9a687df1b21ac6584d0f958e65c5cfc040406ca Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 10:19:02 2021 -0500 WIP commit 7fe8c7fbe52c96f1ccd4128db256656e43af3fa0 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 08:10:08 2021 -0500 added nginx config commit b5540d85872d9d69bda3787db7ecccfce893236f Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 08:03:09 2021 -0500 allow subfolder config on NGINX commit92c65ec1e8
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 21:21:41 2021 +0200 fixed test meal plan commita376c3a5b6
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:55:48 2021 +0200 meal plan random fix commit058d705170
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 17:19:11 2021 +0200 meal plan in search commit4ad5d6ef2f
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 15:01:39 2021 +0200 fixed test + added api doc for new search commite676b4bac3
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 14:05:19 2021 +0200 added api pagination for recipes commit04488741c4
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:11:19 2021 +0200 adv search mobile styling commit99004ad34b
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 11:03:15 2021 +0200 new search and setting commitf78f7dfc14
Author: vabene1111 <vabene1234@googlemail.com> Date: Sun Apr 18 02:55:50 2021 +0200 search ui improvements and filter commit880db58d38
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 21:28:29 2021 +0200 v2 search filtering commitd1d65d878c
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 14:11:10 2021 +0200 v2 search progress commit3194a7580d
Author: vabene1111 <vabene1234@googlemail.com> Date: Sat Apr 17 12:57:02 2021 +0200 basics of v2 search working commit 10683dbefb7b6108abffc29a0b56c6bae1827c01 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 10:28:55 2021 -0500 wip commit 2163771505265b339bc32f717bf5c1119206abd6 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 10:28:26 2021 -0500 settings for nginx subfolder commit 83c753112073dde4861bddabc9f803779917c126 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 18 07:57:28 2021 -0500 WIP commit c8c4939ba5be57ecf32421d205ea09671377bfac Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 22:29:21 2021 -0500 allow app to be served at proxy subfolder commit 9742223b3fd74079483c17241c181951349cd657 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 20:16:28 2021 -0500 Squashed commit of the following: commit f03456411939b9f09704c057e20a970f9545dc0b Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 18:28:45 2021 -0500 no_perm commit 0262d1630dfcae204848a9fa6c41dc36958414d6 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:29:11 2021 -0500 removed unnecessary console message commit 069a02e67a99805ea04b3f2248d48584e146eadd Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:25:23 2021 -0500 removed commented out settings commit 1be713ff9db5e94fc68cfa25f4b8a219edff39b2 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:24:27 2021 -0500 removed unused cors_headers commit 5c9e1f015a6ff667968e6421341061af09d1b34a Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:22:15 2021 -0500 removed line breaks commit 0e92b029d46bbaaf2a5bf2526165d3a4075581f1 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:21:21 2021 -0500 removed console.log() commit e435325e66a1dc25fb9d24391eec5ed76503d969 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 11:17:00 2021 -0500 Fix after rebase commit c6e1add18be6e9791c7142a78129a879020c6f17 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 07:44:53 2021 -0500 updated model commit c52cd0b177da20cbed9a9d606ee4ec54ab865f38 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:46:38 2021 -0500 convert servings to number on import commit a3cf59c7a47dc39bec74b772f789e1c052884550 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:15:59 2021 -0500 update tests to handle url decoding commit 7ff1783578c90e2c6ae931b345d580279daeedf0 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:57:10 2021 -0500 bring parser inline with json_import branch commit 204f3ddf845a91c50d54d8dbd2f1d754d3076d25 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 08:50:00 2021 -0500 unescape html document commit 28291f96afdb70c8259104997000fe9544e0d134 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 11:29:35 2021 -0500 updated bookmarklet to work with updated import process commit e7c7823916febeb0adbe7e548633b737125ad3b7 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:52 2021 -0500 Squashed commit of the following: commit 707d862e01a7497a1f22879d314b865a35e0e85b Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:00 2021 -0500 works now commit 3942a445ed4f2ccec57de25eacd86ea4e4dd6bdb Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:25:24 2021 -0500 updated serializer and api commit 10dc746eb175c7f805a8a8ffa7ce49977a7ce97e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:20:19 2021 -0500 fixed bookmarklet commit 9779104902d3be0258c95cd2eeebcba0d5d48892 Merge: bb8262c 0cb3928 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:56:27 2021 -0500 Merge branch 'bookmarklet' into json_import commit 0cb39284bb835ffc6cfee3e4306aadc4a64a25be Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commit e89e0218de684d40b2e2bfb6ba833891206c828e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commit bb8262ccabb93c56fbc18c407d5a0653b8b3ca79 Merge: b1e73aa35a7f62
Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 20:35:57 2021 -0500 Merge branch 'main_fork' into json_import commit e01efbbf764bbe6b0e1cefac6c0311dd18a0d503 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:20:03 2021 -0500 added missing bookmarklet commit 3e5f3a36a48cdca0087a551a9a6b4d942d81bf19 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:18:14 2021 -0500 Revert "bug fix url import" This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23. commit 22135c7d40a399fafef994372e7ba128fc37c596 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 13 16:44:05 2021 -0500 removed extra string normalization commit 7ab59c55ac75f50997156f8808c18d12ef7ac8f3 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 21:22:56 2021 -0500 updated migration commit 0f6f8c9eeb642a2824c6952a69c2a2a12e628d24 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:14:50 2021 -0500 updated recipe targets in tests to reflect html decoding commit c56add95a4627f5ed874bbce3cb7b0f4d8adbb9f Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 13:28:35 2021 -0500 fixes #527 commit 09993a71515b9b977f074e14e11cf9e4b5c72b96 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 10:57:13 2021 -0500 bug fix url import commit 625d23d994b84be082f20ef1f6527d1d742a7157 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 07:02:43 2021 -0500 url import bug fixes commit df4b2adf7dcd8099871167ed8bab779e976002a4 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:43:33 2021 -0500 bug fix tests commit 0a61c9f9def1da5841031e39ced99a08a2536958 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:41:00 2021 -0500 bug fix url import commit afbf1153bfcc29baa80a07019f337a9c02b66a63 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:26:29 2021 -0500 recipe import tests commit 5857ed171e3b667764f2882d3ee7b73c15bdab8b Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 12:32:11 2021 -0500 simplified url import commit 33cc780cfd8001a0293951f25fd19b3db8ce0461 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 09:20:15 2021 -0500 add data for url_import test commit 322552a1f1434e7ca52f75886e752f31ea5915f3 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:43:36 2021 -0500 added all ATK sites to custom scraper commit 6455e597fbc2a394f217fe8c11d2bc89e8add1a4 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:23 2021 -0500 added cooksillustrated custom scraper commit 1c6ad94a2d8bf466e35c56a1cd82dff9039371c6 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:01 2021 -0500 ensure time is always a number commit fbbc057a8a2964eb6a4ac7d2324adacc679db2d6 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 2 15:19:20 2021 -0500 added ability to create custom scrapers commit fd293f150e959f67b3e8260061f8a72898e0990c Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:21:28 2021 -0500 removed old json importer commit 86b330583a6f5946b5743df8b447dccc1db3ade0 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:19:18 2021 -0500 updated import from source to use text scraper commit c4be53661293bc54c9069c2604d8fe1a61dceddf Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:08:56 2021 -0500 remove old html_import function commit 6a6314e09be06d17cc11bf55e95992f0a10b54ed Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:07:51 2021 -0500 wrapper for recipe_scrapers to parse text input commit 64524c01c8da795269bd2dbdfb5e6a02d47e8904 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:17:46 2021 -0500 fixed broken tab commit 4701d62739550754960e6d1eac437f0d2cea004f Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:11:54 2021 -0500 delete bookmarklet on import commit 4233980dd9df8e0e961363d464b41c61ad1c6288 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:53:06 2021 -0500 removed console message commit 16e34fe3b134bf31bc84c6f7584662a171fa9748 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:51:14 2021 -0500 fixed ingredient display on preview commit c51d715cfee7a787dcd7b1c3dd0beb24a14962d3 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 11:49:56 2021 -0500 redirect to import url for processing commit 29c199320502711a3197eade37f6021064c7dcb0 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 06:39:44 2021 -0500 added hack to fix scopes & CORS for bookmarklet commit 958faf9972d26ad9f78eaaa1126af51d7a3b333b Author: smilerz <smilerz@gmail.com> Date: Sun Mar 28 18:39:20 2021 -0500 added CORS middleware commit c284f830dc7e7339cd2f54185f2ff8ea6866ef19 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 26 14:47:24 2021 -0500 added bookmarklet model and api commit cbfc5fa973c002bc1ce75d3d2671986007b6a3a7 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 17:48:32 2021 -0500 bookmarklet passing data to form commit d9815e445828293bb2965c7c98ab6acf3afe3833 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 14:02:57 2021 -0500 added bookmarklet that doesn't work yet commit 0e327f3bf865a99e95368bf4b74ee9545d9a2b1a Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 14:14:56 2021 -0500 Squashed commit of the following: commit81a8734fac
Merge:abcef54
f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:41:13 2021 +0100 Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support Add iOS webclip icon support commitabcef54e72
Merge:e15c92c
7527646
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:30:43 2021 +0100 Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1 Bump recipe-scrapers from 12.2.0 to 12.2.1 commite15c92cda5
Merge:58fc269
45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:26:06 2021 +0100 Merge pull request #501 from smilerz/main_fork fix json direct import when wrapped in @graph commit45dba6fad2
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:23:55 2021 -0500 fix json direct import when wrapped in @graph commitf67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 15:49:12 2021 +0100 Add generated icons from icongenerator. commit53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 12:48:58 2021 +0100 Fix errors in favicon SVG. commit7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Mar 19 05:51:22 2021 +0000 Bump recipe-scrapers from 12.2.0 to 12.2.1 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1) Signed-off-by: dependabot[bot] <support@github.com> commit 18c5bf8a3eb7dd22504bbd2e40acab9269cc6804 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 13:58:16 2021 -0500 updated links to import recipes commit 9f643b0b85cc89a36a86681e20c68c177959e1a1 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:54:41 2021 -0500 added collapsable cards commit b37594eb84988043afa450de871a036f72a811ee Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:32:55 2021 -0500 cosmetic cleanup commit e5f76034dfc174d3ce307de1c0c5683a159733a9 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:15:57 2021 -0500 added image import commit 792cfb0791c2e682589995ccd1b85eca0a04061c Author: smilerz <smilerz@gmail.com> Date: Mon Mar 22 15:13:01 2021 -0500 consolidated integration imports into url_import commit aa6c9430bce1a63e46ff0325f13e4f4d7369cc00 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:49 2021 -0500 staged app import tabs commit 3dd92d811c140d925b153f30db29e11e4c8a18cc Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:16 2021 -0500 fixed missing space in keyword when adding recipe commit d79283ccabdd014c62dc820f382830421908cf0a Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:08:51 2021 -0500 removed unused templates commit 3f95eb2f3db42628994f1ea80fd5010fa1b247ba Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 13:13:56 2021 -0500 combined json import and source import commit 5016314ab57102454a95e48f0ba50b6031cc5400 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 16:06:02 2021 -0500 more fix from super ugly merge commit 27a489c45a5b169818e36c79591757f99f64c637 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:17:10 2021 -0500 more cleanup from ugly merge commit f7517d51dd9aad61b1e80ec20947c4f597834691 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 11:24:23 2021 -0500 fixed ugly merge commit 7095b6ef89fe350d591f1103c4c1a2d27c60d28f Author: smilerz <smilerz@gmail.com> Date: Thu Mar 18 12:09:53 2021 -0500 added drag and drop to ingredients commit bdadc7168f37eede0f91a2bfa060200273e440a9 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 15 15:56:44 2021 -0500 manually parse json commit 4bcd7e462db760d00483a90883028e5404f33299 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:33:07 2021 -0600 update urls.py commit 794d2798bfe56a27af5e8786e5f3b9701be7fe81 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:32:47 2021 -0600 commit merge from Patralos/recipes commit e97bc6ea89d8c366104d08ce561dd3d3c17c1578 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 15:34:47 2021 -0600 updated URL import page with tab interface commit 7732bc44b83c23901873bce1075b7ac2e68cee07 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 11:29:10 2021 -0600 import raw json/html commit 368d2211efa86e1146e95e3ddd1192b81f0422c2 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 7 14:28:29 2021 -0600 refactored json parser to create functions for each sub parser commit 3ddff8b468e0c85d1a4ff61b565b78c5be0f77ea Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 22:27:32 2021 +0100 replace common fractions with their concrete value (else parsing is not possible) commit 083048e125f63463edca6f4855f6a8e974f61a21 Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 21:37:39 2021 +0100 Allow recipes to be imported from json directly commit 638a66953dd5690426248bab1ee278143dc94efe Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 20:15:41 2021 -0500 Squashed commit of the following: commit7930c2417c
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 17:12:43 2021 -0500 update ATK scrape to handle empty headnote commit2f27413c0a
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 14:12:24 2021 -0500 parse multiple ingredientGroups previous version assumed only a single item in a list - this loops through each item commit5869a8ad1b
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 13:43:34 2021 -0500 fixes to pass tests commit0640a265fc
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 13:42:56 2021 -0500 added test for spruce eats commitd449fc8fd8
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 12:49:42 2021 -0500 updated normalization to skip removing line breaks commitb9ee77709b
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 12:49:06 2021 -0500 updated ATK scraper to include header notes in instructions commit 83ec5c05f84c8734c8a352c3d08276d1ed5f5ca1 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 15:57:20 2021 -0500 updated message commit 04d5a46d0ee5e5d095c871d8f2d1c42c52345563 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 14:17:16 2021 -0500 fixed ATK scraper commit 477e1768b197ca0f149f7d619e7215233d1bf8cd Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 13:44:29 2021 -0500 Squashed commit of the following: commit5869a8ad1b
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 13:43:34 2021 -0500 fixes to pass tests commit0640a265fc
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 13:42:56 2021 -0500 added test for spruce eats commitd449fc8fd8
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 12:49:42 2021 -0500 updated normalization to skip removing line breaks commitb9ee77709b
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 12:49:06 2021 -0500 updated ATK scraper to include header notes in instructions commit 68122ecc6b7afb53430f624512bfc8984191191c Author: smilerz <smilerz@gmail.com> Date: Sat Apr 17 11:58:40 2021 -0500 added upcoming features commit 469d03c69c272d10082748de2f513483854d40d1 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 17:45:42 2021 -0500 Squashed commit of the following: commitba061df1b6
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 17:30:59 2021 -0500 catch attribute error on cooktime commit7cc515bcdf
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 17:08:25 2021 -0500 fix manual url import commit724748d38a
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 14:09:10 2021 -0500 corrected api import workflow commitb2c1c6e301
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 11:26:26 2021 -0500 restored missing manual url scrape commit987be4b04d
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 09:02:27 2021 -0500 Fix after rebase commitca84da68c4
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 18:39:44 2021 -0500 catch attibute error when scrape missing schema commitd75e39fbcd
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 16:27:18 2021 -0500 set persistent connections to db commiteb2593aacd
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 16:08:04 2021 -0500 handle text in cook times during import commit496e04cfc8
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:47:35 2021 -0500 convert servings to number on import commitd814d13d54
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 13:17:15 2021 -0500 custom scraper fails safe commitd0cedaf7a1
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 12:48:26 2021 -0500 added name parser commit01f504f7b1
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:31:47 2021 -0500 updated tests to handle html decoding commitc716346f1f
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:55:07 2021 -0500 flake commitfef5236931
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:53:45 2021 -0500 decode url strings in text_parser commitb115c37eb8
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:32:33 2021 -0500 catch error on scrape.image() commit1e17f3703a
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:28:46 2021 -0500 trap error on scrape.title() commit468b986314
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:05:28 2021 -0500 updated tests commita531d135b5
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:42:31 2021 -0500 remove html tags from description commit7524609cd0
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commita28f8e65d5
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commitd193637091
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:20:03 2021 -0500 added missing bookmarklet commit0953af05fc
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:18:14 2021 -0500 Revert "bug fix url import" This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23. commit19e8e5cb5b
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 13 16:44:05 2021 -0500 removed extra string normalization commit43c808380d
Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 21:22:56 2021 -0500 updated migration commit7ab8b84044
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:14:50 2021 -0500 updated recipe targets in tests to reflect html decoding commitd739fe6752
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 13:28:35 2021 -0500 fixes #527 commita84c41e29f
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 10:57:13 2021 -0500 bug fix url import commit393aba1f31
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 07:02:43 2021 -0500 url import bug fixes commit436a070730
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:43:33 2021 -0500 bug fix tests commit2fe6788ce5
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:41:00 2021 -0500 bug fix url import commit747d146389
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:26:29 2021 -0500 recipe import tests commitefe4c4043d
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 12:32:11 2021 -0500 simplified url import commitc6739ba8e0
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 09:20:15 2021 -0500 add data for url_import test commit50140db668
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:43:36 2021 -0500 added all ATK sites to custom scraper commit028b2dfb22
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:23 2021 -0500 added cooksillustrated custom scraper commitec6a10ca0a
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:01 2021 -0500 ensure time is always a number commit3cf949bf8d
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 2 15:19:20 2021 -0500 added ability to create custom scrapers commit0a62225797
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:21:28 2021 -0500 removed old json importer commita54f4e1367
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:19:18 2021 -0500 updated import from source to use text scraper commitbf3c30a8fb
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:08:56 2021 -0500 remove old html_import function commitf811f5996e
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:07:51 2021 -0500 wrapper for recipe_scrapers to parse text input commita3490240f4
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:17:46 2021 -0500 fixed broken tab commitb26aea96f4
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:11:54 2021 -0500 delete bookmarklet on import commit4d4af5fdf2
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:53:06 2021 -0500 removed console message commit3da74505d6
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:51:14 2021 -0500 fixed ingredient display on preview commitc8a4861df8
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 11:49:56 2021 -0500 redirect to import url for processing commit5e27cd606e
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 06:39:44 2021 -0500 added hack to fix scopes & CORS for bookmarklet commita341fd8ebe
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 28 18:39:20 2021 -0500 added CORS middleware commit9a62b6e4e7
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 26 14:47:24 2021 -0500 added bookmarklet model and api commitf80c44bca3
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 17:48:32 2021 -0500 bookmarklet passing data to form commit09d2e9f831
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 14:02:57 2021 -0500 added bookmarklet that doesn't work yet commit4d5a9e446f
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 14:14:56 2021 -0500 Squashed commit of the following: commit81a8734fac
Merge:abcef54
f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:41:13 2021 +0100 Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support Add iOS webclip icon support commitabcef54e72
Merge:e15c92c
7527646
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:30:43 2021 +0100 Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1 Bump recipe-scrapers from 12.2.0 to 12.2.1 commite15c92cda5
Merge:58fc269
45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:26:06 2021 +0100 Merge pull request #501 from smilerz/main_fork fix json direct import when wrapped in @graph commit45dba6fad2
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:23:55 2021 -0500 fix json direct import when wrapped in @graph commitf67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 15:49:12 2021 +0100 Add generated icons from icongenerator. commit53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 12:48:58 2021 +0100 Fix errors in favicon SVG. commit7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Mar 19 05:51:22 2021 +0000 Bump recipe-scrapers from 12.2.0 to 12.2.1 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1) Signed-off-by: dependabot[bot] <support@github.com> commit6a2c27749f
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 13:58:16 2021 -0500 updated links to import recipes commitde60e12073
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:54:41 2021 -0500 added collapsable cards commit1188ed9227
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:32:55 2021 -0500 cosmetic cleanup commitcb708e7e47
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:15:57 2021 -0500 added image import commit215eadb4a0
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 22 15:13:01 2021 -0500 consolidated integration imports into url_import commit4ffc54f720
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:49 2021 -0500 staged app import tabs commit21f6c7a21f
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:16 2021 -0500 fixed missing space in keyword when adding recipe commitce7c6939d2
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:08:51 2021 -0500 removed unused templates commit40a2f7ff90
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 13:13:56 2021 -0500 combined json import and source import commit4015517c0a
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 16:06:02 2021 -0500 more fix from super ugly merge commit7c8d41753c
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:17:10 2021 -0500 more cleanup from ugly merge commit90670613c5
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 11:24:23 2021 -0500 fixed ugly merge commit647c1678f1
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 18 12:09:53 2021 -0500 added drag and drop to ingredients commit44dee16e0a
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 15 15:56:44 2021 -0500 manually parse json commitf8fedcac82
Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:33:07 2021 -0600 update urls.py commit3a48d0e580
Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:32:47 2021 -0600 commit merge from Patralos/recipes commit9930789aa8
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 15:34:47 2021 -0600 updated URL import page with tab interface commit83fce6461a
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 11:29:10 2021 -0600 import raw json/html commitf0d37244b6
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 7 14:28:29 2021 -0600 refactored json parser to create functions for each sub parser commit386834f409
Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 21:37:39 2021 +0100 Allow recipes to be imported from json directly commit b721577779186013d22d6cea7edb030859aa3156 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 17:30:59 2021 -0500 catch attribute error on cooktime commit 3f6eabe10ef3142eeaba79d79a9d3a2132d07718 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 17:08:25 2021 -0500 fix manual url import commit b5eba6555637eb7247fdcce7cee459ebaec20f9e Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:33:51 2021 -0500 Squashed commit of the following: commit 8e2a15aff203cacd8956c947eecf3967f5b66015 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:29:11 2021 -0500 removed unnecessary console message commit 436d5b3165340772a859899578f7386edfcd587f Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:25:23 2021 -0500 removed commented out settings commit ba6b58b198d2e9260544d64e107afee9420ae340 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:24:27 2021 -0500 removed unused cors_headers commit c7690c391f341d8d92500276f243e99f8700528e Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:22:15 2021 -0500 removed line breaks commit 3259f86ff8b911fa8489922eee43c4465ea81d61 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:21:21 2021 -0500 removed console.log() commit 24552a2d9b644c86dee900322989fb3306ca1b4e Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 14:58:48 2021 -0500 fix after rebase commit bdf8ce1c3357609013c84d2661371ede815cd700 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 11:17:00 2021 -0500 Fix after rebase commit 58cd295e7ae8caa9be588508eb1795fd4a00e810 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 07:44:53 2021 -0500 updated model commit ec786ef8a19f9459cd4c890c60330bcadafb0247 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:46:38 2021 -0500 convert servings to number on import commit 90cc1711b185290778e973821b17a7574c6d3428 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:15:59 2021 -0500 update tests to handle url decoding commit 466eae617cace3b662fe480427018b0ac7a7ab1d Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:57:10 2021 -0500 bring parser inline with json_import branch commit 2668406d4625f747305482ede28e256c94aefcf9 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 08:50:00 2021 -0500 unescape html document commit f765347aec15b7765eaec830dd8dfda1f17b7597 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 11:29:35 2021 -0500 updated bookmarklet to work with updated import process commit 60d95ebf3d4e1c8af7f3b6832adfb28ce13a51aa Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:52 2021 -0500 Squashed commit of the following: commit 707d862e01a7497a1f22879d314b865a35e0e85b Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:00 2021 -0500 works now commit 3942a445ed4f2ccec57de25eacd86ea4e4dd6bdb Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:25:24 2021 -0500 updated serializer and api commit 10dc746eb175c7f805a8a8ffa7ce49977a7ce97e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:20:19 2021 -0500 fixed bookmarklet commit 9779104902d3be0258c95cd2eeebcba0d5d48892 Merge: bb8262c 0cb3928 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:56:27 2021 -0500 Merge branch 'bookmarklet' into json_import commit 0cb39284bb835ffc6cfee3e4306aadc4a64a25be Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commit e89e0218de684d40b2e2bfb6ba833891206c828e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commit bb8262ccabb93c56fbc18c407d5a0653b8b3ca79 Merge: b1e73aa35a7f62
Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 20:35:57 2021 -0500 Merge branch 'main_fork' into json_import commit f50d33a9b2658f6bf27797f645fbd842528a716c Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:20:03 2021 -0500 added missing bookmarklet commit cd482ae8451d3b920d7bb7a2b76044645f6a2e0b Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:18:14 2021 -0500 Revert "bug fix url import" This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23. commit 7032c7cc990af5790073348c3039d907d3469a7e Author: smilerz <smilerz@gmail.com> Date: Tue Apr 13 16:44:05 2021 -0500 removed extra string normalization commit 04b4aeecb9b13ae0023636f65dec8fc0ca1b8e0f Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 21:22:56 2021 -0500 updated migration commit 8b4059d0beed9ae8da9a6943ed550b0a82e12e03 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:14:50 2021 -0500 updated recipe targets in tests to reflect html decoding commit 7388f30ef333315736a8614c2009db37404f4916 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 13:28:35 2021 -0500 fixes #527 commit 6d811738535a81cab737b10f006f50c32cc32f13 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 10:57:13 2021 -0500 bug fix url import commit cbe400cdaccb0fcbebeafea199cf14be3deeb150 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 07:02:43 2021 -0500 url import bug fixes commit f4e33a830b826d1930639f552a2e32882c14d2ba Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:43:33 2021 -0500 bug fix tests commit 1d1cbbe965a5255bd9cabb138a2f1432956a4c6e Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:41:00 2021 -0500 bug fix url import commit 31cf4da8f3dcface57399976679379d11ca6d81e Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:26:29 2021 -0500 recipe import tests commit 1d1b5b545ab35626636ec4d9e1ce020fe508e520 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 12:32:11 2021 -0500 simplified url import commit 25140fa64e9306421956b90e40f53c00429e7c5e Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 09:20:15 2021 -0500 add data for url_import test commit 14d97f671ad356c8212ffc7fdd5b15fce8b5a7c1 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:43:36 2021 -0500 added all ATK sites to custom scraper commit 10975665626ae958f45e4c76b5125978e4776c41 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:23 2021 -0500 added cooksillustrated custom scraper commit 9ea33ec10bc32aa6ffed0c8cd6d5a4b4e123eff1 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:01 2021 -0500 ensure time is always a number commit ceb85137dd25a2cc6192165af9ac9b515cd5cfee Author: smilerz <smilerz@gmail.com> Date: Fri Apr 2 15:19:20 2021 -0500 added ability to create custom scrapers commit cc53a8debe36e65f9f487ac8c31cf3235bad5370 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:21:28 2021 -0500 removed old json importer commit d2233df427cc577fd6ea87458d821ac37c4def48 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:19:18 2021 -0500 updated import from source to use text scraper commit 9a0fcf9d2b6d35f01c16aa1c1a1074bb42577a3e Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:08:56 2021 -0500 remove old html_import function commit 2bc5fbbdcc5d395b7ed7aa1879449e16da0ee2d1 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:07:51 2021 -0500 wrapper for recipe_scrapers to parse text input commit 4a3c1a94a97ec18109ba43a5bbe90a6aa8e622c4 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:17:46 2021 -0500 fixed broken tab commit 6b92f8c325dd4a3c43fec0efe9b20181eaea0951 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:11:54 2021 -0500 delete bookmarklet on import commit dcd12899fd361868d4542e882d413292ef37a92b Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:53:06 2021 -0500 removed console message commit 3e58d79a9279e63af66356d14c7204121f6055dd Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:51:14 2021 -0500 fixed ingredient display on preview commit 1eb6ba707c41f52711ed2d68e3758ce9c70465ec Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 11:49:56 2021 -0500 redirect to import url for processing commit 95b50edc0f33afc1557b6a766e610a6c74b2e8a0 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 06:39:44 2021 -0500 added hack to fix scopes & CORS for bookmarklet commit bdc85694309fb79b9c214f0330848be82c372156 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 28 18:39:20 2021 -0500 added CORS middleware commit c1f5ec44c3f45dd403cc600ed5e38b814fedd138 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 26 14:47:24 2021 -0500 added bookmarklet model and api commit cc9a6fe14adbca88dc8753a7271ed4d47e638822 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 17:48:32 2021 -0500 bookmarklet passing data to form commit 3bf58f633610caa266e210fcdbecdedd0edf2465 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 14:02:57 2021 -0500 added bookmarklet that doesn't work yet commit 9a11ebc7746f2acdd156a574703ea05a0aba0a9b Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 14:14:56 2021 -0500 Squashed commit of the following: commit81a8734fac
Merge:abcef54
f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:41:13 2021 +0100 Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support Add iOS webclip icon support commitabcef54e72
Merge:e15c92c
7527646
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:30:43 2021 +0100 Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1 Bump recipe-scrapers from 12.2.0 to 12.2.1 commite15c92cda5
Merge:58fc269
45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:26:06 2021 +0100 Merge pull request #501 from smilerz/main_fork fix json direct import when wrapped in @graph commit45dba6fad2
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:23:55 2021 -0500 fix json direct import when wrapped in @graph commitf67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 15:49:12 2021 +0100 Add generated icons from icongenerator. commit53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 12:48:58 2021 +0100 Fix errors in favicon SVG. commit7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Mar 19 05:51:22 2021 +0000 Bump recipe-scrapers from 12.2.0 to 12.2.1 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1) Signed-off-by: dependabot[bot] <support@github.com> commit 9307226d777d5648d1cacc0107241dfaec3a4405 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 13:58:16 2021 -0500 updated links to import recipes commit bec00d05898c074b893df7338248b7803f8272c1 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:54:41 2021 -0500 added collapsable cards commit 2d647a2f6aa1afacb6651a6294bba571fafc3190 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:32:55 2021 -0500 cosmetic cleanup commit 48cd8ce5f1c5c3ea2372b0f3fcdb2a9491be52f4 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:15:57 2021 -0500 added image import commit 12e82211ace004c93726b8f6327adee1d1a58f78 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 22 15:13:01 2021 -0500 consolidated integration imports into url_import commit 8cf5dae5482d7b28e386760ca039c60efdfbdb9a Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:49 2021 -0500 staged app import tabs commit a255450fad53f9482711a252ec98b353b66a15df Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:16 2021 -0500 fixed missing space in keyword when adding recipe commit 2bb4dd9954c4913c6b4bd9e23f60315ed0c46552 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:08:51 2021 -0500 removed unused templates commit cddbebbc85377227ba9d753cf9d58db03e7f5ee2 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 13:13:56 2021 -0500 combined json import and source import commit b929bd9ae3a061dc2660602cb2ffb036b7e6cac7 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 16:06:02 2021 -0500 more fix from super ugly merge commit 558eb25faee2f8362a9af1380b40b11a3c05b6fa Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:17:10 2021 -0500 more cleanup from ugly merge commit 8906345e107096a657fac8cdff497548dbaa9ffd Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 11:24:23 2021 -0500 fixed ugly merge commit 966edebfedf89a7976f47dd0526e0aeb41aa0feb Author: smilerz <smilerz@gmail.com> Date: Thu Mar 18 12:09:53 2021 -0500 added drag and drop to ingredients commit a9b24c9f03a223bbf59613a10f000ce1b421383f Author: smilerz <smilerz@gmail.com> Date: Mon Mar 15 15:56:44 2021 -0500 manually parse json commit 908ae04ef98d629da0cd74e94d1401fa6c5ac654 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:33:07 2021 -0600 update urls.py commit e3828f96e6d2db5877789b5bd9be9cc4eb151d5f Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:32:47 2021 -0600 commit merge from Patralos/recipes commit a21fe044ed527dae2ea9a8bce854c628b1a39910 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 15:34:47 2021 -0600 updated URL import page with tab interface commit 59a30f579a25758ec58a938e8a315dd986e62cbf Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 11:29:10 2021 -0600 import raw json/html commit 299194409d9c0a395aaf5d69106c2f35baa1d402 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 7 14:28:29 2021 -0600 refactored json parser to create functions for each sub parser commit 0e480ba82f25a3fa705a9adc2cf82f5234797b44 Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 22:27:32 2021 +0100 replace common fractions with their concrete value (else parsing is not possible) commit 40fb268d2d2cfe5250b1a900eafb4819fd85572b Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 21:37:39 2021 +0100 Allow recipes to be imported from json directly commit987be4b04d
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 09:02:27 2021 -0500 Fix after rebase commitca84da68c4
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 18:39:44 2021 -0500 catch attibute error when scrape missing schema commitd75e39fbcd
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 16:27:18 2021 -0500 set persistent connections to db commiteb2593aacd
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 16:08:04 2021 -0500 handle text in cook times during import commit496e04cfc8
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:47:35 2021 -0500 convert servings to number on import commitd814d13d54
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 13:17:15 2021 -0500 custom scraper fails safe commitd0cedaf7a1
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 12:48:26 2021 -0500 added name parser commit01f504f7b1
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:31:47 2021 -0500 updated tests to handle html decoding commitc716346f1f
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:55:07 2021 -0500 flake commitfef5236931
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:53:45 2021 -0500 decode url strings in text_parser commitb115c37eb8
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:32:33 2021 -0500 catch error on scrape.image() commit1e17f3703a
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:28:46 2021 -0500 trap error on scrape.title() commit468b986314
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:05:28 2021 -0500 updated tests commita531d135b5
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:42:31 2021 -0500 remove html tags from description commit7524609cd0
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commita28f8e65d5
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commitd193637091
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:20:03 2021 -0500 added missing bookmarklet commit0953af05fc
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:18:14 2021 -0500 Revert "bug fix url import" This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23. commit19e8e5cb5b
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 13 16:44:05 2021 -0500 removed extra string normalization commit43c808380d
Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 21:22:56 2021 -0500 updated migration commit7ab8b84044
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:14:50 2021 -0500 updated recipe targets in tests to reflect html decoding commitd739fe6752
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 13:28:35 2021 -0500 fixes #527 commita84c41e29f
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 10:57:13 2021 -0500 bug fix url import commit393aba1f31
Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 07:02:43 2021 -0500 url import bug fixes commit436a070730
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:43:33 2021 -0500 bug fix tests commit2fe6788ce5
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:41:00 2021 -0500 bug fix url import commit747d146389
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:26:29 2021 -0500 recipe import tests commitefe4c4043d
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 12:32:11 2021 -0500 simplified url import commitc6739ba8e0
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 09:20:15 2021 -0500 add data for url_import test commit50140db668
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:43:36 2021 -0500 added all ATK sites to custom scraper commit028b2dfb22
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:23 2021 -0500 added cooksillustrated custom scraper commitec6a10ca0a
Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:01 2021 -0500 ensure time is always a number commit3cf949bf8d
Author: smilerz <smilerz@gmail.com> Date: Fri Apr 2 15:19:20 2021 -0500 added ability to create custom scrapers commit0a62225797
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:21:28 2021 -0500 removed old json importer commita54f4e1367
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:19:18 2021 -0500 updated import from source to use text scraper commitbf3c30a8fb
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:08:56 2021 -0500 remove old html_import function commitf811f5996e
Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:07:51 2021 -0500 wrapper for recipe_scrapers to parse text input commita3490240f4
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:17:46 2021 -0500 fixed broken tab commitb26aea96f4
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:11:54 2021 -0500 delete bookmarklet on import commit4d4af5fdf2
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:53:06 2021 -0500 removed console message commit3da74505d6
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:51:14 2021 -0500 fixed ingredient display on preview commitc8a4861df8
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 11:49:56 2021 -0500 redirect to import url for processing commit5e27cd606e
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 06:39:44 2021 -0500 added hack to fix scopes & CORS for bookmarklet commita341fd8ebe
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 28 18:39:20 2021 -0500 added CORS middleware commit9a62b6e4e7
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 26 14:47:24 2021 -0500 added bookmarklet model and api commitf80c44bca3
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 17:48:32 2021 -0500 bookmarklet passing data to form commit09d2e9f831
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 14:02:57 2021 -0500 added bookmarklet that doesn't work yet commit4d5a9e446f
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 14:14:56 2021 -0500 Squashed commit of the following: commit81a8734fac
Merge:abcef54
f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:41:13 2021 +0100 Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support Add iOS webclip icon support commitabcef54e72
Merge:e15c92c
7527646
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:30:43 2021 +0100 Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1 Bump recipe-scrapers from 12.2.0 to 12.2.1 commite15c92cda5
Merge:58fc269
45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:26:06 2021 +0100 Merge pull request #501 from smilerz/main_fork fix json direct import when wrapped in @graph commit45dba6fad2
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:23:55 2021 -0500 fix json direct import when wrapped in @graph commitf67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 15:49:12 2021 +0100 Add generated icons from icongenerator. commit53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 12:48:58 2021 +0100 Fix errors in favicon SVG. commit7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Mar 19 05:51:22 2021 +0000 Bump recipe-scrapers from 12.2.0 to 12.2.1 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1) Signed-off-by: dependabot[bot] <support@github.com> commit6a2c27749f
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 13:58:16 2021 -0500 updated links to import recipes commitde60e12073
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:54:41 2021 -0500 added collapsable cards commit1188ed9227
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:32:55 2021 -0500 cosmetic cleanup commitcb708e7e47
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:15:57 2021 -0500 added image import commit215eadb4a0
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 22 15:13:01 2021 -0500 consolidated integration imports into url_import commit4ffc54f720
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:49 2021 -0500 staged app import tabs commit21f6c7a21f
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:16 2021 -0500 fixed missing space in keyword when adding recipe commitce7c6939d2
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:08:51 2021 -0500 removed unused templates commit40a2f7ff90
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 13:13:56 2021 -0500 combined json import and source import commit4015517c0a
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 16:06:02 2021 -0500 more fix from super ugly merge commit7c8d41753c
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:17:10 2021 -0500 more cleanup from ugly merge commit90670613c5
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 11:24:23 2021 -0500 fixed ugly merge commit647c1678f1
Author: smilerz <smilerz@gmail.com> Date: Thu Mar 18 12:09:53 2021 -0500 added drag and drop to ingredients commit44dee16e0a
Author: smilerz <smilerz@gmail.com> Date: Mon Mar 15 15:56:44 2021 -0500 manually parse json commitf8fedcac82
Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:33:07 2021 -0600 update urls.py commit3a48d0e580
Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:32:47 2021 -0600 commit merge from Patralos/recipes commit9930789aa8
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 15:34:47 2021 -0600 updated URL import page with tab interface commit83fce6461a
Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 11:29:10 2021 -0600 import raw json/html commitf0d37244b6
Author: smilerz <smilerz@gmail.com> Date: Sun Mar 7 14:28:29 2021 -0600 refactored json parser to create functions for each sub parser commit386834f409
Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 21:37:39 2021 +0100 Allow recipes to be imported from json directly commit 2f8d7c5859831494ca43051837f2c8b607107084 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 15:08:08 2021 -0500 Fix after rebase commit 08752d7567298dca12df5f8c0455f326f94473c4 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 07:48:52 2021 -0500 Squashed commit of the following: commit 7642ac66b4d679fb3bd40d783d8c00e969e48413 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 07:44:53 2021 -0500 updated model commit c887fae3a2b85ad23772944d311761b85bd67031 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:46:38 2021 -0500 convert servings to number on import commit 34966bcef2993f4d0a1309362b0648f2096db996 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:15:59 2021 -0500 update tests to handle url decoding commit 86676772676395482901c195888898e7eaafc015 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:57:10 2021 -0500 bring parser inline with json_import branch commit 2b547f67cd180ca457691e15bc9edc1ae033ecc8 Merge: e5ada34 51d4ffe Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:43:27 2021 -0500 Merge branch 'bookmarklet' of github.com:smilerz/recipes into bookmarklet commit 51d4ffef18d359f75d377eee27bd15816957ac53 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 08:50:00 2021 -0500 unescape html document commit e5ada345d869409b240fd0746a88f269b6c28c2c Merge: 5b7df0a8d02cad
Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 12:39:37 2021 -0500 Merge branch 'deprecation-fixes' into bookmarklet commit8d02cad7d9
Author: smilerz <smilerz@gmail.com> Date: Mon Apr 12 14:12:04 2021 -0500 resolved deprecation warnings introduced in django 3.2 commit 1ab70e7d6b383f88d883aef606752076671eefd8 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 18:38:46 2021 -0500 removed cors_header import - unused commit cbc59d2f16695eda8a1acceb7bf34a039dfc012e Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 18:38:00 2021 -0500 catch attribute error when scrape has no schema commit af8bde46df5af73f3f0983d02407d3bbe4306174 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 16:03:56 2021 -0500 handle text cook times on import commit 0fcab406c41ef328a97f6e9b5931ad75b0511f7d Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:45:34 2021 -0500 convert servings to number on import commit 6f5efd6d2202149ebf828832db51ba98c3bc6fc7 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 13:10:23 2021 -0500 name parser handles list commit edf0da8010963caaa1e6e1031f8808fd26b0bd4d Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:52:34 2021 -0500 updated docs for personal beta commit f5ce6aa486f7c085e9020687e3fbc5a08faf4070 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 08:57:35 2021 -0500 decode html data when passing bookmarklet commit 69d59e542254a90dec8b03537da8eb15102ee768 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:39:30 2021 -0500 extra error catching commit 6183f3aad03fe62edd77200b62782cfb9415d3bf Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 18:48:45 2021 -0500 more shenanigans commit 8a17ce6b4e36caf4dc17679b6ed17bffa8b6c718 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 18:25:24 2021 -0500 add debugpy to requirements commit 3678e1ef0a6e3944f76e37dc56cb51849a115bd1 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 18:24:24 2021 -0500 remote debug commit 3b05078fb6d62d46cd34ea2160f47f91eca65293 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 18:03:15 2021 -0500 remote debug in container commit 7defe28f5ef59fc859f5fef799603013d98dc760 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 16:48:09 2021 -0500 nope, this one works commit 13b4435e56e57f4bbb7a690a5eb1b4f3759ba79a Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 16:28:31 2021 -0500 it finally works commit 28cab6660b3ed51f0847843af70cbc24bceaa52f Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 15:40:36 2021 -0500 fix test again commit 0b67c974fd283060be673017f3fd18f30d161f8f Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 15:02:57 2021 -0500 add bookmarklet back commit 9d0f2ff5458aca7bd6e3ca713c09ea92656074fb Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 14:40:13 2021 -0500 extra docker tags commit f3df56531b19fd1b428d403b7eeb9577703c2ee6 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 14:29:52 2021 -0500 build hook commit 6a26b669ef742ca68ae81028e0d5f8e7064ee015 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:44:03 2021 -0500 fixed workflow commit c9942d0201f530f88dd5ea814e30a20c271b152d Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:42:00 2021 -0500 fixed branch reference commit b520a4ec761e75e146be15953f069d20e53203ca Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:39:08 2021 -0500 personalized build commit 8893fd516120fb374155a1784f236fe447777d29 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:05:28 2021 -0500 updated tests commit 398f71d8fd3fedd9bd1b514f2db1a9732e5943f1 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 11:52:06 2021 -0500 fixed admin commit 8d297f5b5afefb0646c4db002e135b7d2e42aa52 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 11:29:35 2021 -0500 updated bookmarklet to work with updated import process commit e269e9e0319c12d60ed9ad3be8f2b75a32d20a7a Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:42:31 2021 -0500 remove html tags from description commit 63ae4b40c9d98740fef7f61df39203c1dc1f3735 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:52 2021 -0500 Squashed commit of the following: commit 707d862e01a7497a1f22879d314b865a35e0e85b Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:00 2021 -0500 works now commit 3942a445ed4f2ccec57de25eacd86ea4e4dd6bdb Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:25:24 2021 -0500 updated serializer and api commit 10dc746eb175c7f805a8a8ffa7ce49977a7ce97e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:20:19 2021 -0500 fixed bookmarklet commit 9779104902d3be0258c95cd2eeebcba0d5d48892 Merge: bb8262c 0cb3928 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:56:27 2021 -0500 Merge branch 'bookmarklet' into json_import commit 0cb39284bb835ffc6cfee3e4306aadc4a64a25be Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commit e89e0218de684d40b2e2bfb6ba833891206c828e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commit bb8262ccabb93c56fbc18c407d5a0653b8b3ca79 Merge: b1e73aa35a7f62
Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 20:35:57 2021 -0500 Merge branch 'main_fork' into json_import commit 41d535206c93696e49d9a1b48410de51770c4ce3 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commit 719e265cdec1791d5083ffc30341d58740bf4c95 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commit 614878597bb66afad2313b9cb541b5045c15866c Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:20:03 2021 -0500 added missing bookmarklet commit 0688c7d2f14d801acc764d50aa03ab327a64d767 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:18:14 2021 -0500 Revert "bug fix url import" This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23. commit da25e51111d26ec5dc752c40e82af273f3e7b8ae Author: smilerz <smilerz@gmail.com> Date: Tue Apr 13 16:44:05 2021 -0500 removed extra string normalization commit 82d1f4386142a55f2d68ebb6bffac739deb3bb59 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 21:22:56 2021 -0500 updated migration commit cab224962dce8216e778e6a259c922968c42340a Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:14:50 2021 -0500 updated recipe targets in tests to reflect html decoding commit 4cfc86fd7776f4a82f081eae4096438203e65b33 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 13:28:35 2021 -0500 fixes #527 commit 11a6cb907b8c77f80d3b857dc73e3276188924b7 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 10:57:13 2021 -0500 bug fix url import commit 8751d8160d441899f184e58e00be54addbc38f0a Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 07:02:43 2021 -0500 url import bug fixes commit d880750f4e4c87d5bb58b8eced9ef919ecad74f6 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:43:33 2021 -0500 bug fix tests commit 9af90804a73e6ae09049be8bdf2bddc0c63f30d9 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:41:00 2021 -0500 bug fix url import commit 36b701ed714ff6d399fc2d1b58dca32a6f2fff32 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:26:29 2021 -0500 recipe import tests commit 7b26f71bed3f312cbb6e6c3aff1d1ac31c300808 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 12:32:11 2021 -0500 simplified url import commit c7b82e1fd926ad6de58fc0ae60ddc86bf24f4686 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 09:20:15 2021 -0500 add data for url_import test commit a654c094ec43f25c72f2123f9074ac1824db7eeb Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:43:36 2021 -0500 added all ATK sites to custom scraper commit a7b5332b26c67b4156429807bed74a6c7db90ffd Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:23 2021 -0500 added cooksillustrated custom scraper commit 3af8c9dfcb6ed149c77e7bc081dfffdfc3657f45 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:01 2021 -0500 ensure time is always a number commit 95e7a4de10339293fe4c9c63024fe9636fed7f47 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 2 15:19:20 2021 -0500 added ability to create custom scrapers commit 3a880f7924253ca39da336e1f0c401001e26e47c Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:21:28 2021 -0500 removed old json importer commit 7ab7d7ae7310e23b5c6303826fcf34ce9171e569 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:19:18 2021 -0500 updated import from source to use text scraper commit 8f0a32059b70dab279f7e3cd49d519d13e4edde7 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:08:56 2021 -0500 remove old html_import function commit 034ccd9f8b015ab893f4b3170bacb04b25e108fc Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:07:51 2021 -0500 wrapper for recipe_scrapers to parse text input commit 584b8b1f1b646705ea6aec680b14d95acddaad5b Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:17:46 2021 -0500 fixed broken tab commit ec38267f9500a5499b850390eda8a67eadd18369 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:11:54 2021 -0500 delete bookmarklet on import commit 23ea95c4bc34d29bc7f713881ba654512af8ee3a Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:53:06 2021 -0500 removed console message commit 66efedee7451be9e002cfdb4d2becc9022cecc41 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:51:14 2021 -0500 fixed ingredient display on preview commit 840aaffbde65c9b00a83782d39362a19f3153758 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 11:49:56 2021 -0500 redirect to import url for processing commit 824dd9fa850671e6d7a145897b1cb98affc0d2ec Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 06:39:44 2021 -0500 added hack to fix scopes & CORS for bookmarklet commit e3e2e841c9e6a6a8267a6776d8e7b5a947244f21 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 28 18:39:20 2021 -0500 added CORS middleware commit d8031acf858cd44afa5b58dbb83cad06e411ac36 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 26 14:47:24 2021 -0500 added bookmarklet model and api commit 6e9c638b6cfb539b541d9242c5f126b0a5781b8c Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 17:48:32 2021 -0500 bookmarklet passing data to form commit 3fcbb63b8ceaca3ab3574a13112d743a18c499da Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 14:02:57 2021 -0500 added bookmarklet that doesn't work yet commit 6ba5cc97f588823da36d66bf113b6a2efa0cef15 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 14:14:56 2021 -0500 Squashed commit of the following: commit81a8734fac
Merge:abcef54
f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:41:13 2021 +0100 Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support Add iOS webclip icon support commitabcef54e72
Merge:e15c92c
7527646
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:30:43 2021 +0100 Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1 Bump recipe-scrapers from 12.2.0 to 12.2.1 commite15c92cda5
Merge:58fc269
45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:26:06 2021 +0100 Merge pull request #501 from smilerz/main_fork fix json direct import when wrapped in @graph commit45dba6fad2
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:23:55 2021 -0500 fix json direct import when wrapped in @graph commitf67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 15:49:12 2021 +0100 Add generated icons from icongenerator. commit53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 12:48:58 2021 +0100 Fix errors in favicon SVG. commit7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Mar 19 05:51:22 2021 +0000 Bump recipe-scrapers from 12.2.0 to 12.2.1 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1) Signed-off-by: dependabot[bot] <support@github.com> commit 44a000714cb979656f49cb09cdbbefab2044e326 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 13:58:16 2021 -0500 updated links to import recipes commit b8406e0519a076e12df5279d95771974792178c8 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:54:41 2021 -0500 added collapsable cards commit b41c1992f2e7291685da41cdd1899e36266135c1 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:32:55 2021 -0500 cosmetic cleanup commit e64d502d4cdd5b0e3b8edb301260f178a13725d6 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:15:57 2021 -0500 added image import commit 347981760b11f1773410ff84d626d72faef05ae6 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 22 15:13:01 2021 -0500 consolidated integration imports into url_import commit 04aa78c6367164f1df618fde7032c7fb0fe3121b Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:49 2021 -0500 staged app import tabs commit a9d9b536f1cfc02e461d9e3867c16a99d7b088dd Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:16 2021 -0500 fixed missing space in keyword when adding recipe commit 69d1f3c34d8bf7958b63056dfeb3130a3de0009b Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:08:51 2021 -0500 removed unused templates commit 44f971c348c68dd4bf6b88ac5b8949baea3dd516 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 13:13:56 2021 -0500 combined json import and source import commit abbb9960ad99939b55a8d645b93d3838dab90eae Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 16:06:02 2021 -0500 more fix from super ugly merge commit f1786ed64ae39b0755d00e9c79e577a2070d6d27 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:17:10 2021 -0500 more cleanup from ugly merge commit 8c01171a5be4f0dba0d24d9e63cc2157b10877b5 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 11:24:23 2021 -0500 fixed ugly merge commit 2aee965d2a151a93b01b5f1ddc563d862f49f5ea Author: smilerz <smilerz@gmail.com> Date: Thu Mar 18 12:09:53 2021 -0500 added drag and drop to ingredients commit 2c9e1848a54be0b9117c89d18f93b14af71a1eb1 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 15 15:56:44 2021 -0500 manually parse json commit f4ac4501875db11b7e989cfb6a3f1aecc7fc77ab Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:33:07 2021 -0600 update urls.py commit 61b3087a9caa5acec7f9b41e71acc330233f6fde Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:32:47 2021 -0600 commit merge from Patralos/recipes commit a77d75dc10817990c62be30ace54b5a8705652bb Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 15:34:47 2021 -0600 updated URL import page with tab interface commit c81d5b256938446e239c5aee9d10b22bc152480c Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 11:29:10 2021 -0600 import raw json/html commit 8b256cf7cbdf61da747c6c112ae43fc68c96056d Author: smilerz <smilerz@gmail.com> Date: Sun Mar 7 14:28:29 2021 -0600 refactored json parser to create functions for each sub parser commit bdcfcc0a9ed63c6ac771d1cb79dd54393b2216b9 Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 21:37:39 2021 +0100 Allow recipes to be imported from json directly commit 73ca90e11633ebc004588b2cd0ec61747e94ca04 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 14:09:10 2021 -0500 corrected api import workflow commit fcd5d0c08cdc3bc5156c95f5db61b812017f0a71 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 11:26:26 2021 -0500 restored missing manual url scrape commit 122508bb30eb94c83cbca28dd6e84b586bb93c0e Author: smilerz <smilerz@gmail.com> Date: Fri Apr 16 09:02:27 2021 -0500 Fix after rebase commit 5a0704fe49c396f78965cb370f5fe07e75b71920 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 18:39:44 2021 -0500 catch attibute error when scrape missing schema commit 8714586a683285fb6db6688f85f4b35fbc871eee Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 14:47:35 2021 -0500 convert servings to number on import commit cf38a3dd7735c7409c35649b1f0d10fa751e80e6 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 13:17:15 2021 -0500 custom scraper fails safe commit 2d8ab97a3d341a5bfc9860dc29438a188a9b6737 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 12:48:26 2021 -0500 added name parser commit 9797dc4ab33be816e11b0cc75996ba8b46c31bb5 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 10:31:47 2021 -0500 updated tests to handle html decoding commit 49ce2eed7066d82d0ad8fc35b2ff91f42353d985 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:55:07 2021 -0500 flake commit d90cd5c4d930af663d2371c7d0f6fed2bf923194 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 15 09:53:45 2021 -0500 decode url strings in text_parser commit c83951689be8dc075c7dabfafd23642faafbfc01 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:32:33 2021 -0500 catch error on scrape.image() commit 8d88ccb99fe35df158e177fab6f72e6605e26f8d Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 19:28:46 2021 -0500 trap error on scrape.title() commit ec7e3742e0086442618e71fba4478daa3e455118 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 13:05:28 2021 -0500 updated tests commit 862e09e254cf903e9c60df6fb245f1b4e5780c11 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:42:31 2021 -0500 remove html tags from description commit dffcd18ece17d55c80cbd79d7434f188b0604f26 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commit 15a58596782822a2f95be55aa28140440d64cf3e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commit 634e18fe5ea12d7b75edaf2393fb5b878add693b Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:20:03 2021 -0500 added missing bookmarklet commit 98cba92564e927f1c645d72e91d31000dfdad4eb Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:18:14 2021 -0500 Revert "bug fix url import" This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23. commit 4b35585a850dc22c611775663e869b0b75348385 Author: smilerz <smilerz@gmail.com> Date: Tue Apr 13 16:44:05 2021 -0500 removed extra string normalization commit 84a2e18ab4dc3ad7d1a34361aa10c37d7de486d1 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 21:22:56 2021 -0500 updated migration commit bc13f22af28a8bd905699acd45739b78e5cbca8a Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 14:14:50 2021 -0500 updated recipe targets in tests to reflect html decoding commit 3cdf69bf645ebb4e29a17054db311e51badbc38d Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 13:28:35 2021 -0500 fixes #527 commit 73c401ab72681888893704ba8f1b25aeee97165a Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 10:57:13 2021 -0500 bug fix url import commit 6f7ff8ebc897462f8d5ee136e08b5199ea6f7bfe Author: smilerz <smilerz@gmail.com> Date: Tue Apr 6 07:02:43 2021 -0500 url import bug fixes commit b26b5fa2e5ebace3916491eb4d1a7f6dbf14f1b8 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:43:33 2021 -0500 bug fix tests commit 03a976ce17a512e527a7baa19e308fcafec155c3 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:41:00 2021 -0500 bug fix url import commit 873aa85983f195a1a08076086975347b7ac8bc5f Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 21:26:29 2021 -0500 recipe import tests commit ed4c28f9660f35b3d2aff4c7ce36ff4696b8e2ad Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 12:32:11 2021 -0500 simplified url import commit 4d763e479d49f747ce3df879cea8214eb159cab8 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 5 09:20:15 2021 -0500 add data for url_import test commit bf37bb5d55caf7618b86f523a213e3c1e4b2f6c1 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:43:36 2021 -0500 added all ATK sites to custom scraper commit c1aae36897c44e5911a3aa75016887fa0218bf3b Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:23 2021 -0500 added cooksillustrated custom scraper commit 5609d0e2b39a8f1ddfb59af1ef23b865edeeb740 Author: smilerz <smilerz@gmail.com> Date: Sat Apr 3 11:12:01 2021 -0500 ensure time is always a number commit c4970e92b2695668f5614d3093d06e59ef5e17fc Author: smilerz <smilerz@gmail.com> Date: Fri Apr 2 15:19:20 2021 -0500 added ability to create custom scrapers commit d2688987efd74565903a0ebc3d1113892eb7df82 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:21:28 2021 -0500 removed old json importer commit 5dd837eb478365c78ad67c7cd20f44409172a0d0 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 16:19:18 2021 -0500 updated import from source to use text scraper commit 409efa8431af28451c9114b8c1b55b25aec18941 Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:08:56 2021 -0500 remove old html_import function commit 8564d76ac917261db95679122fd3e65ff3637b6f Author: smilerz <smilerz@gmail.com> Date: Thu Apr 1 15:07:51 2021 -0500 wrapper for recipe_scrapers to parse text input commit 9575a922494ab68b1dbfa70db78b211dea724602 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:17:46 2021 -0500 fixed broken tab commit 6819f426f70d381cd18639f620ad87b7210411b1 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 15:11:54 2021 -0500 delete bookmarklet on import commit b71e861e87e0db695e784205875a20ac8a87809a Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:53:06 2021 -0500 removed console message commit f86c93301be91560c2d308f631b12dc1c833fcb7 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 12:51:14 2021 -0500 fixed ingredient display on preview commit 6e5a5727f8579df2e2475eb873d1c37c6c71ff73 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 11:49:56 2021 -0500 redirect to import url for processing commit bdd73ab3a4b8fb0a7400b71aa0bd2cb911c27643 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 29 06:39:44 2021 -0500 added hack to fix scopes & CORS for bookmarklet commit 7c10ebea4dcbcf1e7348bbf50986acb7276564b0 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 28 18:39:20 2021 -0500 added CORS middleware commit d9e6fc5e8fa14effd52d8e68b299655fc6989b78 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 26 14:47:24 2021 -0500 added bookmarklet model and api commit e3ea3679418c2ac7af329a8671b275b3a1945c94 Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 17:48:32 2021 -0500 bookmarklet passing data to form commit d1a62f6577d4b28f22740e2ed673530bce9152ff Author: smilerz <smilerz@gmail.com> Date: Thu Mar 25 14:02:57 2021 -0500 added bookmarklet that doesn't work yet commit 2ea0e988f6458ae26fd9b71fc3eedcebdd103bdd Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 14:14:56 2021 -0500 Squashed commit of the following: commit81a8734fac
Merge:abcef54
f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:41:13 2021 +0100 Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support Add iOS webclip icon support commitabcef54e72
Merge:e15c92c
7527646
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:30:43 2021 +0100 Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1 Bump recipe-scrapers from 12.2.0 to 12.2.1 commite15c92cda5
Merge:58fc269
45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com> Date: Sat Mar 20 22:26:06 2021 +0100 Merge pull request #501 from smilerz/main_fork fix json direct import when wrapped in @graph commit45dba6fad2
Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:23:55 2021 -0500 fix json direct import when wrapped in @graph commitf67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 15:49:12 2021 +0100 Add generated icons from icongenerator. commit53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de> Date: Fri Mar 19 12:48:58 2021 +0100 Fix errors in favicon SVG. commit7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Mar 19 05:51:22 2021 +0000 Bump recipe-scrapers from 12.2.0 to 12.2.1 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1) Signed-off-by: dependabot[bot] <support@github.com> commit f3ef51e0db3c6d96907f2688d890e83722362b98 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 13:58:16 2021 -0500 updated links to import recipes commit 523b566ac520b5f2cd1fa7ba15b8c32e734874c4 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:54:41 2021 -0500 added collapsable cards commit df40cfe953dc2c886177b3347fd23a5b2e33318e Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:32:55 2021 -0500 cosmetic cleanup commit 8acdff09968208791f260f1d83cc278537263317 Author: smilerz <smilerz@gmail.com> Date: Tue Mar 23 12:15:57 2021 -0500 added image import commit f46206bb1b6c82012989c4500671f243e1129849 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 22 15:13:01 2021 -0500 consolidated integration imports into url_import commit b5ba8e33720d5c9939cbba48629eaa50d5dee8f1 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:49 2021 -0500 staged app import tabs commit 7d9c49f7ce98bfc7d73e376a83a83f3974d5472e Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:09:16 2021 -0500 fixed missing space in keyword when adding recipe commit 59ef7fea958068dd45c2d9f28bc91baab5cccbd7 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 17:08:51 2021 -0500 removed unused templates commit d7bf64c452280b5b910811561c97ef0b3d1e5f08 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 21 13:13:56 2021 -0500 combined json import and source import commit e2b578ebccd3e6c4f639fc484d2108ded512e5e6 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 16:06:02 2021 -0500 more fix from super ugly merge commit 72c5ccd39e1923db364b20832c9bdb445d227539 Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 13:17:10 2021 -0500 more cleanup from ugly merge commit 2a298fab635801b395f035459cd3f65646f35f0c Author: smilerz <smilerz@gmail.com> Date: Fri Mar 19 11:24:23 2021 -0500 fixed ugly merge commit 7da1b3d051126a31a944e4dd278c3f09d87380fb Author: smilerz <smilerz@gmail.com> Date: Thu Mar 18 12:09:53 2021 -0500 added drag and drop to ingredients commit 4a03adf762a316c91d0d04887c7783f7c8bfe640 Author: smilerz <smilerz@gmail.com> Date: Mon Mar 15 15:56:44 2021 -0500 manually parse json commit b6173fee3bd26414438dfd99b0f1d63b3a8f6999 Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:33:07 2021 -0600 update urls.py commit d9d1b4f91ce3b8847af1619fa63bb552c6e46bfa Author: smilerz <smilerz@gmail.com> Date: Wed Mar 10 10:32:47 2021 -0600 commit merge from Patralos/recipes commit 29b5e8d0a7774f2a4be51e99ffdffab2c2dba80c Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 15:34:47 2021 -0600 updated URL import page with tab interface commit 908aff8b03027767b3372343efc58f2b31a5fb0a Author: smilerz <smilerz@gmail.com> Date: Tue Mar 9 11:29:10 2021 -0600 import raw json/html commit 32aa659ab6d8a9ff6a293a68172e4d74f4edb193 Author: smilerz <smilerz@gmail.com> Date: Sun Mar 7 14:28:29 2021 -0600 refactored json parser to create functions for each sub parser commit 397dd18790637577430d359689d779d158634ebb Author: Patrick Pirker <pp@ppirker.at> Date: Wed Mar 3 21:37:39 2021 +0100 Allow recipes to be imported from json directly commit 8296765523ddf1af988b0b04a91a6a1ffc8a9363 Author: smilerz <smilerz@gmail.com> Date: Sun Jun 6 14:58:16 2021 -0500 fixed migrations commit e441e5e41518b8cba33d49817461f0794c44184d Author: smilerz <smilerz@gmail.com> Date: Sun Jun 6 14:25:14 2021 -0500 Fix after rebase commit 12a2a294aab24a4e647144127c272457a59459d6 Author: smilerz <smilerz@gmail.com> Date: Sun Jun 6 14:12:19 2021 -0500 fuzzy match on lookups commit fbb9c5fe26a26055cacb58ee44d8a5ba7a1d4e4d Author: smilerz <smilerz@gmail.com> Date: Sat Jun 5 17:56:48 2021 -0500 link to search settings in recipe search commit 0b48ebe3efa43158492dd451f9cbf6023c21c451 Author: smilerz <smilerz@gmail.com> Date: Sat Jun 5 17:43:48 2021 -0500 search form and help doc commit e8a13dc472ca2b9a4a226f213f7cb7a23d5effd5 Author: smilerz <smilerz@gmail.com> Date: Fri Jun 4 13:33:02 2021 -0500 search preference settings commit 67c1456a82fbae6ea94477bf86c565e54dfdd0f0 Author: smilerz <smilerz@gmail.com> Date: Sun May 30 08:57:09 2021 -0500 create indexes commit c2d1bcdc23321b52fee818e8b071ffe8db7d01eb Author: smilerz <smilerz@gmail.com> Date: Sat May 29 20:14:35 2021 -0500 foundation for user configurable search paramaters commit 74e75d217271e65af8ba87e559ece73fe760a670 Author: smilerz <smilerz@gmail.com> Date: Fri May 28 11:37:16 2021 -0500 WIP commit 2e28172de539628736ca138d7f5142e98ce568a0 Author: smilerz <smilerz@gmail.com> Date: Fri May 28 11:37:07 2021 -0500 split search vectors for recipe name and description commit 5469ff88143a50e0d2cfe7a221cac36974cc0615 Author: smilerz <smilerz@gmail.com> Date: Mon May 24 11:35:16 2021 -0500 WIP commit 9cd6f6811c8955d7552fda33d5710f2607ffa259 Author: smilerz <smilerz@gmail.com> Date: Thu May 20 17:27:17 2021 -0500 Fix after rebase commit 6b2a98daba6868666bdbad16a18e0b67dfa38647 Author: smilerz <smilerz@gmail.com> Date: Mon Apr 26 08:35:55 2021 -0500 updated comments, removed direct trigram search commit 4e0adecd1dedbe9b74d1c88d286efbd7d3b1ab63 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 25 19:50:51 2021 -0500 add trigrams to full text search commit 2a8055d63ece64fa530c00567aba5c14a36b4d01 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 25 19:35:17 2021 -0500 add unaccent to full text search vectors commit 844cc76fd18ccc684e4b73372da1b195b3d2cc7c Author: smilerz <smilerz@gmail.com> Date: Sun Apr 25 19:09:54 2021 -0500 WIP commit 1501c6baad4ccdf3b34183d123ecc65e4317ba43 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 19:01:20 2021 -0500 add trigrams to search rank commit 0185eb34f3f67213964ac5fb6bb1f28f3da42fbd Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 15:19:37 2021 -0500 simplified code commit f909e957f7e2181cad48125af32fe9ba32e42cd1 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 14:42:10 2021 -0500 updated search v2 with full text search commit e365fb796e0e12af3444689853dadfc7b8a2ec95 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 21 13:22:48 2021 -0500 filter.py commit 73fa5d39628dc2139a1f4cfa5d3c3b4eaa72d7bb Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 20:17:54 2021 -0500 added multi-language support to FTS commit 918be447983d077c641577000a842a80c5acb8b0 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 19:42:22 2021 -0500 rebuild recipe index from admin site commit f144c26c121a4b174b0546c1ff0807c467f0223b Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 19:07:50 2021 -0500 command line to rebuild index commit 781daee1f59874c8151ae0a0ded82bf058d8722a Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 17:01:18 2021 -0500 updated to handle sqlite commit d85556705b2dda7a98047fbeb4c3388405dc441d Author: smilerz <smilerz@gmail.com> Date: Fri Apr 9 12:47:17 2021 -0500 fixed smalltable commit a080e599e28754f5eb9cb4b2c67d043e27c85091 Author: smilerz <smilerz@gmail.com> Date: Fri Apr 9 12:46:07 2021 -0500 working proof of concept
1 line
41 KiB
JavaScript
1 line
41 KiB
JavaScript
(function(e){function t(t){for(var n,s,o=t[0],c=t[1],l=t[2],p=0,u=[];p<o.length;p++)s=o[p],Object.prototype.hasOwnProperty.call(r,s)&&r[s]&&u.push(r[s][0]),r[s]=0;for(n in c)Object.prototype.hasOwnProperty.call(c,n)&&(e[n]=c[n]);d&&d(t);while(u.length)u.shift()();return a.push.apply(a,l||[]),i()}function i(){for(var e,t=0;t<a.length;t++){for(var i=a[t],n=!0,o=1;o<i.length;o++){var c=i[o];0!==r[c]&&(n=!1)}n&&(a.splice(t--,1),e=s(s.s=i[0]))}return e}var n={},r={recipe_view:0},a=[];function s(t){if(n[t])return n[t].exports;var i=n[t]={i:t,l:!1,exports:{}};return e[t].call(i.exports,i,i.exports,s),i.l=!0,i.exports}s.m=e,s.c=n,s.d=function(e,t,i){s.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:i})},s.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},s.t=function(e,t){if(1&t&&(e=s(e)),8&t)return e;if(4&t&&"object"===typeof e&&e&&e.__esModule)return e;var i=Object.create(null);if(s.r(i),Object.defineProperty(i,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var n in e)s.d(i,n,function(t){return e[t]}.bind(null,n));return i},s.n=function(e){var t=e&&e.__esModule?function(){return e["default"]}:function(){return e};return s.d(t,"a",t),t},s.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},s.p="";var o=window["webpackJsonp"]=window["webpackJsonp"]||[],c=o.push.bind(o);o.push=t,o=o.slice();for(var l=0;l<o.length;l++)t(o[l]);var d=c;a.push([1,"chunk-vendors"]),i()})({"0671":function(e,t,i){"use strict";i.r(t);i("e260"),i("e6cf"),i("cca6"),i("a79d");var n=i("a026"),r=function(){var e=this,t=e.$createElement,i=e._self._c||t;return i("div",{attrs:{id:"app"}},[e.loading?[i("loading-spinner")]:e._e(),e.loading?e._e():i("div",[i("div",{staticClass:"row"},[i("div",{staticClass:"col-12",staticStyle:{"text-align":"center"}},[i("h3",[e._v(e._s(e.recipe.name))])])]),i("div",{staticClass:"my-auto"},[i("div",{staticClass:"col-12",staticStyle:{"text-align":"center"}},[i("i",[e._v(e._s(e.recipe.description))])])]),i("div",{staticStyle:{"text-align":"center"}},[i("keywords",{attrs:{recipe:e.recipe}})],1),i("hr"),i("div",{staticClass:"row"},[i("div",{staticClass:"col col-md-3"},[i("div",{staticClass:"row d-flex",staticStyle:{"padding-left":"16px"}},[e._m(0),i("div",{staticClass:"my-auto",staticStyle:{"padding-right":"4px"}},[i("span",{staticClass:"text-primary"},[i("b",[e._v(e._s(e.$t("Preparation")))])]),i("br"),e._v(" "+e._s(e.recipe.working_time)+" "+e._s(e.$t("min"))+" ")])])]),i("div",{staticClass:"col col-md-3"},[i("div",{staticClass:"row d-flex"},[e._m(1),i("div",{staticClass:"my-auto",staticStyle:{"padding-right":"4px"}},[i("span",{staticClass:"text-primary"},[i("b",[e._v(e._s(e.$t("Waiting")))])]),i("br"),e._v(" "+e._s(e.recipe.waiting_time)+" "+e._s(e.$t("min"))+" ")])])]),i("div",{staticClass:"col col-md-4 col-10"},[i("div",{staticClass:"row d-flex",staticStyle:{"padding-left":"16px"}},[e._m(2),i("div",{staticClass:"my-auto",staticStyle:{"padding-right":"4px"}},[i("input",{directives:[{name:"model",rawName:"v-model.number",value:e.servings,expression:"servings",modifiers:{number:!0}}],staticClass:"form-control form-control-lg",staticStyle:{"text-align":"right","border-width":"0px",border:"none",padding:"0px","padding-left":"0.5vw","padding-right":"8px","max-width":"80px"},attrs:{value:"1",maxlength:"3",min:"0",type:"number"},domProps:{value:e.servings},on:{input:function(t){t.target.composing||(e.servings=e._n(t.target.value))},blur:function(t){return e.$forceUpdate()}}})]),i("div",{staticClass:"my-auto "},[i("span",{staticClass:"text-primary"},[i("b",[""===e.recipe.servings_text?[e._v(e._s(e.$t("Servings")))]:[e._v(e._s(e.recipe.servings_text))]],2)])])])]),i("div",{staticClass:"col col-md-2 col-2 my-auto",staticStyle:{"text-align":"right","padding-right":"1vw"}},[i("recipe-context-menu",{attrs:{recipe:e.recipe,servings:e.servings}})],1)]),i("hr"),i("div",{staticClass:"row"},[e.recipe&&e.ingredient_count>0?i("div",{staticClass:"col-md-6 order-md-1 col-sm-12 order-sm-2 col-12 order-2"},[i("div",{staticClass:"card border-primary"},[i("div",{staticClass:"card-body"},[i("div",{staticClass:"row"},[i("div",{staticClass:"col col-md-8"},[i("h4",{staticClass:"card-title"},[i("i",{staticClass:"fas fa-pepper-hot"}),e._v(" "+e._s(e.$t("Ingredients")))])])]),i("br"),i("div",{staticClass:"row"},[i("div",{staticClass:"col-md-12"},[i("table",{staticClass:"table table-sm"},[e._l(e.recipe.steps,(function(t){return[e._l(t.ingredients,(function(t){return[i("Ingredient",{key:t.id,attrs:{ingredient:t,ingredient_factor:e.ingredient_factor},on:{"checked-state-changed":e.updateIngredientCheckedState}})]}))]}))],2)])])])])]):e._e(),i("div",{staticClass:"col-12 order-1 col-sm-12 order-sm-1 col-md-6 order-md-2"},[i("div",{staticClass:"row"},[i("div",{staticClass:"col-12"},[null!==e.recipe.image?i("img",{staticClass:"img img-fluid rounded",staticStyle:{"max-height":"30vh"},attrs:{src:e.recipe.image,alt:e.$t("Recipe_Image")}}):e._e()])]),i("div",{staticClass:"row",staticStyle:{"margin-top":"2vh","margin-bottom":"2vh"}},[i("div",{staticClass:"col-12"},[i("Nutrition",{attrs:{recipe:e.recipe,ingredient_factor:e.ingredient_factor}})],1)])])]),e.recipe.internal?e._e():[e.recipe.file_path.includes(".pdf")?i("div",[i("PdfViewer",{attrs:{recipe:e.recipe}})],1):e._e(),e.recipe.file_path.includes(".png")||e.recipe.file_path.includes(".jpg")||e.recipe.file_path.includes(".jpeg")||e.recipe.file_path.includes(".gif")?i("div",[i("ImageViewer",{attrs:{recipe:e.recipe}})],1):e._e()],e._l(e.recipe.steps,(function(t,n){return i("div",{key:t.id,staticStyle:{"margin-top":"1vh"}},[i("Step",{attrs:{recipe:e.recipe,step:t,ingredient_factor:e.ingredient_factor,index:n,start_time:e.start_time},on:{"update-start-time":e.updateStartTime,"checked-state-changed":e.updateIngredientCheckedState}})],1)}))],2),i("add-recipe-to-book",{attrs:{recipe:e.recipe}})],2)},a=[function(){var e=this,t=e.$createElement,i=e._self._c||t;return i("div",{staticClass:"my-auto",staticStyle:{"padding-right":"4px"}},[i("i",{staticClass:"fas fa-user-clock fa-2x text-primary"})])},function(){var e=this,t=e.$createElement,i=e._self._c||t;return i("div",{staticClass:"my-auto",staticStyle:{"padding-right":"4px"}},[i("i",{staticClass:"far fa-clock fa-2x text-primary"})])},function(){var e=this,t=e.$createElement,i=e._self._c||t;return i("div",{staticClass:"my-auto",staticStyle:{"padding-right":"4px"}},[i("i",{staticClass:"fas fa-pizza-slice fa-2x text-primary"})])}],s=i("b85c"),o=i("5f5b"),c=(i("2dd8"),i("7c15")),l=function(){var e=this,t=e.$createElement,i=e._self._c||t;return i("div",[i("hr"),"TEXT"===e.step.type?[e.recipe.steps.length>1?i("div",{staticClass:"row"},[i("div",{staticClass:"col col-md-8"},[i("h5",{staticClass:"text-primary"},[e.step.name?[e._v(e._s(e.step.name))]:[e._v(e._s(e.$t("Step"))+" "+e._s(e.index+1))],0!==e.step.time?i("small",{staticClass:"text-muted",staticStyle:{"margin-left":"4px"}},[i("i",{staticClass:"fas fa-user-clock"}),e._v(" "+e._s(e.step.time)+" "+e._s(e.$t("min"))+" ")]):e._e(),""!==e.start_time?i("small",{staticClass:"d-print-none"},[i("b-link",{attrs:{id:"id_reactive_popover_"+e.step.id,href:"#"},on:{click:e.openPopover}},[e._v(" "+e._s(e.moment(e.start_time).add(e.step.time_offset,"minutes").format("HH:mm"))+" ")])],1):e._e()],2)]),i("div",{staticClass:"col col-md-4",staticStyle:{"text-align":"right"}},[i("b-button",{staticClass:"shadow-none",class:{"text-primary":e.details_visible,"text-success":!e.details_visible},staticStyle:{border:"none",background:"none"},on:{click:function(t){e.details_visible=!e.details_visible}}},[i("i",{staticClass:"far fa-check-circle"})])],1)]):e._e(),i("b-collapse",{attrs:{id:"collapse-1"},model:{value:e.details_visible,callback:function(t){e.details_visible=t},expression:"details_visible"}},[i("div",{staticClass:"row"},[e.step.ingredients.length>0&&e.recipe.steps.length>1?i("div",{staticClass:"col col-md-4"},[i("table",{staticClass:"table table-sm"},[e._l(e.step.ingredients,(function(t){return[i("Ingredient",{key:t.id,attrs:{ingredient:t,ingredient_factor:e.ingredient_factor},on:{"checked-state-changed":function(i){return e.$emit("checked-state-changed",t)}}})]}))],2)]):e._e(),i("div",{staticClass:"col",class:{"col-md-8":e.recipe.steps.length>1,"col-md-12":e.recipe.steps.length<=1}},[i("compile-component",{attrs:{code:e.step.ingredients_markdown,ingredient_factor:e.ingredient_factor}})],1)])])]:e._e(),"TIME"===e.step.type||"FILE"===e.step.type?[i("div",{staticClass:"row"},[i("div",{staticClass:"col-md-8 offset-md-2",staticStyle:{"text-align":"center"}},[i("h4",{staticClass:"text-primary"},[e.step.name?[e._v(e._s(e.step.name))]:[e._v(e._s(e.$t("Step"))+" "+e._s(e.index+1))]],2),0!==e.step.time?i("span",{staticClass:"text-muted",staticStyle:{"margin-left":"4px"}},[i("i",{staticClass:"fa fa-stopwatch"}),e._v(" "+e._s(e.step.time)+" "+e._s(e.$t("min")))]):e._e(),""!==e.start_time?i("b-link",{staticClass:"d-print-none",attrs:{id:"id_reactive_popover_"+e.step.id,href:"#"},on:{click:e.openPopover}},[e._v(" "+e._s(e.moment(e.start_time).add(e.step.time_offset,"minutes").format("HH:mm"))+" ")]):e._e()],1),i("div",{staticClass:"col-md-2",staticStyle:{"text-align":"right"}},[i("b-button",{staticClass:"shadow-none",class:{"text-primary":e.details_visible,"text-success":!e.details_visible},staticStyle:{border:"none",background:"none"},on:{click:function(t){e.details_visible=!e.details_visible}}},[i("i",{staticClass:"far fa-check-circle"})])],1)]),i("b-collapse",{attrs:{id:"collapse-1"},model:{value:e.details_visible,callback:function(t){e.details_visible=t},expression:"details_visible"}},[""!==e.step.instruction?i("div",{staticClass:"row"},[i("div",{staticClass:"col col-md-12",staticStyle:{"text-align":"center"}},[i("compile-component",{attrs:{code:e.step.ingredients_markdown,ingredient_factor:e.ingredient_factor}})],1)]):e._e()])]:e._e(),i("div",{staticClass:"row",staticStyle:{"text-align":"center"}},[i("div",{staticClass:"col col-md-12"},[null!==e.step.file?[e.step.file.file.includes(".png")||e.recipe.file_path.includes(".jpg")||e.recipe.file_path.includes(".jpeg")||e.recipe.file_path.includes(".gif")?i("div",[i("img",{staticStyle:{"max-width":"50vw","max-height":"50vh"},attrs:{src:e.step.file.file}})]):i("div",[i("a",{attrs:{href:e.step.file.file,target:"_blank",rel:"noreferrer nofollow"}},[e._v(e._s(e.$t("Download"))+" "+e._s(e.$t("File")))])])]:e._e()],2)]),""!==e.start_time?i("div",[i("b-popover",{ref:"id_reactive_popover_"+e.step.id,attrs:{target:"id_reactive_popover_"+e.step.id,triggers:"click",placement:"bottom",title:e.$t("Step start time")}},[i("div",[i("b-form-group",{staticClass:"mb-1",attrs:{label:"Time","label-for":"popover-input-1","label-cols":"3"}},[i("b-form-input",{attrs:{type:"datetime-local",id:"popover-input-1",size:"sm"},model:{value:e.set_time_input,callback:function(t){e.set_time_input=t},expression:"set_time_input"}})],1)],1),i("div",{staticClass:"row",staticStyle:{"margin-top":"1vh"}},[i("div",{staticClass:"col-12",staticStyle:{"text-align":"right"}},[i("b-button",{staticStyle:{"margin-right":"8px"},attrs:{size:"sm",variant:"secondary"},on:{click:e.closePopover}},[e._v("Cancel")]),i("b-button",{attrs:{size:"sm",variant:"primary"},on:{click:e.updateTime}},[e._v("Ok")])],1)])])],1):e._e()],2)},d=[],p=(i("a9e3"),i("fa7d")),u=function(){var e=this,t=e.$createElement,i=e._self._c||t;return i("tr",{on:{click:function(t){return e.$emit("checked-state-changed",e.ingredient)}}},[e.ingredient.is_header?[i("td",{attrs:{colspan:"5"}},[i("b",[e._v(e._s(e.ingredient.note))])])]:[i("td",[e.ingredient.checked?i("i",{staticClass:"far fa-check-circle text-success"}):e._e(),e.ingredient.checked?e._e():i("i",{staticClass:"far fa-check-circle text-primary"})]),i("td",[0!==e.ingredient.amount?i("span",{domProps:{innerHTML:e._s(e.calculateAmount(e.ingredient.amount))}}):e._e()]),i("td",[null===e.ingredient.unit||e.ingredient.no_amount?e._e():i("span",[e._v(e._s(e.ingredient.unit.name))])]),i("td",[null!==e.ingredient.food?[null!==e.ingredient.food.recipe?i("a",{attrs:{href:e.resolveDjangoUrl("view_recipe",e.ingredient.food.recipe),target:"_blank",rel:"noopener noreferrer"}},[e._v(e._s(e.ingredient.food.name))]):e._e(),null===e.ingredient.food.recipe?i("span",[e._v(e._s(e.ingredient.food.name))]):e._e()]:e._e()],2),i("td",[e.ingredient.note?i("div",[i("span",{directives:[{name:"b-popover",rawName:"v-b-popover.hover",value:e.ingredient.note,expression:"ingredient.note",modifiers:{hover:!0}}],staticClass:"d-print-none"},[i("i",{staticClass:"far fa-comment"})]),i("div",{staticClass:"d-none d-print-block"},[i("i",{staticClass:"far fa-comment-alt"}),e._v(" "+e._s(e.ingredient.note)+" ")])]):e._e()])]],2)},f=[],_={name:"Ingredient",props:{ingredient:Object,ingredient_factor:{type:Number,default:1}},mixins:[p["b"]],data:function(){return{checked:!1}},methods:{calculateAmount:function(e){return Object(p["d"])(e,this.ingredient_factor)}}},m=_,g=i("2877"),v=Object(g["a"])(m,u,f,!1,null,null,null),b=v.exports,h=function(){var e=this,t=e.$createElement,i=e._self._c||t;return i("div",[i(e.compiled,{tag:"component",attrs:{ingredient_factor:e.ingredient_factor,code:e.code}})],1)},j=[],w=function(){var e=this,t=e.$createElement,i=e._self._c||t;return i("span",{domProps:{innerHTML:e._s(e.calculateAmount(e.number))}})},k=[],y={name:"ScalableNumber",props:{number:Number,factor:{type:Number,default:4}},methods:{calculateAmount:function(e){return Object(p["d"])(e,this.factor)}}},C=y,S=Object(g["a"])(C,w,k,!1,null,null,null),x=S.exports,O={name:"CompileComponent",props:["code","ingredient_factor"],data:function(){return{compiled:null}},mounted:function(){this.compiled=n["default"].component("compiled-component",{props:["ingredient_factor","code"],components:{ScalableNumber:x},template:"<div>".concat(this.code,"</div>")})}},E=O,R=Object(g["a"])(E,h,j,!1,null,null,null),$=R.exports,I=i("c1df"),P=i.n(I);n["default"].prototype.moment=P.a;var A={name:"Step",mixins:[p["a"]],components:{Ingredient:b,CompileComponent:$},props:{step:Object,ingredient_factor:Number,index:Number,recipe:Object,start_time:String},data:function(){return{details_visible:!0,set_time_input:""}},mounted:function(){this.set_time_input=P()(this.start_time).add(this.step.time_offset,"minutes").format("yyyy-MM-DDTHH:mm")},methods:{calculateAmount:function(e){return Object(p["d"])(e,this.ingredient_factor)},updateTime:function(){var e=P()(this.set_time_input).add(-1*this.step.time_offset,"minutes").format("yyyy-MM-DDTHH:mm");this.$emit("update-start-time",e),this.closePopover()},closePopover:function(){this.$refs["id_reactive_popover_".concat(this.step.id)].$emit("close")},openPopover:function(){this.$refs["id_reactive_popover_".concat(this.step.id)].$emit("open")}}},N=A,L=Object(g["a"])(N,l,d,!1,null,null,null),z=L.exports,M=i("fc0d"),B=function(){var e=this,t=e.$createElement,i=e._self._c||t;return i("div",[i("iframe",{staticStyle:{border:"none"},attrs:{src:e.pdfUrl,width:"100%",height:"700px"}})])},D=[],T={name:"PdfViewer",mixins:[p["b"]],props:{recipe:Object},computed:{pdfUrl:function(){return"/static/pdfjs/viewer.html?file="+Object(p["g"])("api_get_recipe_file",this.recipe.id)}}},U=T,V=Object(g["a"])(U,B,D,!1,null,null,null),K=V.exports,H=function(){var e=this,t=e.$createElement,i=e._self._c||t;return i("div",{staticStyle:{"text-align":"center"}},[i("b-img",{attrs:{src:e.pdfUrl,alt:e.$t("External_Recipe_Image")}})],1)},F=[],Z={name:"ImageViewer",props:{recipe:Object},computed:{pdfUrl:function(){return Object(p["g"])("api_get_recipe_file",this.recipe.id)}}},W=Z,J=Object(g["a"])(W,H,F,!1,null,null,null),q=J.exports,G=function(){var e=this,t=e.$createElement,i=e._self._c||t;return null!==e.recipe.nutrition?i("div",[i("div",{staticClass:"card border-success"},[i("div",{staticClass:"card-body"},[i("div",{staticClass:"row"},[i("div",{staticClass:"col-12"},[i("h4",{staticClass:"card-title"},[i("i",{staticClass:"fas fa-carrot"}),e._v(" "+e._s(e.$t("Nutrition")))])])]),i("div",{staticClass:"row"},[i("div",{staticClass:"col-6"},[i("i",{staticClass:"fas fa-fire fa-fw text-primary"}),e._v(" "+e._s(e.$t("Calories"))+" ")]),i("div",{staticClass:"col-6"},[i("span",{domProps:{innerHTML:e._s(e.calculateAmount(e.recipe.nutrition.calories))}}),e._v(" kcal ")])]),i("div",{staticClass:"row"},[i("div",{staticClass:"col-6"},[i("i",{staticClass:"fas fa-bread-slice fa-fw text-primary"}),e._v(" "+e._s(e.$t("Carbohydrates"))+" ")]),i("div",{staticClass:"col-6"},[i("span",{domProps:{innerHTML:e._s(e.calculateAmount(e.recipe.nutrition.carbohydrates))}}),e._v(" g ")])]),i("div",{staticClass:"row"},[i("div",{staticClass:"col-6"},[i("i",{staticClass:"fas fa-cheese fa-fw text-primary"}),e._v(" "+e._s(e.$t("Fats"))+" ")]),i("div",{staticClass:"col-6"},[i("span",{domProps:{innerHTML:e._s(e.calculateAmount(e.recipe.nutrition.fats))}}),e._v(" g ")])]),i("div",{staticClass:"row"},[i("div",{staticClass:"col-6"},[i("i",{staticClass:"fas fa-drumstick-bite fa-fw text-primary"}),e._v(" "+e._s(e.$t("Proteins"))+" ")]),i("div",{staticClass:"col-6"},[i("span",{domProps:{innerHTML:e._s(e.calculateAmount(e.recipe.nutrition.proteins))}}),e._v(" g ")])])])])]):e._e()},X=[],Q={name:"Nutrition",props:{recipe:Object,ingredient_factor:Number},methods:{calculateAmount:function(e){return Object(p["d"])(e,this.ingredient_factor)}}},Y=Q,ee=Object(g["a"])(Y,G,X,!1,null,null,null),te=ee.exports,ie=i("81d5"),ne=i("d76c"),re=function(){var e=this,t=e.$createElement,i=e._self._c||t;return i("div",[i("b-modal",{staticClass:"modal",attrs:{id:"id_modal_add_book",title:e.$t("Add_to_Book"),"ok-title":e.$t("Add"),"cancel-title":e.$t("Close")},on:{ok:function(t){return e.addToBook()}}},[i("multiselect",{attrs:{options:e.books,"preserve-search":!0,placeholder:e.$t("Select_Book"),label:"name","track-by":"id",id:"id_books",multiple:!1},on:{"search-change":e.loadBook},model:{value:e.selected_book,callback:function(t){e.selected_book=t},expression:"selected_book"}})],1)],1)},ae=[],se=i("8e5f"),oe=i.n(se);n["default"].prototype.moment=P.a,n["default"].use(o["a"]);var ce={name:"AddRecipeToBook",components:{Multiselect:oe.a},props:{recipe:Object},data:function(){return{books:[],selected_book:null}},mounted:function(){this.loadBook("")},methods:{loadBook:function(e){var t=this;Object(c["b"])(e).then((function(e){t.books=e}))},addToBook:function(){Object(c["a"])({recipe:this.recipe.id,book:this.selected_book.id})}}},le=ce,de=(i("60bc"),Object(g["a"])(le,re,ae,!1,null,null,null)),pe=de.exports;n["default"].prototype.moment=P.a,n["default"].use(o["a"]);var ue={name:"RecipeView",mixins:[p["b"],p["c"]],components:{PdfViewer:K,ImageViewer:q,Ingredient:b,Step:z,RecipeContextMenu:M["a"],Nutrition:te,Keywords:ie["a"],LoadingSpinner:ne["a"],AddRecipeToBook:pe},computed:{ingredient_factor:function(){return this.servings/this.recipe.servings}},data:function(){return{loading:!0,recipe:void 0,ingredient_count:0,servings:1,start_time:""}},mounted:function(){this.loadRecipe(window.RECIPE_ID),this.$i18n.locale=window.CUSTOM_LOCALE},methods:{loadRecipe:function(e){var t=this;Object(c["c"])(e).then((function(e){0!==window.USER_SERVINGS&&(e.servings=window.USER_SERVINGS),t.servings=e.servings;var i,n=0,r=Object(s["a"])(e.steps);try{for(r.s();!(i=r.n()).done;){var a=i.value;t.ingredient_count+=a.ingredients.length;var o,c=Object(s["a"])(a.ingredients);try{for(c.s();!(o=c.n()).done;){var l=o.value;t.$set(l,"checked",!1)}}catch(d){c.e(d)}finally{c.f()}a.time_offset=n,n+=a.time}}catch(d){r.e(d)}finally{r.f()}n>0&&(t.start_time=P()().format("yyyy-MM-DDTHH:mm")),t.recipe=e,t.loading=!1}))},updateStartTime:function(e){this.start_time=e},updateIngredientCheckedState:function(e){var t,i=Object(s["a"])(this.recipe.steps);try{for(i.s();!(t=i.n()).done;){var n,r=t.value,a=Object(s["a"])(r.ingredients);try{for(a.s();!(n=a.n()).done;){var o=n.value;o.id===e.id&&this.$set(o,"checked",!o.checked)}}catch(c){a.e(c)}finally{a.f()}}}catch(c){i.e(c)}finally{i.f()}}}},fe=ue,_e=Object(g["a"])(fe,r,a,!1,null,null,null),me=_e.exports,ge=i("9225");n["default"].config.productionTip=!1,new n["default"]({i18n:ge["a"],render:function(e){return e(me)}}).$mount("#app")},1:function(e,t,i){e.exports=i("0671")},4678:function(e,t,i){var n={"./af":"2bfb","./af.js":"2bfb","./ar":"8e73","./ar-dz":"a356","./ar-dz.js":"a356","./ar-kw":"423e","./ar-kw.js":"423e","./ar-ly":"1cfd","./ar-ly.js":"1cfd","./ar-ma":"0a84","./ar-ma.js":"0a84","./ar-sa":"8230","./ar-sa.js":"8230","./ar-tn":"6d83","./ar-tn.js":"6d83","./ar.js":"8e73","./az":"485c","./az.js":"485c","./be":"1fc1","./be.js":"1fc1","./bg":"84aa","./bg.js":"84aa","./bm":"a7fa","./bm.js":"a7fa","./bn":"9043","./bn-bd":"9686","./bn-bd.js":"9686","./bn.js":"9043","./bo":"d26a","./bo.js":"d26a","./br":"6887","./br.js":"6887","./bs":"2554","./bs.js":"2554","./ca":"d716","./ca.js":"d716","./cs":"3c0d","./cs.js":"3c0d","./cv":"03ec","./cv.js":"03ec","./cy":"9797","./cy.js":"9797","./da":"0f14","./da.js":"0f14","./de":"b469","./de-at":"b3eb","./de-at.js":"b3eb","./de-ch":"bb71","./de-ch.js":"bb71","./de.js":"b469","./dv":"598a","./dv.js":"598a","./el":"8d47","./el.js":"8d47","./en-au":"0e6b","./en-au.js":"0e6b","./en-ca":"3886","./en-ca.js":"3886","./en-gb":"39a6","./en-gb.js":"39a6","./en-ie":"e1d3","./en-ie.js":"e1d3","./en-il":"7333","./en-il.js":"7333","./en-in":"ec2e","./en-in.js":"ec2e","./en-nz":"6f50","./en-nz.js":"6f50","./en-sg":"b7e9","./en-sg.js":"b7e9","./eo":"65db","./eo.js":"65db","./es":"898b","./es-do":"0a3c","./es-do.js":"0a3c","./es-mx":"b5b7","./es-mx.js":"b5b7","./es-us":"55c9","./es-us.js":"55c9","./es.js":"898b","./et":"ec18","./et.js":"ec18","./eu":"0ff2","./eu.js":"0ff2","./fa":"8df4","./fa.js":"8df4","./fi":"81e9","./fi.js":"81e9","./fil":"d69a","./fil.js":"d69a","./fo":"0721","./fo.js":"0721","./fr":"9f26","./fr-ca":"d9f8","./fr-ca.js":"d9f8","./fr-ch":"0e49","./fr-ch.js":"0e49","./fr.js":"9f26","./fy":"7118","./fy.js":"7118","./ga":"5120","./ga.js":"5120","./gd":"f6b4","./gd.js":"f6b4","./gl":"8840","./gl.js":"8840","./gom-deva":"aaf2","./gom-deva.js":"aaf2","./gom-latn":"0caa","./gom-latn.js":"0caa","./gu":"e0c5","./gu.js":"e0c5","./he":"c7aa","./he.js":"c7aa","./hi":"dc4d","./hi.js":"dc4d","./hr":"4ba9","./hr.js":"4ba9","./hu":"5b14","./hu.js":"5b14","./hy-am":"d6b6","./hy-am.js":"d6b6","./id":"5038","./id.js":"5038","./is":"0558","./is.js":"0558","./it":"6e98","./it-ch":"6f12","./it-ch.js":"6f12","./it.js":"6e98","./ja":"079e","./ja.js":"079e","./jv":"b540","./jv.js":"b540","./ka":"201b","./ka.js":"201b","./kk":"6d79","./kk.js":"6d79","./km":"e81d","./km.js":"e81d","./kn":"3e92","./kn.js":"3e92","./ko":"22f8","./ko.js":"22f8","./ku":"2421","./ku.js":"2421","./ky":"9609","./ky.js":"9609","./lb":"440c","./lb.js":"440c","./lo":"b29d","./lo.js":"b29d","./lt":"26f9","./lt.js":"26f9","./lv":"b97c","./lv.js":"b97c","./me":"293c","./me.js":"293c","./mi":"688b","./mi.js":"688b","./mk":"6909","./mk.js":"6909","./ml":"02fb","./ml.js":"02fb","./mn":"958b","./mn.js":"958b","./mr":"39bd","./mr.js":"39bd","./ms":"ebe4","./ms-my":"6403","./ms-my.js":"6403","./ms.js":"ebe4","./mt":"1b45","./mt.js":"1b45","./my":"8689","./my.js":"8689","./nb":"6ce3","./nb.js":"6ce3","./ne":"3a39","./ne.js":"3a39","./nl":"facd","./nl-be":"db29","./nl-be.js":"db29","./nl.js":"facd","./nn":"b84c","./nn.js":"b84c","./oc-lnc":"167b","./oc-lnc.js":"167b","./pa-in":"f3ff","./pa-in.js":"f3ff","./pl":"8d57","./pl.js":"8d57","./pt":"f260","./pt-br":"d2d4","./pt-br.js":"d2d4","./pt.js":"f260","./ro":"972c","./ro.js":"972c","./ru":"957c","./ru.js":"957c","./sd":"6784","./sd.js":"6784","./se":"ffff","./se.js":"ffff","./si":"eda5","./si.js":"eda5","./sk":"7be6","./sk.js":"7be6","./sl":"8155","./sl.js":"8155","./sq":"c8f3","./sq.js":"c8f3","./sr":"cf1e","./sr-cyrl":"13e9","./sr-cyrl.js":"13e9","./sr.js":"cf1e","./ss":"52bd","./ss.js":"52bd","./sv":"5fbd","./sv.js":"5fbd","./sw":"74dc","./sw.js":"74dc","./ta":"3de5","./ta.js":"3de5","./te":"5cbb","./te.js":"5cbb","./tet":"576c","./tet.js":"576c","./tg":"3b1b","./tg.js":"3b1b","./th":"10e8","./th.js":"10e8","./tk":"5aff","./tk.js":"5aff","./tl-ph":"0f38","./tl-ph.js":"0f38","./tlh":"cf755","./tlh.js":"cf755","./tr":"0e81","./tr.js":"0e81","./tzl":"cf51","./tzl.js":"cf51","./tzm":"c109","./tzm-latn":"b53d","./tzm-latn.js":"b53d","./tzm.js":"c109","./ug-cn":"6117","./ug-cn.js":"6117","./uk":"ada2","./uk.js":"ada2","./ur":"5294","./ur.js":"5294","./uz":"2e8c","./uz-latn":"010e","./uz-latn.js":"010e","./uz.js":"2e8c","./vi":"2921","./vi.js":"2921","./x-pseudo":"fd7e","./x-pseudo.js":"fd7e","./yo":"7f33","./yo.js":"7f33","./zh-cn":"5c3a","./zh-cn.js":"5c3a","./zh-hk":"49ab","./zh-hk.js":"49ab","./zh-mo":"3a6c","./zh-mo.js":"3a6c","./zh-tw":"90ea","./zh-tw.js":"90ea"};function r(e){var t=a(e);return i(t)}function a(e){if(!i.o(n,e)){var t=new Error("Cannot find module '"+e+"'");throw t.code="MODULE_NOT_FOUND",t}return n[e]}r.keys=function(){return Object.keys(n)},r.resolve=a,e.exports=r,r.id="4678"},"49f8":function(e,t,i){var n={"./de.json":"6ce2","./en.json":"edd4","./nl.json":"a625","./sv.json":"4c5b"};function r(e){var t=a(e);return i(t)}function a(e){if(!i.o(n,e)){var t=new Error("Cannot find module '"+e+"'");throw t.code="MODULE_NOT_FOUND",t}return n[e]}r.keys=function(){return Object.keys(n)},r.resolve=a,e.exports=r,r.id="49f8"},"4c5b":function(e){e.exports=JSON.parse('{"import_running":"Import pågår, var god vänta!","all_fields_optional":"Alla rutor är valfria och kan lämnas tomma.","convert_internal":"Konvertera till internt recept","Log_Recipe_Cooking":"Logga tillagningen av receptet","External_Recipe_Image":"Externt receptbild","Add_to_Book":"Lägg till i kokbok","Add_to_Shopping":"Lägg till i handelslista","Add_to_Plan":"Lägg till i matsedel","Step_start_time":"Steg starttid","Select_Book":"Välj kokbok","Recipe_Image":"Receptbild","Import_finished":"Importering klar","View_Recipes":"Visa recept","Log_Cooking":"Logga tillagning","Proteins":"Protein","Fats":"Fett","Carbohydrates":"Kolhydrater","Calories":"Kalorier","Nutrition":"Näringsinnehåll","Date":"Datum","Share":"Dela","Export":"Exportera","Rating":"Betyg","Close":"Stäng","Add":"Lägg till","Ingredients":"Ingredienser","min":"min","Servings":"Portioner","Waiting":"Väntan","Preparation":"Förberedelse","Edit":"Redigera","Open":"Öppna","Save":"Spara","Step":"Steg","Search":"Sök","Import":"Importera","Print":"Skriv ut","Information":"Information"}')},"6ce2":function(e){e.exports=JSON.parse('{"Import":"Import","import_running":"Import läuft, bitte warten!","Import_finished":"Import fertig","View_Recipes":"Rezepte Ansehen","Information":"Information","all_fields_optional":"Alle Felder sind optional und können leer gelassen werden.","convert_internal":"Zu internem Rezept wandeln","Log_Recipe_Cooking":"Kochen protokollieren","External_Recipe_Image":"Externes Rezept Bild","Add_to_Book":"Zu Buch hinzufügen","Add_to_Shopping":"Zu Einkaufsliste hinzufügen","Add_to_Plan":"Zu Plan hinzufügen","Step_start_time":"Schritt Startzeit","Select_Book":"Buch wählen","Recipe_Image":"Rezept Bild","Log_Cooking":"Kochen protokollieren","Proteins":"Proteine","Fats":"Fette","Carbohydrates":"Kohlenhydrate","Calories":"Kalorien","Nutrition":"Nährwerte","Keywords":"Stichwörter","Books":"Bücher","show_only_internal":"Nur interne Rezepte anzeigen","Ingredients":"Zutaten","min":"Min","Servings":"Portionen","Waiting":"Wartezeit","Preparation":"Zubereitung","Edit":"Bearbeiten","Open":"Öffnen","Save":"Speichern","Step":"Schritt","Search":"Suchen","Print":"Drucken","New_Recipe":"Neues Rezept","Url_Import":"URL Import","Reset_Search":"Suche zurücksetzen","or":"oder","and":"und","Recently_Viewed":"Kürzlich angesehen","External":"Extern","Settings":"Einstellungen","Meal_Plan":"Speiseplan","Date":"Datum","Share":"Teilen","Export":"Exportieren","Rating":"Bewertung","Close":"Schließen","Add":"Hinzufügen"}')},"7c15":function(e,t,i){"use strict";i.d(t,"c",(function(){return s})),i.d(t,"d",(function(){return o})),i.d(t,"b",(function(){return c})),i.d(t,"a",(function(){return l}));var n=i("bc3a"),r=i.n(n),a=i("fa7d");function s(e){var t=Object(a["g"])("api:recipe-detail",e);return void 0!==window.SHARE_UID&&(t+="?share="+window.SHARE_UID),r.a.get(t).then((function(e){return e.data})).catch((function(e){d(e,"There was an error loading a resource!","danger")}))}function o(e){return r.a.post(Object(a["g"])("api:cooklog-list"),e).then((function(e){Object(a["f"])("Saved","Cook Log entry saved!","success")})).catch((function(e){d(e,"There was an error creating a resource!","danger")}))}function c(e){return r.a.get(Object(a["g"])("api:recipebook-list")+"?query="+e).then((function(e){return e.data})).catch((function(e){}))}function l(e){return r.a.post(Object(a["g"])("api:recipebookentry-list"),e).then((function(e){Object(a["f"])("Saved","Recipe Book entry saved!","success")})).catch((function(e){d(e,"There was an error creating a resource!","danger")}))}function d(e,t){if("response"in e){console.log(e.response);var i="statusText"in e.response?e.response.statusText:Object(a["e"])("Error");t+="\n\n"+JSON.stringify(e.response.data),Object(a["f"])(i,t,"danger")}else Object(a["f"])("Error",t,"danger"),console.log(e)}r.a.defaults.xsrfCookieName="csrftoken",r.a.defaults.xsrfHeaderName="X-CSRFTOKEN"},"81d5":function(e,t,i){"use strict";var n=function(){var e=this,t=e.$createElement,i=e._self._c||t;return e.recipe.keywords.length>0?i("div",e._l(e.recipe.keywords,(function(t){return i("span",{key:t.id,staticStyle:{padding:"2px"}},[i("b-badge",{attrs:{pill:"",variant:"light"}},[e._v(e._s(t.label))])],1)})),0):e._e()},r=[],a={name:"Keywords",props:{recipe:Object}},s=a,o=i("2877"),c=Object(o["a"])(s,n,r,!1,null,null,null);t["a"]=c.exports},9225:function(e,t,i){"use strict";i("159b"),i("d3b7"),i("ddb0"),i("ac1f"),i("466d");var n=i("a026"),r=i("a925");function a(){var e=i("49f8"),t={};return e.keys().forEach((function(i){var n=i.match(/([A-Za-z0-9-_]+)\./i);if(n&&n.length>1){var r=n[1];t[r]=e(i)}})),t}n["default"].use(r["a"]),t["a"]=new r["a"]({locale:Object({NODE_ENV:"production",BASE_URL:""}).VUE_APP_I18N_LOCALE||"en",fallbackLocale:Object({NODE_ENV:"production",BASE_URL:""}).VUE_APP_I18N_FALLBACK_LOCALE||"en",messages:a()})},a625:function(e){e.exports=JSON.parse('{"import_running":"Er wordt geïmporteerd, even geduld!","all_fields_optional":"Alle velden zijn optioneel en kunnen leeg gelaten worden.","convert_internal":"Zet om naar intern recept","Log_Recipe_Cooking":"Log Bereiding","External_Recipe_Image":"Externe Afbeelding Recept","Add_to_Book":"Voeg toe aan Boek","Add_to_Shopping":"Voeg toe aan Boodschappenlijst","Add_to_Plan":"Voeg toe aan Plan","Step_start_time":"Starttijd stap","Select_Book":"Selecteer Boek","Recipe_Image":"Afbeelding Recept","Import_finished":"Importeren gereed","View_Recipes":"Bekijk Recepten","Log_Cooking":"Log Bereiding","Proteins":"Eiwitten","Fats":"Vetten","Carbohydrates":"Koolhydraten","Calories":"Calorieën","Nutrition":"Voedingswaarde","Date":"Datum","Share":"Deel","Export":"Exporteren","Rating":"Beoordeling","Close":"Sluiten","Add":"Voeg toe","Ingredients":"Ingrediënten","min":"min","Servings":"Porties","Waiting":"Wachten","Preparation":"Bereiding","Edit":"Bewerken","Open":"Open","Save":"Opslaan","Step":"Stap","Search":"Zoeken","Import":"Importeer","Print":"Afdrukken","Information":"Informatie","Keywords":"Etiketten","Books":"Boeken","show_only_internal":"Toon alleen interne recepten","New_Recipe":"Nieuw Recept","Url_Import":"Importeer URL","Reset_Search":"Zoeken resetten","or":"of","and":"en","Recently_Viewed":"Recent bekeken","External":"Externe","Settings":"Instellingen","Meal_Plan":"Maaltijdplan","New":"Nieuw","Supermarket":"Supermarkt","Categories":"Categorieën","Category":"Categorie","Selected":"Geselecteerd"}')},d76c:function(e,t,i){"use strict";var n=function(){var e=this,t=e.$createElement;e._self._c;return e._m(0)},r=[function(){var e=this,t=e.$createElement,i=e._self._c||t;return i("div",{staticClass:"row"},[i("div",{staticClass:"col",staticStyle:{"text-align":"center"}},[i("img",{staticClass:"spinner-tandoor",staticStyle:{height:"30vh"},attrs:{alt:"loading spinner",src:""}})])])}],a={name:"LoadingSpinner",props:{recipe:Object}},s=a,o=i("2877"),c=Object(o["a"])(s,n,r,!1,null,null,null);t["a"]=c.exports},edd4:function(e){e.exports=JSON.parse('{"err_fetching_resource":"There was an error fetching a resource!","err_creating_resource":"There was an error creating a resource!","err_updating_resource":"There was an error updating a resource!","err_deleting_resource":"There was an error deleting a resource!","success_fetching_resource":"Successfully fetched a resource!","success_creating_resource":"Successfully created a resource!","success_updating_resource":"Successfully updated a resource!","success_deleting_resource":"Successfully deleted a resource!","import_running":"Import running, please wait!","all_fields_optional":"All fields are optional and can be left empty.","convert_internal":"Convert to internal recipe","show_only_internal":"Show only internal recipes","show_split_screen":"Show split view","Log_Recipe_Cooking":"Log Recipe Cooking","External_Recipe_Image":"External Recipe Image","Add_to_Book":"Add to Book","Add_to_Shopping":"Add to Shopping","Add_to_Plan":"Add to Plan","Step_start_time":"Step start time","Meal_Plan":"Meal Plan","Select_Book":"Select Book","Recipe_Image":"Recipe Image","Import_finished":"Import finished","View_Recipes":"View Recipes","Log_Cooking":"Log Cooking","New_Recipe":"New Recipe","Url_Import":"Url Import","Reset_Search":"Reset Search","Recently_Viewed":"Recently Viewed","Load_More":"Load More","New_Keyword":"New Keyword","Delete_Keyword":"Delete Keyword","Edit_Keyword":"Edit Keyword","Move_Keyword":"Move Keyword","Merge_Keyword":"Merge Keyword","Hide_Keywords":"Hide Keywords","Hide_Recipes":"Hide Recipes","Keywords":"Keywords","Books":"Books","Proteins":"Proteins","Fats":"Fats","Carbohydrates":"Carbohydrates","Calories":"Calories","Nutrition":"Nutrition","Date":"Date","Share":"Share","Export":"Export","Rating":"Rating","Close":"Close","Cancel":"Cancel","Add":"Add","New":"New","Success":"Success","Ingredients":"Ingredients","Supermarket":"Supermarket","Categories":"Categories","Category":"Category","Selected":"Selected","min":"min","Servings":"Servings","Waiting":"Waiting","Preparation":"Preparation","External":"External","Size":"Size","Files":"Files","File":"File","Edit":"Edit","Delete":"Delete","Open":"Open","Ok":"Open","Save":"Save","Step":"Step","Search":"Search","Import":"Import","Print":"Print","Settings":"Settings","or":"or","and":"and","Information":"Information","View":"View","Recipes":"Recipes","Move":"Move","Merge":"Merge","Parent":"Parent","delete_confimation":"Are you sure that you want to delete {kw} and all of it\'s children?","move_confirmation":"Move {child} to parent {parent}","merge_confirmation":"Replace {source} with {target}","move_selection":"Select a parent to move {child} to.","merge_selection":"Replace all occurences of {source} with the selected {type}.","Advanced Search Settings":"Advanced Search Settings","Download":"Download","Root":"Root"}')},fa7d:function(e,t,i){"use strict";i.d(t,"c",(function(){return s})),i.d(t,"f",(function(){return o})),i.d(t,"a",(function(){return c})),i.d(t,"e",(function(){return l})),i.d(t,"b",(function(){return d})),i.d(t,"g",(function(){return p})),i.d(t,"d",(function(){return f}));var n=i("53ca"),r=(i("99af"),i("59e4"));function a(e,t,i){var n=Math.floor(e),r=1,a=n+1,s=1;if(e!==n)while(r<=t&&s<=t){var o=(n+a)/(r+s);if(e===o){r+s<=t?(r+=s,n+=a,s=t+1):r>s?s=t+1:r=t+1;break}e<o?(a=n+a,s=r+s):(n+=a,r+=s)}if(r>t&&(r=s,n=a),!i)return[0,n,r];var c=Math.floor(n/r);return[c,n-c*r,r]}var s={methods:{makeToast:function(e,t){var i=arguments.length>2&&void 0!==arguments[2]?arguments[2]:null;return o(e,t,i)}}};function o(e,t){var i=arguments.length>2&&void 0!==arguments[2]?arguments[2]:null,n=new r["a"];n.$bvToast.toast(t,{title:e,variant:i,toaster:"b-toaster-top-center",solid:!0})}var c={methods:{_:function(e){return l(e)}}};function l(e){return window.gettext(e)}var d={methods:{resolveDjangoUrl:function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:null;return p(e,t)}}};function p(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:null;if(null==t)return window.Urls[e]();if("object"!=Object(n["a"])(t))return window.Urls[e](t);if("object"==Object(n["a"])(t)){if(1===t.length)return window.Urls[e](t);if(2===t.length)return window.Urls[e](t[0],t[1]);if(3===t.length)return window.Urls[e](t[0],t[1],t[2])}}function u(e){return window.USER_PREF[e]}function f(e,t){if(u("use_fractions")){var i="",n=a(e*t,9,!0);return n[0]>0&&(i+=n[0]),n[1]>0&&(i+=" <sup>".concat(n[1],"</sup>⁄<sub>").concat(n[2],"</sub>")),i}return _(e*t)}function _(e){var t=u("user_fractions")?u("user_fractions"):2;return+(Math.round(e+"e+".concat(t))+"e-".concat(t))}},fc0d:function(e,t,i){"use strict";var n=function(){var e=this,t=e.$createElement,i=e._self._c||t;return i("div",[i("div",{staticClass:"dropdown"},[e._m(0),i("div",{staticClass:"dropdown-menu dropdown-menu-right",attrs:{"aria-labelledby":"dropdownMenuLink"}},[i("a",{staticClass:"dropdown-item",attrs:{href:e.resolveDjangoUrl("edit_recipe",e.recipe.id)}},[i("i",{staticClass:"fas fa-pencil-alt fa-fw"}),e._v(" "+e._s(e.$t("Edit")))]),e.recipe.internal?e._e():i("a",{staticClass:"dropdown-item",attrs:{href:e.resolveDjangoUrl("edit_convert_recipe",e.recipe.id)}},[i("i",{staticClass:"fas fa-exchange-alt fa-fw"}),e._v(" "+e._s(e.$t("convert_internal")))]),i("button",{staticClass:"dropdown-item",on:{click:function(t){return e.$bvModal.show("id_modal_add_book")}}},[i("i",{staticClass:"fas fa-bookmark fa-fw"}),e._v(" "+e._s(e.$t("Add_to_Book"))+" ")]),e.recipe.internal?i("a",{staticClass:"dropdown-item",attrs:{href:e.resolveDjangoUrl("view_shopping")+"?r=["+e.recipe.id+","+e.servings_value+"]",target:"_blank",rel:"noopener noreferrer"}},[i("i",{staticClass:"fas fa-shopping-cart fa-fw"}),e._v(" "+e._s(e.$t("Add_to_Shopping"))+" ")]):e._e(),i("a",{staticClass:"dropdown-item",attrs:{href:e.resolveDjangoUrl("new_meal_plan")+"?recipe="+e.recipe.id,target:"_blank",rel:"noopener noreferrer"}},[i("i",{staticClass:"fas fa-calendar fa-fw"}),e._v(" "+e._s(e.$t("Add_to_Plan"))+" ")]),i("button",{staticClass:"dropdown-item",on:{click:function(t){return e.$bvModal.show("id_modal_cook_log")}}},[i("i",{staticClass:"fas fa-clipboard-list fa-fw"}),e._v(" "+e._s(e.$t("Log_Cooking"))+" ")]),i("button",{staticClass:"dropdown-item",attrs:{onclick:"window.print()"}},[i("i",{staticClass:"fas fa-print fa-fw"}),e._v(" "+e._s(e.$t("Print"))+" ")]),i("a",{staticClass:"dropdown-item",attrs:{href:e.resolveDjangoUrl("view_export")+"?r="+e.recipe.id,target:"_blank",rel:"noopener noreferrer"}},[i("i",{staticClass:"fas fa-file-export fa-fw"}),e._v(" "+e._s(e.$t("Export")))]),e.recipe.internal?i("a",{staticClass:"dropdown-item",attrs:{href:e.resolveDjangoUrl("new_share_link",e.recipe.id),target:"_blank",rel:"noopener noreferrer"}},[i("i",{staticClass:"fas fa-share-alt fa-fw"}),e._v(" "+e._s(e.$t("Share")))]):e._e()])]),i("cook-log",{attrs:{recipe:e.recipe}})],1)},r=[function(){var e=this,t=e.$createElement,i=e._self._c||t;return i("a",{staticClass:"btn shadow-none",attrs:{href:"#",role:"button",id:"dropdownMenuLink","data-toggle":"dropdown","aria-haspopup":"true","aria-expanded":"false"}},[i("i",{staticClass:"fas fa-ellipsis-v"})])}],a=(i("a9e3"),i("fa7d")),s=function(){var e=this,t=e.$createElement,i=e._self._c||t;return i("div",[i("b-modal",{staticClass:"modal",attrs:{id:"id_modal_cook_log",title:e.$t("Log_Recipe_Cooking"),"ok-title":e.$t("Save"),"cancel-title":e.$t("Close")},on:{ok:function(t){return e.logCook()}}},[i("p",[e._v(e._s(e.$t("all_fields_optional")))]),i("form",[i("label",{attrs:{for:"id_log_servings"}},[e._v(e._s(e.$t("Servings")))]),i("input",{directives:[{name:"model",rawName:"v-model",value:e.logObject.servings,expression:"logObject.servings"}],staticClass:"form-control",attrs:{type:"number",id:"id_log_servings"},domProps:{value:e.logObject.servings},on:{input:function(t){t.target.composing||e.$set(e.logObject,"servings",t.target.value)}}}),i("label",{staticStyle:{"margin-top":"2vh"}},[e._v(e._s(e.$t("Rating"))+" - "),i("span",{attrs:{id:"id_rating_show"}},[e._v(e._s(e.logObject.rating)+"/5")])]),i("b-form-rating",{model:{value:e.logObject.rating,callback:function(t){e.$set(e.logObject,"rating",t)},expression:"logObject.rating"}}),i("label",{staticStyle:{"margin-top":"2vh"},attrs:{for:"id_date"}},[e._v(e._s(e.$t("Date")))]),i("input",{directives:[{name:"model",rawName:"v-model",value:e.logObject.created_at,expression:"logObject.created_at"}],staticClass:"form-control",attrs:{type:"datetime-local",id:"id_date"},domProps:{value:e.logObject.created_at},on:{input:function(t){t.target.composing||e.$set(e.logObject,"created_at",t.target.value)}}})],1)])],1)},o=[],c=i("c1df"),l=i.n(c),d=i("a026"),p=i("5f5b"),u=i("7c15");d["default"].prototype.moment=l.a,d["default"].use(p["a"]);var f={name:"CookLog",props:{recipe:Object},data:function(){return{logObject:{recipe:this.recipe.id,servings:0,rating:0,created_at:l()().format("yyyy-MM-DDTHH:mm")}}},methods:{logCook:function(){Object(u["d"])(this.logObject)}}},_=f,m=i("2877"),g=Object(m["a"])(_,s,o,!1,null,null,null),v=g.exports,b={name:"RecipeContextMenu",mixins:[a["b"]],components:{CookLog:v},data:function(){return{servings_value:0}},props:{recipe:Object,servings:{type:Number,default:-1}},mounted:function(){this.servings_value=-1===this.servings?this.recipe.servings:this.servings}},h=b,j=Object(m["a"])(h,n,r,!1,null,null,null);t["a"]=j.exports}}); |