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

10337 Commits

Author SHA1 Message Date
cxt 398a6f1da7 Merge branch 'cxt_course' into develop 2016-09-23 16:50:45 +08:00
cxt 0a74660cfb Merge branch 'cs_optimize_txz' into develop 2016-09-23 16:49:04 +08:00
cxt 2e58a219e4 作业回复无法展开 2016-09-23 16:47:32 +08:00
Tim 13f3ffec9f 侧导航调整 2016-09-23 16:47:12 +08:00
cxt 70042fe91f 帖子详情页面的优化 2016-09-23 16:44:49 +08:00
daiao e998ffec95 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-09-23 14:53:46 +08:00
daiao 7b5fc8b323 issues列表功能 2016-09-23 14:53:36 +08:00
huang 56ac8b61c9 issue列表过滤条件 2016-09-23 14:51:44 +08:00
Tim 86a3ce185d 个人主页侧导航宽度限制更改，提示框效果及js实现 2016-09-23 14:17:23 +08:00
daiao ca00f0b9f8 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-09-23 11:31:31 +08:00
daiao 8336fb2684 项目issue功能 2016-09-23 11:31:23 +08:00
huang 751665089c 完成项目base搭建 2016-09-23 11:28:00 +08:00
huang 61f99137fc 去掉项目模式及数据迁移 2016-09-23 10:53:45 +08:00
huang a8acb4a6cb 项目base功能添加 2016-09-23 10:36:47 +08:00
huang 29b2a257c7 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-09-23 09:29:38 +08:00
huang 5c54368518 项目新版base 2016-09-23 09:29:31 +08:00
daiao e16b5b2f5d issue界面功能调整 2016-09-23 09:27:34 +08:00
cxt caf5602389 课程大纲教师团队的管理 2016-09-23 09:22:47 +08:00
daiao 1da7b79cfb Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-09-23 09:05:37 +08:00
daiao b300c85227 issue界面功能调整 2016-09-23 09:05:26 +08:00
Tim e6657ae422 甘特图样式调整 2016-09-22 17:39:45 +08:00
huang 0976f084f0 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-09-22 17:12:02 +08:00
huang 92b48ea218 甘特图 2016-09-22 17:11:36 +08:00
Tim cda32cdda9 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-09-22 17:10:34 +08:00
Tim a0772332da 项目侧导航快捷按钮样式更改 2016-09-22 17:04:45 +08:00
daiao d0ae48bbf1 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-09-22 16:13:45 +08:00
daiao aacac0aa02 里程碑相关样式修改 2016-09-22 16:12:32 +08:00
huang de0f49f850 ISSUE列表添加新的分页 2016-09-22 14:38:45 +08:00
Tim dac9502f1f 资源库来源title显示带html代码bug修复 2016-09-22 14:25:09 +08:00
huang 775655b854 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-09-22 13:42:24 +08:00
yuanke 0a9d288880 Merge branch 'weixin_guange' into develop 2016-09-22 13:41:52 +08:00
huang 80105181ce issue中我的issue，指派给我的issue和全部issue js实现 2016-09-22 13:41:46 +08:00
daiao c37c880eb2 里程碑加入导出excel功能 2016-09-22 08:40:41 +08:00
Tim c718cb2144 新建issue时，增加评审，来源，实际工时选项 2016-09-21 15:27:32 +08:00
Tim d83441fe7c 反馈框提交文字大小调整 2016-09-21 14:58:48 +08:00
Tim 25b2418730 完善资料界面问题反馈框样式更新 2016-09-21 14:33:46 +08:00
cxt d1c284c953 作业详情页 2016-09-21 10:34:38 +08:00
huang 2ae7dd0087 项目issue导出excel功能 2016-09-21 10:18:40 +08:00
Tim fec493b287 Merge branch 'develop' into cs_optimize_txz 2016-09-21 09:44:59 +08:00
Tim e4f6852d1b 我的作业页面，按钮字体大小统一，作品数宽度增加 2016-09-21 09:44:02 +08:00
yuanke 8b771a183c 微信分班功能 2016-09-20 14:58:37 +08:00
cxt ba4a1c64d9 作业动态的重构 2016-09-19 17:14:14 +08:00
huang 8e6a88f7d8 项目日历功能 2016-09-19 16:19:59 +08:00
Tim 8d2636e3e6 甘特图css样式引用 2016-09-19 15:43:40 +08:00
huang 7ed7129ace 甘特图和日历显示及CSS架构 2016-09-19 14:23:33 +08:00
daiao 673b68f2a2 修复：在公共贴吧，新建贴吧总提示“提拔名称已存在”的问题 2016-09-19 13:37:18 +08:00
daiao 984b540a63 游客身份，进入具体的班级和项目各功能入口的调整 2016-09-19 10:01:22 +08:00
huang 728e1333fc issue author为空处理 2016-09-18 15:58:55 +08:00
huang 924db06cbf 项目版本库隐藏代码统计 2016-09-18 15:55:22 +08:00
daiao 4504308403 修复管理员界面，项目列表的搜索功能 2016-09-18 15:16:31 +08:00
cxt fc630b9322 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-18 15:11:20 +08:00
cxt 19721e20c5 Merge branch 'cxt_course' into develop 2016-09-18 15:11:11 +08:00
cxt f50663158a 新建班级页面的提示调整 2016-09-18 15:07:22 +08:00
cxt 3f7935bf85 班级/项目帖子锁定回复的，已有回复的二级回复按钮未屏蔽 2016-09-18 14:39:03 +08:00
huang 8aba516d1e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-18 14:21:02 +08:00
liguangye 53bdeed1e4 解决铃铛404问题 2016-09-18 14:20:08 +08:00
daiao 43a3ad1ce8 问题跟踪作者下拉列表由登录名改为用户姓名 2016-09-18 09:38:02 +08:00
cxt b468134e3e Merge branch 'cxt_course' into develop 2016-09-14 21:19:01 +08:00
cxt 0d12acd42a 样式修改 2016-09-14 21:11:20 +08:00
cxt abdc08c7af 提交作品时左侧导航栏对应班级的导航栏 2016-09-14 20:58:15 +08:00
Tim b6389a22f3 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-14 20:46:35 +08:00
Tim 7b9ba6a1f7 问题反馈样式调整 2016-09-14 20:46:23 +08:00
daiao 912a840d70 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-14 20:32:27 +08:00
huang a593fa9239 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-14 20:33:41 +08:00
huang 54df8307a8 issue 500问题 2016-09-14 20:33:25 +08:00
daiao c4ed5b0e83 点击帮助中心，弹无效弹框 2016-09-14 20:32:12 +08:00
cxt f880ab1c14 样式调整 2016-09-14 20:02:43 +08:00
Tim caae04e77e 组员评分样式调整 2016-09-14 19:57:17 +08:00
cxt 1bd93904af Merge branch 'cxt_course' into develop 2016-09-14 19:47:24 +08:00
Tim 9064cf1aa2 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-09-14 19:44:56 +08:00
Tim e8cca255a0 分组作业点击展开效果 2016-09-14 19:44:46 +08:00
cxt 020018fd31 分组作业的作品列表样式修改 2016-09-14 19:31:14 +08:00
huang 7210eefe1d 1156项目讨论区异常问题 2016-09-14 18:51:32 +08:00
cxt 6f4618fffb 分组作业可对组员单独评分 2016-09-14 17:38:57 +08:00
huang 7ea2163bce Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-14 17:36:33 +08:00
huang 9f5e257890 作品列表搜索问题 2016-09-14 17:36:20 +08:00
daiao cd59a8d597 Merge branch 'dev_shcool' into develop 2016-09-14 17:28:27 +08:00
daiao bac1dc7779 Isuue详情页面附件上传者由登录名修改为姓名 2016-09-14 17:27:21 +08:00
daiao 4e6205e026 Merge branch 'dev_shcool' into develop 2016-09-14 17:11:12 +08:00
daiao 431f5ae492 修复帮助中心弹无效弹框 2016-09-14 17:09:26 +08:00
Tim 237d6f7d2e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-14 16:50:56 +08:00
Tim 7cd2a98f11 侧导航课程、班级名称长度控制；箭头替换；tip显示更改 2016-09-14 16:50:46 +08:00
cxt e4efc8c302 作业编辑 2016-09-14 16:45:10 +08:00
huang aeaf99f79e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-14 16:26:51 +08:00
daiao bad170ce22 Merge branch 'dev_shcool' into develop 2016-09-14 16:12:44 +08:00
daiao 5d8ed8c054 修改发送附件人名样式的问题 2016-09-14 16:07:43 +08:00
huang 89de36ec65 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-14 15:24:02 +08:00
daiao 5a25eb324b Merge branch 'dev_shcool' into develop 2016-09-14 15:13:31 +08:00
huang 054dae7acb Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-14 15:13:03 +08:00
daiao e508cba951 1.游客进入班级，资源出现了两个入口 2016-09-14 15:10:26 +08:00
Tim ffedecab7a 新问题反馈样式；侧导航课程、班级名称长度js控制 2016-09-14 15:05:08 +08:00
daiao 41ab10410f 1. PullRequest后面加入请求数目 2016-09-14 13:15:00 +08:00
daiao 3e38b09219 修复：项目动态附件，组织列表，贴吧列表交流，贴吧吧主，贴吧发帖人，贴吧最后回复，详情页面问题跟踪，项目动态的指派的地方的用户改为显示用户姓名 2016-09-14 10:42:30 +08:00
Tim 0444904904 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-14 08:59:25 +08:00
Tim 135a2b21f5 新问题反馈样式更新 2016-09-13 18:53:00 +08:00
daiao f0d150ec47 点击首页底部的“帮助中心”，弹无效弹框 2016-09-13 17:05:42 +08:00
huang 235554a104 新闻首页优化 2016-09-13 16:34:40 +08:00
cxt 9002844188 新版发布作业 2016-09-13 16:18:57 +08:00
huang 390f68aad6 作品列表页面性能提升（主要是数据库查询减少，建立相关索引） 2016-09-13 14:57:45 +08:00
daiao 8626692367 项目issue：编辑issue后点击确定按钮，却还是返回的编辑模式 2016-09-13 14:47:05 +08:00
Tim b9fec966c7 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-09 17:58:32 +08:00
Tim 1fe8b35fc9 课程名称，班级名称过长时，省略号显示 2016-09-09 17:58:21 +08:00
Tim 34a1bb0b49 侧导航课程，班级名称过长显示效果 2016-09-09 17:54:54 +08:00
huang ddb369928f 消息列表问题 2016-09-09 17:44:41 +08:00
huang 7fd73348a6 消息404问题 2016-09-09 17:41:09 +08:00
huang 59ebadd406 Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/layouts/_user_courses.html.erb
 2016-09-09 17:25:51 +08:00
