github.com/OpenLitterMap/openlittermap-web commits

Merge branch 'staging' into teams-map-wip

# Conflicts:
# app/Console/Commands/Clusters/GenerateClusters.php

e30a9cfe13a5b93f1d21ec2d54dc67b14b93004d authored almost 3 years ago by geni_jaho <[email protected]>

regenerate clusters daily

c444ababfaa5ada146d19aa5acc1fb6b45457fe0 authored almost 3 years ago by xlcrr <[email protected]>

merge staging, improve clustering performance, add mobile API for teams

6141553f4a4e017c391061608014a0d4e58f138d authored almost 3 years ago by xlcrr <[email protected]>

add comments to clustering

a7778dddf54f84d2dcad3dd85319cb09725443b8 authored almost 3 years ago by xlcrr <[email protected]>

Merge pull request #385 from GeniJaho/feature/mobile-api-teams

Feature - Mobile API for teams

5d5bbd9b6f60796529906705945779e24b90d177 authored almost 3 years ago by Seán Lynch <[email protected]>

Teams map small fixes 2

d46c656998051440348d46a895e11c6607fe45dc authored almost 3 years ago by geni_jaho <[email protected]>

Teams map small fixes

95ece8c46074b917fc21b22430ad2246b2649ee7 authored almost 3 years ago by geni_jaho <[email protected]>

Teams map wip 5 - Added Team Clusters generation command

c8e1b1cae5ffab90a7a15ab135c8a0009605cef2 authored almost 3 years ago by geni_jaho <[email protected]>

Teams map wip 4 - Map extraction complete

d7fe76486169bbbf8d5201a53d99b37fe6aa5d17 authored almost 3 years ago by geni_jaho <[email protected]>

Teams map wip 3

2a0e14c71a50f4eec593b2b8d0727f94ba703a52 authored almost 3 years ago by geni_jaho <[email protected]>

Teams map wip 2

7d312ca3b87582c3b6a30b1729e7663df6c87912 authored about 3 years ago by geni_jaho <[email protected]>

Teams map wip

f43b2fd567641051ddc024140906179396d77829 authored about 3 years ago by geni_jaho <[email protected]>

Compile for production

ddff20b2203b112dfd21e3869df65459627d803a authored about 3 years ago by geni_jaho <[email protected]>

Merge branch 'staging' into feature/mobile-api-teams

5f947ef48c75df862f1936c0a0de1d511a4c3f87 authored about 3 years ago by geni_jaho <[email protected]>

Deleted commented routes

7358453e6ebe88679d242aaf2e0cf08e43b28832 authored about 3 years ago by geni_jaho <[email protected]>

Added api to show team leaderboards

1b5b45dd835634dbac44b901fdc7df533aba64ff authored about 3 years ago by geni_jaho <[email protected]>

Merge pull request #386 from OpenLitterMap/dependabot/npm_and_yarn/axios-0.21.2

Bump axios from 0.21.1 to 0.21.2

36282cc528947bfc25dfdb714c1bccf2a4c60929 authored about 3 years ago by Seán Lynch <[email protected]>

Merge pull request #387 from GeniJaho/bugfix/small-fixes

Bugfixes - Small fixes on Global Map and clustering

16d65787cc1e33a45794d8dfcce62bb953e3cdbe authored about 3 years ago by Seán Lynch <[email protected]>

Small bug fixes on clustering

080701ec6cbdc06dd9832ab60496a16341324492 authored about 3 years ago by geni_jaho <[email protected]>

Small fixes on Global Map and clustering

f75238d3613141153a77eb91c0c6461700dca07b authored about 3 years ago by geni_jaho <[email protected]>

small changes

2fb3a46ec4255a605e679b7183f8e889bba79e9f authored about 3 years ago by xlcrr <[email protected]>

update mobile app version

bd55dad6a3d4ccef671be2437b907b69c8161814 authored about 3 years ago by xlcrr <[email protected]>

Bump axios from 0.21.1 to 0.21.2

