9431 Commits

Author	SHA1	Message	Date
lizanle	084844941f	个人单位修改。 ... 聚焦就搜索所有的学校	2015-12-18 15:22:29 +08:00
lizanle	eb02a3d34a	Merge remote-tracking branch 'origin/szzh' into szzh	2015-12-18 14:38:10 +08:00
lizanle	70f93741d6	issue图标问题	2015-12-18 14:38:04 +08:00
ouyangxuhua	b3b5bc7ffd	Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh	2015-12-18 14:30:43 +08:00
ouyangxuhua	85bc9ce43d	解决组织模块的一些bug	2015-12-18 14:30:25 +08:00
lizanle	e867358bc1	Merge remote-tracking branch 'origin/szzh' into szzh	2015-12-18 11:20:07 +08:00
lizanle	06734d86ca	attachment_acts页面变量错误	2015-12-18 11:19:55 +08:00
guange	8c967e6559	格式改进	2015-12-18 11:13:27 +08:00
guange	e8cf5d1042	at消息html代码问题	2015-12-18 10:53:35 +08:00
guange	39ad191dd0	Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh	2015-12-18 10:41:06 +08:00
guange	b4016faeb6	编辑框消失	2015-12-18 10:40:12 +08:00
lizanle	47b20d3639	journal不应该算入ForgeActivity	2015-12-18 10:19:18 +08:00
lizanle	f3f64b8655	Merge remote-tracking branch 'origin/szzh' into szzh	2015-12-18 09:46:35 +08:00
lizanle	5d47afdc43	issue 删除回复的权限问题	2015-12-18 09:46:28 +08:00
huang	b34b1181b7	Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh	2015-12-18 09:39:55 +08:00
huang	4ca177970b	fork点击提示	2015-12-18 09:39:36 +08:00
lizanle	38c3422b83	Merge remote-tracking branch 'origin/szzh' into szzh	2015-12-18 09:28:41 +08:00
lizanle	0659015ada	issue 多了一个提交按钮和时间显示	2015-12-18 09:26:35 +08:00
guange	d703f75c98	merge	2015-12-18 09:23:52 +08:00
guange	eb97f7dfb2	merge	2015-12-18 09:20:51 +08:00
huang	5259831224	Merge branch 'szzh' into hjq_new_course	2015-12-18 09:17:49 +08:00
huang	b87943ff1d	Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh ... Conflicts: db/schema.rb 处理冲突	2015-12-18 09:17:18 +08:00
guange	b69f5f0da3	Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh	2015-12-17 22:36:33 +08:00
guange	c98e9fc639	查看作业代码着色	2015-12-17 22:36:18 +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
cxt	c7f321475a	多选题错判	2015-12-17 19:05:22 +08:00
lizanle	5f8c04e3a0	Merge branch 'szzh' into dev_zanle	2015-12-17 18:17:38 +08:00
lizanle	8ce2dbc4b8	issue回复	2015-12-17 18:12:38 +08:00
guange	716604903b	修复讨论区at错误	2015-12-17 18:07:19 +08:00
ouyangxuhua	ef46191c80	Merge branch 'szzh' into dev_hjq	2015-12-17 17:42:48 +08:00
lizanle	1dbccd81d6	issue回复的删除功能	2015-12-17 17:15:03 +08:00
guange	923cb3c84f	中文报错	2015-12-17 15:44:17 +08:00
lizanle	1809a93770	editor修改	2015-12-17 15:41:36 +08:00
cxt	a2ebaa0729	分组作业提交作品时如果关联了项目则从项目成员中添加分组成员	2015-12-17 15:28:28 +08:00
lizanle	505d1b5546	editor修改	2015-12-17 15:19:29 +08:00
lizanle	4bc68081ee	editor修改	2015-12-17 15:15:00 +08:00
guange	fc63dfcb7b	消息通知	2015-12-17 15:14:52 +08:00
ouyangxuhua	de229c0f1c	组织资源栏目的文件可以被引用至当前组织下的资源栏目	2015-12-17 14:51:02 +08:00
huang	2d2329a1e0	代码定位问题	2015-12-17 14:31:55 +08:00
lizanle	b02cb6fdd4	issue的修改如果更改issue的类型，那么就会有问题。需要重新新建editor	2015-12-17 11:30:52 +08:00
lizanle	31c57b78bf	issue的修改如果更改issue的类型，那么就会有问题。需要重新新建editor	2015-12-17 11:28:28 +08:00
cxt	89d3d3821c	分组作业的导入	2015-12-17 10:38:14 +08:00
lizanle	c183574a5e	博客回复	2015-12-17 10:19:43 +08:00
cxt	51e082a551	编辑和新建作品时的样式和提示信息调整	2015-12-17 10:17:13 +08:00
cxt	fa0f9c6751	分组作业的编辑，若分组作业已提交了作品则不可再编辑分组设置	2015-12-17 10:16:29 +08:00
ouyangxuhua	acb604883d	项目/课程配置关联组织，左边的组织列表由每页10个组织增至15个组织。	2015-12-17 10:01:28 +08:00
cxt	ff579afd45	作业动态中添加分组人数	2015-12-17 09:27:51 +08:00
lizanle	0a3c5f6acc	issues如果标题为空需要弹框报错	2015-12-17 09:22:01 +08:00
cxt	a8c8dc3cc6	关联项目的提示信息修改	2015-12-16 17:38:28 +08:00