daiao 67757b90c8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-09 17:25:27 +08:00
daiao 75908f976c Merge branch 'dev_shcool' into develop 2016-09-09 17:23:45 +08:00
huang aff9c38737 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-09 17:22:53 +08:00
huang 121537bfcb 消息404问题 2016-09-09 17:22:38 +08:00
daiao f9a905a344 issue详情页面回复，点击附件直接下载（应该是预览） 2016-09-09 17:22:10 +08:00
Tim 3d68e8963a 侧导航课程和班级超长时，省略号显示 2016-09-09 17:11:51 +08:00
cxt af1aa2cac4 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-09 16:44:28 +08:00
cxt d44aea1ce1 左侧班级列表的黑点改成灰色 2016-09-09 16:44:22 +08:00
huang 502bd9f451 里程碑样式过长问题 2016-09-09 16:37:24 +08:00
daiao 70fc7761da Merge branch 'dev_shcool' into develop 2016-09-09 16:03:13 +08:00
daiao 2307c0c3c0 项目列表，添加“公开"字样 2016-09-09 16:00:51 +08:00
cxt 5d83c66949 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2016-09-09 15:58:42 +08:00
huang 7899bfe985 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/issues/_form.html.erb
	db/schema.rb
 2016-09-09 16:00:05 +08:00
