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

Multiple tree flow fix #210

Merged
merged 50 commits into from
Mar 24, 2021
Merged
Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
e2b7889
fixed multiple tree flow till review page
ankitecd Feb 18, 2021
d0139ea
Merge branch 'feature/species-sync' into feature/multiple-trees-fix
ankitecd Feb 18, 2021
fd7e7b7
fixed plantation date on review page
ankitecd Feb 18, 2021
ac48d98
Merge branch 'develop' into feature/multiple-trees-fix
ankitecd Feb 18, 2021
6fc6d77
reverted eslint to unix
ankitecd Feb 18, 2021
0224f55
Merge branch 'develop' into feature/multiple-trees-fix
ankitecd Mar 1, 2021
35bd313
Merge branch 'develop' into feature/multiple-trees-fix
ankitecd Mar 1, 2021
173ff7a
added sample tree count screen
ankitecd Mar 1, 2021
16fc572
Merge branch 'develop' into feature/multiple-trees-fix
ankitecd Mar 2, 2021
98b2471
refactored map marking to hooks
ankitecd Mar 2, 2021
147d9b1
added sample trees count navigation in multiple tree
ankitecd Mar 3, 2021
74679c0
Merge branch 'develop' into feature/multiple-trees-fix
ankitecd Mar 3, 2021
4a8edda
changed schema verison to 4
ankitecd Mar 4, 2021
555d4e8
Merge branch 'develop' into feature/multiple-trees-fix
ankitecd Mar 4, 2021
ab38808
completed sample trees flow
ankitecd Mar 10, 2021
e723c68
Merge branch 'develop' into feature/multiple-trees-fix
ankitecd Mar 10, 2021
7da6543
fixed lint error
ankitecd Mar 10, 2021
35885fe
fixed offsite polygon registration
ankitecd Mar 11, 2021
be550df
Merge branch 'develop' into feature/multiple-trees-fix
ankitecd Mar 11, 2021
0faef21
added German language resources (for better translation check)
norbertschuler Mar 12, 2021
45282f4
fixed sample tree upload
ankitecd Mar 14, 2021
29de041
Merge branch 'feature/multiple-trees-fix' of github.com:Plant-for-the…
ankitecd Mar 14, 2021
d4e39b8
Merge branch 'develop' into feature/multiple-trees-fix
ankitecd Mar 14, 2021
ca03784
fixed linting error
ankitecd Mar 14, 2021
bee6872
added maps in total trees when no specie is present, fixed UI added d…
ankitecd Mar 15, 2021
31163d8
added sample tree in geojson export and removed console logs
ankitecd Mar 15, 2021
bc7a98c
added bounding box to map
ankitecd Mar 17, 2021
e7b7e17
Merge branch 'develop' into feature/multiple-trees-fix
ankitecd Mar 17, 2021
5366f35
fixed less hooks rendered issue
ankitecd Mar 17, 2021
312f1f0
merged all MapMarking to single component and added offsite-point in …
ankitecd Mar 18, 2021
44135d6
upgraded iOS Pods
norbertschuler Mar 19, 2021
6a5a63e
upgraded mapbox to latest beta
norbertschuler Mar 19, 2021
a3a0e29
Merge branch 'develop' into feature/multiple-trees-fix
norbertschuler Mar 19, 2021
b0f7769
clear Pod cache
norbertschuler Mar 19, 2021
efb91cb
added sample tree inside polygon check
ankitecd Mar 22, 2021
e86914b
Merge branch 'feature/multiple-trees-fix' of github.com:Plant-for-the…
ankitecd Mar 22, 2021
3ddaa20
added navigation of sample tree from inventory overview and unit conv…
ankitecd Mar 22, 2021
3151b24
fixed round issue with measurements and measurement conversion in inv…
ankitecd Mar 22, 2021
1b276f8
fixed editing issue in overview screen for sample tree
ankitecd Mar 23, 2021
9cafe18
removed code smells and few duplicate code
ankitecd Mar 23, 2021
6eb6a88
disabled Podfile caching once more
norbertschuler Mar 23, 2021
92dda49
fixed map ui for unreachable elements
ankitecd Mar 23, 2021
91be8bf
Merge branch 'feature/multiple-trees-fix' of github.com:Plant-for-the…
ankitecd Mar 23, 2021
bbec892
fixed map UI for iOS
ankitecd Mar 23, 2021
c51bf14
fixed image not showing in sample tree
ankitecd Mar 23, 2021
79ebc62
added missing resources for inch and feet and corrected wrong resourc…
norbertschuler Mar 23, 2021
541cac9
fixed conversions and UI issue
ankitecd Mar 24, 2021
e49e715
adding missing translation for location
norbertschuler Mar 24, 2021
8b0013c
fixed conversion accuracy and added loc accuracy check for onsite mul…
ankitecd Mar 24, 2021
a764424
Merge branch 'feature/multiple-trees-fix' of github.com:Plant-for-the…
ankitecd Mar 24, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 51 additions & 0 deletions app/assets/images/sample_trees_vector.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions app/assets/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import { off_site_enable_banner } from './images/off_site_enable_banner';
import { empty } from './images/empty';
import mobile_download from './images/mobile_download';
import cloud_sync from './images/cloud_sync';
import sample_trees_vector from './images/sample_trees_vector';

export {
arrow_up,
Expand Down Expand Up @@ -62,4 +63,5 @@ export {
single_tree_png,
mobile_download,
cloud_sync,
sample_trees_vector,
};
Loading