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

5108 Commits

Author SHA1 Message Date
daiao 3080c8ff09 里程碑列表，新建弹框 2016-10-26 18:04:12 +08:00
huang a83f5317bb 里程碑列表页面添加删除 2016-10-26 16:28:40 +08:00
huang 68ff26e3ef Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-26 15:41:07 +08:00
huang 7035dab4ce pull request 提交动态按天排序 2016-10-26 15:40:44 +08:00
daiao a40d6933f6 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-26 15:18:42 +08:00
daiao 3229277737 里程碑编辑弹框 2016-10-26 15:18:07 +08:00
huang 5eb82de6e0 pull request权限判断 2016-10-26 13:45:15 +08:00
yuanke a9136bd8d0 班级微信通知改为异步发送 2016-10-26 11:18:05 +08:00
huang 187a96b251 pull request评论局部刷新及样式 2016-10-25 15:34:32 +08:00
huang a0ff6a0cb1 完成项目讨论区的拉宽工作 2016-10-25 14:47:05 +08:00
huang f41696eaee 版本库创建跳转及显示 2016-10-25 13:32:22 +08:00
huang a86ad7d99a 项目配置各种局部刷新（新建编辑提示等） 2016-10-25 11:11:25 +08:00
cxt c962e3c18b 导入问卷后进入问卷再回退，再点击该问卷，页面报404 2016-10-24 17:35:06 +08:00
huang 651ea5d189 配置页面，里程碑编辑删除局部刷新以及标题为空JS判断 2016-10-24 16:36:08 +08:00
cxt 3d3b46f7f3 问卷：没有选定时，其它 选项的输入框禁用。选择了才可用 2016-10-24 16:01:46 +08:00
huang d385123a93 里程碑添加导出功能 2016-10-24 15:42:22 +08:00
cxt fcb1d4d115 打开分班名称编辑框后，点击其他分班名称或全部、未分班，数据刷新，但是编辑框未收起，应该收起 2016-10-24 14:02:09 +08:00
huang db50d32f78 二级回复样式 2016-10-24 11:33:06 +08:00
yuanke b7cd1e8fa2 Merge branch 'cxt_course' into develop 2016-10-21 19:59:37 +08:00
cxt fefc1bf800 分組作业的动态和详情的调整、作品列表增加项目提示和老师加入项目的功能 2016-10-21 19:58:02 +08:00
yuanke 5811f3944e 小班导出列表500BUG 2016-10-21 19:25:09 +08:00
yuanke f785fe4fbd 修改路由 2016-10-21 19:14:07 +08:00
daiao e23b01f90c 项目里程碑详情页面的issue统计页面 2016-10-21 19:04:58 +08:00
yuanke bb5d957ec5 Merge branch 'cxt_course' into develop 2016-10-21 17:46:29 +08:00
cxt 4da113dc19 讨论区增加“添加子栏目”按钮跳到设置页面的添加子栏目 2016-10-21 17:40:19 +08:00
cxt 3d29eb2be0 分班批量添加学生、小班页面 2016-10-21 17:34:02 +08:00
daiao fa453090aa 项目里程碑详情页面 2016-10-21 16:16:26 +08:00
yuanke 7f99c2fdc5 Merge branch 'weixin_guange' into develop 2016-10-21 15:39:28 +08:00
yuanke a363b89e32 点联系我们提示文字修改 2016-10-21 15:22:08 +08:00
huang 49c77312da Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-21 14:23:20 +08:00
daiao 624cba3228 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-21 14:22:44 +08:00
daiao 64dd693e6f 项目里程碑详情页面 2016-10-21 14:22:14 +08:00
huang 6481978def Merge branch 'rep_quality' into develop 2016-10-21 14:20:32 +08:00
yuanke 1f0e8649b9 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-21 14:07:14 +08:00
yuanke 8e35158fe9 增加统计功能 2016-10-21 14:06:45 +08:00
huang 6b8184ed49 issue模块新版二级回复ajax刷新 2016-10-21 13:27:41 +08:00
huang 3ccff07bf0 项目动态issue模块删除的时候样式 2016-10-21 11:26:15 +08:00
huang a3da43b793 里程碑列表 2016-10-20 18:08:24 +08:00
cxt 0ccb6b884a 编辑作业时分组作业的评分比例 2016-10-20 17:31:48 +08:00
cxt e8d7e64f80 主页子页面链接 2016-10-20 16:18:45 +08:00
cxt bee1597167 删除的个人主页报500 2016-10-20 15:01:05 +08:00
cxt 269083c4a6 分组作业的评分设置 2016-10-20 14:24:07 +08:00
cxt 70c7b0d12c 设为主页后页面未刷新 2016-10-19 20:44:14 +08:00
cxt e5cfcdc038 个人主页列表的翻页 2016-10-19 20:33:39 +08:00
cxt 251465ceb5 袁可 编程 2016-10-19 19:41:02 +08:00
cxt 85f489eb97 主页页面设为主页或取消首页后跳转至主页列表、已设为主页的始终显示在前方 2016-10-19 19:38:44 +08:00
cxt bebff7b24a “个人主页列表"变细体、编辑时也可设为主页 2016-10-19 19:05:42 +08:00
cxt 6109a1602b Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-10-19 18:11:02 +08:00
cxt e102815f60 个人主页 2016-10-19 18:03:59 +08:00
huang c34209534d 版本库展开文件目录异步刷新 2016-10-19 15:51:55 +08:00
huang 97172ed76f 版本库异步加载 2016-10-19 15:18:26 +08:00
huang cff887a2be 删除项目的时候删除版本库功能 2016-10-19 11:23:15 +08:00
huang fce6c407c8 Merge branch 'rep_quality' into dev_newproject 
Conflicts:
	app/controllers/projects_controller.rb
	app/views/layouts/base_projects.html.erb
	app/views/projects/settings/_new_edit.html.erb
	public/stylesheets/css/project.css
 2016-10-19 11:27:49 +08:00