cxt 0437920438 Merge branch 'dev_shcool' into develop 2016-09-09 15:58:15 +08:00
cxt bc2e9f2231 Merge branch 'cxt_course' into develop 2016-09-09 15:55:54 +08:00
cxt 547e786a10 “全部”添加链接 2016-09-09 15:54:51 +08:00
Tim f6efefd38d Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-09-09 15:50:05 +08:00
Tim 862bbd1a1f 班级名称前增加课程名，一系列更改 2016-09-09 15:49:31 +08:00
cxt 724ae058db 班级左侧添加“分班”入口 2016-09-09 15:49:24 +08:00
cxt 355f0580cb 作业状态的api 2016-09-09 15:28:32 +08:00
daiao de769454a7 修复公共贴吧：回复非汉字类型内容超出边框的问题 2016-09-09 15:16:08 +08:00
daiao 96dfa4281d 修复：强制修改页面，左侧编辑个人资料可用 2016-09-09 15:03:46 +08:00
daiao 89f3e0ee0d 项目iuss:编辑issue时，弹出空白弹框的问题 2016-09-09 14:43:47 +08:00
huang 4900ff5492 里程碑中添加 完成者姓名 2016-09-09 14:36:03 +08:00
daiao 19d925d592 项目列表中公开项目无法点击 2016-09-09 14:22:47 +08:00
daiao 4959910ebe ucloud无法发布新issue 2016-09-09 14:20:56 +08:00
Tim b796ac3b53 Merge branch 'develop' into cxt_course 
Conflicts:
	app/views/exercise/_student_table.html.erb
	db/schema.rb
 2016-09-09 13:30:10 +08:00
Tim a88a36bd35 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-09 13:27:53 +08:00
cxt d0686b46d7 在线测验：如图截止时间未到，是不能点击查看作品详情的，建议去掉左侧提示“点击查看详情”，测验结果列表的样式调整 2016-09-09 11:09:47 +08:00
huang b308100d3e 去掉管理员界面项目复制功能 2016-09-09 10:50:30 +08:00
daiao d9ad0fa1d7 issue详情界面回复之后，图片附件是下载，而不是放大 2016-09-09 10:39:39 +08:00
cxt b3f738ee5d 与班级相关平台班级名称规范调整 2016-09-09 10:23:18 +08:00
huang c025e40905 解决正式版管理员界面选择跟踪标签500问题 2016-09-09 09:51:02 +08:00
daiao ed448f0087 Merge branch 'develop' into dev_shcool 
Conflicts:
	db/schema.rb
 2016-09-09 09:31:17 +08:00
