Commit Graph

409 Commits

Author SHA1 Message Date
wrzzx 22fbf6fdf6 fix.. 2017-02-16 11:22:14 +08:00
wrzzx 614027dec0 fix... 2017-02-16 11:08:00 +08:00
wrzzx e682fcf652 Merge branch 'dev' 2017-02-15 21:54:37 +08:00
wrzzx 91137d2ac4 fix the extractor of the openhub_homepage(by liuyizhou) 2017-02-15 21:51:07 +08:00
nigel cb8348ee24 trustie2 rm ajax type post 2017-02-15 20:59:28 +08:00
nigel 26e7374203 trustie2 add Time.now 2017-02-15 20:36:23 +08:00
nigel 0c8ebe3ec7 trustie add ajax timeout 2000 2017-02-15 20:28:36 +08:00
nigel 8eeba962fa trustie2 welcome search ajax rm post 2017-02-15 19:40:51 +08:00
nigel 8269276efa trustie2 route.rb test 2017-02-15 19:27:15 +08:00
nigel 34aef80f77 trustie2 _base_welcome_header callback 2017-02-15 19:07:59 +08:00
nigel a376286a97 trustie test user_trace 2017-02-15 18:54:32 +08:00
nigel 8f435bdcad Merge branch 'master' of https://git.trustie.net/gcm3651/ossean 2017-02-15 17:21:41 +08:00
nigel 150ff3cabd rm trustie user_traces_controller writeDatabase if 2017-02-15 17:21:33 +08:00
wrzzx ae32cea6d8 fix the resource root 2017-02-15 13:00:43 +08:00
wrzzx 126a1f18da fix the openhub-extract process 2017-02-13 17:39:21 +08:00
湛云 aa7a2f96b9 Merge branch 'zxh' into 'master'
将alert session_id注释掉了



See merge request !6
2017-02-13 16:41:00 +08:00
nigel 9259b5b817 rm alert session_id 2017-02-13 16:39:12 +08:00
湛云 b94f3eb837 Merge branch 'zxh' into 'master'
删除了一个migrate文件

delete migrate create_user_actions.rb

See merge request !5
2017-02-13 15:37:44 +08:00
nigel a53f17656c delete create_user_actions.rb migrate 2017-02-13 15:35:02 +08:00
湛云 4261c4a46c Merge branch 'zxh' into 'master'
用户行为监控

将用户行为监控从日志文件转移到数据库user_actions表中 将搜索帖子的注释取消

See merge request !4
2017-02-13 15:31:14 +08:00
nigel 594210e172 uncomments search knowledge 2017-02-13 11:11:32 +08:00
nigel 4e3ff50396 Merge branch 'master' of https://git.trustie.net/gcm3651/ossean 2017-02-13 09:27:44 +08:00
nigel 879c4a3847 change click_project_after_search session_id 2017-02-11 10:23:51 +08:00
wrzzx 74a8487e6c Merge branch 'master' of https://git.trustie.net/gcm3651/ossean 2017-02-09 16:28:50 +08:00
ronger bb1fd8e063 transfer error verify 2017-02-07 10:11:26 +08:00
ronger b833748d69 modify error 2017-02-07 02:57:05 +08:00
ronger 107b1c1c87 add try catch 2017-02-07 02:41:01 +08:00
ronger e5df8eff14 add try catch error 2017-02-07 02:15:51 +08:00
ronger e95ac6ae9c update main program 2017-02-07 01:59:25 +08:00
nigel bf80c073a9 add trustie_user_id to session; set session to 60 minutes; change log to database 2017-02-01 23:30:19 +08:00
ronger 53b0450904 modify homepege with same source 2017-01-31 14:08:42 +08:00
ronger 5ba973b60f modify mergerprjects 2017-01-31 13:41:48 +08:00
ronger a945a485f9 modify mergerprjects 2017-01-31 13:40:36 +08:00
ronger 318452bea1 add sourceforge desc check 2017-01-31 13:26:39 +08:00
ronger c8bef39062 add check openhub prj to MergerProjectsNew2.java 2017-01-31 12:44:37 +08:00
waterbeach 3631f4178b check openhub url multi thread~ 2017-01-21 15:58:17 +08:00
waterbeach 35286cb78b check openhub url multi thread 2017-01-21 15:56:18 +08:00
wrzzx 7a3789536e fix some problems 2017-01-21 14:00:18 +08:00
waterbeach 6a1f6692eb add check openhub url validity 2017-01-21 11:09:46 +08:00
waterbeach 2a4ef6c78c delete code comment and sysout 2017-01-21 10:18:42 +08:00
waterbeach 5cc72deabb delete code comment 2017-01-21 10:15:03 +08:00
waterbeach 5925ddc7c7 add check openhub homepage.. 2017-01-21 10:11:28 +08:00
waterbeach 3e3e04781d add check openhub homepage 2017-01-21 10:09:35 +08:00
waterbeach 9982f38f35 add check openhub url 2017-01-21 09:55:29 +08:00
ronger 49fdf2ee95 update project_match by zyr 2017-01-20 23:39:41 +08:00
wrzzx cd203ca23d fix scripts 2017-01-20 15:00:48 +08:00
wrzzx dc9847175e modify the crawler 2017-01-20 11:35:47 +08:00
ronger 4cb14eab2c Revert "update project from zyr"
This reverts commit 6eec0ae436.
2017-01-20 00:07:05 +08:00
waterbeach 6eec0ae436 update project from zyr 2017-01-19 23:30:43 +08:00
zhanyun 8ef4a4900e trustie2/config/database.yml.example 2017-01-04 14:42:52 +08:00