 daiao
|
cd76f92405
|
博客回复消息加入小铃铛；申请加入项目的操作样式修改
|
2017-01-13 17:00:43 +08:00 |
|
daiao
|
0591440c9e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/controllers/users_controller.rb
app/views/users/_user_message_forge.html.erb
db/schema.rb
|
2017-01-13 11:28:33 +08:00 |
 黄井泉
|
c177230b08
|
Merge branch 'develop' into 'develop'
这周上线任务
See merge request !122
|
2017-01-13 11:24:07 +08:00 |
|
huang
|
d5a0133b0b
|
个人主页部分优化
|
2017-01-12 16:19:11 +08:00 |
|
daiao
|
fd61782739
|
修复申请加入项目被审批后，出现的审批人名字错误的缺陷
|
2017-01-12 10:19:10 +08:00 |
|
huang
|
6aa2052c7f
|
版本库界面改版及show页面代码优化
|
2017-01-12 10:11:42 +08:00 |
 cxt
|
14652ea6ff
|
项目社区/课程社区：如图将项目“设为公开/私有”，项目列表中状态没有自动刷新
|
2017-01-11 15:42:03 +08:00 |
|
cxt
|
c44af451ce
|
竞赛增加留言模块
|
2017-01-11 10:16:25 +08:00 |
|
daiao
|
84a0c1d7b7
|
将pulrequest放入小铃铛消息并加入到待审批消息；调整贴吧样式，及其个人主页头部样式
|
2017-01-10 14:22:27 +08:00 |
|
cxt
|
d4d8a82e8b
|
竞赛成员申请的审批结果消息通知，与班级、项目的最新处理方式一致，请修正
|
2017-01-09 11:10:45 +08:00 |
|
cxt
|
cb8d295088
|
竞赛首页报500
|
2017-01-06 22:35:44 +08:00 |
|
cxt
|
406d987125
|
加入竞赛消息通知未显示在未读消息列表中
|
2017-01-06 18:53:39 +08:00 |
|
cxt
|
83c00d1225
|
竞赛图片的上传
|
2017-01-06 15:52:34 +08:00 |
|
cxt
|
cc4d46c3ee
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/css/common.css
|
2017-01-06 15:06:22 +08:00 |
|
cxt
|
44e1a09906
|
竞赛图片上传
|
2017-01-06 15:03:01 +08:00 |
|
daiao
|
4f2bd2dc31
|
还原pullrequest小铃铛消息
|
2017-01-06 12:15:46 +08:00 |
|
cxt
|
1fce3e7778
|
在线评审启动失败发消息
|
2017-01-05 19:12:31 +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 |
|
cxt
|
9f62c3d22a
|
竞赛相关消息通知的完善
|
2017-01-04 15:53:36 +08:00 |
|
daiao
|
111bf5a140
|
新注册用户，课程，项目，竞赛数据为空时，不显示
|
2017-01-04 14:49:21 +08:00 |
|
cxt
|
b539c201bc
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2017-01-04 14:02:00 +08:00 |
|
cxt
|
c36b454c6b
|
竞赛的子讨论区和子讨论区的配置页面
|
2017-01-04 14:01:46 +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 |