 huang
|
a62001c892
|
新建版本库--
如果主版本库已存在，新建的时候不允许设置主版本库
|
2015-05-13 10:27:27 +08:00 |
|
huang
|
6c500109c9
|
修改项目上传资源
|
2015-05-13 10:06:04 +08:00 |
 lizanle
|
7112d91706
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-05-13 09:56:50 +08:00 |
|
lizanle
|
3fae37fa90
|
课程学生列表下啦刷新显示，查看历次作业成绩的下啦刷新显示api改动
|
2015-05-13 09:56:34 +08:00 |
 guange
|
50575c1c20
|
issue的排序经一线人员使用，还是按创建时间排序好
|
2015-05-13 09:45:09 +08:00 |
|
guange
|
aab94676bb
|
在lib里不能直接用logger,要用Rails.logger
|
2015-05-13 09:24:02 +08:00 |
|
guange
|
80d44e4f4c
|
新版项目的上传图标问题解决
|
2015-05-12 17:46:54 +08:00 |
 alan
|
fe92b05026
|
讨论区编辑添加附件
Signed-off-by: alan <547533434@qq.com>
|
2015-05-12 17:14:07 +08:00 |
|
alan
|
29114e19f3
|
Signed-off-by: alan <547533434@qq.com>
|
2015-05-12 15:15:04 +08:00 |
|
guange
|
4e6ca53b53
|
jquery-js找不到报错
|
2015-05-12 10:12:00 +08:00 |
|
guange
|
092af28476
|
修正编辑器在火狐下粘贴不成功
|
2015-05-11 20:57:59 +08:00 |
|
alan
|
8773842801
|
Signed-off-by: alan <547533434@qq.com>
|
2015-05-11 17:35:36 +08:00 |
|
alan
|
8e61136d7f
|
Signed-off-by: alan <547533434@qq.com>
|
2015-05-11 17:23:53 +08:00 |
|
alan
|
79c0c6f551
|
修改路由跳转
Signed-off-by: alan <547533434@qq.com>
|
2015-05-11 16:45:03 +08:00 |
|
alan
|
ee18ba7051
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
app/views/boards/_course_show.html.erb
app/views/boards/_project_show.html.erb
Signed-off-by: alan <547533434@qq.com>
|
2015-05-11 16:25:17 +08:00 |
|
alan
|
25bcc676b9
|
增加附件功能以及修改路由跳转
Signed-off-by: alan <547533434@qq.com>
|
2015-05-11 16:23:15 +08:00 |
 sw
|
328dc828c2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-11 16:12:49 +08:00 |
|
sw
|
c51794d754
|
提交通知连接
|
2015-05-11 16:06:40 +08:00 |
|
huang
|
f3b46c5823
|
项目资源库权限优化：
管理员、资源上传者拥有设置公开私有权限
私有项目不提供引用其它项目和公开功能
|
2015-05-11 15:50:23 +08:00 |
|
sw
|
910f9b670e
|
Merge branch 'develop' into szzh
|
2015-05-11 15:25:47 +08:00 |
|
sw
|
87564eceee
|
修改作业--->修改作品
|
2015-05-11 15:25:16 +08:00 |
|
guange
|
11d7c234f7
|
merge
|
2015-05-10 18:12:51 +08:00 |
|
guange
|
461d9cc183
|
将autologin默认过期时间改为两个月
|
2015-05-10 18:06:45 +08:00 |
|
sw
|
4a4dfe79db
|
Merge branch 'szzh' into develop
|
2015-05-08 18:09:26 +08:00 |
|
sw
|
f12a20f85e
|
用户修改资料保存报错
|
2015-05-08 16:32:55 +08:00 |
|
sw
|
6a31a99c93
|
编辑课程讨论区回复时的问题
|
2015-05-08 16:14:46 +08:00 |
|
sw
|
e4e683d59b
|
Merge branch 'szzh' into develop
|
2015-05-08 15:46:03 +08:00 |
|
sw
|
1b6ecbf520
|
Merge branch 'guange_dev' into szzh
|
2015-05-08 15:45:24 +08:00 |
|
sw
|
25e80cefb8
|
Merge branch 'szzh' into guange_dev
|
2015-05-08 15:44:47 +08:00 |
|
sw
|
821ceb41cf
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-08 15:44:03 +08:00 |
|
sw
|
d4f73ae472
|
111
|
2015-05-08 15:43:55 +08:00 |
|
sw
|
5f6f7b7cdf
|
引用功能图片显示不正常
|
2015-05-08 15:31:13 +08:00 |
|
huang
|
80e1d1f277
|
去掉讨论区编辑页面虚线
|
2015-05-08 15:20:28 +08:00 |
|
huang
|
a5fbccc975
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-08 15:02:27 +08:00 |
|
huang
|
f7ad600dde
|
发布帖子不能删除
|
2015-05-08 15:02:04 +08:00 |
|
sw
|
5a4f477e46
|
课程讨论区编辑、删除按钮互换
|
2015-05-08 14:57:55 +08:00 |
|
sw
|
86f686efb3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-08 14:56:22 +08:00 |
|
sw
|
ee051f6a37
|
1、课程讨论区回复取消功能
2、课程讨论区回复时不现实主题
|
2015-05-08 14:55:56 +08:00 |
|
huang
|
89ea9ddc7b
|
项目讨论区代码还原
样式调整
|
2015-05-08 14:41:57 +08:00 |
|
guange
|
5c4ad1ce7d
|
merge
|
2015-05-08 14:31:23 +08:00 |
|
guange
|
eed39ef0ef
|
上传头像会进行压缩
|
2015-05-08 14:28:17 +08:00 |
|
sw
|
05c26aceb6
|
发布新贴按钮跳转
|
2015-05-08 14:27:59 +08:00 |
|
sw
|
34dbde442d
|
还原课程讨论区
|
2015-05-08 14:23:57 +08:00 |
|
sw
|
a24e4d345d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-08 14:03:08 +08:00 |
|
alan
|
c21f2c3927
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-08 14:02:46 +08:00 |
|
alan
|
2d93cd4bdc
|
Signed-off-by: alan <547533434@qq.com>
|
2015-05-08 13:33:18 +08:00 |
|
alan
|
23ef975c23
|
讨论区修改bug
Signed-off-by: alan <547533434@qq.com>
|
2015-05-08 13:04:25 +08:00 |
|
huang
|
30c6a71cbc
|
修正新建课程讨论区跳转
|
2015-05-08 11:25:25 +08:00 |
|
alan
|
07ca42b24d
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-05-08 10:59:30 +08:00 |
|
alan
|
63351fc049
|
Signed-off-by: alan <547533434@qq.com>
|
2015-05-08 10:59:11 +08:00 |