huang e3ef502be2 版本库删除功能 2016-10-19 10:09:38 +08:00
huang 72ce5a51ed 新版项目顶部样式JS控制 2016-10-19 10:01:14 +08:00
huang 207273839b Merge branch 'dev_newrep' into dev_newproject 
Conflicts:
	app/controllers/projects_controller.rb
	app/views/projects/settings/_new_repositories.html.erb
 2016-10-19 08:53:38 +08:00
cxt 8648ea605f 问卷导出的统计结果：“其他”选项要标出来，多行主观题要对各小题标识出来 2016-10-18 11:14:29 +08:00
cxt a709f5c720 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-15 15:16:39 +08:00
cxt a289a2cee0 班级问卷：新建时只保存并设置学生可查看统计列表，再到问卷列表中去发布，但实际学生不能查看统计结果 2016-10-15 15:16:21 +08:00
huang 106e77409b Merge branch 'dev_shcool' of https://git.trustie.net/jacknudt/trustieforge into dev_shcool 2016-10-15 12:36:42 +08:00
huang 50ba2fb04f 多个历史版本和没有历史版本删除附件提醒 2016-10-15 11:31:15 +08:00
huang 5532ec3b86 Merge branch 'develop' into dev_newproject 
Conflicts:
	app/views/issues/index.html.erb
	app/views/layouts/base_projects.html.erb
	public/stylesheets/css/project.css
 2016-10-15 10:53:01 +08:00
daiao d3575b288e Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 
Conflicts:
	db/schema.rb
 2016-10-15 09:00:03 +08:00
daiao 3ceee6522b 还原新建贴吧报贴吧名已存在的问题 2016-10-14 21:05:40 +08:00
huang 80bf13c516 资源库删除历史版本功能 2016-10-14 19:21:41 +08:00
huang 0760836f29 项目base优化 2016-10-14 17:23:51 +08:00
cxt ce1da89e02 Merge branch 'cxt_replies' into develop 2016-10-14 16:18:43 +08:00
cxt a1b70a7e91 Merge branch 'cxt_course' into develop 2016-10-14 16:18:12 +08:00
huang 446f0d142c Merge branch 'rep_quality' into develop 2016-10-14 16:11:49 +08:00
huang b9d87b1b29 Merge branch 'develop' into rep_quality 
Conflicts:
	public/stylesheets/css/project.css
 2016-10-14 15:43:45 +08:00
cxt 5f04baf572 博客动态回复显示：“展开更多”、“收起回复”点击无反应 2016-10-14 15:09:47 +08:00
cxt f87e335acf 课程大纲、作业二级回复不可用 2016-10-14 15:01:36 +08:00
huang 4646f20bba 项目版本库历史版本删除功能及弹框样式 2016-10-14 14:28:51 +08:00
cxt 12ad7c1612 班级讨论区增加二级子栏目 2016-10-14 14:28:19 +08:00
huang db63a5514d 项目资源库历史版本更新及局部刷新 2016-10-14 13:45:47 +08:00
daiao c26af37456 管理员界面项目列表可以按状态进行搜索功能；游客身份，班级留言右侧“+"隐藏 2016-10-14 09:29:53 +08:00
daiao 2324ad31e2 Merge branch 'develop' into dev_newproject 
Conflicts:
	app/views/issues/index.html.erb
	public/stylesheets/css/common.css
	public/stylesheets/css/project.css
 2016-10-13 17:00:53 +08:00
