Commit Graph

1826 Commits

Author SHA1 Message Date
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 bdfc8dca5f merge heihedata branch from r4161 to r4168. 2014-01-07 12:56:16 +00:00
wlx 6db4162f06 merge heihedata branch to trunk from r4153 to r4159 2013-12-27 13:44:12 +00:00
wlx ee4d32a372 merge heihedata branch r4153 2013-12-27 02:12:27 +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 8c2b1e4b74 merge heihedata branch to trunk from r4110 to r4111 2013-11-26 13:53:20 +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 012b56501e 修复不能申请数据的错误 2013-11-17 14:48:19 +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 f7eaf86999 merge from heihedata branch from r3956 to r3959. 2013-10-10 02:52:07 +00:00
wlx a36fecad2a merge heihedata branch from r3925 to r3955. 2013-10-09 08:03:47 +00:00
wlx b854b5cb53 merge heihedata branch from r3921 to r3924 2013-09-26 10:40:36 +00:00
wlx 3dc9186923 change search engine to westdc 2013-09-26 10:36:04 +00:00
wlx c5fe940c48 merge heihedata branch from r3822 to r3920. 2013-09-26 10:28:55 +00:00
wlx 9376e9e143 comment wsn metadata query 2013-07-22 12:46:43 +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 aa2a230753 merge heihedata branch r3794 to r3799. 2013-07-12 06:54:04 +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 ade674438e merge heihedata branch from r3741 to r3746. 2013-06-21 13:58:44 +00:00
wlx 7052e0b5a5 merge heihedata branch r3739. 2013-06-20 14:39:11 +00:00
wlx 47eacc7c14 merge heihedata branch r3736. 2013-06-20 07:33:20 +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 0c27367b7a add active class & add text 2013-06-16 15:38:17 +00:00
wlx 74cf7212d8 fix field error 2013-06-16 15:28:28 +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
Li Jianxuan a19a57a512 后台我负责的评审中增加了按专题搜索 2013-06-13 08:06:11 +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 49365d7dee remove /data/doc action 2013-06-11 07:23:22 +00:00
wlx 6a38e0bcca 修复数据分类问题 2013-06-11 07:07:01 +00:00
wlx 6265948c41 fix #508, email attachments 2013-06-11 07:04:51 +00:00
wlx ca1063b9a2 minor fix 2013-06-11 07:04:21 +00:00
wlx 25a24e2e1b #506, 实现问题数据的检查;优化数据恢复的SQL,提升相应速度 2013-06-11 05:39:56 +00:00
wlx ae389ecc7c 修复接受单条数据的错误 2013-06-10 14:45:31 +00:00
wlx 1685942a13 change breadcrumps in the heihe view 2013-06-09 15:34:18 +00:00
wlx cc69916289 change style 2013-06-09 15:21:52 +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
Li Jianxuan 79fad444bb 在评审管理的我负责的元数据中添加了批量发布的功能 2013-06-09 09:39:16 +00:00
wlx f30ac08f4f 修复sql中的错误,以及视图中的逻辑错误 2013-06-09 04:26:41 +00:00
wlx c93a382588 comment the mkdir process 2013-06-09 03:59:33 +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 85528018dd 可以空白搜索 2013-06-08 17:55:02 +00:00
wlx 49d77ec085 #220, 修改高级搜索指向xunsearch 2013-06-08 17:51:38 +00:00
wlx a32be26328 修复safari下不能跳转的问题 2013-06-08 17:24:22 +00:00
wlx 0aab45fb31 comment seekspace link 2013-06-08 16:44:49 +00:00
wlx 063ef7db05 默认只显示中文的地点,样式修改 2013-06-08 16:32:41 +00:00
wlx 8bb20b0bd2 change lai category 2013-06-08 09:56:15 +00:00
Li Jianxuan db1dd7667d 添加了geonetwork区域管理,修改通用分页方法,引入Zend_EventManger 2013-06-08 09:51:44 +00:00
wlx b60a981a91 merge heihedata branch from r3613 to r3661. 2013-06-08 07:38:33 +00:00
wlx 710a816368 确认空白序列不会进行数据库操作 2013-06-07 09:45:10 +00:00
wlx e9e6bbc479 更新hiwater专题,添加并列条件获取数据列表方法 2013-06-07 02:30:26 +00:00