github.com/OpenLitterMap/openlittermap-web commits

pull

f6cdc89a0ddb6993040ab5a9fe4063c741fbaabc authored over 3 years ago

Merge pull request #313 from GeniJaho/feat/fix-images

Feature - Fix & improve map images

52d7d7eed583ee9d00b7919a3edfb4292b0406b3 authored over 3 years ago

Merge pull request #287 from OpenLitterMap/Brands/add-brand

Brands/add brand

389ca312fbd1fb8092abe8db025d9a6ac07f4da2 authored over 3 years ago

Merge branch 'staging' into feat/fix-images

4860e576ceddcf3f1bf7b8ec520709778171c996 authored over 3 years ago

Refactored and unified images on all maps

b0f94534687ba97f812a6d754877a455901d0679 authored over 3 years ago

Fixed images showing on the Global map

f5ec77d079bd26388b157f907cf353698fe7cdf0 authored over 3 years ago

Merge branch 'master' into Brands/add-brand

466114efe13f3b2481a03835710037c6ca7603cb authored over 3 years ago

Merge branch 'master' into Brands/add-brand

# Conflicts:
# app/Http/Controllers/PhotosController.php
# public/js/app.js
# public/mix-manifes...

aaf505d8cf7fb4ac18b11ff2eab0391b9e7cb0eb authored over 3 years ago

Merge pull request #311 from jshepin/fixed_blog

fixed footer link to blog

836e13b4bd3285eee9debb632f3a3eb780595797 authored over 3 years ago

Merge pull request #282 from OpenLitterMap/Dummy_Data

Dummy data

30219bb7a35487a63ddcc4a12022aa60fab28926 authored over 3 years ago

Readme updated with Dummy-photos command instruction, renamed variable names

a8b010c950b5e91e3aafe142648476691fe2a678 authored over 3 years ago

user, country, city and state is now created, also now you can add an argument of how many photos you want to generate, default is 1500.

1ec68af8ea6b87acce5bb776e796c259860455cc authored over 3 years ago

fixed footer link to blog

0a770d019f368c38c67d0bcddc1ce3897b0bbb3a authored over 3 years ago

Merge pull request #310 from OpenLitterMap/staging

Merge staging

724e01999ef9f3e4e79ba6f24658a2a5cb0494ce authored over 3 years ago

compile for production

b85fe000b08184a2dfd6b99bcd77d64542d3615f authored over 3 years ago

stash

9b42f067b9b9c6895b042db6a9f025db8e090e00 authored over 3 years ago

stash

60650a4a762f77763c29fd755f6b0f1d5bec8134 authored over 3 years ago

Merge pull request #309 from GeniJaho/feat/real-time-global-map

Feature - Real time global map

e917cb08975dbae2fcb042dcaf963fa298afa6cd authored over 3 years ago

Merge branch 'staging' into feat/real-time-global-map

# Conflicts:
# app/Events/ImageDeleted.php
# app/Events/TagsVerifiedByAdmin.php
# app/Listeners/...

36ca4072e45e019fc6a07519f0d6100f827cae6b authored over 3 years ago

Refactored listeners for when admin deletes tags of a photo

ad6ae7016152033a2d38ae549f6e4c0de56dd35d authored over 3 years ago

Merge branch 'master' into Dummy_Data

# Conflicts:
# app/Http/Controllers/GlobalMap/GlobalMapController.php
# app/Http/Controllers/Map...

67bb6b7afc61bf8a68d9e86eae560a4a6413d5b2 authored over 3 years ago

