Commit Graph

2204 Commits

Author SHA1 Message Date
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 5f3c8e8cae revert include path 2013-12-22 02:05:23 +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 0ae5b11589 change include path 2013-09-26 10:23:33 +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 8c41981a6b merge r3733 2013-06-19 14:05:42 +00:00
wlx 51b0ba0d1b merge heihedata branch from r3715 to r3729 2013-06-19 02:38:06 +00:00
wlx 52862e9509 import font awesome 3.2.1 version 2013-06-18 12:29:50 +00:00
wlx a66fa64d42 add ccd navigation 2013-06-18 12:23:33 +00:00
wlx 6bed4b8821 切换为全部数字列表 2013-06-18 12:09:16 +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 9b32dd5718 add heihe logo 2013-06-18 03:04:11 +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