Bumps [axios](https://github.com/axios/axios) from 0.21.1 to 0.21.2.
- [Release notes](https://g...

19b4734bacf2e1f7326f74e9b30487b7bed0252a authored about 3 years ago by dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

add teams update, 2 new references

76cfcf6bfa634b1dfce5751d6d84351955b59efa authored about 3 years ago by xlcrr <[email protected]>

add teams update, 2 new references

e8929149aeb90be1f6f4513264d8e98ae1f08d99 authored about 3 years ago by xlcrr <[email protected]>

Merge branch 'staging' into feature/mobile-api-teams

9786b69ecca8c1486ecb0881d1ab1572b39d1a5e authored about 3 years ago by geni_jaho <[email protected]>

Added api to list all available team types

8be9a4e0c46e26fa7c8de4fb921cae34f421b7e7 authored about 3 years ago by geni_jaho <[email protected]>

Added api to update a team

a2485efe61e5fe68757bedae2ade58506dbdf38c authored about 3 years ago by geni_jaho <[email protected]>

Added api to list user's teams

89f600c3b6acabf6765cd34e5f9148ae49f847a5 authored about 3 years ago by geni_jaho <[email protected]>

Small refactoring

e821f7930b266b05eb9fce0d19c0f1e2a7af3ac0 authored about 3 years ago by geni_jaho <[email protected]>

Added api to create a team

cfbba4c06d752dbb89964c5ebe4d3689efde7659 authored about 3 years ago by geni_jaho <[email protected]>

prepare to merge staging

89ec2aec8419cbcd8af4390cc22e64a2fccad314 authored about 3 years ago by xlcrr <[email protected]>

Added api to leave a team

1933db9b4c1ebe4ef3735a051ecf9b284fc61a98 authored about 3 years ago by geni_jaho <[email protected]>

compile dev

5b7292e2abd46e18de96dce8814b3f3b34dfa584 authored about 3 years ago by xlcrr <[email protected]>

Merge pull request #384 from GeniJaho/feature/my-teams-fixes

Feature - My Teams fixes

98944edbec70875d4cdcf00b57a93ee046e66609 authored about 3 years ago by Seán Lynch <[email protected]>

Added api to join team

3a8b7db96e1907372603b97dee30693e4cb86d2c authored about 3 years ago by geni_jaho <[email protected]>

Fixed failing GitHub Action

a8bb80472c7b3db44c0908f3687598c3e5bb907c authored about 3 years ago by geni_jaho <[email protected]>

Added My Teams translations

8bc6b5295cff972905d64ba32cabc21527b413d3 authored about 3 years ago by geni_jaho <[email protected]>

Added explanations on My Teams page

4199738dbb7cf47980994332191f5f8b04114af8 authored about 3 years ago by geni_jaho <[email protected]>

Updated My Teams page layout

86224921b7e2713bdec47d442d9050f6db9dc23b authored about 3 years ago by geni_jaho <[email protected]>

change version

7429299e4936956b15adb157256f0f2a0866142b authored about 3 years ago by xlcrr <[email protected]>

Merge pull request #383 from GeniJaho/bugfix/team-identifier

Add Team Identifier

c662c6db7afe93e51f4d1f7514924461b5f93c98 authored about 3 years ago by Seán Lynch <[email protected]>

Added team identifier to Teams page

30e3b13950f88f1dba0dcc4e546bbafa0a5d8221 authored about 3 years ago by geni_jaho <[email protected]>

get next image for verification

1a0b2d752fee346fd40a64ac3e11c11d61d2e358 authored about 3 years ago by xlcrr <[email protected]>

increase android store version

a2738f1e3f4121add957b7d320494f09f995cb7d authored about 3 years ago by xlcrr <[email protected]>

add reference

2f297d05ceba7dccf4503ea639b144b84ed5ea27 authored about 3 years ago by xlcrr <[email protected]>

increase iOS store version

7efaa6a4f33f90625ce21c5553952e848d0fe55b authored about 3 years ago by xlcrr <[email protected]>

Merge pull request #381 from OpenLitterMap/staging

Merge Staging

1185cfc6e38b22f316428529d431727d97b0ce50 authored about 3 years ago by Seán Lynch <[email protected]>

Merge pull request #380 from OpenLitterMap/sean/2021/11/23/fix-date-string-int

Bugfix - [ Uploading API ] - Parse Date As String Or Int

8c60ed35c0dcb1e045606f62dba7c2889418cc0c authored about 3 years ago by Seán Lynch <[email protected]>

parse date string or int

1dd39bd5af7297072029cb97b0b20f2b38a7fc68 authored about 3 years ago by xlcrr <[email protected]>

parse unix as int

a3a0ea33b77832ab2a344c6b4d067a06138754b9 authored about 3 years ago by xlcrr <[email protected]>

add new reference

d890a65295e2ad4692319b40a63b8098b9214611 authored about 3 years ago by xlcrr <[email protected]>

add video to watch list

f5a9037b75946a83930934307cdab9e34232ef3e authored about 3 years ago by xlcrr <[email protected]>

add references

a80f6dafffb2ed7e4363c08d39f97309823ed0fd authored about 3 years ago by xlcrr <[email protected]>

add reference

38f27bc339a98d052feeca6a8612fd6b9a3491db authored about 3 years ago by xlcrr <[email protected]>

merge staging

3216a7562f3ac51e1922c248b0055e0e4bf309f6 authored about 3 years ago by xlcrr <[email protected]>

merge master

84e8f4cf6ca71363c05e623de70d29c7360a32b6 authored about 3 years ago by xlcrr <[email protected]>

update welcome page gap

95d076103df24496ccc0016706b716ccb90526d9 authored about 3 years ago by xlcrr <[email protected]>

check for photo

426fd0c4ec3434df4aefd2b0c8099506849bb418 authored about 3 years ago by xlcrr <[email protected]>

remove logs

30ee4dec5c1eed8c9a8cbfbf177b3c677ff0751f authored about 3 years ago by xlcrr <[email protected]>

get photo tags

9755d3f0ffa7881cf04e777150d3bd7a0f2f8a1c authored about 3 years ago by xlcrr <[email protected]>

Merge pull request #379 from OpenLitterMap/sean/2021/11/14/refactor-privacy-frontend-fix-display

Refactor: Multiple Privacy components, Fix display notifications

aff3cb48027b9028d2b4b914b93cd08211daadd6 authored about 3 years ago by Seán Lynch <[email protected]>

refactor privacy.vue

66c8d8081701e227a9577c6a10869ed4f4500163 authored about 3 years ago by xlcrr <[email protected]>

change route name

db6d48740e5032485f70a9776885f8c9d8da1d72 authored about 3 years ago by xlcrr <[email protected]>

Merge pull request #378 from OpenLitterMap/GeniJaho-bugfix/accept-only-images-on-upload

Geni jaho bugfix/accept only images on upload

71208c478c1963f6f8e03e3ba80bc0e8aca4afd8 authored about 3 years ago by Seán Lynch <[email protected]>

git pull

bd36dfbc1e4364de5602b4df440332bb933048ab authored about 3 years ago by xlcrr <[email protected]>

git pull

16a31d90b37fabb13cb71fc7313ecd7a7c1a92cf authored about 3 years ago by xlcrr <[email protected]>

Merge pull request #377 from OpenLitterMap/GeniJaho-feature/new-tags-and-categories

Geni jaho feature/new tags and categories

fd2b4d556cfbab2afa68045647617c9f65bf37c2 authored about 3 years ago by Seán Lynch <[email protected]>

compile

154c6f2b7d785e8fc703adc60f3ab35454606fa6 authored about 3 years ago by xlcrr <[email protected]>

Merge pull request #375 from GeniJaho/bugfix/welcome-page-text

Bugfix - Removed heading on welcome page

1dde76c57c7e132b43defceedaa24b4abfb0e150 authored about 3 years ago by Seán Lynch <[email protected]>

Removed heading on welcome page

586b0b4bf815bfe997c553e75c0bf64e9ec8655b authored about 3 years ago by geni_jaho <[email protected]>

Restricted to image types on photo upload dropzone

4c4e0440184f4240fee7d111ef3b75f78caa837e authored about 3 years ago by geni_jaho <[email protected]>

Added new tags

c75af91af784aad90b7cb92882fd38b3d98459c5 authored about 3 years ago by geni_jaho <[email protected]>

Merge pull request #370 from GeniJaho/feature/picked-up-litter-updates

Feature - Picked up litter updates

bdaf2b0697dd3add1638ae487d39179be9ddb68e authored about 3 years ago by Seán Lynch <[email protected]>

Merge pull request #372 from OpenLitterMap/sean/2021/11/06/general-forgot-message

Fix [ Password ] - Show Generic Message

ca8cd36f0bdfa6023356e05f77383f1b9de458b3 authored about 3 years ago by Seán Lynch <[email protected]>

add generic message

5749d63d01125bee2906290d40c563d3eb6eac1a authored about 3 years ago by xlcrr <[email protected]>

Create pull_request_template.md

7cfc1af91ae10bdfeefcde6b76bded534057cfdd authored about 3 years ago by Seán Lynch <[email protected]>

Merge branch 'OpenLitterMap:master' into feature/picked-up-litter-updates

85b67c1c324608628d1a37c51d3b62b7ccaf87ee authored about 3 years ago by Geni Jaho <[email protected]>

Merge pull request #364 from GeniJaho/feature/single-api-for-uploads-with-tags

Feature/single api for uploads with tags

44fc586fdc0ec82b2b1e920b1e31eaf004159732 authored about 3 years ago by Seán Lynch <[email protected]>

Added picked_up attribute on all user instances

c08745fd5062b6d876f5492a2a8f682082cd6122 authored about 3 years ago by geni_jaho <[email protected]>

Added support for picked_up when changing user settings from api

5c18ea364d1b473a44156c3a3d3eeab2042cb85f authored about 3 years ago by geni_jaho <[email protected]>

Added support for picked_up on api

bd4b62fbaf97febb37e66b03cc518b5dd2658fa1 authored about 3 years ago by geni_jaho <[email protected]>

Merge pull request #369 from OpenLitterMap/sean/references/22

Feature: Add 22nd reference

a0fe8c611f64504291180a4c9081393e7dbbd87e authored about 3 years ago by Seán Lynch <[email protected]>

compole for production

794be34285a69d866c8fd88e817be6e747d0631d authored about 3 years ago by xlcrr <[email protected]>

add new reference

1e65ed904ce553ede4a84c8bd357eaf6dbbeea81 authored about 3 years ago by xlcrr <[email protected]>

Reverted heic tests

0715287aca9a19cae02e78179ad266a8dbba1198 authored about 3 years ago by geni_jaho <[email protected]>

Added .gitignore for heic images directory

5442a8cd4dcbb10d293ac9bc5b937f084158c84e authored about 3 years ago by geni_jaho <[email protected]>

Restored heic tests

393521c08f65b1307378e1f0c588bc41de848e18 authored about 3 years ago by geni_jaho <[email protected]>

Merge branch 'staging' into feature/single-api-for-uploads-with-tags

d754ee4c4e39f33b13141c963b79f74e336a129b authored about 3 years ago by geni_jaho <[email protected]>

update composer

68ff366bf263a164f32cf1210555cbe1d3247a73 authored about 3 years ago by xlcrr <[email protected]>

fix heic, compile for production

44b395511f5812d50c4c8b088cd9b8ae1f4f451f authored about 3 years ago by xlcrr <[email protected]>

Merge remote-tracking branch 'origin/fix-heic'

45b2e480aba41d6618fe10ea88d76d64bbacba67 authored about 3 years ago by xlcrr <[email protected]>

add env example

648678bc67e6c93db0f986cb7145698f1d332c0d authored about 3 years ago by xlcrr <[email protected]>

git pull

bca6588287a22660843afbb0d1211144a60403a6 authored about 3 years ago by xlcrr <[email protected]>

Reverted tags validation for new api endpoint

4decc6a14e1e698a1fd29db803cb18ceac0b1ef4 authored about 3 years ago by geni_jaho <[email protected]>

Merge branch 'master' into fix-heic

fbfb2e996edd1c4435f440fb955d6e9696836c91 authored about 3 years ago by geni_jaho <[email protected]>

Revert HEIC changes

907376dd311a9512d2c355b46185f179b78bf831 authored about 3 years ago by geni_jaho <[email protected]>

compile for production

c83c4c1127af1d8dbad0ad4a250f7ee06084b21b authored about 3 years ago by xlcrr <[email protected]>

test create account

3187b0c7e7083959a46a1b2510960932595e208e authored about 3 years ago by xlcrr <[email protected]>

compile with different mix keys

ae3bf735fcacc6cb3c70daba0ca6dc2099b93901 authored about 3 years ago by xlcrr <[email protected]>

Ecosyste.ms: OpenCollective

github.com/OpenLitterMap/openlittermap-web