Feature - Real time global stats (#308)

Updated Global Leaderboards and statistics in real-time

b9c1c80e053fc86f1064cc473a2ddfb7a845bcb4 authored over 3 years ago

Updated Global Leaderboards and statistics in real time

8f92a0ac20d2aa981b326a43676ddecef798ab29 authored over 3 years ago

Refactored Image uploads and deletes redis actions

e80c64319d25838e31b6178080770afa455f13a9 authored over 3 years ago

Merge pull request #307 from OpenLitterMap/master

Merge master into staging

d1c9e44adfa5181c5a3abfe5c3f1d5d23d457ac5 authored over 3 years ago

Update UploadPhotoTest.php

cb0f0161660d2573202ce330bdd484e57f9bff0c authored over 3 years ago

Update laravel.yml

cca769189c9d1c3a0ab344999933592a78bb67b6 authored over 3 years ago

Update laravel.yml

07c659a1165b523e270f8afd81e68b4e332ca65f authored over 3 years ago

Update laravel.yml

8033153782b948ea8430547213214750ce6b8938 authored over 3 years ago

Update UploadPhotoTest.php

4ee0209e7342e0867e3106ca659e992b068f7009 authored over 3 years ago

Update UploadPhotoTest.php

b28d7c43eb023db39980caeb6d1954219642e97d authored over 3 years ago

Update laravel.yml

54521acb813857b8e215fb158dcbaac16d908469 authored over 3 years ago

Update laravel.yml

9e5a95a331d7eac9f1327f8067c9e412403d2160 authored over 3 years ago

Update UploadPhotoTest.php

f53b26ddd04079f56ebb71f064ac53b1200061e2 authored over 3 years ago

Update laravel.yml

4b05135880edef7858854ff69cc54aae0a0d5ed2 authored over 3 years ago

Update laravel.yml

ffdf6aa1d26af17f86dcf24ceed5c0bb6d58b8ed authored over 3 years ago

Update laravel.yml

60d7015e683fb69805335568c2fd00b851911bd3 authored over 3 years ago

Update laravel.yml

8f06d91a2ab5359bd875a60e0d875825a240a231 authored over 3 years ago

Update laravel.yml

c41580f0f4899f89bfdeb86cefb299b94fbb5bac authored over 3 years ago

Update laravel.yml

327d4e7fd8dcbb1df97c8815c3ba4591fdf9ec5a authored over 3 years ago

Update laravel.yml

c3814e71f4dd1a36ef0e122077a733f5d7fd760d authored over 3 years ago

Update laravel.yml

88df8265aa57fe8c10dd6a0a019a4df36abfe56a authored over 3 years ago

Update laravel.yml

92ed193765df75941c28e701136ac486601fa35b authored over 3 years ago

Update laravel.yml

57499a47c89f93b5058c0fd6aa9657e12f2008d8 authored over 3 years ago

add bbox

466a8a2943d30b88219ac4dcd1dbb66a3b51d993 authored over 3 years ago

add log

ec8565368debb42b0b1806354bfa4e258337f158 authored over 3 years ago

incl url

5789dbd8e20a6efe6aeb287dd2aa4c139473d1f8 authored over 3 years ago

comment out

f0824f6937f63f2fcb2aa97b9d7e1e97f232e16f authored over 3 years ago

temp remove bbox

26d7aca19003884ddc30c01a9d9087474c26de6f authored over 3 years ago

Merge branch 'master' of github.com:OpenLitterMap/openlittermap-web

22e3509a63deb302394b054c82d4814d7dcb0117 authored over 3 years ago

Merge pull request #305 from OpenLitterMap/staging

Merge Staging

8f759fab0dea5f4e014caade35a5e0eee5e01623 authored over 3 years ago

Update laravel.yml

37e0111ca1111c38f8fef614443e7284ed82c902 authored over 3 years ago

Merge pull request #303 from GeniJaho/staging

Bugfix - AWS Credentials and path

48b7dc854aab32841fab6c5225e34a3edb5b47ca authored over 3 years ago

Update laravel.yml

ef9ebde6baf3ec8ec1a67b916194dafab70dbc3a authored over 3 years ago

Update laravel.yml

3812923f6d99ac6f439e4cf2b3237daeab67112c authored over 3 years ago

Create laravel.yml

9d8caea436358afef6ce968142db846d3faba1f9 authored over 3 years ago

add comment

8d0c705bc062d475d882bdba9211ee6fde4e27a1 authored over 3 years ago

enforce max zoom. fix category filter bug

4e24ae6efdbab1cfbd2cb41201841b13435236e0 authored over 3 years ago

enforce max zoom. fix category filter bug

7e68b094c898edf9e0a76a2f35a97bcf689f4e68 authored over 3 years ago

Fixed AWS S3 endpoints

d4abbec1c452b53c746055dc888b8aee688ada20 authored over 3 years ago

make uploads work

c0ad6d8fd105e7573d65b4a31af8846514e58370 authored over 3 years ago

revert filepath config to pre-merge

b423b6aee3d43e28b9b0d767f9202a30b60caac3 authored over 3 years ago

add path again

546d9fb67bc4ee4917bc7a8c0966110610973034 authored over 3 years ago

remove path

56fd1fbe8a3addafbd292104033db301143527b2 authored over 3 years ago

make path false

cc902a3a529af10633d8b78f838eeab772a933be authored over 3 years ago

replace

ca597868268cfc25890fbd1af88be4427cb02d7e authored over 3 years ago

comment it out

6b3db15dbf277f5b6581186ad46e9d24b9a43cff authored over 3 years ago

Merge branch 'master' of github.com:OpenLitterMap/openlittermap-web

e47ce3ea923fd71f870d630ca19ed9252876f731 authored over 3 years ago

update use_path_style_endpoint => false

ef147a226d8c53e8cc36e4fed5fbd63d0a930d46 authored over 3 years ago

Merge pull request #301 from jshepin/seeder

added users to seeder

d4584c77c53144fc509d447d4bc8c22654db2685 authored over 3 years ago

added users to seeder

fc55149841e78a74f3be20ca85a49d02a0147b14 authored over 3 years ago

merge staging. Include Actions

13fe5e0b501a64159baaac46b5f91dd2a31e4c3e authored over 3 years ago

Merge branch 'staging'

4bfae835270166e6300f6174169b31430c48e906 authored over 3 years ago

udpate comments

c03ddef4e96021b4f0495c7e75cb89d883af5cc4 authored over 3 years ago

update comments

e071737a6b0386fbc3296f9176de97f0d69d138e authored over 3 years ago

merge master into staging

57681732ba1e2ba433db552ea1ed7132bc0e6c2f authored over 3 years ago

Merge branch 'master' into staging

837303ac43810ae9cc175cd5390bc5c9d41ec24f authored over 3 years ago

cleanup

41faf872bd50f9ba1d7072d16b7a4764d9d5c311 authored over 3 years ago

Merge pull request #299 from jshepin/improvement-3

added seeders

b6ea38867d012beb739e2854d22ab0afb2f51d5f authored over 3 years ago

send email to subscribers

c94a79108671faf9211325d18f045568c2036a2f authored over 3 years ago

added seeders

- permissions
- roles
- role_has_permissions

fc0cf9283e6dee23e713e968da4fb0d635a21baf authored over 3 years ago

Merge pull request #298 from OpenLitterMap/updates/update-24

Updates/update 24

9d41bad42f049d9003f7a718a899372a1cc6d6d2 authored over 3 years ago

update url

73ff8854874c3e3745eb9c5dffa0916641f65438 authored over 3 years ago

remove test route

d56a6d029d108cd06b3cb02fbbde3b57636b63f8 authored over 3 years ago

update 24

ce8dafd7901356f3ae74154a23b755bd1ba8d125 authored over 3 years ago

Merge pull request #297 from GeniJaho/staging

Fixed Excel downloads

39ec6cdadcfb9e0ce9fcccc92f9112c6af54328b authored over 3 years ago

Fixed Excel downloads

7184cc8668bcb6615eea24d4496ae5b9721d49d3 authored over 3 years ago

Merge pull request #296 from GeniJaho/staging

Small fix

cd886a140858be0d12f986b0b71f0e56d781b9db authored over 3 years ago

Small fix

9be95749f67f2fdda863c16a22ab1bf7e58c0c90 authored over 3 years ago

Merge pull request #295 from GeniJaho/refactoring-s3

Refactoring s3 - small fix

a980cc569b557d2b919ecbf4ade52193b775c298 authored over 3 years ago

Small fix

7c279b432c91840b442ec9511373bb19a90aa81f authored over 3 years ago

Merge pull request #293 from GeniJaho/refactoring-s3

Refactoring S3

e1d934a876df7d179f5bac15aca366c6d12d90ff authored over 3 years ago

Merge branch 'staging' into refactoring-s3

cef4ccf1dad066a0420d5735cda084efdfb827db authored over 3 years ago

Fixed bounding box images

19a635ad50f93db3f3830bdd1b19e66589efb5de authored over 3 years ago

Merge branch 'staging' into refactoring-s3

# Conflicts:
# app/Http/Controllers/PhotosController.php
# public/js/app.js
# public/mix-manifes...

2dacaf97678ee436aab22a3251eeb5bcd896db0d authored over 3 years ago

Merge pull request #294 from GeniJaho/staging

Merge master into staging

cb1eeefeef3935754afdcdcfddce91179edc0d17 authored over 3 years ago

Compile assets

3b18adb66eb0b708200af0b29ac7cfe3a0550d0a authored over 3 years ago

Merge branch 'master' into staging

# Conflicts:
# public/js/app.js
# public/mix-manifest.json

6b2d318ff128ace3deca315fc1e6879acac8f348 authored over 3 years ago

update references

31541a37ef2cd9d0d18e0b4e7d952ef553f9863a authored over 3 years ago

change litter image style

86c63ef362e4257ff9b82008f851726a96c84751 authored over 3 years ago

Ecosyste.ms: OpenCollective

github.com/OpenLitterMap/openlittermap-web