Tim 2c719feacd 无用的内联样式 2016-09-08 18:34:35 +08:00
huang 6dbb2e4e94 Pull request数量为0的时候显示在更多中 2016-09-08 16:03:32 +08:00
huang 08c64d2ac7 解决新建及复制issue时点击取消没反应的问题 2016-09-08 15:38:01 +08:00
cxt cf25dc8dfd 首页的项目列表 2016-09-08 15:00:20 +08:00
cxt d8e04e7923 暂时隐藏“复制班级” 2016-09-08 14:04:40 +08:00
cxt ab0863c9fb 平台的邀请码提示 2016-09-08 13:59:48 +08:00
cxt 3efc158fb5 班级作业：当已经发布了作业再去编辑作业时，现在是“发布时间”就不能再编辑了，建议代码判断只有当学生已经提交了作品或关联了项目才禁止再编辑发布时间，且要给出必要提示 2016-09-08 10:54:41 +08:00
cxt 49e8a6f1ff 作业匿评时：学生点击作业列表中“追加附件”，进入作品列表后要默认打开自己提交的作品且弹出追加附件的弹框 2016-09-07 15:45:12 +08:00
cxt 775ed19129 admin界面-班级列表：课程列表中不显示已经删除的班级，全部班级列表中显示已经删除的班级 2016-09-07 15:26:15 +08:00
cxt e6ddb3cec0 个人主页动态过滤中点击全部动态要显示当前用户关联的所有动态 2016-09-07 11:30:26 +08:00
Tim 95824e3b6b 新建课程增加名称正确错误示例，课程说明 2016-09-07 11:24:38 +08:00
cxt e084543030 新建作业时给出截止日期和发布日期的提示 2016-09-07 10:45:22 +08:00
cxt 5433e6d714 多重角色，教师/助教查看自己作为学生身份时提交的作品，追加附件重复显示 2016-09-07 09:29:06 +08:00
Tim 99e63b1477 班级推荐数字block颜色字体更改；测验学号超出省略号显示 2016-09-06 17:22:38 +08:00
cxt 17f6b9c286 管理员界面的被留言内容加上“RE: ” 2016-09-06 15:17:49 +08:00
cxt 1e7f3db946 分组作业：组内每个成员都复制一份组长的作业，得分相同 2016-09-06 15:07:43 +08:00
daiao cdd4dfcf09 项目列表中：私有项目对非成员显示，非成员不点击进入 2016-09-05 16:55:56 +08:00
cxt 252851b4ad 课程导航的修改 2016-09-05 16:36:43 +08:00
cxt 7123c66481 课程列表中：点击课程的名称就弹出新的tab页，进入课程的页面 2016-09-05 16:20:38 +08:00
cxt ad0acb5188 课程大纲的内容图片自适应大小 2016-09-05 14:31:49 +08:00
cxt 2974833533 新建班级页面--创建课程后面，增加： 然后 【刷新】 2016-09-05 14:14:25 +08:00
cxt 573eb13283 课程导航中的用户是创建该课程的老师，课程链接应跳到该用户的课程列表 2016-09-05 13:52:42 +08:00
daiao 3dc0e8407a Merge branch 'develop' into dev_shcool 
Conflicts:
	app/views/organizations/_org_member_list.html.erb
	app/views/organizations/setting.html.erb
	app/views/users/_project_news.html.erb
 2016-09-05 13:47:39 +08:00
daiao bb0bafb0fd 1.修复项目名称太长，导致动态显示名称与issue编辑图标按钮重叠 2016-09-05 13:27:41 +08:00
Tim f94b048af2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-05 13:18:55 +08:00
Tim 9ec6074260 将头部帮助中心改为贴吧交流 2016-09-05 13:18:35 +08:00
cxt 36e541a6d0 消息列表报500 2016-09-05 11:30:13 +08:00
huang 3e17edecd1 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-02 19:05:46 +08:00
huang 2cd41cde7f 1706项目500问题 2016-09-02 19:05:21 +08:00
cxt c794c6197d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-02 18:19:43 +08:00
huang 7b6657a3e6 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-02 16:51:23 +08:00
huang 2c03bfbf3a 资源提示权限控制 2016-09-02 16:51:05 +08:00
cxt b8d04c1352 课程列表的主讲老师改为创建老师 2016-09-02 16:40:07 +08:00
cxt 01ca94bc98 未读消息弹框 2016-09-02 16:21:58 +08:00
daiao 9a3603c778 1.基本资料页面，身份为从业者时，直接点确定报提示问题 
2.强制修改基本资料，修改资料按键错误
 2016-09-02 16:11:14 +08:00
