jasder
/
trustieforge
forked from jacknudt/trustieforge
0
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity
12,268 Commits 103 Branches 0 Tags 142 MiB
Commit Graph

546 Commits

Author SHA1 Message Date
ouyangxuhua 63b644dbb9 解决”组织帖子附件超过20个后，编辑时不能增加附件“的问题 2016-02-20 11:06:21 +08:00
cxt d42f144f23 作业、组织帖子描述框的自动增高 2016-02-02 15:50:28 +08:00
cxt 265359cd74 发布作业时作业类型的切换 2016-01-29 18:17:27 +08:00
ouyangxuhua 280f679b0c 1.调整项目中的问题快捷编辑的宽度；2.https://www.trustie.net/manual/feedback链接到帮助中心；3.编辑框显示更多选项 2016-01-28 16:49:25 +08:00
ouyangxuhua c857fb734b 快捷回复中，设置回复框的高度和宽度 2016-01-28 10:16:45 +08:00
ouyangxuhua 89a919163c 一旦组织私有，就disabled掉允许游客下载选项 2016-01-26 15:25:25 +08:00
cxt f632a3d4fb 编程弹框固定位置 2016-01-22 22:17:52 +08:00
cxt 8f1bffd28b 留言不能为空 2016-01-22 21:53:32 +08:00
cxt bb67a8f77d 若测试集够长，点击增加测试集，此时应该自动定位到测试集输入框 2016-01-22 17:34:35 +08:00
cxt 338c224846 课程配置页面的结束学期可修改 2016-01-22 15:17:11 +08:00
ouyangxuhua b8ae62db84 Merge branch 'szzh' into dev_hjq 2016-01-21 15:32:18 +08:00
ouyangxuhua c303f7ff3f 将分享的js方法统一，分享文件、通知等均可复用 2016-01-21 14:33:31 +08:00
cxt 247924af26 动态内容显示不全 2016-01-21 11:24:26 +08:00
cxt 1ff244ad98 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-01-20 18:38:00 +08:00
cxt 3b180aca90 用户个人留言页面的改版 2016-01-20 18:37:47 +08:00
Tim c7edf0d73b 弹框样式修改 2016-01-20 17:55:20 +08:00
ouyangxuhua 340d404ecd 组织栏目的通知增加查、改、删功能 2016-01-20 17:23:02 +08:00
Tim ffba281de5 弹框蓝色边框与关闭键替换 2016-01-20 16:03:28 +08:00
huang c936304314 课程默认收起 2016-01-15 15:37:17 +08:00
Tim 8feea07825 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2016-01-14 15:59:50 +08:00
ouyangxuhua 7bcf995eaf Merge branch 'develop' into dev_hjq 
Conflicts:
	db/schema.rb
	public/stylesheets/share.css
 2016-01-13 09:58:14 +08:00
ouyangxuhua d5fc0277a2 3.2组织资源的样式更新 2016-01-12 16:43:40 +08:00
guange e96496ddcd avatar.js和attachments.js冲突,导致头像不能上传 2016-01-08 23:01:16 +08:00
huang 5b9be0bb11 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	db/schema.rb
	public/stylesheets/public.css
 2016-01-08 18:11:54 +08:00
ouyangxuhua 626e3da1e6 Merge branch 'szzh' into dev_hjq 
Conflicts:
	public/stylesheets/new_user.css
	public/stylesheets/public.css
 2016-01-08 18:09:21 +08:00
ouyangxuhua b2bad60b38 1.修改用户留言页面的宽度；2.编辑博客首页转到博客首页 2016-01-08 16:16:57 +08:00
cxt 7d663ce66f 动态内容统一高度 2016-01-08 14:53:12 +08:00
huang 0a1aa9e569 Merge branch 'develop' into hjq_new_course 
Conflicts:
	db/schema.rb
	public/stylesheets/public.css
 2016-01-06 09:27:00 +08:00
huang 680e861620 项目资源搜索功能 2016-01-05 11:00:26 +08:00
guange d2c7d12cd9 merge 2016-01-04 15:53:56 +08:00
guange 8ea9430318 at链接问题修改 2016-01-04 15:51:24 +08:00
lizanle d26b51c982 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/controllers/organizations_controller.rb
	db/schema.rb
 2015-12-31 15:44:57 +08:00
cxt ec631691e3 新建课程和课程配置页面增加结束学期 2015-12-31 11:12:09 +08:00
lizanle be146a9421 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/controllers/organizations_controller.rb
	db/schema.rb
	public/stylesheets/courses.css
	public/stylesheets/public.css
 2015-12-31 11:11:38 +08:00
ouyangxuhua 82b8cb77fd Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-30 17:28:04 +08:00
cxt 76b95fbf93 课程和项目的课程简介默认可显示20行 2015-12-30 16:27:56 +08:00
ouyangxuhua dcfe89c544 帖子发送到组织资源栏目，同时增加增删查改功能 2015-12-30 15:46:01 +08:00
lizanle abb19422ff 发送资源到组织功能。同时个人资源库也要添加这个功能 2015-12-29 17:13:01 +08:00
huang 41cd038758 讨论区帖子添加锁定 2015-12-29 15:05:07 +08:00
huang 5060ec26bb 项目讨论区 2015-12-29 11:04:20 +08:00
guange fd746c25f3 文件下载改为base64传输 2015-12-22 16:11:09 +08:00
guange 22d8fc9abd 作业附件乱码优化 2015-12-22 15:45:17 +08:00
cxt e86f9f9aeb 去掉通知页面的字符限制 2015-12-21 13:20:09 +08:00
huang ea51b24a4e Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-18 17:06:00 +08:00
guange d0e139650f issue回复的at出错 2015-12-18 16:50:44 +08:00
huang a080306f75 解决课程动态中，点击按钮，提交多次的问题 2015-12-18 16:05:39 +08:00
guange eb97f7dfb2 merge 2015-12-18 09:20:51 +08:00
cxt 0ed58d4898 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-17 19:07:17 +08:00
cxt 3b25616f0c 编辑作品时可编辑分组成员 2015-12-17 19:06:10 +08:00
lizanle 5f8c04e3a0 Merge branch 'szzh' into dev_zanle 2015-12-17 18:17:38 +08:00