Commit Graph

273 Commits

Author SHA1 Message Date
自由的飞翔 0c44eb4bf4 Merge remote-tracking branch 'origin/master' 2018-12-29 10:44:02 +08:00
自由的飞翔 8234ceb76f interpolation dynamic spi 2018-12-29 10:43:07 +08:00
bob e0c68fde92 #县区显示修复 2018-12-29 09:29:42 +08:00
bob 2ef833325e Merge branch 'master' of http://git.eanbo.cn/xieshen/drought
# Conflicts:
#	users/views.py
2018-12-29 09:18:31 +08:00
bob e61c6fc37d Merge branch 'master' of http://git.eanbo.cn/xieshen/drought
# Conflicts:
#	users/views.py
2018-12-29 09:17:48 +08:00
bob ac194abeac #20181229 2018-12-29 09:11:57 +08:00
Yin.T430u faac06bb28 clear btn && loading btn 2018-12-29 02:00:00 +08:00
自由的飞翔 2320a81103 interpolation dynamic spi 2018-12-28 23:22:00 +08:00
自由的飞翔 79041c8fe6 Merge remote-tracking branch 'origin/master' 2018-12-28 21:52:37 +08:00
自由的飞翔 342b1bd401 encoding 2018-12-28 21:51:57 +08:00
baoliang 4ef805d80c #1 2018-12-28 21:44:18 +08:00
baoliang 6a91314ee4 #1 2018-12-28 21:36:49 +08:00
自由的飞翔 94e82a3268 cut raster 2018-12-28 21:24:05 +08:00
bob 84bff5deb4 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	users/urls.py
#	users/views.py
2018-12-28 17:08:27 +08:00
bob 5468d94106 #20181228 2018-12-28 17:06:54 +08:00
baoliang e423855382 #1 2018-12-28 17:05:12 +08:00
bob c63c99bae5 #20181228 2018-12-28 16:27:17 +08:00
baoliang 29ce3d8c5d #1 2018-12-28 16:09:15 +08:00
baoliang 4ea9f70f3a #1 2018-12-28 16:08:16 +08:00
baoliang caf7d6bbb1 #1 2018-12-28 15:03:45 +08:00
baoliang 63160439d5 #1 2018-12-28 11:42:05 +08:00
baoliang e9a76968be Merge remote-tracking branch 'origin/master' 2018-12-28 11:04:17 +08:00
bob 13cc922f9d Merge remote-tracking branch 'origin/master' 2018-12-28 10:22:51 +08:00
bob d20cb6d145 #20181228 2018-12-28 10:22:40 +08:00
baoliang 73bb7f4717 #1 2018-12-28 10:13:51 +08:00
Yin.T430u c3c4f90867 t push -u origin masterMerge branch 'master' of http://git.eanbo.cn/xieshen/drought 2018-12-28 02:09:08 +08:00
Yin.T430u 3898675445 integration with /calc_hailstone_impact 2018-12-28 02:08:41 +08:00
自由的飞翔 47bf6e1d11 Merge remote-tracking branch 'origin/master' 2018-12-28 01:49:48 +08:00
自由的飞翔 15992a1e6b cut raster 2018-12-28 01:48:36 +08:00
bob dd73157776 Merge remote-tracking branch 'origin/master' 2018-12-27 18:12:13 +08:00
bob ecb338e530 #20181227 2018-12-27 18:11:59 +08:00
baoliang 667426f3c4 #1 2018-12-27 18:10:00 +08:00
baoliang bff4e89aa2 Merge remote-tracking branch 'origin/master' 2018-12-27 17:54:55 +08:00
baoliang fbe2fdb4ce #1 2018-12-27 17:54:51 +08:00
bob 4380e9e627 Merge remote-tracking branch 'origin/master' 2018-12-27 12:14:26 +08:00
bob 3efcfb8a2f #20181227 2018-12-27 12:14:18 +08:00
自由的飞翔 c5f6ac303f cut raster 2018-12-26 22:59:59 +08:00
自由的飞翔 8a99614303 cut raster 2018-12-26 22:54:04 +08:00
自由的飞翔 e76f9a6b3e cut raster 2018-12-26 22:30:51 +08:00
自由的飞翔 b06d827aa9 cut raster 2018-12-26 22:27:54 +08:00
自由的飞翔 96d5891cf3 cut raster 2018-12-26 22:23:15 +08:00
自由的飞翔 a11775c631 Merge remote-tracking branch 'origin/master' 2018-12-26 22:19:59 +08:00
自由的飞翔 17fdf6b191 cut raster 2018-12-26 22:19:17 +08:00
bob 364b3b1da4 #20181226 2018-12-26 19:00:57 +08:00
xieshen cac04c40e5 #20181226 2018-12-26 18:52:34 +08:00
xieshen 069215a1b8 #20181226 2018-12-26 10:00:22 +08:00
xieshen 9bc3516df8 #20181226 2018-12-26 09:53:46 +08:00
xieshen e4dd610dae Merge remote-tracking branch 'origin/master' 2018-12-26 09:11:09 +08:00
xieshen 8fa99c53b6 #20181226 2018-12-26 09:10:53 +08:00
自由的飞翔 5c7199b7c2 intersection 2018-12-25 00:35:01 +08:00