cxt 0d2a3cbe36 测试版消息列表报500 2016-09-02 16:00:54 +08:00
cxt b588495847 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-02 15:26:23 +08:00
huang 6c0bcadf6d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-02 15:27:08 +08:00
cxt e949566d3d 合并 2016-09-02 15:26:00 +08:00
cxt aaefd8b4aa Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/users/_news_replies.html.erb
 2016-09-02 15:24:55 +08:00
huang 58176456e1 Merge branch 'develop' into rep_quality 2016-09-02 15:23:00 +08:00
cxt 4cdef4a22b Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-02 15:22:20 +08:00
cxt 613f974440 项目的管理员和课程的老师都有权限删除帖子和新闻/通知的回复 2016-09-02 15:22:09 +08:00
huang 3881e5c5c5 资源搜索的是时候tip局部刷新 
组织资源更新公开私有问题
 2016-09-02 14:50:06 +08:00
Tim 0d7e9d4f9b Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-02 14:45:11 +08:00
Tim 396664d4e7 课程右侧增加下间距 2016-09-02 14:45:01 +08:00
cxt e70334ea16 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-02 14:43:07 +08:00
cxt 51ef4a96e6 课程导航添加链接 2016-09-02 14:42:59 +08:00
Tim d0a2ea02f2 学生列表名字学号过长省略号显示；课程教师团队名称过长省略号显示 2016-09-02 14:27:49 +08:00
cxt ded6753ce1 访问他人的主页只显示他本人的动态 2016-09-02 14:23:02 +08:00
Tim 0974153364 课程加入路径显示 2016-09-02 13:49:08 +08:00
daiao 27ad94eac2 组织配置界面，成员列表分页 2016-09-02 13:25:01 +08:00
huang 2e36cf6d6a 课程资源库添加资源提示及 2016-09-02 12:12:26 +08:00
huang fa25a78f62 项目资源库 添加私有资源提示及局部过滤刷新 2016-09-02 11:27:35 +08:00
cxt 231c660744 老师对帖子的删除权限 2016-09-02 10:06:03 +08:00
cxt f78595bbbb 管理员界面中的学校列表支持按用户数排序 2016-09-01 17:11:39 +08:00
huang e798381feb 项目资源数改成实时获取 2016-09-01 16:39:09 +08:00
huang 17440ca5dc Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-09-01 16:04:00 +08:00
huang 79e30862e9 change sonar method into restart and cancel push events 2016-09-01 15:58:53 +08:00
Tim 4d93b860f9 作品信息确认时，描述文字折行 2016-09-01 15:35:45 +08:00
Tim d080f0bb16 Merge branch 'cs_optimize_txz' into develop 2016-09-01 14:34:56 +08:00
huang 742c84bb26 项目隐藏之 issue详情页面发送隐藏课程信息 2016-09-01 14:30:56 +08:00
Tim 27a2da8b7b 意见反馈增加二维码 2016-09-01 13:56:13 +08:00
huang 5527b4e3a9 项目隐藏之 公共资源库底端发送隐藏课程信息 2016-09-01 12:25:35 +08:00
huang 4903064a5b 项目隐藏之 公共资源右键发送隐藏课程功能 2016-09-01 12:18:39 +08:00
huang c51f725a78 项目隐藏之 项目动态中讨论区 新闻发送隐藏课程信息 2016-09-01 11:24:16 +08:00
huang 1444511fd9 项目隐藏之 项目讨论区详情页面 发送隐藏课程信息 2016-09-01 11:18:07 +08:00
huang efa162fdeb 项目隐藏之组织资源发送 2016-09-01 11:16:09 +08:00
huang b2aba0f0bc 项目隐藏之 新闻发送隐藏课程信息 2016-09-01 11:12:56 +08:00
huang 3856ed8033 项目隐藏之资源发送项目组织 2016-09-01 11:00:34 +08:00
huang 52a8a64a69 项目隐藏 项目讨论区发送中去掉课程 2016-09-01 10:48:13 +08:00
cxt 5676f0b82f 项目类消息为空导致消息列表报500 2016-08-31 17:14:32 +08:00
daiao 548a263f0f 1.修复项目新闻发送至其他项目后，位于讨论区下的bug 
2.资料未完善情况下，“修改资料”可操作
3.组织成员列表增加分页功能（配置成员页面分页为完成）
4.修复回复表情显示不对
 2016-08-31 17:09:02 +08:00
