Commit Graph

351 Commits

Author SHA1 Message Date
wlx a4ddb0a87b merge heihedata branch r5110 - r5206 into trunk 2015-01-31 03:59:50 +00:00
wlx a0de4fb65d merge heihedata branch r5000 to r5007 into trunk 2014-09-18 04:07:54 +00:00
wlx 050f6a0454 merge heihedata branch r4882 - r4999 into trunk 2014-09-13 02:18:32 +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 bdfc8dca5f merge heihedata branch from r4161 to r4168. 2014-01-07 12:56:16 +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 f7eaf86999 merge from heihedata branch from r3956 to r3959. 2013-10-10 02:52:07 +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 ccdb4f2fbc merge heihedata branch r3812 to r3821 for trunk 2013-07-22 11:27:11 +00:00
wlx aa2a230753 merge heihedata branch r3794 to r3799. 2013-07-12 06:54:04 +00:00
wlx 9c281d60f8 merge heihedata branche from r3759 to r3769 2013-06-29 14:40:59 +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 6bed4b8821 切换为全部数字列表 2013-06-18 12:09:16 +00:00
Li Jianxuan a12603a0de #495 修改了文件列表,添加了文件大小和时间的显示 2013-06-18 09:04:45 +00:00
wlx 9b32dd5718 add heihe logo 2013-06-18 03:04:11 +00:00
wlx b60a981a91 merge heihedata branch from r3613 to r3661. 2013-06-08 07:38:33 +00:00
wlx c64ecd7ece change diff view style, try to fix #486 2013-06-06 23:37:30 +00:00
Li Jianxuan 21b13ad8f3 修改kindeditor中允许的文件扩展名 2013-06-06 02:07:30 +00:00
wlx 0e1b55905d change hr height 2013-06-01 01:45:57 +00:00
wlx f31752f178 change index style 2013-06-01 01:21:02 +00:00
wlx cfc0649536 merge heihedata branch from r3591 to r3612. 2013-05-31 02:09:32 +00:00
Li Jianxuan 65c07e543e metadataview中恢复fitBounds 2013-05-28 07:08:32 +00:00
wlx ccef383b14 style change 2013-05-28 03:55:51 +00:00
Li Jianxuan 492e5a25e0 修改data/view中单个点显示为一个小黑块的bug 2013-05-27 09:03:11 +00:00
wlx 84403075e9 merge heihedata branch from r3483 to r3503. 2013-05-13 07:37:48 +00:00
wlx 4079de5c22 import fontawesome 3.1.1 version 2013-05-12 05:44:40 +00:00
Li Jianxuan 326572d7c2 修改了后台元数据评审中发出反馈的的方式 2013-05-10 08:53:24 +00:00
wlx 1cd0a48210 merge heihedata branch from r3451 to r3465 2013-05-08 05:54:39 +00:00
wlx d97bd5b603 change data/offlineapp style 2013-05-07 02:45:31 +00:00
wlx 9fb00529c2 merge heihedata branch from r3436 to r3451. 2013-05-07 01:41:39 +00:00
Li Jianxuan f3e7deaf02 添加了文献排序功能和修改文献的功能 2013-05-06 09:01:14 +00:00
wlx 965cfec4e9 add jplayer skin 2013-05-03 06:20:11 +00:00
wlx 7fe6c51cc7 remove button style 2013-04-24 11:56:56 +00:00
wlx 227a0ca119 remove ul style in water css 2013-04-22 17:29:13 +00:00
Li Jianxuan b315128848 add md-fund remove/order 2013-04-21 01:52:07 +00:00
Li Jianxuan a31fd7ca59 添加了支持项目的操作功能 2013-04-19 10:03:57 +00:00
wlx ba891b7f11 add new logo 2013-04-17 12:45:56 +00:00
wlx 44b2781e89 change form style 2013-04-17 12:44:49 +00:00
wlx 6dc360749d add sidebar style 2013-04-17 01:56:53 +00:00
Li Jianxuan 1b7ce74a20 修改water专题的导航样式和页面模板 2013-04-16 02:15:14 +00:00
Li Jianxuan 6ac2fbf4f7 修改数据页面JS代码,封装独立函数 2013-04-15 07:16:49 +00:00
Li Jianxuan 1576d6f258 修改高级搜索中的bug,修改相关文献和相关搜索部分 2013-04-15 02:34:12 +00:00
wlx 3cec9dc5bf fix #456 2013-04-14 04:50:57 +00:00
wlx 4b46901e1e update OpenLayers to version 2.12 2013-04-14 03:23:43 +00:00
Li Jianxuan 77ec3f7306 fix metadata view page files list bug 2013-04-13 08:58:58 +00:00