 huang
|
ae42e0f0c5
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-15 12:38:02 +08:00 |
|
huang
|
c0460a20a1
|
Merge branch 'dev_shcool' into develop
|
2016-10-15 12:37:42 +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
|
8699ca2733
|
Merge branch 'develop' into dev_shcool
|
2016-10-15 12:36:29 +08:00 |
 cxt
|
caf2b5be9b
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-15 12:36:19 +08:00 |
|
cxt
|
5aab3fdb75
|
rake中加打印日志
|
2016-10-15 12:36:07 +08:00 |
|
huang
|
8005958f03
|
删除版本刷新
|
2016-10-15 12:35:36 +08:00 |
|
huang
|
6dbb50f803
|
确定按钮变成手型
|
2016-10-15 11:34:06 +08:00 |
|
huang
|
50ba2fb04f
|
多个历史版本和没有历史版本删除附件提醒
|
2016-10-15 11:31:15 +08:00 |
|
huang
|
da7de2c2a2
|
更新版本中隐藏删除
|
2016-10-15 11:12:12 +08:00 |
|
huang
|
f2f9792203
|
attachment history中description字段类型修改
|
2016-10-15 09:38:48 +08:00 |
|
huang
|
f1e4628e75
|
组织添加历史版本删除功能
|
2016-10-15 09:17:47 +08:00 |
|
huang
|
7e1d871cf0
|
更新资源刷新
|
2016-10-15 09:04:19 +08:00 |
|
huang
|
3db29cd40b
|
J解决重复提交问题
|
2016-10-14 21:10:58 +08:00 |
 daiao
|
3ceee6522b
|
还原新建贴吧报贴吧名已存在的问题
|
2016-10-14 21:05:40 +08:00 |
|
daiao
|
64d446e480
|
还原组织一级栏目列表
|
2016-10-14 20:35:51 +08:00 |
|
cxt
|
d5eea455e9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-14 20:31:53 +08:00 |
|
cxt
|
13b1d7bb78
|
作业发布的rake
|
2016-10-14 20:31:42 +08:00 |
 Tim
|
162838dae6
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-14 20:31:04 +08:00 |
|
Tim
|
9ce87808c8
|
里程碑编辑页面样式添加
|
2016-10-14 20:30:52 +08:00 |
|
huang
|
e7f930a678
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-14 20:26:46 +08:00 |
|
huang
|
3a1ab607fa
|
附件重复提交问题
|
2016-10-14 20:25:14 +08:00 |
|
Tim
|
326fab566d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-14 19:36:03 +08:00 |
|
Tim
|
ef9e9aca04
|
弹框居中显示
|
2016-10-14 19:35:53 +08:00 |
|
huang
|
91ee5a0d9f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-14 19:21:54 +08:00 |
|
huang
|
80bf13c516
|
资源库删除历史版本功能
|
2016-10-14 19:21:41 +08:00 |
|
Tim
|
71f43c757f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-14 18:25:44 +08:00 |
|
Tim
|
981e1eb358
|
问卷宽度减少，编辑按钮可见
|
2016-10-14 18:25:35 +08:00 |
|
cxt
|
5870c3eaaf
|
子栏目讨论区列表的排序、作品内容的样式调整
|
2016-10-14 18:24:54 +08:00 |
|
cxt
|
142e301e53
|
必答换行
|
2016-10-14 18:03:49 +08:00 |
|
daiao
|
262c4c5673
|
Merge branch 'develop' into dev_shcool
|
2016-10-14 17:53:47 +08:00 |
|
cxt
|
2d7c7dc05d
|
左侧讨论区子栏目的样式修改
|
2016-10-14 17:13:26 +08:00 |
|
cxt
|
89307f9e84
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-14 17:05:55 +08:00 |
|
cxt
|
5b5bfe005e
|
新增栏目名称过长时添加失败
|
2016-10-14 17:05:47 +08:00 |
|
daiao
|
ec582af985
|
Merge branch 'develop' into dev_shcool
|
2016-10-14 17:01:21 +08:00 |
|
Tim
|
8e9694ba79
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-14 17:00:16 +08:00 |
|
Tim
|
7f7f786aa0
|
资源库描述文字折行
|
2016-10-14 16:59:50 +08:00 |
|
cxt
|
e59f3f887a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-14 16:44:42 +08:00 |
|
cxt
|
d247109819
|
编程作业提示信息
|
2016-10-14 16:44:37 +08:00 |
|
Tim
|
75a68e9844
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-14 16:34:09 +08:00 |
|
Tim
|
a302dcca04
|
匿评分数tip
|
2016-10-14 16:33:56 +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 |
|
cxt
|
0a9b6bcdbc
|
资源发布失败测试
|
2016-10-14 16:17:00 +08:00 |
|
cxt
|
2d508254ac
|
51、94用户个人主页报500
|
2016-10-14 16:16:35 +08:00 |
|
Tim
|
8aaab44697
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-14 16:13:44 +08:00 |
|
Tim
|
2955d07f7c
|
分数显示tip
|
2016-10-14 16:13:30 +08:00 |
|
huang
|
446f0d142c
|
Merge branch 'rep_quality' into develop
|
2016-10-14 16:11:49 +08:00 |
|
cxt
|
38d43cfb67
|
必答不应换行
|
2016-10-14 16:11:46 +08:00 |
|
daiao
|
7d8091e455
|
Merge branch 'dev_shcool' into develop
|
2016-10-14 16:03:57 +08:00 |