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

merge branch Dev1.7 to master #402

Merged
merged 400 commits into from
Apr 26, 2016
Merged

merge branch Dev1.7 to master #402

merged 400 commits into from
Apr 26, 2016

Conversation

lixun910
Copy link
Member

merge branch dev1.7 to master
tag as 1.8 release (milestone point)

lixun910 added 30 commits January 11, 2016 23:54
@lixun910
fix and update build for windows with new wx and gdal
9f3e5d4
@lixun910
fix build on 32-bit windows
50f3eeb
@lixun910
fix cartodb connection on windows
340baa4 
Add https for libcurl
@lixun910
fix crash of CartoDB on windows
f8542cc 
finally got a fix for crash of CartoDB on windows. Access violation for
curl_easy_free() function.
A weird library linking of a older version libcurl caused the crash. The
code in libcurl 7.46 has a fix. Upgrade build script.
@lixun910
fix issue #289
e1a8586
@lixun910
update build on mac OS X
ab8539a 
sync build scripts with windows
@lixun910
fix issue #292 #288
e2d0784 
#288 causes crash due to large number of observations (>70000) generates
too many pairs (which is set as default) and cause memory issue and
crash in non-parametric correlogram. So, a detection is added to set
"Random Sample" as default when observation number is larger than 10000.

Note: this crash only appears on Windows platform.
@lixun910
fix issu #265
8abaac8 
nonparametric spatial autocorrelation: display histogram later
@lixun910
fix issue #257
56a4e2a 
continue by Adding a toolbar for Map in connectivity map.
@lixun910
fix issue #245
8fec1cc 
calculator will not be available since it’s not well tested.
@lixun910
fix issue #260
ba122dd 
Add a toolbar to the cartogram view. Disable basemap button, since it’s
coord system is different
@lixun910
fix issue #194
51da283
@lixun910
fix issue #183
41e23cb 
Let's truncate labels on horizontal axis at 1 decimal place. — Still it
relies on users to adjust the width of the axis to get rid of overlay
of numbers.

for the crash, there is assert violation when handles NAN number.
@lixun910
fix issue 256
49c53c0
@lixun910
fix issue #256
83c4bc6
@lixun910
fix issue 267
09d9eff
@lixun910
fix issue #275
20f2094
@lixun910
fix issue #286
23c797a 
update version number
@lixun910
fix issue #276
810121c 
update label
@lixun910
fix issue #275
dba143f 
update create new button
@lixun910
update fix for #271
3a313d7
@lixun910
fix issue #255
94e836e 
fix a memory issue in Average Chart
@lixun910
update nonparam AC random code to large data
a08fd17
@lixun910
fix issue #294
11fccba
@lixun910
fix issue #293
728a4e1
@lixun910
fix issue #293
bc7f5c5 
take coefficients variance matrix out
@lixun910
fix issue #295
5e72f90
@lixun910
update resource file
585afa6
@lixun910
fix issue #295
1fb0b9d
@lixun910
update 64bit build script
0d96958
lixun910 added 25 commits April 6, 2016 21:38
@lixun910
update new viz code to compatible with many plots
582a43e
@lixun910
update fix for new viz code and some bugs
488f487 
Cartogram and Bubble charts crash due to category setting
@lixun910
fix issue #389
ef2195d
@lixun910
update fix issue #381
2788343 
revert back to show average line as reference
@lixun910
fix issue #386
550ece0 
make sure weights definition or changes are saved to project file.
@lixun910
last touch of tile rendering
9f1a484
@lixun910
update tile on windows
1e2a5e1
@lixun910
update fix issue #381
dc95376 
change “Excluded” to “Unselected”.
@lixun910
fix issue #381
f273fb8 
fix a bug that min/max value on Y axis changed like a memory violation.
@lixun910
update version
968ffc4
@lixun910
fix issue #381
1e17ef3 
fix the shrinked plot with time variable
@lixun910
update version
b462ddf
@lixun910
update fix issue #381
013202e
@lixun910
fix issue #394
4154349 
projection is not initialized and cause crash
@lixun910
update version
1d7e4c4
@lixun910
fix issue #393
fda803d 
ignore OpenFileGDB and require user to use official FileGDB library
@lixun910
fix issue #381
ffe6c1d 
When change selection, update the Yaxis back is actually easier to do.

Bring the black line back to “All” comparison.
@lixun910
update fix issue #381
0006d41 
fix issue for Y-axis value range adjustment.
@lixun910
fix issue #395
b4d1c89 
Enhance duplicated field detection when Merge Table.

Prompt more details when Save/SaveAs failed creating field.

Enhance detection when Add Variable with weird field name.
@lixun910
fix issue #397
77aafff
@lixun910
update version
922a1cd
@lixun910
update #obs for map and table
ac6065e
@lixun910
update version to 1.8.0
9d591ef
@lixun910
fix ubuntu basemap rendering bug
696eead
@lixun910
update build scripts from ubuntu 32bit
adcd562
@lixun910 lixun910 added this to the 1.8 milestone Apr 26, 2016
@lixun910
Copy link
Member Author

Allow merge to create 1.8 base at master/

@lixun910 lixun910 merged commit fbd8ae0 into master Apr 26, 2016
@lixun910 lixun910 self-assigned this Apr 26, 2016
@lixun910 lixun910 deleted the dev1.7 branch April 30, 2016 04:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@lixun910 lixun910

Labels
None yet
Projects
None yet
Milestone
1.8
Development

Successfully merging this pull request may close these issues.
1 participant
@lixun910