-
Notifications
You must be signed in to change notification settings - Fork 45
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Issue/284 #294
Open
aleksandr-wemakesoftware
wants to merge
169
commits into
letsdoitworld:master
Choose a base branch
from
aleksandr-wemakesoftware:issue/284
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Issue/284 #294
Changes from 1 commit
Commits
Show all changes
169 commits
Select commit
Hold shift + click to select a range
1c6f0d7
Add base functionality and components, etc. for realize teams.
oboz a03443e
Add endpoint to change team
20c8ddc
Add new button component. Change team screen layout.
oboz 8abdc6c
Implement teams in backend-db
oboz 945644b
Implement teams in backend-db
oboz fa15cb6
Add new button component. Change team screen layout.
oboz 6783ac0
Fix loading teams when app is started
oboz 7582327
Pre-final implementation of teams functionality
oboz 4a76e2c
Predefined teams added
oboz 91330ee
Add predefined teams list to DB
oboz dd4608f
Add images for profile features list
oboz 63869db
Final version of implementation of teams functionality
oboz d9b1330
Sorting of commands was transferred from the mobile app to the backend
oboz 29c9d0a
Base for implement "trashpoint by teams" functionality.
oboz d95b316
Update gitignore
oboz e77dc1b
Rewrite Profile screen without react-native-elements
oboz 77bf5fc
Change gitignore files
oboz 3af2039
Remove .idea/ and yarn-error.log files from git
d96dbd4
Remove .idea folder from root of project
8309b29
Add preloader and filter to teams screen
f6ca72f
Code review. Remove teamtrashpoints db and api endpoints. Add data ab…
oboz 8133359
Code review
oboz ce90a2c
Code review
oboz 45c0002
Fix team in account in API yaml
oboz 1186663
Add translations for Team screen
oboz 68d13d1
Add team screen to admin interface
oboz 537bc0d
Removed forgotten console.log
oboz 679e2b7
Removed forgotten console.log
oboz 8622948
Count users by team
oboz eb30fcb
Merge remote-tracking branch 'origin/master'
22407b2
Update volunteer count
krishaamer 14dc65a
Home: fixed add trashpoint button width #168
lynxlynxlynx 2ed5e84
CONTRIBUTING: added TOC for clarity
lynxlynxlynx d180ed8
web-app: replaced default readme
lynxlynxlynx 4fce1bc
GETTING_STARTED: added
lynxlynxlynx 2fe340d
CONTRIBUTING: added intro with link to getting started guide
lynxlynxlynx 0df5af3
Update gitignore
oboz 2a4ed94
Update to last version
oboz cd99423
Functionality for save trashpoints in offline mode and sync it after
ed100d7
MapView: enable google map's inbuilt scale component
lynxlynxlynx 748f50f
Merge branch 'master' of https://github.com/letsdoitworld/World-Clean…
eecf9c8
Merge branch 'letsdoitworld-master' into OfflineTrashpoint
85fb587
little fix after problems with conflicts
oboz 93c1d2e
Merge pull request #176 from oboz/OfflineTrashpoint
KucherenkoIhor 17556e8
Add link to wcd translation hub
krishaamer 6f8a17c
google maps: use current release version 3.31
lynxlynxlynx a867aec
Fix merge bugs and network message output if user know that he in
oboz ea8d2cc
Merge pull request #187 from oboz/OfflineTrashpoint
KucherenkoIhor 30ff9d3
mobile-app: make use translated trash types #156
lynxlynxlynx a498b36
removed stale vim temporary file
lynxlynxlynx 744ea98
web-app: enable map type control
lynxlynxlynx b2d8b92
Fixed the problem of doubling the trash points created in offline mode
oboz 437ba00
Fix marker click in offline mode and 'where in' clause for temp. DB
oboz 894010c
Remove 'OR REPLACE' from insert query to temporary DB for new markers
oboz a23ec1c
Merge pull request #197 from oboz/OfflineTrashpoint
KucherenkoIhor 1fd3b9f
New Crowdin translations (#150)
krishaamer 93174d3
i18n: remove redundant js files from crowdin sync
lynxlynxlynx b63cf08
i18n: enable more LTR languages that reached 100%
lynxlynxlynx df4a91a
i18n: turkish and norwegian (which?) is also 100%
lynxlynxlynx 68df76b
New translations ui-strings.json (Polish)
krishaamer c09468c
Add Slack link
krishaamer 5586f6f
New translations ui-strings.json
lynxlynxlynx af1dc52
New Crowdin translations (#201)
krishaamer 203b379
CountryModal: fixed untranslatable strings
lynxlynxlynx 85ed0ff
Merge pull request #196 from letsdoitworld/fix156
lynxlynxlynx d861a3d
Add to screens loaders if app in offline mode
d181d23
Add redirect user to home screen if user in offline mode
6720690
popoverInitialState: use translated string
lynxlynxlynx 54d14ef
AlertModal: increased height a bit
lynxlynxlynx 5590148
CongratsModal: increase header size, for longer translations
lynxlynxlynx f551bfb
New Crowdin translations (#203)
krishaamer 2f87be8
Fix code after review
oboz ede1588
Save profile with redux-persist
oboz a855955
Merge branch 'master' into OfflineTrashpoint
lynxlynxlynx 9c21d5d
Merge pull request #205 from oboz/OfflineTrashpoint
lynxlynxlynx 435dfcc
Api.js: enable BASE_URL override without modifying the file
lynxlynxlynx 40d42d4
web-app: added instructions for running vs local api server
lynxlynxlynx 0cf7954
Merge pull request #186 from letsdoitworld/fix185
lynxlynxlynx ec16b93
mobile-app: use translated composition types also when not editing a TP
lynxlynxlynx f438102
mobile: fix expo build
lynxlynxlynx 529d30c
ui-strings: added the 3 new offline strings
lynxlynxlynx d246b8f
Teams first iteration
aleksandr-wemakesoftware 4859570
code review fix
2359bde
merge fixes
17d7187
feedback changes
aleksandr-wemakesoftware 99d8b63
merge fixes
77487d9
feedback changes
aleksandr-wemakesoftware c016523
Merge branch 'teams_iteration1_pull_request' of github.com:aleksandr-…
aleksandr-wemakesoftware 51b263e
feedback changes
aleksandr-wemakesoftware 428f12b
i18n: manual cherrypicks of the 2 offline strings
lynxlynxlynx 66fe387
cherry-picked the full faroese translation and enabled it
lynxlynxlynx 50403ee
i18n: fixed more typos in the source strings
lynxlynxlynx 82fdd1e
Swarm documentation
daniel-jirca a68b52f
Fix typo
krishaamer 028e8bc
Add backup script and changes to docs. Fixes letsdoitworld/World-Clea…
daniel-jirca cd58d5c
fix facebook login
264ad7e
Merge pull request #221 from aleksandr-wemakesoftware/issues/212
lynxlynxlynx 9f318fb
i18n: added and enabled full japanese translation
lynxlynxlynx 51488b9
sort areas by name
faea077
pull request fixes
4e311dc
Revert "CongratsModal: increase header size, for longer translations"
lynxlynxlynx 87ce094
mobile-app/package.json: updated for the latest offline build
lynxlynxlynx 68e030b
Revert "AlertModal: increased height a bit"
lynxlynxlynx a8b608a
Remove Slack link
krishaamer ed9f2e0
fix offline trashpoint create
0309524
issue/224
6f7e17e
issue/225
b6a1e49
Revert "sort areas by name"
4bfeb60
updated expo and react-native versions
aleksandr-wemakesoftware 0438f07
Merge pull request #228 from aleksandr-wemakesoftware/issue/225
severianremi 18d05d3
android create trashpoint fix
b93b9b5
android create trashpoint fix
a366053
delete console
8f24c76
Merge branch 'issues/212' into 'all_in_master'
dd4348b
Merge remote-tracking branch 'origin/all_in_master' into all_in_master
35021be
expo update fix ios load error
c8694f9
Update package.json
d137b71
Merge remote-tracking branch 'origin/master' into expo_ios_fix
74ce0b4
expo update fix ios load error
12ba3c2
Merge branch 'expo_ios_fix' into 'master'
aleksandr-wemakesoftware b0b6679
Android fixes for expo update
aleksandr-wemakesoftware c93ebc4
permitted rename
956ac3e
Merge pull request #234 from aleksandr-wemakesoftware/master
severianremi 01dc466
marker size on ios fix
994bdfd
marker size on ios fix and android fix
7a9489d
fix trashpoint creation
11a0ca4
Merge pull request #243 from aleksandr-wemakesoftware/issues/237
lynxlynxlynx 7fc4874
Merge pull request #242 from aleksandr-wemakesoftware/issues/239
lynxlynxlynx d7e424c
Changed zoom level and coordinates for blocked geolocation in browser
69addd0
Merge pull request #252 from vsheremet92/improvement/change_blocked_g…
lynxlynxlynx d404872
team list fixes
9fa8e1e
Add teams source strings
krishaamer 121d2b4
Merge pull request #257 from Haamer-Ventures/master
krishaamer d3970f8
Couple of missing strings sourced from en.json
krishaamer 96f3ac9
Linted json: remove 2 duplicate keys
krishaamer 05c2832
Valid JSON (RFC 4627)
krishaamer af2aedc
Merge pull request #258 from Haamer-Ventures/master
krishaamer ada3254
ui-strings: made offline mode warning less confusing #256
lynxlynxlynx 40220bb
add one more team
9b3ba45
merge from git.wemakesoftware.eu
aleksandr-wemakesoftware 8ee9205
pull request feedback implemented
aleksandr-wemakesoftware 34417d0
package.json versions
d3ec595
Merge branch 'teams_iteration1_pull_request' of ssh://git.wemakesoftw…
aleksandr-wemakesoftware 4a068e7
ui-string fix
d4d5f9c
Merge branch 'teams_iteration1_pull_request' of ssh://git.wemakesoftw…
aleksandr-wemakesoftware 6a4908a
Merge remote-tracking branch 'github/master' into teams_iteration1_pu…
9bf6ec7
Merge branch 'teams_iteration1_pull_request' of ssh://git.wemakesoftw…
aleksandr-wemakesoftware 3d1a450
Merge pull request #213 from aleksandr-wemakesoftware/teams_iteration…
severianremi 9eab7aa
i18n: added full German translation
lynxlynxlynx 768de8e
Fix blue screen
aca0af5
New Crowdin translations (#206)
krishaamer 3204d45
teams view on the mobile client
993f153
Add null check
998ee65
Add null check to Offline
cf6dad9
Merge pull request #270 from letsdoitworld/hotfix/blue_screen
lynxlynxlynx 80e6a73
change search bar input length and fix bug with all teams fetching
7559bee
Merge pull request #271 from aleksandr-wemakesoftware/issue/265
severianremi 0d8228c
fixed bug with fetching team
9441f41
Fix retrieving team by id
c2a3c25
Merge pull request #275 from letsdoitworld/fix-retrieving-team-by-id
SlavaPanevskiy a5404d8
Merge branch 'master-gh' into issue/14
aaba76b
fix trashpoint create with team
c123834
fix trashpoint create with team
024fc3a
leader loads teams according his assigned area
72427b0
fixed: mobile app - refreshing team profile, web app - created trashp…
d189945
display 4 last activity trashpoints in team profile
6df44a3
delete code from some other branches
b4eb42f
delete code from some other branches
b6c6a35
fixed: missing info of trashpoint created in offline mode in latest a…
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This or condition is extraneus, "" is always false.