Commit Graph

5895 Commits

Author SHA1 Message Date
Jasder 4f8e992fb1 Merge branch 'dev-homepage-revision' into dev_project_new 2019-11-12 10:32:37 +08:00
Jasder 36a11d9690 ADD trustie home edit 2019-11-12 10:20:26 +08:00
Jasder 01b0f6beea Merge branch 'dev_project_new' of http://git.trustie.net/jacknudt/trustieforge into dev_project_new 2019-11-11 14:35:51 +08:00
Jasder 49bbefac2e FIX created_on sort 2019-11-08 23:16:54 +08:00
Jasder b4bca51a85 Merge branch 'dev-homepage-revision' of http://git.trustie.net/jacknudt/trustieforge into dev-homepage-revision 2019-11-08 18:02:00 +08:00
Jasder a46ae51006 ADD project list and search by name 2019-11-08 18:01:48 +08:00
caishi 97d90bdcd4 项目新建页面改版 2019-11-07 15:48:43 +08:00
SylorHuang 82956b37dd 消息的部分优化 2019-11-07 09:04:33 +08:00
SylorHuang 8d55788cd0 个人主页待办事项及底部的部分信息 2019-11-06 14:27:35 +08:00
SylorHuang 9523a8304e 私信添加提醒 2019-10-30 09:44:40 +08:00
SylorHuang 14353bceb6 私信的页面的完成 2019-10-29 19:01:56 +08:00
SylorHuang 82c5fbd4fe Merge branch 'dev_new_head' of http://git.trustie.net/jacknudt/trustieforge into dev_new_head 2019-10-29 10:16:03 +08:00
SylorHuang b650b8efe6 私信未完成 2019-10-29 10:15:57 +08:00
caishi 6452bb1f6f Merge branch 'dev-homepage-revision' into dev_new_head
# Conflicts:
#	app/views/issues/index.html.erb
2019-10-28 17:40:34 +08:00
Jasder 3877d6e29d FIX 完善 网站合作单位的相关功能 2019-10-28 17:27:13 +08:00
caishi 98cfa418ac pull 2019-10-28 15:03:58 +08:00
SylorHuang d8b0a1987e Merge branch 'dev-homepage-revision' into dev_new_head 2019-10-28 14:27:50 +08:00
caishi 774d12ed9d Merge branch 'develop' into dev_new_head 2019-10-28 09:02:43 +08:00
SylorHuang 40941b0f6d 新增私信的前端和后端 2019-10-26 19:13:30 +08:00
Jasder 50047d1e1c ADD web footer companies sort 2019-10-26 18:06:52 +08:00
Jasder b8c67ef297 Merge branch 'dev_new_head' of http://git.trustie.net/jacknudt/trustieforge into dev_new_head 2019-10-26 14:56:58 +08:00
SylorHuang ac49cd0fa8 私信的列表页前后端 2019-10-26 11:07:11 +08:00
Jasder 62f38402f7 Merge branch 'xss-bug' into dev-homepage-revision 2019-10-25 22:27:20 +08:00
SylorHuang 7096abce3b 私信的页面 2019-10-25 16:44:30 +08:00
Jasder b57f5d5d3b ADD build socks shop request 2019-10-24 23:47:07 +08:00
SylorHuang 5064dffbc6 homeservice的修改 2019-10-24 14:50:21 +08:00
SylorHuang e1c89c6662 消息通知 2019-10-23 15:33:06 +08:00
Jasder 9b0c37a9bd FIX 首页更新 2019-10-23 10:10:55 +08:00
SylorHuang 0da8977115 消息通知 2019-10-22 18:42:10 +08:00
caishi 70630df038 首页 2019-10-22 17:55:55 +08:00
caishi 3df8f6acdf 首页修改 2019-10-22 17:55:33 +08:00
SylorHuang 88505a22a4 个人主页的样式和功能 2019-10-22 14:01:58 +08:00
Jasder b4cc5883bd ADD edit and delete dynamic_news 2019-10-22 10:42:52 +08:00
Jasder 418975c21e ADD admin destroy dynamic_new 2019-10-21 17:09:26 +08:00
Jasder 50e31873dc FIX dynamic_news search 2019-10-21 16:47:21 +08:00
SylorHuang 8f9f0215e3 change user page 2019-10-21 15:42:34 +08:00
Jasder 0cc06409c1 FIX 修复home主页链接错误问题 2019-10-18 13:55:20 +08:00
Jasder 63057a1fb5 ADD more news page 2019-10-18 13:35:59 +08:00
Jasder 0bc4ba2ac2 ADD more companies page 2019-10-18 11:05:53 +08:00
caishi 613b371e58 加入项目弹框 2019-10-18 09:10:17 +08:00
Jasder 082056ae47 ADD dynamic managerment 2019-10-17 19:02:48 +08:00
caishi fee44440de 社区动态 2019-10-17 14:33:54 +08:00
Jasder 6070c44ffe FIX logger print 2019-10-17 14:19:20 +08:00
Jasder ea1f3ed5bf ADD frendly_id to homes 2019-10-16 10:31:28 +08:00
Jasder 30ff3234aa ADD home page 2019-10-15 17:34:56 +08:00
Jasder 492a0e10da FIX 2019-10-11 14:02:19 +08:00
Jasder 6c9f4b08ee FIX bug 2019-10-11 13:56:45 +08:00
Jasder 789ee5b87f FIX 版本库不存在时,管理员删除项目出错的bug 2019-10-11 12:58:24 +08:00
jasder f4bc7d1af7 FIX 创建 pull request时关闭代码质量检测功能 2019-09-06 17:15:23 +08:00
cxt 15e0bd4133 打印信息 2019-07-27 17:32:43 +08:00