lizanle
|
90c63192e6
|
历史资源模型修改
|
2015-12-30 10:32:32 +08:00 |
lizanle
|
abb19422ff
|
发送资源到组织功能。同时个人资源库也要添加这个功能
|
2015-12-29 17:13:01 +08:00 |
ouyangxuhua
|
77e0f0cd08
|
转发帖子新建帖子,并更新相关表
|
2015-12-29 15:49:24 +08:00 |
Tim
|
b0b4527ea1
|
Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq
Conflicts:
public/stylesheets/org.css
|
2015-12-24 10:40:00 +08:00 |
ouyangxuhua
|
b9ae579622
|
将课程帖子转发至组织帖子栏目
|
2015-12-23 15:35:26 +08:00 |
ouyangxuhua
|
2220e0b7cc
|
增加帖子-组织栏目关联表
|
2015-12-22 15:48:41 +08:00 |
huang
|
dae6e68623
|
renwu
|
2015-12-18 20:46:17 +08:00 |
cxt
|
c6e7c8860d
|
dd
|
2015-12-18 15:45:23 +08:00 |
lizanle
|
70f93741d6
|
issue图标问题
|
2015-12-18 14:38:04 +08:00 |
lizanle
|
5d47afdc43
|
issue 删除回复的权限问题
|
2015-12-18 09:46:28 +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
|
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 |
cxt
|
0ed58d4898
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-17 19:07:17 +08:00 |
lizanle
|
5f8c04e3a0
|
Merge branch 'szzh' into dev_zanle
|
2015-12-17 18:17:38 +08:00 |
huang
|
721a007779
|
删除 由于course、project一张表而引起的历史数据异常问题
|
2015-12-17 13:22:41 +08:00 |
lizanle
|
71f6a637e0
|
帖子按时间倒排
|
2015-12-16 17:26:19 +08:00 |
guange
|
c0de5d55de
|
加入了issue的at消息提醒
|
2015-12-16 16:37:00 +08:00 |
cxt
|
5cf88a287b
|
分组作业提示语的修改
|
2015-12-16 11:37:59 +08:00 |
huang
|
06e5784436
|
解决英雄榜两个用户同时存在的but
|
2015-12-16 10:00:10 +08:00 |
ouyangxuhua
|
0602a03e12
|
组织资源类型的栏目,增加搜索功能
|
2015-12-14 10:26:34 +08:00 |
cxt
|
bb2f49439e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2015-12-11 15:00:35 +08:00 |
cxt
|
27ed6df9d6
|
Merge branch 'szzh' into develop
|
2015-12-11 14:59:52 +08:00 |
huang
|
fed989753a
|
修复林处账号不能查看消息的问题
|
2015-12-11 13:46:23 +08:00 |
huang
|
9710731a2c
|
课程配置添加登录名
|
2015-12-10 20:03:59 +08:00 |
huang
|
fbba933a46
|
Merge branch 'hjq_new_course' of http://git.trustie.net/jacknudt/trustieforge into hjq_new_course
|
2015-12-10 16:09:42 +08:00 |
huang
|
be940ee3aa
|
Merge branch 'develop' into hjq_new_course
|
2015-12-10 16:09:36 +08:00 |
lizanle
|
433059e1bc
|
schema
|
2015-12-10 10:12:54 +08:00 |
cxt
|
a9f6e817b4
|
分组作业关联项目
|
2015-12-08 17:37:15 +08:00 |
huang
|
ac9f13c842
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
Conflicts:
app/views/repositories/show.html.erb
db/schema.rb
处理冲突
|
2015-12-08 17:13:50 +08:00 |
houxiang
|
56cb83ffba
|
版本库首页没有统计commit_count,具体的详情页在开始统计
|
2015-12-08 15:56:31 +08:00 |
huang
|
42f5b86d95
|
添加字段删除课程
|
2015-12-08 10:32:10 +08:00 |
huang
|
068c305c06
|
Merge branch 'hjq_new_course' of http://repository.trustie.net/xianbo/trustie2 into hjq_new_course
Conflicts:
app/views/courses/member.html.erb
app/views/courses/settings.html.erb
app/views/repositories/show.html.erb
db/schema.rb
处理冲突
|
2015-12-08 09:10:21 +08:00 |
cxt
|
b61a0a98e5
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/student_work/new.html.erb
app/views/users/_user_homework_form.html.erb
db/schema.rb
public/stylesheets/courses.css
|
2015-12-07 09:47:18 +08:00 |
huang
|
bd3d0547f5
|
组织样式修改
|
2015-12-05 14:34:16 +08:00 |
lizanle
|
4c00312f45
|
Merge branch 'szzh' into dev_zanle
|
2015-12-04 16:42:02 +08:00 |
lizanle
|
0a5a33c2de
|
schema
|
2015-12-04 16:36:03 +08:00 |
huang
|
c1747ab217
|
fork重名,提交
|
2015-12-04 15:49:05 +08:00 |
huang
|
8f024bdf4d
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
Conflicts:
db/schema.rb
|
2015-12-04 09:12:24 +08:00 |
huang
|
89b8f7783d
|
添加forked_form的id
|
2015-12-04 08:57:29 +08:00 |
cxt
|
fd51b02e16
|
添加修订附件
|
2015-12-03 18:33:08 +08:00 |
cxt
|
77e96af78f
|
还原分组作业
|
2015-12-03 10:41:27 +08:00 |
cxt
|
f90ff781ab
|
学生提交作品页面的合作成员弹窗
|
2015-12-03 09:17:36 +08:00 |
cxt
|
fee438cc0b
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-11-30 16:27:39 +08:00 |
cxt
|
ebeaac5798
|
作业匿评的结束状态未更新
|
2015-11-30 16:27:26 +08:00 |
huang
|
364c9a3a9e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
合并
|
2015-11-30 14:35:37 +08:00 |
huang
|
39b87aaaac
|
为student_work表添加索引
为homework_comments添加索引
大幅提高查询速度
|
2015-11-30 13:09:13 +08:00 |
lizanle
|
d266237590
|
kaminari分页添加上一页下一页
|
2015-11-30 11:08:08 +08:00 |
lizanle
|
96290ad975
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/models/attachment.rb
db/schema.rb
|
2015-11-27 18:47:19 +08:00 |
lizanle
|
582cd6f5d4
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/models/attachment.rb
db/schema.rb
|
2015-11-27 18:47:02 +08:00 |
lizanle
|
487c6bad09
|
schema.rb
|
2015-11-27 18:08:38 +08:00 |
huang
|
f91918145d
|
0
|
2015-11-27 18:00:26 +08:00 |
huang
|
634e11d0ec
|
0
|
2015-11-27 17:15:51 +08:00 |
huang
|
b130b52a23
|
修改迁移
|
2015-11-27 16:55:45 +08:00 |
Tim
|
580cc6b8d8
|
系统自动生成文件
|
2015-11-27 16:14:42 +08:00 |
huang
|
501a8f905b
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
public/stylesheets/courses.css
|
2015-11-27 14:56:30 +08:00 |
huang
|
36b1649fbd
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
2015-11-27 14:49:49 +08:00 |
huang
|
042b197767
|
课程英雄榜界面调整
动作触发的时候更新总分
更换迁移顺序
|
2015-11-27 10:49:41 +08:00 |
houxiang
|
c6b5abba4e
|
hide the the count of project'repo
|
2015-11-27 10:10:59 +08:00 |
huang
|
8c83bbfff3
|
课程英雄榜数据
|
2015-11-27 00:48:08 +08:00 |
huang
|
aca7684414
|
课程英雄榜
各模块动作 触发加分
|
2015-11-26 18:22:03 +08:00 |
lizanle
|
4efb660214
|
全站搜索
|
2015-11-26 09:57:53 +08:00 |
huang
|
c8b1cae947
|
建立贡献榜表及相关关联
部分页面
按总分排序(英雄榜)
部分页面(未完成)
|
2015-11-25 15:16:33 +08:00 |
Tim
|
d1f16a0851
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
db/schema.rb
|
2015-11-25 10:15:12 +08:00 |
Tim
|
ec42cd2d7f
|
系统自动生成文件
|
2015-11-25 10:12:20 +08:00 |
cxt
|
f262a7cc13
|
cffd
|
2015-11-20 22:05:31 +08:00 |
huang
|
1df8c94b98
|
解决字符过长不能保存成功的问题
|
2015-11-20 21:49:36 +08:00 |
huang
|
dd148fb7c5
|
Merge branch 'szzh' into sw_new_course
Conflicts:
db/schema.rb
|
2015-11-20 20:25:17 +08:00 |
Tim
|
e3d78bf4f0
|
组织样式更改
|
2015-11-20 14:30:54 +08:00 |
cxt
|
99945d5bb5
|
学生答题界面的修改
|
2015-11-20 12:54:41 +08:00 |
huang
|
3deebf2006
|
show
|
2015-11-20 11:08:47 +08:00 |
huang
|
7dc16775dc
|
添加字段迁移
|
2015-11-19 20:44:01 +08:00 |
lizanle
|
56e96a035b
|
schema.rb
|
2015-11-19 15:01:03 +08:00 |
houxiang
|
4a9da97f9b
|
modify by hx add commit_count_detail_show
|
2015-11-18 16:23:02 +08:00 |
cxt
|
249b15751d
|
新建多选题
|
2015-11-18 14:05:29 +08:00 |
huang
|
282c7f5bd2
|
修改添加题目相关
|
2015-11-18 10:46:56 +08:00 |
ouyangxuhua
|
71bf80c7a5
|
1.创建组织课程关联表,建立相应模型及控制器;
2.在课程设置中,添加加入组中功能;
3.解决添加项目后,组织列表的上一页和下一页链接问题。
|
2015-11-17 17:34:50 +08:00 |
lizanle
|
291868ba43
|
Merge branch 'szzh' into dev_zanle
Conflicts:
db/schema.rb
|
2015-11-17 16:48:03 +08:00 |
lizanle
|
0eff2bcb74
|
课程添加允许学生发布资源的配置
|
2015-11-17 16:43:50 +08:00 |
huang
|
23ca20692f
|
问卷部分方法
|
2015-11-17 15:20:59 +08:00 |
cxt
|
5400b907e6
|
学生测验列表
|
2015-11-17 09:33:40 +08:00 |
cxt
|
10ac8eaa35
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-16 10:58:08 +08:00 |
houxiang
|
9350841d50
|
change by hx
|
2015-11-16 10:44:36 +08:00 |
cxt
|
62d80c27d6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-16 08:59:54 +08:00 |
cxt
|
24e9f5e7d5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2015-11-16 08:53:15 +08:00 |
cxt
|
a50ec626cd
|
数据
|
2015-11-16 08:52:32 +08:00 |
lizanle
|
b88d5e59a1
|
回复的时候会多出一条一模一样的内容
|
2015-11-14 09:44:53 +08:00 |
cxt
|
ee8d9d7b4e
|
提交
|
2015-11-13 17:47:29 +08:00 |
sw
|
466f3c4cc3
|
数据库修改以及一对一,一对多,多对多等关系的确立
|
2015-11-13 15:47:39 +08:00 |
lizanle
|
b24fadea05
|
设置 删除 编辑按钮做成项目一样的
|
2015-11-12 19:15:35 +08:00 |
cxt
|
ab868d7b65
|
课程通知增加置顶
|
2015-11-12 16:52:42 +08:00 |
ouyangxuhua
|
a3443ba968
|
组织模块功能实现
|
2015-11-12 09:32:00 +08:00 |
cxt
|
2a82f33227
|
个人首页的留言动态显示不合理
|
2015-11-09 16:08:15 +08:00 |
lizanle
|
8e66bb8fe1
|
在课程 项目 上传资源后跳转到对应的资源库界面
|
2015-11-09 10:07:12 +08:00 |
ouyangxuhua
|
283af137c6
|
组织模块动态及配置
|
2015-11-05 17:57:07 +08:00 |
Tim
|
223b17d8fe
|
普通作品列表、系统评分作品列表、匿评作品列表格式修改
|
2015-11-05 14:45:22 +08:00 |
huang
|
4608190529
|
增加点击选择历史版本记录
|
2015-11-05 14:31:43 +08:00 |
cxt
|
ee7b21de72
|
禁用匿评功能
|
2015-11-04 10:54:09 +08:00 |
cxt
|
3bb56f1606
|
教辅可查看未发布的作业
|
2015-10-30 17:24:09 +08:00 |
cxt
|
f5aaf7ac58
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2015-10-30 13:59:33 +08:00 |
cxt
|
6dcc97d5d1
|
添加作业的发布功能
|
2015-10-30 13:58:54 +08:00 |
lizanle
|
c2be8b4eec
|
课程大纲界面
|
2015-10-28 15:54:27 +08:00 |
Tim
|
61dc979ee4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2015-10-28 14:53:39 +08:00 |
Tim
|
e58dcc851b
|
资源库搜索图标替换
|
2015-10-28 14:34:39 +08:00 |
huang
|
294a517251
|
查看所有提交记录入口
点击自动复制版本库地址
|
2015-10-27 15:27:12 +08:00 |
huang
|
4c61e7490b
|
Merge branch 'develop' into gitlab_guange
Conflicts:
db/schema.rb
|
2015-10-27 14:42:05 +08:00 |
lizanle
|
2a76461cd1
|
简单博客功能
|
2015-10-24 15:34:43 +08:00 |
huang
|
1157dcaa06
|
版本库summary
文件目录
新版本库地址
按分支显示提交记录
相关界面
|
2015-10-22 13:44:35 +08:00 |
cxt
|
d049a00655
|
删除课程动态中未发布问卷的动态
|
2015-10-20 10:28:16 +08:00 |
cxt
|
90ee4bbe60
|
删除空的课程动态
|
2015-10-20 09:55:51 +08:00 |
cxt
|
0b565b1be0
|
私有课程的课件迁移
|
2015-10-19 17:34:59 +08:00 |
guange
|
6086c9304e
|
merge
|
2015-10-16 17:00:46 +08:00 |
guange
|
9e8e77f3e1
|
方法重构
|
2015-10-16 16:57:45 +08:00 |
cxt
|
5f3c8d928d
|
作业批次下拉列表的样式修改
|
2015-10-16 14:51:30 +08:00 |
huang
|
150ee3d28d
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
2015-10-16 09:07:38 +08:00 |
cxt
|
caa278d9f5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/boards_controller.rb
db/schema.rb
|
2015-10-15 16:22:49 +08:00 |
lizanle
|
b3d15b886a
|
学校的查询与现实问题重做
|
2015-10-15 12:04:55 +08:00 |
guange
|
9266eccdff
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
|
2015-10-14 17:28:11 +08:00 |
guange
|
716f0f31b3
|
merge
|
2015-10-14 17:26:51 +08:00 |
cxt
|
ea66ca5e00
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
public/javascripts/init_activity_KindEditor.js
|
2015-10-14 11:41:30 +08:00 |
cxt
|
8abc97ae84
|
个人主页添加个人留言动态
|
2015-10-14 11:38:16 +08:00 |
guange
|
6472367b68
|
firefox粘贴图片只能一张的bug
|
2015-10-13 21:47:55 +08:00 |
cxt
|
b9b7f6fa9e
|
个人主页留言动态的实现
|
2015-10-13 16:51:44 +08:00 |
huang
|
73898953d9
|
project表添加字段,记录project对应gitlba中project id
|
2015-10-13 10:58:22 +08:00 |
huang
|
fbeb6585d2
|
去掉初始化输出提示
|
2015-10-10 16:18:05 +08:00 |
huang
|
7c1bb8b9ed
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
Gemfile
app/models/user.rb
db/schema.rb
lib/trustie.rb
解决冲突
|
2015-10-10 16:09:05 +08:00 |
lizanle
|
d8a4e4d710
|
issue序号丢失的问题
issue缩进以及代码缩进的样式不同 的问题
|
2015-10-08 11:33:52 +08:00 |
sw
|
11736eb266
|
迁移文件有问题
|
2015-09-30 10:16:55 +08:00 |
cxt
|
452766bade
|
课程通知的动态排序时间调整
|
2015-09-30 09:58:29 +08:00 |
huang
|
5f26e331c6
|
缺陷截止时间到了消息通知
|
2015-09-28 17:31:55 +08:00 |
cxt
|
6a3089bb9b
|
动态的回复图片超出边框
|
2015-09-28 10:51:24 +08:00 |
cxt
|
c81e07d588
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2015-09-25 16:32:25 +08:00 |
cxt
|
223bac373f
|
课程动态的数据迁移
|
2015-09-25 16:29:47 +08:00 |
guange
|
08eecbd5ec
|
merge
|
2015-09-25 09:30:32 +08:00 |
huang
|
25a604d7b8
|
issue解决冲突
|
2015-09-24 16:59:19 +08:00 |
guange
|
0b4c8b05f1
|
JAVA语言支持
|
2015-09-24 15:09:15 +08:00 |
sw
|
f2325dee88
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-22 16:21:54 +08:00 |
cxt
|
a37f39558d
|
项目和课程的列表符号样式修改
|
2015-09-22 15:54:50 +08:00 |
sw
|
7a62b7f13d
|
增加匿评开启时间和匿评关闭时间,并对其业务逻辑进行js的控制。以及这两个值得修改
|
2015-09-21 17:11:45 +08:00 |
sw
|
385f2aa4ac
|
111
|
2015-09-19 15:23:01 +08:00 |
sw
|
a54a51c984
|
Merge branch 'guange_homework' into szzh
Conflicts:
app/models/homework_detail_programing.rb
db/schema.rb
|
2015-09-19 11:21:45 +08:00 |
sw
|
07dbb9da4c
|
111
|
2015-09-19 11:18:30 +08:00 |
huang
|
961b2bd564
|
开启/关闭匿评邮件通知
|
2015-09-19 10:54:50 +08:00 |
guange
|
c99222820e
|
加入了python语言支持
|
2015-09-19 10:39:10 +08:00 |
huang
|
fb76bc8f9a
|
完成项目邀请消息通知及对应页面
解决防注入问题(通过随机6为密码)
|
2015-09-18 23:18:15 +08:00 |
huang
|
ba2474e480
|
关闭匿评消息
|
2015-09-18 17:38:19 +08:00 |
huang
|
f041c80d0a
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/users/user_messages.html.erb
db/schema.rb
public/stylesheets/new_user.css
解决冲突
|
2015-09-18 13:08:12 +08:00 |
huang
|
9324d45e2c
|
系统消息发布添加标题功能
|
2015-09-17 16:23:09 +08:00 |
cxt
|
68338c46e1
|
个人动态按最后更新时间排序
|
2015-09-17 15:50:33 +08:00 |
Tim
|
5b6ac4564a
|
回复框头像路径改变
|
2015-09-17 08:46:43 +08:00 |
huang
|
b0ccf9037a
|
邮件邀请:
1、修改私有项目跳入403问题
2、增加同一个用户反复邀请的邮箱提醒。
3、修改邮箱的发送策略
|
2015-09-15 17:39:57 +08:00 |
lizanle
|
2fa01f32fb
|
schema
|
2015-09-15 11:28:08 +08:00 |
huang
|
4a7d3c9072
|
系统消息增加长度
|
2015-09-14 15:33:11 +08:00 |
sw
|
da269ef716
|
发布作业,请先输入作业标题
|
2015-09-11 17:27:07 +08:00 |
cxt
|
9dc3f43af1
|
修改迁移文件
|
2015-09-11 17:15:05 +08:00 |
cxt
|
dbdd68f45d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2015-09-11 16:43:59 +08:00 |
cxt
|
585818fe7a
|
讨论区动态重复出现
|
2015-09-11 16:42:24 +08:00 |
huang
|
dc564c37f1
|
修改系统消息参数
输入内容JS控制
|
2015-09-11 16:36:10 +08:00 |
huang
|
4d4b48ef99
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
2015-09-11 15:50:10 +08:00 |
sw
|
cd36965cd1
|
历史编程作业数据补齐
|
2015-09-11 11:31:59 +08:00 |
lizanle
|
80e38287dd
|
所有baselayout都引入prttefy.css .js
调整资源库宽度
|
2015-09-10 16:38:45 +08:00 |
huang
|
66251c8d30
|
添加功能:管理员界面发送系统消息
|
2015-09-09 17:05:32 +08:00 |
sw
|
519f079bcc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-09 16:54:21 +08:00 |
cxt
|
a991500e55
|
登录首页的样式修改
|
2015-09-09 10:21:44 +08:00 |
sw
|
1cbda41997
|
11
|
2015-09-08 14:43:59 +08:00 |
guange
|
be29bcc8bd
|
模拟答题记入数据库
|
2015-09-07 23:47:14 +08:00 |
guange
|
9e9f373a76
|
发布作业优化
|
2015-09-07 23:09:19 +08:00 |
cxt
|
aa0c0dab83
|
添加“我的动态”
|
2015-09-07 15:01:08 +08:00 |
cxt
|
d667e6359c
|
切换
|
2015-09-07 11:12:04 +08:00 |
huang
|
b2e25e8afc
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
2015-09-06 17:19:33 +08:00 |
sw
|
093273968b
|
删除匿名用户在缺陷中的回复
|
2015-09-06 16:38:12 +08:00 |
huang
|
c579ee51fe
|
增加点击时间表
|
2015-09-06 15:31:48 +08:00 |
sw
|
fe91ec1a85
|
1、历史数据导致项目动态中部分数据连接到课程相关页面
2、项目缺陷列表显示为整个系统的缺陷
3、用户得分的还原
4、样式调整
|
2015-09-06 11:22:27 +08:00 |
sw
|
1bda18afff
|
111
|
2015-09-06 09:31:09 +08:00 |
huang
|
353e2f5d18
|
添加课程消息迁移
|
2015-08-29 16:08:09 +08:00 |
suntao
|
b6d58b1b58
|
样式调整
|
2015-08-28 11:55:34 +08:00 |
sw
|
5b9c9312f5
|
留言界面样式修改
|
2015-08-26 17:42:02 +08:00 |
huang
|
bc563119d6
|
Merge branch 'sw_new_course' into dev_hjq
Conflicts:
app/controllers/users_controller.rb
public/stylesheets/new_user.css
|
2015-08-26 15:04:44 +08:00 |
huang
|
1dce1a2a4c
|
老师更新作品评阅消息通知
区分第一次评阅和后面的评阅
|
2015-08-26 14:47:53 +08:00 |
cxt
|
bd00870eba
|
个人主页
|
2015-08-25 19:24:23 +08:00 |
sw
|
44419eff04
|
rake db
|
2015-08-25 15:39:50 +08:00 |
lizanle
|
256ccedfe8
|
schema
|
2015-08-25 15:16:24 +08:00 |
ouyangxuhua
|
d7de5fc480
|
更改消息样式
|
2015-08-25 13:04:46 +08:00 |
huang
|
0da75afc88
|
消息排序(公共表)
|
2015-08-25 11:10:08 +08:00 |
huang
|
7961e3db6f
|
建立公共表
|
2015-08-24 22:47:48 +08:00 |
cxt
|
2e5916cf5e
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/controllers/admin_controller.rb
|
2015-08-24 18:01:51 +08:00 |
huang
|
4af3c9816c
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
db/schema.rb
|
2015-08-24 17:53:55 +08:00 |
huang
|
2d05d1f7d0
|
0
|
2015-08-24 17:51:44 +08:00 |
ouyangxuhua
|
f0483b6de8
|
更新新闻viewed
|
2015-08-24 17:45:00 +08:00 |
sw
|
535145f8f2
|
11
|
2015-08-21 16:35:52 +08:00 |
lizanle
|
1aa61acd79
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/public.css
|
2015-08-21 16:16:18 +08:00 |
lizanle
|
11d6298efa
|
资源库 合并后css样式冲突
|
2015-08-21 14:37:19 +08:00 |
lizanle
|
9138f46301
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/users_controller.rb
|
2015-08-21 14:10:50 +08:00 |
cxt
|
4c87071765
|
个人动态
|
2015-08-20 17:24:34 +08:00 |
huang
|
a15ab2c72e
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
2015-08-20 14:07:11 +08:00 |
sw
|
b52f607b68
|
用户动态 = 参与课程动态 + 参与课程动态
表创建以及相关关系的搭建
|
2015-08-20 11:19:26 +08:00 |
huang
|
6b6f6e0b0d
|
个人主页留言消息推送
|
2015-08-20 09:25:48 +08:00 |
huang
|
d18d1a9d81
|
用户留言添加
公共讨论区留言修改
|
2015-08-19 17:29:05 +08:00 |
huang
|
d657e9f3cc
|
新增 公共贴吧 消息通知
|
2015-08-19 11:06:39 +08:00 |
cxt
|
27ff5471ec
|
超级管理员新增功能页面的分页、添加超链接,添加查询条件。
|
2015-08-18 14:40:12 +08:00 |