Skip to content
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/283 #290

Open
wants to merge 169 commits into
base: master
Choose a base branch
from

Commits on Oct 19, 2017

  1. Add base functionality and components, etc. for realize teams.

    oboz authored and Andrei Abozau committed Oct 19, 2017
    Configuration menu
    Copy the full SHA
    1c6f0d7 View commit details
    Browse the repository at this point in the history
  2. Add endpoint to change team

    Andrei Abozau committed Oct 19, 2017
    Configuration menu
    Copy the full SHA
    a03443e View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2017

  1. Add new button component. Change team screen layout.

    oboz authored and Andrei Abozau committed Oct 20, 2017
    Configuration menu
    Copy the full SHA
    20c8ddc View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2017

  1. Implement teams in backend-db

    oboz authored and Andrei Abozau committed Oct 22, 2017
    Configuration menu
    Copy the full SHA
    8abdc6c View commit details
    Browse the repository at this point in the history
  2. Implement teams in backend-db

    oboz authored and Andrei Abozau committed Oct 22, 2017
    Configuration menu
    Copy the full SHA
    945644b View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2017

  1. Add new button component. Change team screen layout.

    oboz authored and Andrei Abozau committed Oct 23, 2017
    Configuration menu
    Copy the full SHA
    fa15cb6 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2017

  1. Fix loading teams when app is started

    oboz authored and Andrei Abozau committed Oct 25, 2017
    Configuration menu
    Copy the full SHA
    6783ac0 View commit details
    Browse the repository at this point in the history
  2. Pre-final implementation of teams functionality

    oboz authored and Andrei Abozau committed Oct 25, 2017
    Configuration menu
    Copy the full SHA
    7582327 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2017

  1. Predefined teams added

    oboz authored and Andrei Abozau committed Oct 26, 2017
    Configuration menu
    Copy the full SHA
    4a76e2c View commit details
    Browse the repository at this point in the history
  2. Add predefined teams list to DB

    oboz authored and Andrei Abozau committed Oct 26, 2017
    Configuration menu
    Copy the full SHA
    91330ee View commit details
    Browse the repository at this point in the history
  3. Add images for profile features list

    oboz authored and Andrei Abozau committed Oct 26, 2017
    Configuration menu
    Copy the full SHA
    dd4608f View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2017

  1. Final version of implementation of teams functionality

    oboz authored and Andrei Abozau committed Oct 27, 2017
    Configuration menu
    Copy the full SHA
    63869db View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2017

  1. Sorting of commands was transferred from the mobile app to the backend

    oboz authored and Andrei Abozau committed Oct 28, 2017
    Configuration menu
    Copy the full SHA
    d9b1330 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2017

  1. Base for implement "trashpoint by teams" functionality.

    oboz authored and Andrei Abozau committed Oct 31, 2017
    Configuration menu
    Copy the full SHA
    29c9d0a View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2017

  1. Update gitignore

    oboz authored and Andrei Abozau committed Nov 2, 2017
    Configuration menu
    Copy the full SHA
    d95b316 View commit details
    Browse the repository at this point in the history
  2. Rewrite Profile screen without react-native-elements

    oboz authored and Andrei Abozau committed Nov 2, 2017
    Configuration menu
    Copy the full SHA
    e77dc1b View commit details
    Browse the repository at this point in the history
  3. Change gitignore files

    oboz authored and Andrei Abozau committed Nov 2, 2017
    Configuration menu
    Copy the full SHA
    77bf5fc View commit details
    Browse the repository at this point in the history
  4. Remove .idea/ and yarn-error.log files from git

    Andrei Abozau committed Nov 2, 2017
    Configuration menu
    Copy the full SHA
    3af2039 View commit details
    Browse the repository at this point in the history
  5. Remove .idea folder from root of project

    Andrei Abozau committed Nov 2, 2017
    Configuration menu
    Copy the full SHA
    d96dbd4 View commit details
    Browse the repository at this point in the history
  6. Add preloader and filter to teams screen

    Andrei Abozau committed Nov 2, 2017
    Configuration menu
    Copy the full SHA
    8309b29 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2017

  1. Code review. Remove teamtrashpoints db and api endpoints. Add data ab…

    …out team to trashpoints directly. Add new endpoint for get data about teams and its trashpoints.
    oboz authored and Andrei Abozau committed Nov 4, 2017
    Configuration menu
    Copy the full SHA
    f6ca72f View commit details
    Browse the repository at this point in the history
  2. Code review

    oboz authored and Andrei Abozau committed Nov 4, 2017
    Configuration menu
    Copy the full SHA
    8133359 View commit details
    Browse the repository at this point in the history
  3. Code review

    oboz authored and Andrei Abozau committed Nov 4, 2017
    Configuration menu
    Copy the full SHA
    ce90a2c View commit details
    Browse the repository at this point in the history
  4. Fix team in account in API yaml

    oboz authored and Andrei Abozau committed Nov 4, 2017
    Configuration menu
    Copy the full SHA
    45c0002 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2017

  1. Add translations for Team screen

    oboz authored and Andrei Abozau committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    1186663 View commit details
    Browse the repository at this point in the history
  2. Add team screen to admin interface

    oboz authored and Andrei Abozau committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    68d13d1 View commit details
    Browse the repository at this point in the history
  3. Removed forgotten console.log

    oboz authored and Andrei Abozau committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    537bc0d View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2017

  1. Removed forgotten console.log

    oboz authored and Andrei Abozau committed Nov 7, 2017
    Configuration menu
    Copy the full SHA
    679e2b7 View commit details
    Browse the repository at this point in the history
  2. Count users by team

    oboz authored and Andrei Abozau committed Nov 7, 2017
    Configuration menu
    Copy the full SHA
    8622948 View commit details
    Browse the repository at this point in the history
  3. Merge remote-tracking branch 'origin/master'

    Andrei Abozau committed Nov 7, 2017
    Configuration menu
    Copy the full SHA
    eb30fcb View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2018

  1. Update volunteer count

    krishaamer authored Feb 27, 2018
    Configuration menu
    Copy the full SHA
    22407b2 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2018

  1. Configuration menu
    Copy the full SHA
    14dc65a View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2018

  1. Configuration menu
    Copy the full SHA
    2ed5e84 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d180ed8 View commit details
    Browse the repository at this point in the history
  3. GETTING_STARTED: added

    to be a quick dev-start guide
    lynxlynxlynx committed Mar 7, 2018
    Configuration menu
    Copy the full SHA
    4fce1bc View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    2fe340d View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2018

  1. Update gitignore

    oboz authored and Andrei Abozau committed Mar 8, 2018
    Configuration menu
    Copy the full SHA
    0df5af3 View commit details
    Browse the repository at this point in the history
  2. Update to last version

    oboz authored and Andrei Abozau committed Mar 8, 2018
    Configuration menu
    Copy the full SHA
    2a4ed94 View commit details
    Browse the repository at this point in the history
  3. Functionality for save trashpoints in offline mode and sync it after

    connect to network.
    Andrei Abozau committed Mar 8, 2018
    Configuration menu
    Copy the full SHA
    cd99423 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2018

  1. MapView: enable google map's inbuilt scale component

    eases spatial reasoning, especially at high zoom levels and poorly mapped areas
    lynxlynxlynx committed Mar 10, 2018
    Configuration menu
    Copy the full SHA
    ed100d7 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2018

  1. Merge branch 'master' of https://github.com/letsdoitworld/World-Clean…

    …up-Day into letsdoitworld-master
    
    # Conflicts:
    #	mobile-app/src/reducers/app/actions.js
    #	mobile-app/src/reducers/app/reducers.js
    #	mobile-app/src/reducers/app/selectors.js
    #	mobile-app/src/reducers/app/types.js
    #	mobile-app/src/services/Network.js
    Andrei Abozau committed Mar 13, 2018
    Configuration menu
    Copy the full SHA
    748f50f View commit details
    Browse the repository at this point in the history
  2. Merge branch 'letsdoitworld-master' into OfflineTrashpoint

    Andrei Abozau committed Mar 13, 2018
    Configuration menu
    Copy the full SHA
    eecf9c8 View commit details
    Browse the repository at this point in the history
  3. little fix after problems with conflicts

    oboz authored and Andrei Abozau committed Mar 13, 2018
    Configuration menu
    Copy the full SHA
    85fb587 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    93c1d2e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    17556e8 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2018

  1. google maps: use current release version 3.31

    fixes letsdoitworld#185 (deprecation warning)
    lynxlynxlynx committed Mar 17, 2018
    Configuration menu
    Copy the full SHA
    6f8a17c View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2018

  1. Fix merge bugs and network message output if user know that he in

    offline mode
    oboz authored and Andrei Abozau committed Mar 18, 2018
    Configuration menu
    Copy the full SHA
    a867aec View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2018

  1. Configuration menu
    Copy the full SHA
    ea8d2cc View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2018

  1. Configuration menu
    Copy the full SHA
    30ff9d3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a498b36 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    744ea98 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2018

  1. Fixed the problem of doubling the trash points created in offline mode

    oboz authored and Andrei Abozau committed Mar 22, 2018
    Configuration menu
    Copy the full SHA
    b2d8b92 View commit details
    Browse the repository at this point in the history
  2. Fix marker click in offline mode and 'where in' clause for temp. DB

    oboz authored and Andrei Abozau committed Mar 22, 2018
    Configuration menu
    Copy the full SHA
    437ba00 View commit details
    Browse the repository at this point in the history
  3. Remove 'OR REPLACE' from insert query to temporary DB for new markers

    oboz authored and Andrei Abozau committed Mar 22, 2018
    Configuration menu
    Copy the full SHA
    894010c View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    a23ec1c View commit details
    Browse the repository at this point in the history
  5. New Crowdin translations (letsdoitworld#150)

    translation data update
    krishaamer authored and lynxlynxlynx committed Mar 22, 2018
    Configuration menu
    Copy the full SHA
    1fd3b9f View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    93174d3 View commit details
    Browse the repository at this point in the history
  7. i18n: enable more LTR languages that reached 100%

    albanian (sq), belarussian (be), cebuano (ceb), dutch (nl), estonian (et),
    fillipino (fil), greek (el), hungarian (hu), italian (it), lithuanian (lt),
    polish (pl), portuguese (pt), romanian (ro), slovenian (sl), tagalog (tl),
    ukrainian (uk), vietnamese (vi)
    lynxlynxlynx committed Mar 22, 2018
    Configuration menu
    Copy the full SHA
    b63cf08 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    df4a91a View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    68df76b View commit details
    Browse the repository at this point in the history
  10. Add Slack link

    krishaamer authored Mar 22, 2018
    Configuration menu
    Copy the full SHA
    c09468c View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    5586f6f View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2018

  1. New Crowdin translations (letsdoitworld#201)

    * New translations ui-strings.json
    krishaamer authored and lynxlynxlynx committed Mar 26, 2018
    Configuration menu
    Copy the full SHA
    af1dc52 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2018

  1. Configuration menu
    Copy the full SHA
    203b379 View commit details
    Browse the repository at this point in the history
  2. Merge pull request letsdoitworld#196 from letsdoitworld/fix156

    mobile-app: make use of translated trash types letsdoitworld#156
    lynxlynxlynx authored Mar 27, 2018
    Configuration menu
    Copy the full SHA
    85ed0ff View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2018

  1. Add to screens loaders if app in offline mode

    Andrei Abozau committed Mar 28, 2018
    Configuration menu
    Copy the full SHA
    d861a3d View commit details
    Browse the repository at this point in the history
  2. Add redirect user to home screen if user in offline mode

    Andrei Abozau committed Mar 28, 2018
    Configuration menu
    Copy the full SHA
    d181d23 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6720690 View commit details
    Browse the repository at this point in the history
  4. AlertModal: increased height a bit

    should fix at minimum estonian translation getting cut off at
    label_network_off_warning
    lynxlynxlynx committed Mar 28, 2018
    Configuration menu
    Copy the full SHA
    54d14ef View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    5590148 View commit details
    Browse the repository at this point in the history
  6. New Crowdin translations (letsdoitworld#203)

    * New translations ui-strings.json
    krishaamer authored and lynxlynxlynx committed Mar 28, 2018
    Configuration menu
    Copy the full SHA
    f551bfb View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2018

  1. Fix code after review

    oboz authored and Andrei Abozau committed Mar 29, 2018
    Configuration menu
    Copy the full SHA
    2f87be8 View commit details
    Browse the repository at this point in the history
  2. Save profile with redux-persist

    oboz authored and Andrei Abozau committed Mar 29, 2018
    Configuration menu
    Copy the full SHA
    ede1588 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a855955 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    9c21d5d View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2018

  1. Configuration menu
    Copy the full SHA
    435dfcc View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    40d42d4 View commit details
    Browse the repository at this point in the history
  3. Merge pull request letsdoitworld#186 from letsdoitworld/fix185

    google maps: use current release version 3.31
    lynxlynxlynx authored Mar 30, 2018
    Configuration menu
    Copy the full SHA
    0cf7954 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    ec16b93 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2018

  1. mobile: fix expo build

    lynxlynxlynx committed Apr 2, 2018
    Configuration menu
    Copy the full SHA
    f438102 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2018

  1. Configuration menu
    Copy the full SHA
    529d30c View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2018

  1. Teams first iteration

    create global teams
    join / leave a team
    team search screen (mobile app)
    team profile (mobile and web)
    aleksandr-wemakesoftware committed Apr 5, 2018
    Configuration menu
    Copy the full SHA
    d246b8f View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2018

  1. code review fix

    Dmitriy Zolotukhin committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    4859570 View commit details
    Browse the repository at this point in the history
  2. merge fixes

    Dmitriy Zolotukhin committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    2359bde View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2018

  1. Configuration menu
    Copy the full SHA
    17d7187 View commit details
    Browse the repository at this point in the history
  2. merge fixes

    Dmitriy Zolotukhin committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    99d8b63 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    77487d9 View commit details
    Browse the repository at this point in the history
  4. Merge branch 'teams_iteration1_pull_request' of github.com:aleksandr-…

    …wemakesoftware/World-Cleanup-Day into teams_iteration1_pull_request
    aleksandr-wemakesoftware committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    c016523 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    51b263e View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    428f12b View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2018

  1. Configuration menu
    Copy the full SHA
    66fe387 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    50403ee View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2018

  1. Swarm documentation

    daniel-jirca authored and lynxlynxlynx committed Apr 17, 2018
    Configuration menu
    Copy the full SHA
    82fdd1e View commit details
    Browse the repository at this point in the history
  2. Fix typo

    krishaamer authored and lynxlynxlynx committed Apr 17, 2018
    Configuration menu
    Copy the full SHA
    a68b52f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    028e8bc View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2018

  1. fix facebook login

    Dmitriy Zolotukhin committed Apr 19, 2018
    Configuration menu
    Copy the full SHA
    cd58d5c View commit details
    Browse the repository at this point in the history
  2. Merge pull request letsdoitworld#221 from aleksandr-wemakesoftware/is…

    …sues/212
    
    fix facebook login
    lynxlynxlynx authored Apr 19, 2018
    Configuration menu
    Copy the full SHA
    264ad7e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9f318fb View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2018

  1. sort areas by name

    kakarda65 authored and kakarda65 committed Apr 23, 2018
    Configuration menu
    Copy the full SHA
    51488b9 View commit details
    Browse the repository at this point in the history
  2. pull request fixes

    Dmitriy Zolotukhin committed Apr 23, 2018
    Configuration menu
    Copy the full SHA
    faea077 View commit details
    Browse the repository at this point in the history
  3. Revert "CongratsModal: increase header size, for longer translations"

    offsets the main title too, which is not good
    
    This reverts commit 5590148.
    lynxlynxlynx committed Apr 23, 2018
    Configuration menu
    Copy the full SHA
    4e311dc View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    87ce094 View commit details
    Browse the repository at this point in the history
  5. Revert "AlertModal: increased height a bit"

    hides the button if there's not enough space
    
    This reverts commit 54d14ef.
    lynxlynxlynx committed Apr 23, 2018
    Configuration menu
    Copy the full SHA
    68e030b View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2018

  1. Remove Slack link

    krishaamer authored Apr 25, 2018
    Configuration menu
    Copy the full SHA
    a8b608a View commit details
    Browse the repository at this point in the history
  2. fix offline trashpoint create

    kakarda653 authored and kakarda653 committed Apr 25, 2018
    Configuration menu
    Copy the full SHA
    ed9f2e0 View commit details
    Browse the repository at this point in the history
  3. issue/224

    kakarda653 authored and kakarda653 committed Apr 25, 2018
    Configuration menu
    Copy the full SHA
    0309524 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2018

  1. issue/225

    kakarda653 authored and kakarda653 committed Apr 26, 2018
    Configuration menu
    Copy the full SHA
    6f7e17e View commit details
    Browse the repository at this point in the history
  2. Revert "sort areas by name"

    This reverts commit 51488b9.
    kakarda653 authored and kakarda653 committed Apr 26, 2018
    Configuration menu
    Copy the full SHA
    b6a1e49 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4bfeb60 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    0438f07 View commit details
    Browse the repository at this point in the history

Commits on May 4, 2018

  1. android create trashpoint fix

    kakarda653 authored and kakarda653 committed May 4, 2018
    Configuration menu
    Copy the full SHA
    18d05d3 View commit details
    Browse the repository at this point in the history

Commits on May 5, 2018

  1. android create trashpoint fix

    kakarda653 authored and kakarda653 committed May 5, 2018
    Configuration menu
    Copy the full SHA
    b93b9b5 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2018

  1. delete console

    kakarda653 authored and kakarda653 committed May 7, 2018
    Configuration menu
    Copy the full SHA
    a366053 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2018

  1. Merge branch 'issues/212' into 'all_in_master'

    fix facebook login
    
    See merge request !6
    Dmitry Zolotuhin committed May 9, 2018
    Configuration menu
    Copy the full SHA
    8f24c76 View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'origin/all_in_master' into all_in_master

    kakarda653 authored and kakarda653 committed May 9, 2018
    Configuration menu
    Copy the full SHA
    dd4348b View commit details
    Browse the repository at this point in the history
  3. expo update fix ios load error

    kakarda653 authored and kakarda653 committed May 9, 2018
    Configuration menu
    Copy the full SHA
    35021be View commit details
    Browse the repository at this point in the history
  4. Update package.json

    Dmitry Zolotuhin committed May 9, 2018
    Configuration menu
    Copy the full SHA
    c8694f9 View commit details
    Browse the repository at this point in the history
  5. Merge remote-tracking branch 'origin/master' into expo_ios_fix

    # Conflicts:
    #	mobile-app/package.json
    kakarda653 authored and kakarda653 committed May 9, 2018
    Configuration menu
    Copy the full SHA
    d137b71 View commit details
    Browse the repository at this point in the history
  6. expo update fix ios load error

    kakarda653 authored and kakarda653 committed May 9, 2018
    Configuration menu
    Copy the full SHA
    74ce0b4 View commit details
    Browse the repository at this point in the history
  7. Merge branch 'expo_ios_fix' into 'master'

    Update package.json
    
    See merge request !8
    aleksandr-wemakesoftware committed May 9, 2018
    Configuration menu
    Copy the full SHA
    12ba3c2 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    b0b6679 View commit details
    Browse the repository at this point in the history
  9. permitted rename

    kakarda653 authored and kakarda653 committed May 9, 2018
    Configuration menu
    Copy the full SHA
    c93ebc4 View commit details
    Browse the repository at this point in the history
  10. Merge pull request letsdoitworld#234 from aleksandr-wemakesoftware/ma…

    …ster
    
    Expo update to the latest version
    severianremi authored May 9, 2018
    Configuration menu
    Copy the full SHA
    956ac3e View commit details
    Browse the repository at this point in the history

Commits on May 11, 2018

  1. marker size on ios fix

    kakarda653 authored and kakarda653 committed May 11, 2018
    Configuration menu
    Copy the full SHA
    01dc466 View commit details
    Browse the repository at this point in the history
  2. marker size on ios fix and android fix

    kakarda653 authored and kakarda653 committed May 11, 2018
    Configuration menu
    Copy the full SHA
    994bdfd View commit details
    Browse the repository at this point in the history
  3. fix trashpoint creation

    kakarda653 authored and kakarda653 committed May 11, 2018
    Configuration menu
    Copy the full SHA
    7a9489d View commit details
    Browse the repository at this point in the history

Commits on May 15, 2018

  1. Configuration menu
    Copy the full SHA
    11a0ca4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7fc4874 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2018

  1. Configuration menu
    Copy the full SHA
    d7e424c View commit details
    Browse the repository at this point in the history
  2. Merge pull request letsdoitworld#252 from vsheremet92/improvement/cha…

    …nge_blocked_geolocation_coordinates
    
    Changed zoom level and coordinates for blocked geolocation in browser
    lynxlynxlynx authored May 21, 2018
    Configuration menu
    Copy the full SHA
    69addd0 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2018

  1. team list fixes

    Dmitriy Zolotukhin committed May 25, 2018
    Configuration menu
    Copy the full SHA
    d404872 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2018

  1. Add teams source strings

    krishaamer authored May 28, 2018
    Configuration menu
    Copy the full SHA
    9fa8e1e View commit details
    Browse the repository at this point in the history
  2. Merge pull request letsdoitworld#257 from Haamer-Ventures/master

    Teams source strings hotfix
    krishaamer authored May 28, 2018
    Configuration menu
    Copy the full SHA
    121d2b4 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d3970f8 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    96f3ac9 View commit details
    Browse the repository at this point in the history
  5. Valid JSON (RFC 4627)

    krishaamer authored May 28, 2018
    Configuration menu
    Copy the full SHA
    05c2832 View commit details
    Browse the repository at this point in the history
  6. Merge pull request letsdoitworld#258 from Haamer-Ventures/master

    Remove 2 duplicated keys and add a few missing strings sourced from en.json
    krishaamer authored May 28, 2018
    Configuration menu
    Copy the full SHA
    af2aedc View commit details
    Browse the repository at this point in the history

Commits on May 29, 2018

  1. Configuration menu
    Copy the full SHA
    ada3254 View commit details
    Browse the repository at this point in the history
  2. add one more team

    Dmitriy Zolotukhin committed May 29, 2018
    Configuration menu
    Copy the full SHA
    40220bb View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9b3ba45 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    8ee9205 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2018

  1. package.json versions

    Dmitriy Zolotukhin committed May 30, 2018
    Configuration menu
    Copy the full SHA
    34417d0 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'teams_iteration1_pull_request' of ssh://git.wemakesoftw…

    …are.eu:2222/letsdoit/cleanup_app into teams_iteration1_pull_request
    aleksandr-wemakesoftware committed May 30, 2018
    Configuration menu
    Copy the full SHA
    d3ec595 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2018

  1. ui-string fix

    Dmitriy Zolotukhin committed May 31, 2018
    Configuration menu
    Copy the full SHA
    4a068e7 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'teams_iteration1_pull_request' of ssh://git.wemakesoftw…

    …are.eu:2222/letsdoit/cleanup_app into teams_iteration1_pull_request
    aleksandr-wemakesoftware committed May 31, 2018
    Configuration menu
    Copy the full SHA
    d4d5f9c View commit details
    Browse the repository at this point in the history
  3. Merge remote-tracking branch 'github/master' into teams_iteration1_pu…

    …ll_request
    
    # Conflicts:
    #	mobile-app/src/i18n/ui-strings.json
    #	mobile-app/yarn.lock
    Dmitriy Zolotukhin committed May 31, 2018
    Configuration menu
    Copy the full SHA
    6a4908a View commit details
    Browse the repository at this point in the history
  4. Merge branch 'teams_iteration1_pull_request' of ssh://git.wemakesoftw…

    …are.eu:2222/letsdoit/cleanup_app into teams_iteration1_pull_request
    aleksandr-wemakesoftware committed May 31, 2018
    Configuration menu
    Copy the full SHA
    9bf6ec7 View commit details
    Browse the repository at this point in the history
  5. Merge pull request letsdoitworld#213 from aleksandr-wemakesoftware/te…

    …ams_iteration1_pull_request
    
    Teams first iteration
    severianremi authored May 31, 2018
    Configuration menu
    Copy the full SHA
    3d1a450 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2018

  1. Configuration menu
    Copy the full SHA
    9eab7aa View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2018

  1. Fix blue screen

    anna committed Jun 4, 2018
    Configuration menu
    Copy the full SHA
    768de8e View commit details
    Browse the repository at this point in the history
  2. New Crowdin translations (letsdoitworld#206)

    i18n: updated translations from crowdin
    krishaamer authored and lynxlynxlynx committed Jun 4, 2018
    Configuration menu
    Copy the full SHA
    aca0af5 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2018

  1. teams view on the mobile client

    Dmitriy Zolotukhin committed Jun 5, 2018
    Configuration menu
    Copy the full SHA
    3204d45 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2018

  1. Add null check

    anna committed Jun 6, 2018
    Configuration menu
    Copy the full SHA
    993f153 View commit details
    Browse the repository at this point in the history
  2. Add null check to Offline

    anna committed Jun 6, 2018
    Configuration menu
    Copy the full SHA
    998ee65 View commit details
    Browse the repository at this point in the history
  3. Merge pull request letsdoitworld#270 from letsdoitworld/hotfix/blue_s…

    …creen
    
    Hotfix/blue screen
    lynxlynxlynx authored Jun 6, 2018
    Configuration menu
    Copy the full SHA
    cf6dad9 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    80e6a73 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    7559bee View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2018

  1. fixed bug with fetching team

    Dmitriy Zolotukhin committed Jun 7, 2018
    Configuration menu
    Copy the full SHA
    0d8228c View commit details
    Browse the repository at this point in the history
  2. Fix retrieving team by id

    slava.p committed Jun 7, 2018
    Configuration menu
    Copy the full SHA
    9441f41 View commit details
    Browse the repository at this point in the history
  3. Merge pull request letsdoitworld#275 from letsdoitworld/fix-retrievin…

    …g-team-by-id
    
    Fix retrieving team by id
    SlavaPanevskiy authored Jun 7, 2018
    Configuration menu
    Copy the full SHA
    c2a3c25 View commit details
    Browse the repository at this point in the history
  4. Merge branch 'master-gh' into issue/14

    Dmitriy Zolotukhin committed Jun 7, 2018
    Configuration menu
    Copy the full SHA
    a5404d8 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2018

  1. fix trashpoint create with team

    Dmitriy Zolotukhin committed Jun 8, 2018
    Configuration menu
    Copy the full SHA
    aaba76b View commit details
    Browse the repository at this point in the history
  2. fix trashpoint create with team

    Dmitriy Zolotukhin committed Jun 8, 2018
    Configuration menu
    Copy the full SHA
    c123834 View commit details
    Browse the repository at this point in the history
  3. leader loads teams according his assigned area

    Dmitriy Zolotukhin committed Jun 8, 2018
    Configuration menu
    Copy the full SHA
    024fc3a View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2018

  1. fixed: mobile app - refreshing team profile, web app - created trashp…

    …oints counted in teams statistics
    Dmitriy Zolotukhin committed Jun 9, 2018
    Configuration menu
    Copy the full SHA
    72427b0 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2018

  1. display 4 last activity trashpoints in team profile

    Dmitriy Zolotukhin committed Jun 11, 2018
    Configuration menu
    Copy the full SHA
    d189945 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2018

  1. delete code from some other branches

    Dmitriy Zolotukhin committed Jun 12, 2018
    Configuration menu
    Copy the full SHA
    6df44a3 View commit details
    Browse the repository at this point in the history
  2. delete code from some other branches

    Dmitriy Zolotukhin committed Jun 12, 2018
    Configuration menu
    Copy the full SHA
    b4eb42f View commit details
    Browse the repository at this point in the history
  3. delete code from some other branches

    Dmitriy Zolotukhin committed Jun 12, 2018
    Configuration menu
    Copy the full SHA
    b1a997d View commit details
    Browse the repository at this point in the history