 huang
|
31f71c474c
|
Merge branch 'szzh' into develop
|
2015-08-01 15:17:18 +08:00 |
 sw
|
fe2d621dc3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/helpers/users_helper.rb
|
2015-08-01 15:17:01 +08:00 |
|
huang
|
7ac3eec94b
|
Merge branch 'dev_hjq' into szzh
|
2015-08-01 15:16:12 +08:00 |
|
huang
|
6c6d46a4c6
|
Merge branch 'szzh' into dev_hjq
|
2015-08-01 15:15:31 +08:00 |
|
sw
|
11afcaf17c
|
没有昵称的用户显示为：匿名用户
个人主页留言换行
|
2015-08-01 15:14:45 +08:00 |
|
huang
|
5e857d3472
|
...
|
2015-08-01 15:14:36 +08:00 |
 cxt
|
14673e79d8
|
个人主页标签相关问题的修复
|
2015-08-01 15:09:14 +08:00 |
|
sw
|
c200634c27
|
个人主页--课程列表：加入课程失败后，加入课程按钮却能变为提交作业按钮
|
2015-08-01 15:08:11 +08:00 |
|
sw
|
bed46c050f
|
创建课程、加入课程、创建作业数的显示
|
2015-08-01 15:04:39 +08:00 |
|
sw
|
793f477f1c
|
创建课程数、加入课程数、创建项目数、加入项目数统计问题
|
2015-08-01 14:58:41 +08:00 |
|
sw
|
1cd50693b5
|
登录失败错误信息提示
|
2015-08-01 14:31:22 +08:00 |
|
sw
|
f5cfd7258d
|
修改编程作业时，对已通过测试、未通过测试显示的初始化，以及修改时的结果的存储
|
2015-08-01 14:27:32 +08:00 |
|
cxt
|
76ea93c89c
|
修改标签与上面块之间的间距
|
2015-08-01 13:47:58 +08:00 |
|
huang
|
41345c329d
|
Merge branch 'dev_hjq' into szzh
|
2015-08-01 11:37:48 +08:00 |
|
huang
|
9d6ac57052
|
Merge branch 'szzh' into dev_hjq
|
2015-08-01 11:37:00 +08:00 |
|
huang
|
2d6909b4ee
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-01 11:36:47 +08:00 |
|
huang
|
a915a35819
|
优化版本代码加提示
|
2015-08-01 11:35:48 +08:00 |
|
huang
|
c376c0e38f
|
新建版本 --新页面设计
|
2015-08-01 11:25:33 +08:00 |
|
huang
|
3980e84817
|
修改wiki上传附件 附件名丢失的问题
|
2015-08-01 10:52:06 +08:00 |
|
sw
|
cbbc93acbd
|
当标准代码内容改变时，自动还原所有的测试信息
|
2015-08-01 10:45:32 +08:00 |
|
huang
|
ef8a7a7419
|
添加资源后，项目左侧统计数字自动刷新
|
2015-08-01 10:30:13 +08:00 |
|
cxt
|
8de8fe69cc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-01 10:02:23 +08:00 |
|
huang
|
e70748fd81
|
去掉项目辅助工具（dts、yun）
|
2015-08-01 09:57:44 +08:00 |
|
sw
|
504d5a6b32
|
Merge branch 'develop' into szzh
|
2015-07-31 17:27:57 +08:00 |
|
sw
|
346f4d6018
|
作品列表界面，学生不显示输入输出
|
2015-07-31 17:27:43 +08:00 |
|
huang
|
cecbf8b43f
|
Merge branch 'szzh' into dev_hjq
|
2015-07-31 17:20:51 +08:00 |
|
huang
|
3b60d409d3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-07-31 17:20:35 +08:00 |
|
huang
|
f95fa6b5e7
|
修复：项目名称带点号，issue回复的404问题
项目名称全数字：不能留言等问题
|
2015-07-31 17:20:04 +08:00 |
|
sw
|
d6fe9939f6
|
老师测试代码base64加密，
返回值json取值有问题
|
2015-07-31 16:59:30 +08:00 |
|
cxt
|
f8274fbdb6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-07-31 16:25:27 +08:00 |
|
sw
|
782f7b074e
|
Merge branch 'szzh' into develop
|
2015-07-31 16:10:33 +08:00 |
|
sw
|
e17b834706
|
编辑资料显示在头像的右下角
|
2015-07-31 16:09:07 +08:00 |
|
cxt
|
8eb2b72802
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-07-31 15:51:52 +08:00 |
|
cxt
|
e743852657
|
Merge branch 'dev_cxt2' into szzh
|
2015-07-31 15:51:27 +08:00 |
|
cxt
|
55a7c168b5
|
Merge branch 'szzh' into dev_cxt2
Conflicts:
app/views/users/show.html.erb
|
2015-07-31 15:51:11 +08:00 |
|
huang
|
45ca398f71
|
Merge branch 'dev_hjq' into szzh
|
2015-07-31 15:48:18 +08:00 |
|
huang
|
b42d8c6d2c
|
Merge branch 'szzh' into dev_hjq
|
2015-07-31 15:47:27 +08:00 |
|
sw
|
d5cf0c65a7
|
验证正确和错误之后，可以继续点击进行验证
|
2015-07-31 15:38:50 +08:00 |
|
cxt
|
8340e9fe1b
|
添加个人主页标签
|
2015-07-31 15:36:35 +08:00 |
|
huang
|
b4e12b6e71
|
解决版本库--查看修订异常问题
|
2015-07-31 15:29:55 +08:00 |
|
sw
|
d5e97c6131
|
1、留言界面显示top_view
2、留言界面删除部分留言后报错
|
2015-07-31 15:25:01 +08:00 |
|
sw
|
a74409fa04
|
回复子留言不成功
|
2015-07-31 15:18:57 +08:00 |
|
huang
|
47e66d87c9
|
邮件通知：issue":用issue 标题 替换提示语
|
2015-07-31 15:04:05 +08:00 |
|
sw
|
e2ec37026c
|
不是自己的个人主页也显示top_view
|
2015-07-31 14:46:05 +08:00 |
|
sw
|
f0552ad367
|
他人留言界面进入却是我的留言列表
|
2015-07-31 14:19:28 +08:00 |
|
sw
|
a52c906217
|
用户留言界面插件问题
|
2015-07-31 14:18:32 +08:00 |
|
huang
|
93ef63d60d
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/layouts/base_users_new.html.erb
|
2015-07-31 14:07:04 +08:00 |
|
huang
|
ef5bd664cc
|
..合并
|
2015-07-31 14:04:39 +08:00 |
|
sw
|
b045b2a648
|
个人主页留言多出的；两个冒号
|
2015-07-31 14:03:19 +08:00 |
|
sw
|
9da18bcad4
|
老师测试结果的返回
|
2015-07-31 13:58:27 +08:00 |