jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
18,410 Commits 98 Branches 0 Tags 0 B
Commit Graph

2104 Commits

Author SHA1 Message Date
daiao 4f2bd2dc31 还原pullrequest小铃铛消息 2017-01-06 12:15:46 +08:00
daiao 230e8c3605 进入他人的首页，增加“TA的主页”入口 2017-01-05 15:18:20 +08:00
daiao 25d8452b86 用户申请加入班级，被管理员审批后，用户收到的消息调整 2017-01-05 14:32:33 +08:00
daiao 602870069f 将pullrequest消息放入小铃铛内 2017-01-05 13:35:19 +08:00
daiao 5cc362e6eb 我收到的作业 2017-01-05 10:14:56 +08:00
daiao e43ef02d57 我发布的作业 2017-01-05 09:06:41 +08:00
daiao 111bf5a140 新注册用户，课程，项目，竞赛数据为空时，不显示 2017-01-04 14:49:21 +08:00
daiao 82a253765c 我收到的issues 2017-01-04 13:33:01 +08:00
daiao 432c98881b Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-01-04 10:41:38 +08:00
daiao 53d48b7559 我发布的Issue 2017-01-04 10:41:26 +08:00
daiao 8fad30da15 admin隐藏非项目信息 2017-01-03 16:40:08 +08:00
daiao e5363e82cf Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dev_tieba 2017-01-03 16:24:19 +08:00
huang 148d958de6 隐藏非项目信息的一些修改 2017-01-03 16:21:50 +08:00
daiao d87430ae31 将用户头像区域的背景换回彩色 2017-01-03 16:21:47 +08:00
daiao 58615d93f7 隐藏和显示非项目信息 2017-01-03 16:16:44 +08:00
huang b9eb320d17 用户注册激活、token值过期添加提示 2017-01-03 15:20:31 +08:00
daiao fbfbc0cdeb 问吧样式调整 2016-12-30 21:05:14 +08:00
huang 17d4e45acc Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/layouts/_logined_header.html.erb
 2016-12-30 17:33:18 +08:00
cxt 986fe7db86 竞赛增加讨论区模块 2016-12-30 16:37:20 +08:00
huang 2c7e7bed0b Merge branch 'develop' into dev_tieba 2016-12-30 15:04:43 +08:00
cxt 6ba5f124e3 竞赛相关icon更换 2016-12-30 13:58:40 +08:00
cxt d1fbaa27b9 竞赛 ：作品--》提交 2016-12-30 13:58:09 +08:00
daiao 70e8e51a5e 问吧-贴吧右侧js调整 2016-12-30 13:49:57 +08:00
daiao 37d82f6c8a 问吧的贴吧右上角标签，编辑和删除js 2016-12-30 11:32:32 +08:00
cxt 738db43f34 具体竞赛页的邀请码tip没有显示、竞赛菜单的“暂停加入”和“删除” 2016-12-30 11:18:29 +08:00
daiao 16e1f0c701 导航栏“帮助中心”改为“问吧”，并调整帖子展示内容的高度 2016-12-30 10:45:22 +08:00
cxt 73350e34f1 竞赛作品的相关设置 2016-12-30 10:30:21 +08:00
daiao ba08bbf906 贴吧右侧的贴吧列表页面 2016-12-29 13:52:45 +08:00
huang b2a53b65f8 邮件激活页面，并添加留言功能 2016-12-29 10:47:35 +08:00
huang 91e452b0c8 邮件激活新页面 2016-12-28 17:58:27 +08:00
daiao 506d7ae82c Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into dev_tieba 2016-12-28 16:38:30 +08:00
daiao 64c6fa1f37 首页显示的个人信息区域北京，换成灰度背景 2016-12-28 09:55:59 +08:00
huang 465b3e7b52 问吧 base框架 2016-12-27 16:09:09 +08:00
huang 30d0cfc2af Merge branch 'develop' into dev_tieba 2016-12-27 13:28:36 +08:00
huang 616e7a2a11 公共贴吧 2016-12-27 12:12:07 +08:00
cxt 3d30a11f66 导航栏头部增加竞赛入口 2016-12-27 10:06:56 +08:00
cxt e22e1caaed bug修复 2016-12-24 18:48:50 +08:00
daiao e86bd6728e Merge branch 'cxt_course' into develop 
Conflicts:
	app/controllers/users_controller.rb
	app/helpers/application_helper.rb
	app/views/users/_user_activities.html.erb
	db/schema.rb
 2016-12-24 16:48:48 +08:00
cxt 9af9945cb4 竞赛 2016-12-24 16:29:10 +08:00
cxt 44b3f6019c Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-23 21:44:20 +08:00
cxt 86bd5b97b1 竞赛头部调整 2016-12-23 21:44:03 +08:00
huang 69bacc1f6e base添加竞赛入口 2016-12-23 20:27:16 +08:00
daiao 1c868e5f12 Issue统计过滤条件样式调整。管理员帖子界面点击跳新页面 2016-12-23 18:42:44 +08:00
cxt 544702e11f 新建题目 2016-12-23 14:41:21 +08:00
huang b74c034237 项目配置添加ke编辑 base中去掉配置 2016-12-22 16:39:54 +08:00
huang 0d00b6ca74 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-12-22 15:17:54 +08:00
huang 037e717937 竞赛邀请码 竞赛settings（部分） 2016-12-22 15:17:02 +08:00
cxt cf8725f2ee Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-22 15:08:49 +08:00
cxt 4c5a2aa40b 加入竞赛 2016-12-22 15:08:15 +08:00
huang 01d9fbbef3 组织base框架 2016-12-22 14:47:42 +08:00