Commit Graph

4372 Commits

Author SHA1 Message Date
Jasder 3978b14e2a FIX 更改导航栏间距 2020-02-10 10:22:58 +08:00
caicai8 caa48d7942 back 2019-12-26 09:31:18 +08:00
caicai8 a882d17d1d 项目banner图背景色 2019-12-23 09:10:22 +08:00
caishi 17869b774b 项目动态-json格式的数据未换行 2019-11-21 14:36:47 +08:00
SylorHuang f6ec18e3d5 新建项目添加choosen 2019-11-18 10:55:03 +08:00
caishi 6a692adee7 导航选中样式 2019-11-15 10:30:35 +08:00
caishi 5c400eab28 导航选中样式 2019-11-15 10:13:38 +08:00
caishi d501415da4 头部定位 2019-11-13 15:56:26 +08:00
SylorHuang 22a0e156c0 修复冲突 2019-11-13 13:11:11 +08:00
SylorHuang 195e8c5a3d 个人主页和关注和私信 2019-11-13 13:10:00 +08:00
caishi 88172dbe1e fix 2019-11-13 09:11:32 +08:00
caishi 7963f0d300 我发布的issue页面 2019-11-13 09:11:02 +08:00
Jasder 69bdb65ec7 ADD init some licenses and ignores 2019-11-12 16:53:04 +08:00
Jasder 4f8e992fb1 Merge branch 'dev-homepage-revision' into dev_project_new 2019-11-12 10:32:37 +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
caishi 0bce630c8c 项目主页 2019-11-11 09:20:56 +08:00
caishi 29e65d2f1c 博客 2019-11-07 18:09:18 +08:00
caishi a8510bb4da 博客 2019-11-07 18:08:53 +08:00
caishi 97d90bdcd4 项目新建页面改版 2019-11-07 15:48:43 +08:00
SylorHuang 2c0e26499e Merge branch 'dev_new_head' into dev-homepage-revision 2019-11-06 14:41:46 +08:00
SylorHuang 7f29a13fab add myimgh48 css 2019-11-06 14:41:30 +08:00
SylorHuang b988cb0a54 Merge branch 'dev_new_head' into dev-homepage-revision 2019-11-06 14:35:46 +08:00
SylorHuang 8d55788cd0 个人主页待办事项及底部的部分信息 2019-11-06 14:27:35 +08:00
caishi b0ecc9f819 nyan 2019-11-04 15:25:22 +08:00
caishi 61b844dfd4 个人主页左侧 2019-11-04 15:05:13 +08:00
SylorHuang 9523a8304e 私信添加提醒 2019-10-30 09:44:40 +08:00
SylorHuang 4555eba8e7 私信的功能完成 2019-10-29 19:03:37 +08:00
SylorHuang 14353bceb6 私信的页面的完成 2019-10-29 19:01:56 +08:00
caishi 96816ffb5d 待办事项页面 2019-10-29 17:32:35 +08:00
caishi 3ab74de0eb Merge branch 'dev-homepage-revision' into dev_new_head 2019-10-29 11:25:01 +08:00
caishi 26cee33e9e common.css 2019-10-29 11:23:08 +08:00
caishi 644300ccaa fix 2019-10-29 11:21:41 +08:00
caishi c041de02a7 新版个人主页和“TA的主页”的左侧头像和个人信息显示调整 2019-10-29 11:20:55 +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 6ebd78f3cc Merge branch 'dev-homepage-revision' into dev_new_head 2019-10-29 09:53:08 +08:00
caishi e64c570b38 fix 2019-10-29 09:52:32 +08:00
caishi 1e7587f69c Merge branch 'dev-homepage-revision' into dev_new_head
# Conflicts:
#	public/stylesheets/css/iconfont/iconfont.css
2019-10-28 17:46:04 +08:00
caishi caf41f92b1 icon1 2019-10-28 17:44:11 +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
caishi 008e8a0f7a icon 2019-10-28 17:36:56 +08:00
caishi f5d6e1f347 icon 2019-10-28 17:36:15 +08:00
caishi 95f83f7793 个人主页 2019-10-28 17:32:40 +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 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 52bebf73b8 Merge branch 'dev_new_head' of http://git.trustie.net/jacknudt/trustieforge into dev_new_head 2019-10-26 11:07:16 +08:00