yuanke 7dc0ba005e Merge branch 'dev_shcool' into develop 
Conflicts:
	app/views/issues/index.html.erb
	app/views/users/_course_newslist.html.erb
 2016-10-13 14:37:37 +08:00
cxt f56fc5a44d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-13 14:25:36 +08:00
yuanke 1afa774fa9 Merge branch 'weixin_guange' into develop 2016-10-13 14:23:52 +08:00
cxt d2b6d81373 Merge branch 'cxt_replies' into develop 
Conflicts:
	app/views/blog_comments/show.html.erb
	app/views/blogs/_article.html.erb
	app/views/org_document_comments/show.html.erb
 2016-10-13 14:22:05 +08:00
cxt 5fb7da4681 Merge branch 'cxt_course' into develop 
Conflicts:
	public/stylesheets/css/public.css
 2016-10-13 14:17:54 +08:00
cxt b8296f3e7e 首页的课程列表显示缺漏 2016-10-13 14:08:20 +08:00
cxt d87e4f368a 学生答完问卷后的显示界面调整，提交问卷时的必答题的判断，新建题目时先不输入标题会提示“标题不能为空”、接着输入标题后依然提示“标题不能为空” 2016-10-13 11:22:38 +08:00
cxt 8b4c02ec98 问卷增加其他选项、多行主观题的改版 2016-10-13 10:17:09 +08:00
yuanke 0265b6bfb7 搜索分页修改 2016-10-13 09:52:05 +08:00
huang dd4d20011d 公共资源库显示优化 2016-10-13 09:43:53 +08:00
huang edf2a059e8 Merge branch 'develop' into rep_quality 2016-10-13 09:00:35 +08:00
yuanke 5ac30fe09c Merge branch 'cxt_replies' into weixin_guange 2016-10-13 08:49:20 +08:00
yuanke e52026142a 主页搜索功能的下一页修改 2016-10-12 17:10:38 +08:00
daiao 065ec67417 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-12 17:03:33 +08:00
huang 4348ae653f Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-12 17:03:05 +08:00
huang 10778fabc9 新版版本库界面代码整理 2016-10-12 17:02:51 +08:00
daiao 4093847017 Merge branch 'develop' into dev_newproject 2016-10-12 16:29:14 +08:00
daiao b925ee312e Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-12 16:28:02 +08:00
daiao 9b5999eed1 项目Issue列表功能 2016-10-12 16:27:50 +08:00
huang 50f9c5244d 项目配置--版本库代码简化及界面 2016-10-12 16:09:17 +08:00
huang 57d1397597 版本库界面优化（未完） 2016-10-12 10:45:14 +08:00
cxt a581f989c9 给messages、journals_for_messages、blog_comments、org_document_comments表增加root_id，优化平台的回复 2016-10-11 14:08:44 +08:00
huang a206a471af Merge branch 'dev_newproject' into dev_newrep 
Conflicts:
	app/controllers/repositories_controller.rb
	app/views/layouts/base_projects.html.erb
 2016-10-11 10:58:37 +08:00