cxt 7efdda5b45 班级老师也可以点击班级logo进行编辑 2016-08-31 17:01:31 +08:00
huang 9b14b86b64 隐藏项目之 隐藏组织左侧的信息 2016-08-31 16:01:23 +08:00
huang ac85eadc30 资源库点击切换样式 2016-08-31 15:42:17 +08:00
huang 1f6bd68e61 隐藏项目 组织隐藏课程信息 2016-08-31 15:37:28 +08:00
Tim ecf7522c4b Merge branch 'cs_optimize_txz' into rep_quality 2016-08-31 15:32:23 +08:00
Tim 718e59c144 消息下拉框样式 2016-08-31 15:31:09 +08:00
huang 2df6047b03 隐藏项目信息之 新用户注册但是未完善资料页面修改 2016-08-31 15:14:55 +08:00
cxt 4c59acf5a3 issue编辑后点赞按钮不见了 2016-08-31 15:04:56 +08:00
cxt 9b3e1e0275 Merge branch 'develop' into cxt_course 2016-08-31 15:02:13 +08:00
huang 02fbdb57bd 隐藏项目中用户消息信息 2016-08-31 14:44:31 +08:00
cxt 8494d71e8e “课程名称”不显示，英文名称为空时不显示“课程英文名称” 2016-08-31 14:33:29 +08:00
cxt 076feb17e8 课程大纲的班级列表中的“主讲老师”改为“创建老师” 2016-08-31 14:12:04 +08:00
cxt a8575f2a15 暂时隐藏个人名片 2016-08-31 14:08:19 +08:00
huang 9ab68625df Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-31 13:50:57 +08:00
cxt cc7b97192e 分组作业关联项目下的文字链接到项目 2016-08-31 11:27:37 +08:00
cxt e05780cc3f 设置了答题时间的测验不应有保存按钮，而是直接提交 2016-08-31 10:48:43 +08:00
huang 4320fbf945 Merge branch 'dev_blankdatabase' into develop 2016-08-31 10:30:46 +08:00
huang 936198a8bd 隐藏非项目信息 2016-08-31 10:30:23 +08:00
huang 0c221abd61 PULL REQUEST 默认情况下不显示 2016-08-31 09:18:05 +08:00
cxt 23ff5f6449 匿评时具有多重身份的教辅打的分变成了“我的评分” 2016-08-30 15:01:41 +08:00
cxt 623dadaea1 回复的删除按钮当鼠标放上去才显示 2016-08-30 14:12:50 +08:00
huang 2b7a38062c css for red 2016-08-30 11:30:08 +08:00
huang bbe44b3957 Merge branch 'develop' into rep_quality 2016-08-30 11:18:49 +08:00
huang ee2ae456ac unresolved issues for sonar 2016-08-30 10:43:47 +08:00
cxt f803a23298 组织头像编辑的小笔调整 2016-08-29 16:49:54 +08:00
cxt 141118e3d8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-29 16:39:54 +08:00
Tim ac0cc37fe4 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-29 16:39:23 +08:00
Tim ea0211c9ca 组织搜索成员时，页数过多折行问题 2016-08-29 16:39:13 +08:00
cxt 60fb21d2fc 班级主页的样式调整 2016-08-29 16:30:37 +08:00
cxt eb255d84b1 issue详情页里的点赞刷新 2016-08-29 16:25:30 +08:00
cxt 45f0234ff7 组织logo点击可编辑 2016-08-29 16:19:06 +08:00
cxt 4ff45c15a3 还原质量分析的代码 2016-08-29 15:43:32 +08:00
cxt acb18ca4c6 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-29 15:40:26 +08:00
cxt 15ba4a6136 头像调整 2016-08-29 15:38:58 +08:00
cxt 3c5afb2b4f Merge branch 'develop' into cxt_course 
Conflicts:
	app/views/layouts/new_base_user.html.erb
 2016-08-29 15:35:04 +08:00
Tim a8d551105b Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-29 15:28:45 +08:00
Tim 64b7aedd1c footer部分logo与链接替换更新 2016-08-29 15:28:32 +08:00
cxt cbcf414e63 班级主页的访问计数 2016-08-29 14:44:33 +08:00
cxt 547fb8a1a5 未登录用户访问个人主页时的头像显示 2016-08-29 14:41:01 +08:00
cxt 0b0a23f270 issue详情页面的点赞 2016-08-29 14:26:25 +08:00
cxt 313bc8573d 首页访问计数失效 2016-08-29 14:01:40 +08:00
huang a6f9c3375e 代码质量分析加入“未解决质量问题数” 2016-08-29 10:21:42 +08:00
huang 8c4f943f83 注释掉资源提示 2016-08-26 19:33:18 +08:00
huang 5237d9664f css for avatar 2016-08-26 18:52:20 +08:00
huang 803bd9819a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
	public/stylesheets/css/public.css
 2016-08-26 17:55:51 +08:00
