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

5320 Commits

Author SHA1 Message Date
黄井泉 4125c1b44a Merge branch 'develop' into 'develop' 
issue详情页面一、二级回复、一级删除局部刷新



See merge request !80
 2016-12-23 14:35:51 +08:00
huang 37f1aa1442 邮件相关改进 2016-12-23 14:29:48 +08:00
daiao fd97d8b421 课程社区的首页动态，加入班级资源库动态 2016-12-23 14:03:43 +08:00
daiao a40b7f6fd0 申请项目，申请人接受到的消息调整为：申请人头像+申请姓名+消息 2016-12-23 09:34:23 +08:00
daiao 884a201953 项目加入申请，被审批后，其他管理员的消息显示加入操作人姓名（并将提示弹框改为新版） 2016-12-22 13:48:03 +08:00
daiao 2f86fa5c5f 待审判用户，管理员批准时，其实管理员依旧还显示的问题 2016-12-21 14:56:49 +08:00
daiao 51f5bb6050 课程和项目的首页，在标签名称中显示 2016-12-21 10:29:54 +08:00
huang ff34ec6de8 版本库下载 参数加密 gitlab添加解密功能 2016-12-20 16:33:26 +08:00
daiao de44385548 Issue统计页面，增加用户筛选过滤条件的提示 2016-12-20 15:45:33 +08:00
daiao c2924e06e6 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-20 11:04:39 +08:00
daiao 2b60143f78 博客，班级的帖子标题和内容，留言显示出现英文单词分隔显示问题 2016-12-20 11:04:16 +08:00
huang d304555044 用户修改密码、删除项目成员 添加事务处理 2016-12-19 17:26:56 +08:00
huang 7faddc30c5 项目成员编辑 添加事务 2016-12-19 17:08:32 +08:00
huang 05d10e20d1 项目添加成员 使用事务处理 2016-12-19 17:04:27 +08:00
huang a3e3c9d4db 版本库创建添加事务处理（两边数据一致性） 2016-12-19 16:36:25 +08:00
huang cc68f33a5a issue 详情删除局部刷新 2016-12-19 15:29:39 +08:00
huang 1caf8d9935 issue 详情页面二级回复局部刷新 2016-12-19 15:16:45 +08:00
huang 3c1de111c6 issue回复局部刷新（项目动态、用户动态。issue详情） 2016-12-19 15:02:40 +08:00
guange 34f8450885 ids为空时不需要执行 2016-12-18 18:29:24 +08:00
guange 6ef7a15a5b 设置只读不需要放到delayed_job 2016-12-18 12:28:56 +08:00
daiao 96e02cd48f 项目社区、课程社区点击我的动态错误，新建用户个人主页显示错误 2016-12-17 17:04:44 +08:00
daiao d16e9e4ecd Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-17 15:38:49 +08:00
cxt 158ea7dc41 问卷报网络异常 2016-12-17 15:36:45 +08:00
daiao 73747a81d6 个人主页消息铃铛翻页 2016-12-17 15:34:26 +08:00
cxt 21377fa45a 班级作业：评分设置中“最终评分”设置为“助教评分+学生匿评”不可用 2016-12-17 14:36:32 +08:00
cxt fc67e6e3be Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	app/views/users/_anonymous_evaluation_list.html.erb
 2016-12-17 10:25:48 +08:00
cxt 2275a0ecae 首页、课程社区、项目社区的点击展开更多 2016-12-17 09:38:32 +08:00
cxt b661593e29 问卷创建者不应填问卷 2016-12-17 09:37:26 +08:00
黄井泉 353073c82a Merge branch 'develop' into 'develop' 
个人主页功能

个人主页功能

See merge request !67
 2016-12-16 20:57:21 +08:00
daiao 72ff880424 个人主页样式调整 2016-12-16 20:19:57 +08:00
daiao e30006be39 个人主页样式调整 2016-12-16 18:47:15 +08:00
cxt a67d809168 在导出的Excel中，如果用户填写了其它，则应该在下方的列表中记录“其它（我录入的其它回复）” 2016-12-16 17:27:24 +08:00
cxt d8f098c6f4 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	app/views/users/_user_message_course.html.erb
 2016-12-16 16:56:21 +08:00
huang f71ccb6c67 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-16 16:30:25 +08:00
cxt 8e20dd1a5f issue详情页面的回复调整 2016-12-16 16:30:08 +08:00
黄井泉 48774d7ab7 Merge branch 'develop' into 'develop' 
个人主页

个人主页

See merge request !61
 2016-12-16 16:29:39 +08:00
黄井泉 85d01a7392 Merge branch 'guange_dev' into 'develop' 
去除个人信息编辑中的邮箱



See merge request !56
 2016-12-16 16:27:28 +08:00
huang c477d15fae Merge branch 'dev_newproject' into develop 2016-12-16 16:13:26 +08:00
huang 4c340a5822 个人主页申请类消息统计 2016-12-16 16:03:59 +08:00
daiao ce9f9ff209 Merge branch 'develop' of https://git.trustie.net/daiao/trustieforge into develop 2016-12-16 15:32:36 +08:00
daiao 27597cf6ed 个人主页 2016-12-16 15:32:30 +08:00
cxt bc16476646 首页待办任务个数的计算调整 2016-12-16 15:28:45 +08:00
daiao c42fd235e8 Merge branch 'develop' of https://git.trustie.net/daiao/trustieforge into develop 
Conflicts:
	app/views/users/_new_user_message.html.erb
	public/stylesheets/css/user.css
 2016-12-16 14:51:10 +08:00
cxt 0fe7b96473 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/users/_new_user_message.html.erb
	public/stylesheets/css/user.css
 2016-12-16 14:41:37 +08:00
cxt 271cee79d1 待匿评的作业 2016-12-16 14:38:27 +08:00
huang a148f3c157 Merge branch 'dai_ao' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/users/_new_user_message.html.erb
	public/stylesheets/css/user.css
 2016-12-16 14:06:17 +08:00
cxt 6dfebd447c 导入的试卷进入查看页报500 2016-12-16 14:05:14 +08:00
daiao 1ff1ed3c54 个人主页 2016-12-16 14:03:01 +08:00
huang c0391b967f 注册用户发送留言 、留言页面代码优化 2016-12-16 11:42:52 +08:00
cxt 710c06e41a 匿评成绩的申诉功能 2016-12-16 11:01:58 +08:00