Commit Graph

1203 Commits

Author SHA1 Message Date
wlx 154abea890 fix error 2014-06-06 01:56:28 +00:00
wlx e04d016145 merge heihedata branch from r4487-4579 into trunk 2014-06-06 01:02:29 +00:00
wlx 44ec14a878 merge heihedata branch from r4251 to r4486. 2014-05-15 06:49:15 +00:00
wlx 336882754a merge heihedata branch from r4221 to r4235 into trunk 2014-02-26 01:55:33 +00:00
wlx e5e8f4b9d1 merge heihedata branch from r4217 to r4220 2014-02-21 09:14:14 +00:00
wlx ab930d5ef5 merge heihedata branch r4203 to r4215 to trunk 2014-02-17 03:27:54 +00:00
wlx f6a719ad1b merge heihedata branch r4201 2014-01-22 02:56:40 +00:00
wlx e2f1e9e25a merge heihedata branch from r4193 to r4199 2014-01-22 02:11:37 +00:00
wlx 77112818fc add haihe theme 2014-01-14 02:26:22 +00:00
wlx d41a3c3be5 merge heihedata branch r4194 2014-01-14 02:25:19 +00:00
wlx 0d5ce7a19f merge heihedata branch from r4187 to r4192 2014-01-14 02:19:43 +00:00
wlx ddeb9e4970 add haihe theme 2014-01-13 06:18:24 +00:00
wlx 81bd58fe37 merge heihedata branch from r4182 to r4186 2014-01-10 05:26:39 +00:00
wlx b1a4cb94eb merge heihedata branch r4180 2014-01-10 04:11:09 +00:00
wlx a92a46c17c merge heihedata branch from r4169 to r4177 2014-01-09 14:28:17 +00:00
wlx 1687fcab72 add view & down link for multi citation 2014-01-09 13:32:28 +00:00
wlx 055b5a6af2 修复计数不准的问题 2014-01-09 12:27:07 +00:00
wlx 4f5ccf02d7 修复数据重复问题 2014-01-09 12:25:43 +00:00
wlx d8261f8dbe make multi citation cooperate with data citation 2014-01-09 11:52:07 +00:00
wlx 6db4162f06 merge heihedata branch to trunk from r4153 to r4159 2013-12-27 13:44:12 +00:00
wlx 60432a9987 add multi reference 2013-12-26 14:12:26 +00:00
wlx 7b7699f5f5 merge heihedata branche from r4135 to r4146 2013-12-26 13:33:29 +00:00
wlx ca8626b6f7 merge heihedata branch r4132 to trunk 2013-12-22 02:01:24 +00:00
wlx 6b4e98b87a merge heihedata branch to trunk from r4112 to r4116 2013-11-29 02:30:29 +00:00
wlx 6127e1766a merge heihedata branch to trunk from r4099 to r4106 2013-11-22 04:20:00 +00:00
wlx f5591aec93 merge r4097 to trunk 2013-11-20 10:43:54 +00:00
wlx 491621e821 merge heihedata branch to trunk from r4083 to r4095 2013-11-20 10:03:16 +00:00
wlx 1a8c85bd9e merge heihedata branch to r4082 2013-11-15 02:42:46 +00:00
wlx a4c02d8876 merge heihedata branch from r4060 to r4071 2013-11-12 13:16:26 +00:00
wlx 991a5abda3 merge heihedata branch from r3961 to r4058 2013-11-11 04:17:15 +00:00
wlx a36fecad2a merge heihedata branch from r3925 to r3955. 2013-10-09 08:03:47 +00:00
wlx c5fe940c48 merge heihedata branch from r3822 to r3920. 2013-09-26 10:28:55 +00:00
wlx aa073dab8f fix heihe data problem 2013-07-22 12:45:33 +00:00
wlx ccdb4f2fbc merge heihedata branch r3812 to r3821 for trunk 2013-07-22 11:27:11 +00:00
wlx 3bfb53767a merge heihedata branch from r3802 to r3810 into trunk 2013-07-15 13:33:19 +00:00
wlx 4ab527d6d0 merge heihedata branch from r3777 to r3791. 2013-07-09 06:24:43 +00:00
wlx 15b7e274f0 merge heihedata branch r3775, r3776 to trunk 2013-07-02 07:10:59 +00:00
wlx 90f11cd4f4 merge heihedata branch r3771, r3772 to trunk 2013-07-01 15:11:03 +00:00
wlx 9c281d60f8 merge heihedata branche from r3759 to r3769 2013-06-29 14:40:59 +00:00
wlx 88548c6a97 merge heihedata branch from r3748 to r3758. 2013-06-25 01:01:35 +00:00
wlx 7052e0b5a5 merge heihedata branch r3739. 2013-06-20 14:39:11 +00:00
wlx 51b0ba0d1b merge heihedata branch from r3715 to r3729 2013-06-19 02:38:06 +00:00
wlx a66fa64d42 add ccd navigation 2013-06-18 12:23:33 +00:00
wlx 1e05da7fbe 优化文件列表显示 2013-06-18 12:08:28 +00:00
Li Jianxuan a12603a0de #495 修改了文件列表,添加了文件大小和时间的显示 2013-06-18 09:04:45 +00:00
wlx 6168aaafa4 添加黑河logo 2013-06-18 03:05:05 +00:00
wlx c47d78e7a1 更新doc格式的数据引用方式以及项目支持 2013-06-18 02:03:32 +00:00
wlx c821576353 实现pdf格式中对引用方式、支持项目的更新 2013-06-18 00:31:08 +00:00
wlx b626bfc7b8 odtAction中修改引用方式支持以及项目支持 2013-06-18 00:18:57 +00:00
wlx f865c0289e 添加数据的多文献引用方式,hiwater定制 2013-06-16 16:34:41 +00:00
wlx c12e8952b5 merge heihedata branch from r3704 to r3714. 2013-06-16 10:35:56 +00:00
wlx e28595ff97 fix url problem in view 2013-06-16 10:34:04 +00:00
wlx aa3030460d change help url 2013-06-16 05:23:38 +00:00
wlx 3c2aaadf95 修复英文引用的年份问题 2013-06-15 08:59:16 +00:00
wlx d52972c5ee 优化hiwater导航菜单 2013-06-13 13:09:31 +00:00
wlx e68958132c 优化hiwater导航 2013-06-13 13:09:10 +00:00
wlx 733a844b3a add list action 2013-06-13 12:39:15 +00:00
wlx 47b561c0e5 add list view 2013-06-13 12:38:51 +00:00
wlx 9790931463 mrege from heihedata branch from r3662 to r3703 2013-06-12 04:34:15 +00:00
wlx 20988eb73e change to the release url 2013-06-12 04:30:56 +00:00
wlx 5f28d52bdd add qrcode action, #509 2013-06-12 04:29:07 +00:00
wlx eb001f9ecd change simple odt 2013-06-11 10:34:59 +00:00
wlx ea6778a80e change sql in odt action 2013-06-11 09:36:53 +00:00
wlx 70a968e556 add simple odt option 2013-06-11 09:23:21 +00:00
wlx 01b84f469a remove /data/doc action 2013-06-11 07:23:54 +00:00
wlx 6a38e0bcca 修复数据分类问题 2013-06-11 07:07:01 +00:00
wlx 1685942a13 change breadcrumps in the heihe view 2013-06-09 15:34:18 +00:00
wlx 8352cd99b9 修复空白标题错误 2013-06-09 15:21:27 +00:00
wlx 81db4bca0f 优化黑河计划专题 2013-06-09 15:21:04 +00:00
wlx cfbc7f8815 黑河计划专题修改优化 2013-06-09 15:20:15 +00:00
wlx f30ac08f4f 修复sql中的错误,以及视图中的逻辑错误 2013-06-09 04:26:41 +00:00
wlx 0ce5031ff6 集成高级搜索到xunsearch 2013-06-09 03:03:47 +00:00
wlx eaf8c644f2 echo empty q search result 2013-06-08 17:59:48 +00:00
wlx 49d77ec085 #220, 修改高级搜索指向xunsearch 2013-06-08 17:51:38 +00:00
wlx 8bb20b0bd2 change lai category 2013-06-08 09:56:15 +00:00
wlx b60a981a91 merge heihedata branch from r3613 to r3661. 2013-06-08 07:38:33 +00:00
wlx e9e6bbc479 更新hiwater专题,添加并列条件获取数据列表方法 2013-06-07 02:30:26 +00:00
wlx 18a42a5a51 change download text 2013-06-07 01:20:03 +00:00
wlx c64ecd7ece change diff view style, try to fix #486 2013-06-06 23:37:30 +00:00
wlx 673eaabcdb #491, #492, 实现如何申请、如何发布的后台管理 2013-06-06 23:14:17 +00:00
wlx f54c3015c6 明确离线数据的服务流程,让用户更清晰 2013-06-06 13:38:09 +00:00
Li Jianxuan 7ea443bcba 修改高级搜索中google map返回值的键名 2013-06-06 07:25:43 +00:00
wlx a62960a0e6 #503, 修改项目浏览的排序方式 2013-06-06 06:28:10 +00:00
Li Jianxuan 2e07551832 修改在线下载中默认选择的项目类型 2013-06-04 07:40:06 +00:00
wlx 5334bcb9e8 add nav array 2013-06-02 03:56:12 +00:00
wlx 9239c23408 add breadcrumps for search 2013-06-02 03:52:20 +00:00
wlx 8f0b9552ed fix link error 2013-06-02 02:19:17 +00:00
wlx 97b3d291f9 style change 2013-06-01 09:13:53 +00:00
wlx c3f7a0f01a style change 2013-06-01 01:41:57 +00:00
wlx d6a393cb79 change index style 2013-06-01 01:21:17 +00:00
Li Jianxuan aa30f6ba52 修改dbh类中返回ID的insert bug,添加支持项目有选择项目时的自动关联功能 2013-05-31 02:48:56 +00:00
wlx cfc0649536 merge heihedata branch from r3591 to r3612. 2013-05-31 02:09:32 +00:00
Li Jianxuan 599f383648 #487 在空间浏览中加入了关键字搜索,整理通用的Metadata类中数据过滤器 2013-05-30 02:24:36 +00:00
wlx 32ea43eb59 添加英文引用格式的年份信息 2013-05-30 01:19:43 +00:00
wlx 82ad1ef053 加入姓名判断功能 2013-05-30 00:14:54 +00:00
Li Jianxuan 68ad754db0 #465 数据作者打开页面时默认显示内容 2013-05-29 07:36:44 +00:00
Li Jianxuan cd4d644c1b 恢复fitBounds的加载 2013-05-28 06:58:32 +00:00
wlx ca13409673 优化支持项目操作 2013-05-28 05:36:26 +00:00
wlx 8e8737cf49 数据作者可以添加所有项目 2013-05-28 05:10:10 +00:00
wlx 73dac5540d change navi 2013-05-28 04:20:36 +00:00
Li Jianxuan 36f914df7e 修改空间浏览方式 2013-05-27 08:59:42 +00:00
wlx f1990b25cd merge heihedata branch from r3573 to r3590. add ftp2 support, implement hiwater 2013-05-27 05:54:29 +00:00
wlx a9489cbe51 修复在线下载的ftp地址 2013-05-27 05:49:01 +00:00
Li Jianxuan 91c5223eef 使所有用户都可以查看所有项目,修改doi中作者信息的表单样式 2013-05-27 02:35:41 +00:00
wlx 3c9632319f style change 2013-05-26 23:34:12 +00:00
wlx 63bed29856 修复在线数据的下载问题 2013-05-26 12:08:28 +00:00
wlx 3af3b545ee 完善hiwater功能 2013-05-26 11:23:36 +00:00
wlx f185fad3be active hiwater 2013-05-26 04:06:01 +00:00
wlx 3ca45e3618 add ftp2 support 2013-05-26 03:58:38 +00:00
wlx 83bf8acbf4 实现hiwater功能 2013-05-25 03:46:38 +00:00
wlx 792da56172 hiwatr implementation 2013-05-25 02:19:17 +00:00
wlx 8ab96d547a change hiwater code 2013-05-24 16:24:31 +00:00
wlx fca38a73f7 change style 2013-05-24 14:40:57 +00:00
wlx 52afa54b60 merge heihedata branch from r3553 to r3572 2013-05-24 11:58:18 +00:00
wlx 703c42f778 change ftp1 to ftp2 2013-05-24 09:02:54 +00:00
wlx 170df8fbea fix spell error 2013-05-24 08:48:52 +00:00
wlx 13296214af chagne ftp1 to ftp2 2013-05-24 08:39:32 +00:00
wlx ebe7205124 change ftp to ftp2.westgis.ac.cn 2013-05-24 08:37:35 +00:00
Li Jianxuan ec18b2737b 修改支持项目中的链接错误,添加无数据时页面上的提示文字 2013-05-24 02:34:47 +00:00
Li Jianxuan 8234d6e625 #490 添加相关数据的查看功能 2013-05-22 09:13:50 +00:00
Li Jianxuan 00f0609eeb #490 添加数据相关选项,修改tab导航的显示 2013-05-22 07:06:30 +00:00
wlx 4745e2dead fix pagenator error 2013-05-21 23:27:58 +00:00
wlx eeea7ce910 fix fund error 2013-05-21 23:26:17 +00:00
wlx b99f34f6d5 更新数据引用方式 2013-05-20 22:29:47 +00:00
wlx 561628ced4 merge heihedata branch from r3540 to r3552. 2013-05-20 15:19:32 +00:00
wlx 44436b8cf2 add date 2013-05-20 15:10:15 +00:00
wlx f0e12ab9f5 更新发布时间的选择 2013-05-20 15:04:29 +00:00
wlx 014a20c053 fix error 2013-05-20 14:43:41 +00:00
wlx b997ee9368 fix error 2013-05-20 14:10:30 +00:00
wlx 220dfb4549 修正首页doi显示的年份问题 2013-05-20 13:44:40 +00:00
wlx c1803dac86 添加发布时间 2013-05-20 13:36:05 +00:00
wlx 9de8d02452 change index page style 2013-05-19 02:35:42 +00:00
wlx 706071835d style change 2013-05-19 02:30:10 +00:00
wlx f3b4c5cdcb merge heihedata branch from r3531 to r3539. 2013-05-18 04:00:41 +00:00
wlx 4611e4c9a2 首页添加doi链接;数据页调整序列的个数 2013-05-17 08:34:47 +00:00
wlx 44b178502d 首页增加最新DOI数据信息 2013-05-17 04:34:06 +00:00
wlx 5dc02f8840 fix doi logic 2013-05-17 03:03:30 +00:00
wlx bf7c665ed2 将数据作者首页的文本放入数据库管理 2013-05-17 01:52:01 +00:00
wlx 44eaee5f09 merge heihedata branch from r3515 to r3531. 2013-05-16 11:03:52 +00:00
wlx 7712a0f910 添加doi显示逻辑 2013-05-16 03:06:28 +00:00
wlx a5c49863b8 use round function 2013-05-16 00:38:11 +00:00
wlx 55c5a6a533 优化小数点位数 2013-05-16 00:35:37 +00:00
wlx 327de3f9fa fix error 2013-05-16 00:33:41 +00:00
wlx 50911f04f3 优化数据大小显示 2013-05-16 00:29:48 +00:00
wlx efb207e957 #475, 交换新闻标题及时间的先后次序 2013-05-14 23:57:52 +00:00
wlx 6a98bb51f2 change featured image style 2013-05-14 23:50:42 +00:00
wlx 78bcc82fad merge heihedata branch from r3504 to r3514 2013-05-14 23:23:00 +00:00
wlx b2696d04ba add breadcrump in water/view 2013-05-14 23:14:49 +00:00
wlx c162b5d27a #462, add fund support 2013-05-14 22:46:45 +00:00
wlx 44321d4085 repair the authors problem in bibtex 2013-05-14 22:20:12 +00:00