huang 9b86661f4a <ul class=contribute-list> 2016-08-26 17:49:31 +08:00
huang 420a17a7e4 资源提示统计数字及权限修改 2016-08-26 17:34:17 +08:00
cxt f25a90cccd 项目的非创建者管理员也可编辑项目头像 2016-08-26 17:33:04 +08:00
cxt 5fbb9f56a6 Merge branch 'dev_shcool' into develop 2016-08-26 17:10:15 +08:00
cxt 148aa9cda9 首页头像调整 2016-08-26 16:42:29 +08:00
huang af68f4ca76 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 
Conflicts:
	app/views/files/_course_file.html.erb
	app/views/files/_project_file.html.erb
 2016-08-26 16:27:14 +08:00
huang a71f948f41 项目、课程资源库添加私有资源提示 2016-08-26 16:26:12 +08:00
cxt 6eb518c465 Merge branch 'cxt_course' into develop 
Conflicts:
	app/helpers/application_helper.rb
	app/views/at/show.json.erb
	app/views/layouts/new_base_user.html.erb
 2016-08-26 16:23:07 +08:00
yuanke 21df119c59 Merge branch 'weixin_guange' into develop 2016-08-26 16:19:50 +08:00
yuanke a66ecf6c28 修改图片地址 2016-08-26 16:18:57 +08:00
Tim 3f7c623163 新增资源提示框 2016-08-26 15:57:45 +08:00
huang a434942b6d Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-26 15:14:07 +08:00
huang 60a76e64a5 贡献列表 2016-08-26 15:13:07 +08:00
cxt cdffaed1ea 班级主页设置班级为公开私有时刷新资源库页面 2016-08-26 15:11:57 +08:00
cxt eb20ca4ffe 新建班级时班级名称实例要加上课程名称 2016-08-26 14:56:29 +08:00
cxt 0d05d04d2c 头像编辑的样式调整 2016-08-26 14:44:32 +08:00
cxt 62e28f638c Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	app/views/layouts/_course_base_info.html.erb
	app/views/layouts/base_projects.html.erb
	app/views/layouts/new_base_user.html.erb
 2016-08-26 14:33:18 +08:00
cxt 774b5eca89 课程和项目的头像点击可编辑 2016-08-26 14:31:14 +08:00
yuanke fcf6325761 Merge branch 'weixin_guange' into develop 2016-08-26 14:04:22 +08:00
yuanke 2a6321cd9e 发布帖子标题长度改为128 2016-08-26 14:03:09 +08:00
Tim a8f30fe85f 个人主页，课程，项目头像、logo增加编辑按钮 2016-08-26 11:31:54 +08:00
daiao d37cbaad61 1.完善资料流程优化；2.基本资料从业者单位保存丢失问题 2016-08-26 10:14:48 +08:00
cxt f4b5a5cf4e Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-08-26 09:23:33 +08:00
Tim fbad4ecd8a 班级页面logo及行间距调整；测导航数字大小背景调整 2016-08-25 17:52:19 +08:00
cxt cb5e5f18ce Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-08-25 15:59:15 +08:00
cxt b33136c59b 班级问答区改成讨论区 2016-08-25 15:59:09 +08:00
Tim 27678d09f6 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-08-25 15:55:49 +08:00
Tim df1039cd09 项目收藏按钮位置调整 2016-08-25 15:55:36 +08:00
cxt d8117f9576 作品列表页面中分组作业关联项目的综合评分应与项目首页的评分一致 2016-08-25 15:43:11 +08:00
daiao 758aaca12a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-25 15:29:19 +08:00
daiao a466fdd64e 强制修改基本资料：申请单位点击确定后，进入主页面；提问按钮不可用 2016-08-25 15:29:04 +08:00
cxt 60beb2abab 首页左侧班级和项目列表的收藏功能 2016-08-25 11:30:47 +08:00
huang 3778871f58 issue在项目动态、列表、用户动态中删除回复添加提示 2016-08-25 10:39:16 +08:00
huang 69301a1120 Pull reques登录提示（权限控制） 2016-08-25 10:04:51 +08:00
huang 799c451921 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-25 09:20:46 +08:00
cxt 21c48ea383 at所有人 2016-08-24 17:46:18 +08:00
huang 80c6132ba5 Merge branch 'rep_quality' into develop 2016-08-24 17:39:44 +08:00
huang 7493de1334 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-24 17:38:40 +08:00
huang 0cc59260cd modified sonar list form of language 2016-08-24 17:35:04 +08:00
cxt 56b74b755b 取消收藏 2016-08-24 17:30:30 +08:00
huang 8cc60ef1e8 delete some language of quality_analysis 2016-08-24 17:28:55 +08:00
cxt ea7f65308e at所有人后不应带有用户登录名 2016-08-24 16:02:02 +08:00
cxt 7d89f69981 班级和项目收藏夹 2016-08-24 15:58:23 +08:00
daiao a3ec35c008 个人主页报500 2016-08-24 15:56:03 +08:00
huang f0ed380002 Merge branch 'rep_quality' into develop 2016-08-24 15:13:37 +08:00
daiao 90803fbb2a Merge branch 'dev_shcool' into develop 2016-08-24 14:53:31 +08:00
daiao 8b0c0925dd Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/layouts/new_base_user.html.erb
 2016-08-24 14:52:10 +08:00