huang e9a1582b71 项目添加收藏功能 2016-10-11 09:30:45 +08:00
cxt 405e2cfb9b 问卷单选题 2016-10-11 08:51:00 +08:00
daiao 850a88c6b0 组织帖子，回复有时不可用 2016-10-10 17:31:39 +08:00
cxt 3217f84df2 问卷的单选题 2016-10-10 14:13:20 +08:00
huang 17743457e1 项目menu导航 2016-10-10 10:41:41 +08:00
yuanke 9ca685ea94 搜索课程 2016-10-09 16:10:33 +08:00
yuanke c4de8cf948 调试 2016-10-09 16:00:41 +08:00
cxt 38589641a3 删除未命名的问卷 2016-10-09 15:44:16 +08:00
huang acb6fcfc81 Merge branch 'develop' into dev_newrep 2016-10-09 15:36:49 +08:00
huang 2e94fbee81 项目、课程、组织资源描述过长不能提交的问题 2016-10-09 15:09:18 +08:00
yuanke 5d5306dede 搜索课程 2016-10-09 15:05:50 +08:00
cxt 3b44f05b2b 博客的详情页回复分页、博客列表的回复数未统计二级回复 2016-10-09 11:12:44 +08:00
yuanke eb3a463166 Merge branch 'develop' into weixin_guange 2016-10-09 10:36:18 +08:00
yuanke d407b5ab10 搜索中加入课程 2016-10-09 10:35:43 +08:00
cxt b123192286 分组作业的匿评分配 2016-10-09 09:48:55 +08:00
huang 45d8e64840 修改gitlab tree返回类型（lastrev） 2016-10-09 09:30:20 +08:00
cxt f0e334d33d 分组作业的迟交扣分和缺评扣分 2016-10-09 09:16:05 +08:00
daiao da630a728e Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-10-09 09:02:39 +08:00
daiao b259f92381 一级帖子栏目默认展示5个，点击可进入详情页面， 2016-10-09 09:02:12 +08:00
cxt 12d70c6999 分组作业编辑时“基于项目实施”的设置不起作用 2016-10-08 18:06:09 +08:00
cxt f332f2a469 组织文章的回复作分页 2016-10-08 17:50:06 +08:00
huang 937f93e756 Merge branch 'develop' into dev_newrep 2016-10-08 16:05:47 +08:00
huang 54b66b86dc 0 2016-10-08 15:58:05 +08:00
huang b7b94fb050 版本库控制器代码优化一 2016-10-08 14:57:55 +08:00
cxt 6ef45a094f Merge branch 'cxt_course' into develop 2016-10-08 14:24:47 +08:00
cxt 7f3bb0be63 教师团队中上移、下移功能的完善 2016-10-08 13:54:35 +08:00
huang 137d62ae5d Merge branch 'rep_quality' into dev_newrep 2016-10-08 11:14:36 +08:00
huang 351ca6d074 Merge branch 'rep_quality' into develop 
Conflicts:
	app/views/layouts/_logined_header.html.erb
 2016-10-08 10:41:05 +08:00
cxt 3b8dded2bc 新建课程的教师团队为空 2016-10-08 10:21:33 +08:00
huang 0906da5132 版本库代码简化 2016-10-08 10:10:59 +08:00
cxt ceb0913568 学生列表报500 2016-09-30 18:35:08 +08:00
cxt e5204112d0 教师列表报500 2016-09-30 17:19:57 +08:00
cxt b5782bae39 班级左侧导航的“分班” 2016-09-30 17:12:40 +08:00
cxt 23f1c3175c 学生列表的导出 2016-09-30 17:04:19 +08:00
cxt db9d4900ac Merge branch 'cxt_course' into develop 2016-09-30 16:48:05 +08:00
cxt b25e4ed5d7 新闻、通知的回复分页 2016-09-30 16:09:10 +08:00
cxt b28579a3a3 Merge branch 'cxt_course' into develop 2016-09-30 14:49:57 +08:00
cxt 5d0e3889df 班级、项目、组织帖子详情回复的分页 2016-09-30 14:26:16 +08:00
cxt a9a53caa13 学生提交作品后，跳转至“作品列表”，而不是“作业信息” 2016-09-30 10:29:42 +08:00
cxt f6296377bd 班级内的分班 2016-09-29 11:29:37 +08:00
daiao fdca4ea968 项目与班级资源库导入资源重名时导入异常 2016-09-28 16:52:02 +08:00
huang 25b2602d3e 版本库路径唯一 2016-09-28 16:51:25 +08:00
huang bd383f5010 项目历史版本库提示删除一级setting中控制权限判断 2016-09-28 16:04:53 +08:00
huang 6ece9c0463 性能优化 2016-09-28 10:40:56 +08:00
cxt 03fac1900e 分班 2016-09-28 10:00:01 +08:00
huang e49f9b49b2 Merge branch 'rep_quality' into develop 2016-09-27 19:48:10 +08:00
daiao 7c76584e14 issue功能优化 2016-09-27 19:44:24 +08:00
huang c76cfad51a Merge branch 'rep_quality' into develop 2016-09-27 18:03:02 +08:00
huang b96ab3676c issue过滤条件 2016-09-27 18:01:26 +08:00
yuanke 89d91f69c2 Merge branch 'weixin_guange' into develop 2016-09-27 16:20:07 +08:00