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.

Sign up for GitHub

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

Jump to bottom

latest copy #37

Merged
merged 87 commits into from
Apr 6, 2018
Merged

latest copy #37

merged 87 commits into from
Apr 6, 2018

Conversation

bethanclarke
Copy link
Owner

No description provided.

maxwellfundi and others added 30 commits December 7, 2017 11:45
@maxwellfundi
Designing dlgthemes
1f91acc
@maxwellfundi
Edits
9072770
@maxwellfundi
minor edit
507c278
@maxwellfundi
Merge pull request #278 from africanmathsinitiative/master
6fa2f21 
Updating branch
@maxwellfundi
Merge pull request #285 from africanmathsinitiative/master
5cf507e 
updating
@shadrackkibet
Merge pull request #178 from africanmathsinitiative/master
53dbe5e 
updating branch
@bethanclarke
Changed the following parameters from mandatory to optional
b059508 
- slope and intercept (geom_abline)
- yintercept (geom_hline)
- xintercept (geom_vline)
added proportions function
2ba6590
enabled proportion controls
13e7f48
setting proportions functionality
51f7e6e
adding count function
1a869d0
designer fixes
8bb519f
Setting counts and proportions functionality
ac7c187
@bethanclarke
geom violin - draw_quantiles parameter default changed from not(NULL)…
e10f127 
… to NULL
@maxwellfundi
Merge pull request #287 from africanmathsinitiative/master
9462efb 
updating
@maxwellfundi
Merge pull request #291 from africanmathsinitiative/master
72332d7 
updating
@bethanclarke
changed numeric box from 0 decimal places to 2 for: abline, hline and…
51a10d4 
… vline
@shadrackkibet
Merge pull request #188 from africanmathsinitiative/master
325a3f1 
updating master
@shadrackkibet
Merge pull request #191 from africanmathsinitiative/master
6cb3b1c 
updating master
@maxwellfundi
Merge pull request #293 from africanmathsinitiative/master
2c3df2f 
updating
@shadrackkibet
Merge pull request #192 from africanmathsinitiative/master
dda26f5 
updating master
added missing as a summary checkbox
2ed0918
added miss and changed M to m options, linking group box content to T…
3143852 
…able rdo and disabled summary missing chk
added the size of the dialog depending on which rdo i s checked.
a2b3df6
@dannyparsons
Merge pull request #867 from africanmathsinitiative/master
64292fa 
merge from main
@dannyparsons
created doy range sub dialog
6e323e0
@dannyparsons
added set value method to doy control
d3b9283 
added setup method to doy range subdialog
@dannyparsons
added setup function for doy sub dialog
e760db6
@dannyparsons
doy range sub dialog linked correctly to functions
17b87c9
@maxwellfundi
Merge pull request #294 from africanmathsinitiative/master
9d6f18e 
Updating branch
dannyparsons and others added 28 commits April 5, 2018 14:30
@dannyparsons
Merge pull request #870 from africanmathsinitiative/master
6113061 
merge from main
@dannyparsons
Merge branch 'displaydaily' of https://github.com/shadrackkibet/R-Instat
56f2286 
 into shadrackkibet-displaydaily
@dannyparsons
added count missing to summaries for display daily
5cbd45d
@dannyparsons
Merge pull request #4482 from dannyparsons/shadrackkibet-displaydaily
906c93f 
Shadrackkibet displaydaily
@bethanclarke
implementing R function
fdcd796
@dannyparsons
Merge pull request #871 from africanmathsinitiative/master
d21c96e 
merge from main
@dannyparsons
Merge branch 'crops' of https://github.com/bethanclarke/Instat into b…
df7d723 
…ethanclarke-crops
@dannyparsons
corrected rain total calculations in crops method
f5a8917 
finished crops dialog
enabled crops dialog on frmMain
@dannyparsons
added comments
58fae2c
@dannyparsons
Merge pull request #4485 from dannyparsons/bethanclarke-crops
7a4b2fa 
Bethanclarke crops
@maxwellfundi
Merge pull request #295 from africanmathsinitiative/master
8e673e5 
updating
@shadrackkibet
Merge pull request #201 from africanmathsinitiative/master
9be6cf0 
update
@dannyparsons
Merge pull request #4455 from bethanclarke/line-geoms
9da1527 
Line geoms
@dannyparsons
Merge pull request #872 from africanmathsinitiative/master
dbfb6f2 
merge from main
@maxwellfundi
edits on script window
c758fa3
@maxwellfundi
.
7dbe117
@maxwellfundi
..
c59a5f1
@dannyparsons
corrected call type on crops dialog
6793551
@dannyparsons
Merge pull request #4487 from dannyparsons/crops
e5e5e1e 
corrected call type on crops dialog
@maxwellfundi
adding proper paste method
b8a8c44
@maxwellfundi
Merge pull request #4486 from maxwellfundi/NewScript
4a621cc 
Ucrscript
@dannyparsons
fixes #4484
7608097
@dannyparsons
Merge pull request #4488 from dannyparsons/summaries
59a5315 
fixed bug in climatic summaries
@maxwellfundi
Adding cut and copy
465e69c
@dannyparsons
Merge pull request #4489 from maxwellfundi/NewScript
2a84922 
Adding cut and copy
designer fixes
a393eba
implementing Doy range as an sdg
82d1827
@dannyparsons
Merge pull request #4490 from shadrackkibet/spells
5dd0c6e 
Spells
@bethanclarke bethanclarke merged commit 41bfe2d into bethanclarke:master Apr 6, 2018
bethanclarke pushed a commit that referenced this pull request Apr 13, 2018
@conlooptechnologies
Merge pull request #37 from africanmathsinitiative/master
eeb0875 
Updating my master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@bethanclarke @maxwellfundi @shadrackkibet @dannyparsons