daiao 078900088a 修复：新建组织关联trustie-forge项目，点击组织动态的论坛动态报500 2016-08-24 14:41:26 +08:00
cxt 6af43070c7 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-08-24 13:56:53 +08:00
Tim bb2b51aa8d 收藏按钮增加title 2016-08-24 10:30:20 +08:00
Tim 57ecffc130 班级新增收藏功能 2016-08-24 10:28:09 +08:00
cxt 5d5bd88c88 个人主页：用户不应有修改他人头像的权限 2016-08-24 09:30:57 +08:00
cxt 74b15229fb at所有人 2016-08-23 17:15:51 +08:00
daiao 5088770214 修复：文章附件和资源栏目下载权限一致 2016-08-23 16:34:11 +08:00
daiao 7e34062435 Merge branch 'dev_shcool' into develop 2016-08-23 09:43:38 +08:00
huang ea6b928188 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-22 17:19:48 +08:00
huang 5e98884801 tip for sonar 2016-08-22 16:32:32 +08:00
cxt 06361246c7 作品列表中的已提交人数无法自动刷新 2016-08-22 15:24:12 +08:00
cxt 572ad5a162 个人主页的课程和项目展开出现重复数据 2016-08-22 10:49:46 +08:00
huang ea3ba1f71e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-14 11:30:54 +08:00
huang 577aa40ea1 time for nil 2016-08-14 11:27:49 +08:00
huang 7c28f97208 get quality analisys update time 2016-08-14 10:45:01 +08:00
huang ff592c106e sonar最新触发时间获取 2016-08-14 10:29:52 +08:00
yuanke 9446760258 Merge branch 'weixin_guange' into develop 
Conflicts:
	db/schema.rb
 2016-08-14 09:56:17 +08:00
huang 1f4f03d8ed 修改项目列表中的资源链接 2016-08-13 17:31:09 +08:00
cxt a4a0ef139b Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-13 17:04:16 +08:00
cxt 1374444ec1 左侧项目列表的展开 2016-08-13 17:04:09 +08:00
huang 3ce088002a 留言和已关闭流程修改 2016-08-13 16:53:56 +08:00
Tim f67336fbe5 课程信息单词折行 2016-08-13 16:27:29 +08:00
huang d7faed7f6d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-13 15:39:06 +08:00
cxt 35260f2f6d Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-08-13 15:36:48 +08:00
cxt f4e965c9fb Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-13 15:35:10 +08:00
cxt 2759d562ac 首页项目列表 2016-08-13 15:35:03 +08:00
huang 9003040d6a 版本库获取动态API修改 2016-08-13 14:42:24 +08:00
daiao 4a9967674a 1. 强制编辑基本资料，在删除单位时给出消息通知 
2. 单位名称申请提示一直显示
3. 申请单位的消息通知显示申请人头像，并连接到申请人主页
 2016-08-13 14:29:33 +08:00
huang 93f8ac31f1 项目资源库新分页及ajax刷新 2016-08-13 14:17:50 +08:00
huang 00f032816c 版本库获取方式修改 2016-08-13 13:48:23 +08:00
guange a761bfe3f8 . 2016-08-13 11:37:37 +08:00
huang 37df983009 项目列表 2016-08-13 11:13:11 +08:00
huang 1b19d227f9 项目列表样式及连接 2016-08-13 10:17:38 +08:00
huang ce9c2d3d06 搜索的时候分页刷新 2016-08-12 17:25:20 +08:00
huang 75971120f7 Merge branch 'develop' into rep_quality 2016-08-12 17:14:18 +08:00
huang 047eea125d 课程资源分页及局部刷新 2016-08-12 17:05:46 +08:00
huang 7efc8ccac6 新建项目，增加项目名称输入例 2016-08-12 14:11:15 +08:00
yuanke 24a0bfea77 分享修改 2016-08-12 12:05:14 +08:00
yuanke 3a000a360a appid 修改 2016-08-11 17:30:06 +08:00
yuanke 4e6c58ae37 动态点提交如果没绑定则自动创建一个帐号绑定，然后注册的时候将已绑定的用户信息修改为注册的信息 2016-08-11 17:22:48 +08:00
cxt 03c093fb13 班级作业列表中“赞”和“取消点赞”不可用 2016-08-11 16:34:00 +08:00
huang 8eaeea299a 相同分支和项目消息JS提示 2016-08-11 15:19:58 +08:00
huang 3df8a46634 PUll request代码简化及reverse评论 2016-08-11 14:16:13 +08:00
huang 41ad5ca444 修改Gitlab接口返回创建时间 2016-08-11 11:11:49 +08:00
Tim f4445619d2 题库预览弹框样式调整 2016-08-11 11:02:40 +08:00