Commit Graph

762 Commits

Author SHA1 Message Date
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 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 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 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 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 c5fe940c48 merge heihedata branch from r3822 to r3920. 2013-09-26 10:28:55 +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 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 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 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 1685942a13 change breadcrumps in the heihe view 2013-06-09 15:34:18 +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 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