 ouyangxuhua
|
1e652faec7
|
Merge branch 'develop' into dev_hjq
|
10 years ago |
 lizanle
|
433059e1bc
|
schema
|
10 years ago |
|
ouyangxuhua
|
2f7260cba2
|
1.在栏目表中增加field_type(类型)字段；
2.在组织配置-》栏目，增加栏目类型。
|
10 years ago |
|
ouyangxuhua
|
09f0d0201e
|
组织增加栏目发帖功能
|
10 years ago |
 cxt
|
a9f6e817b4
|
分组作业关联项目
|
10 years ago |
 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
处理冲突
|
10 years ago |
|
huang
|
916d99be82
|
课程删除功能
|
10 years ago |
 houxiang
|
56cb83ffba
|
版本库首页没有统计commit_count，具体的详情页在开始统计
|
10 years ago |
|
huang
|
42f5b86d95
|
添加字段删除课程
|
10 years ago |
|
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
处理冲突
|
10 years ago |
|
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
|
10 years ago |
|
huang
|
bd3d0547f5
|
组织样式修改
|
10 years ago |
|
huang
|
9d7bc17115
|
Merge branch 'develop' into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
ab4d0e4678
|
组织界面增加分栏
|
10 years ago |
|
lizanle
|
4c00312f45
|
Merge branch 'szzh' into dev_zanle
|
10 years ago |
|
lizanle
|
0a5a33c2de
|
schema
|
10 years ago |
|
huang
|
4d0956dff1
|
Merge branch 'develop' into gitlab_guange
|
10 years ago |
|
huang
|
9f73807e05
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
Conflicts:
db/schema.rb
处理冲突
|
10 years ago |
|
huang
|
c1747ab217
|
fork重名，提交
|
10 years ago |
|
huang
|
8f024bdf4d
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
89b8f7783d
|
添加forked_form的id
|
10 years ago |
|
cxt
|
fd51b02e16
|
添加修订附件
|
10 years ago |
|
cxt
|
77e96af78f
|
还原分组作业
|
10 years ago |
|
cxt
|
f90ff781ab
|
学生提交作品页面的合作成员弹窗
|
10 years ago |
|
cxt
|
fee438cc0b
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
10 years ago |
|
cxt
|
ebeaac5798
|
作业匿评的结束状态未更新
|
10 years ago |
|
ouyangxuhua
|
6f9c89d67b
|
1.更改首页内容，不显示作者等信息，增加取消首页、编辑首页、删除首页等功能；
2.增加editor_of_documents表，记录文章编辑的作者、时间等，并显示首页的最后编辑人；
3.在首页编辑文章后，应返回首页。
|
10 years ago |
|
huang
|
364c9a3a9e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
合并
|
10 years ago |
|
huang
|
39b87aaaac
|
为student_work表添加索引
为homework_comments添加索引
大幅提高查询速度
|
10 years ago |
|
lizanle
|
d266237590
|
kaminari分页添加上一页下一页
|
10 years ago |
|
lizanle
|
3c946c034a
|
Merge branch 'szzh' into dev_zanle
Conflicts:
db/schema.rb
kaminari分页添加上一页下一页
|
10 years ago |
|
lizanle
|
885215fb8f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
96290ad975
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/models/attachment.rb
db/schema.rb
|
10 years ago |
|
lizanle
|
582cd6f5d4
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/models/attachment.rb
db/schema.rb
|
10 years ago |
|
lizanle
|
487c6bad09
|
schema.rb
|
10 years ago |
|
huang
|
f91918145d
|
0
|
10 years ago |
|
huang
|
634e11d0ec
|
0
|
10 years ago |
|
huang
|
b130b52a23
|
修改迁移
|
10 years ago |
 Tim
|
580cc6b8d8
|
系统自动生成文件
|
10 years ago |
|
huang
|
501a8f905b
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
public/stylesheets/courses.css
|
10 years ago |
|
huang
|
36b1649fbd
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
2ec78d07fa
|
Merge branch 'szzh' into hjq_new_course
|
10 years ago |
|
ouyangxuhua
|
e0f4050779
|
1.修改组织中关联项目和课程的内容和样式
|
10 years ago |
|
huang
|
042b197767
|
课程英雄榜界面调整
动作触发的时候更新总分
更换迁移顺序
|
10 years ago |
|
houxiang
|
c6b5abba4e
|
hide the the count of project'repo
|
10 years ago |
|
huang
|
8c83bbfff3
|
课程英雄榜数据
|
10 years ago |
|
huang
|
aca7684414
|
课程英雄榜
各模块动作 触发加分
|
10 years ago |
|
cxt
|
cc0ff6bbc0
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
10 years ago |
|
cxt
|
c9f844b9ba
|
Merge branch 'sw_new_course' into develop
|
10 years ago |
|
lizanle
|
4efb660214
|
全站搜索
|
10 years ago |
|
huang
|
c8b1cae947
|
建立贡献榜表及相关关联
部分页面
按总分排序（英雄榜）
部分页面（未完成）
|
10 years ago |
|
Tim
|
d1f16a0851
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
db/schema.rb
|
10 years ago |
|
Tim
|
ec42cd2d7f
|
系统自动生成文件
|
10 years ago |
|
ouyangxuhua
|
ccfbc1e0bd
|
1.组织翻页增加type参数；
2.删除组织表中冗余的项目动态和课程动态。
|
10 years ago |
|
cxt
|
9b033c3adf
|
数据日志
|
10 years ago |
|
huang
|
55ff5f4931
|
Merge branch 'develop' into gitlab_guange
Conflicts:
app/views/projects/settings/_join_org.html.erb
db/schema.rb
处理冲突
|
10 years ago |
|
huang
|
a174cade83
|
commit by hx , 2015/11/13
|
10 years ago |
|
cxt
|
f262a7cc13
|
cffd
|
10 years ago |
|
huang
|
fd03e62957
|
添加字段迁移
|
10 years ago |
|
huang
|
1df8c94b98
|
解决字符过长不能保存成功的问题
|
10 years ago |
|
huang
|
dd148fb7c5
|
Merge branch 'szzh' into sw_new_course
Conflicts:
db/schema.rb
|
10 years ago |
|
ouyangxuhua
|
5ac65d86b1
|
将org_document_comment中的title改成text类型
|
10 years ago |
|
Tim
|
e3d78bf4f0
|
组织样式更改
|
10 years ago |
|
cxt
|
99945d5bb5
|
学生答题界面的修改
|
10 years ago |
|
huang
|
3deebf2006
|
show
|
10 years ago |
|
ouyangxuhua
|
4d4b163f17
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
d71d9730bd
|
修改迁移文件的bug
|
10 years ago |
|
huang
|
7dc16775dc
|
添加字段迁移
|
10 years ago |
|
lizanle
|
dffabce806
|
Merge branch 'dev_zanle' into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
lizanle
|
56e96a035b
|
schema.rb
|
10 years ago |
|
houxiang
|
4a9da97f9b
|
modify by hx add commit_count_detail_show
|
10 years ago |
|
cxt
|
249b15751d
|
新建多选题
|
10 years ago |
|
ouyangxuhua
|
f6251b758b
|
1.迁移课程动态数据至组织动态
2.“项目动态迁移至组织动态”迁移文件增加事物
|
10 years ago |
|
huang
|
282c7f5bd2
|
修改添加题目相关
|
10 years ago |
|
ouyangxuhua
|
71bf80c7a5
|
1.创建组织课程关联表，建立相应模型及控制器；
2.在课程设置中，添加加入组中功能；
3.解决添加项目后，组织列表的上一页和下一页链接问题。
|
10 years ago |
|
lizanle
|
291868ba43
|
Merge branch 'szzh' into dev_zanle
Conflicts:
db/schema.rb
|
10 years ago |
|
lizanle
|
0eff2bcb74
|
课程添加允许学生发布资源的配置
|
10 years ago |
|
huang
|
23ca20692f
|
问卷部分方法
|
10 years ago |
|
cxt
|
167d001b3f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
5400b907e6
|
学生测验列表
|
10 years ago |
|
ouyangxuhua
|
687c0c8306
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/org_document_comments/edit.html.erb
|
10 years ago |
|
ouyangxuhua
|
d220dbbc9a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
10dedcb7be
|
增加组织成员加入时间
|
10 years ago |
|
ouyangxuhua
|
de32745eef
|
1.将项目动态数据迁移至组织动态；
2.在组织动态中，按时间倒排显示组织动态；
3.增加我的组织中搜索功能。
|
10 years ago |
|
cxt
|
10ac8eaa35
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
houxiang
|
9350841d50
|
change by hx
|
10 years ago |
|
cxt
|
62d80c27d6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
24e9f5e7d5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
a50ec626cd
|
数据
|
10 years ago |
|
lizanle
|
b88d5e59a1
|
回复的时候会多出一条一模一样的内容
|
10 years ago |
|
cxt
|
ee8d9d7b4e
|
提交
|
10 years ago |
|
ouyangxuhua
|
78e1ae4188
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
10 years ago |
|
ouyangxuhua
|
71e6a8b135
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
 sw
|
466f3c4cc3
|
数据库修改以及一对一，一对多，多对多等关系的确立
|
10 years ago |
|
sw
|
bbf087fa67
|
数据库的修改以及model数据关系的确定
|
10 years ago |
|
sw
|
5a153637b7
|
增加在线测试迁移问卷
|
10 years ago |
|
lizanle
|
b24fadea05
|
设置 删除 编辑按钮做成项目一样的
|
10 years ago |
|
cxt
|
ab868d7b65
|
课程通知增加置顶
|
10 years ago |
|
ouyangxuhua
|
a3443ba968
|
组织模块功能实现
|
10 years ago |
|
cxt
|
2a82f33227
|
个人首页的留言动态显示不合理
|
10 years ago |
|
lizanle
|
8e66bb8fe1
|
在课程 项目 上传资源后跳转到对应的资源库界面
|
10 years ago |
|
ouyangxuhua
|
283af137c6
|
组织模块动态及配置
|
10 years ago |
|
Tim
|
223b17d8fe
|
普通作品列表、系统评分作品列表、匿评作品列表格式修改
|
10 years ago |
|
huang
|
4608190529
|
增加点击选择历史版本记录
|
10 years ago |
|
cxt
|
958532bedc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
ee7b21de72
|
禁用匿评功能
|
10 years ago |
|
ouyangxuhua
|
eadab840b6
|
建立组织、成员表及模型控制器；
编写创建组织页面。
|
10 years ago |
|
ouyangxuhua
|
636063c6ca
|
添加组织表和组织成员表
|
10 years ago |
|
cxt
|
3bb56f1606
|
教辅可查看未发布的作业
|
10 years ago |
|
cxt
|
f5aaf7ac58
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
6dcc97d5d1
|
添加作业的发布功能
|
10 years ago |
|
lizanle
|
c2be8b4eec
|
课程大纲界面
|
10 years ago |
|
Tim
|
61dc979ee4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
Tim
|
e58dcc851b
|
资源库搜索图标替换
|
10 years ago |
|
huang
|
294a517251
|
查看所有提交记录入口
点击自动复制版本库地址
|
10 years ago |
|
huang
|
4c61e7490b
|
Merge branch 'develop' into gitlab_guange
Conflicts:
db/schema.rb
|
10 years ago |
|
lizanle
|
2a76461cd1
|
简单博客功能
|
10 years ago |
|
huang
|
1157dcaa06
|
版本库summary
文件目录
新版本库地址
按分支显示提交记录
相关界面
|
10 years ago |
|
huang
|
147cdf3018
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
d049a00655
|
删除课程动态中未发布问卷的动态
|
10 years ago |
|
cxt
|
90ee4bbe60
|
删除空的课程动态
|
10 years ago |
|
cxt
|
dbbdae1be2
|
附件迁移文件的修改
|
10 years ago |
|
cxt
|
0b565b1be0
|
私有课程的课件迁移
|
10 years ago |
guange
|
6086c9304e
|
merge
|
10 years ago |
|
guange
|
9e8e77f3e1
|
方法重构
|
10 years ago |
|
cxt
|
5f3c8d928d
|
作业批次下拉列表的样式修改
|
10 years ago |
|
huang
|
150ee3d28d
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
caa278d9f5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/boards_controller.rb
db/schema.rb
|
10 years ago |
|
lizanle
|
b3d15b886a
|
学校的查询与现实问题重做
|
10 years ago |
|
guange
|
9266eccdff
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
|
10 years ago |
|
guange
|
716f0f31b3
|
merge
|
10 years ago |
|
cxt
|
ea66ca5e00
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
public/javascripts/init_activity_KindEditor.js
|
10 years ago |
|
cxt
|
8abc97ae84
|
个人主页添加个人留言动态
|
10 years ago |
|
guange
|
6472367b68
|
firefox粘贴图片只能一张的bug
|
10 years ago |
|
cxt
|
b9b7f6fa9e
|
个人主页留言动态的实现
|
10 years ago |
|
huang
|
73898953d9
|
project表添加字段，记录project对应gitlba中project id
|
10 years ago |
|
huang
|
fbeb6585d2
|
去掉初始化输出提示
|
10 years ago |
|
huang
|
7c1bb8b9ed
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
Gemfile
app/models/user.rb
db/schema.rb
lib/trustie.rb
解决冲突
|
10 years ago |
|
lizanle
|
d8a4e4d710
|
issue序号丢失的问题
issue缩进以及代码缩进的样式不同 的问题
|
10 years ago |
|
sw
|
11736eb266
|
迁移文件有问题
|
10 years ago |
|
cxt
|
452766bade
|
课程通知的动态排序时间调整
|
10 years ago |
|
sw
|
774b00f2d4
|
数据迁移错误
|
10 years ago |
|
huang
|
5f26e331c6
|
缺陷截止时间到了消息通知
|
10 years ago |
|
cxt
|
a2d6168043
|
课程动态的数据迁移
|
10 years ago |
|
cxt
|
6a3089bb9b
|
动态的回复图片超出边框
|
10 years ago |
|
cxt
|
c81e07d588
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
223bac373f
|
课程动态的数据迁移
|
10 years ago |
|
guange
|
08eecbd5ec
|
merge
|
10 years ago |
|
huang
|
25a604d7b8
|
issue解决冲突
|
10 years ago |
|
huang
|
38ba47f8c8
|
讨论区结构修改
任务中添加：自动开启/关闭匿评消息通知
匿评开启失败消息通知
|
10 years ago |
|
guange
|
0b4c8b05f1
|
JAVA语言支持
|
10 years ago |
|
sw
|
f2325dee88
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
a37f39558d
|
项目和课程的列表符号样式修改
|
10 years ago |
|
sw
|
7a62b7f13d
|
增加匿评开启时间和匿评关闭时间，并对其业务逻辑进行js的控制。以及这两个值得修改
|
10 years ago |
|
sw
|
385f2aa4ac
|
111
|
10 years ago |
|
sw
|
a54a51c984
|
Merge branch 'guange_homework' into szzh
Conflicts:
app/models/homework_detail_programing.rb
db/schema.rb
|
10 years ago |
|
sw
|
07dbb9da4c
|
111
|
10 years ago |
|
huang
|
c9bedb2362
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
961b2bd564
|
开启/关闭匿评邮件通知
|
10 years ago |
|
guange
|
c99222820e
|
加入了python语言支持
|
10 years ago |
|
huang
|
fb76bc8f9a
|
完成项目邀请消息通知及对应页面
解决防注入问题（通过随机6为密码）
|
10 years ago |
|
sw
|
34db84e79f
|
test
|
10 years ago |
|
sw
|
715dc28187
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
ba2474e480
|
关闭匿评消息
|
10 years ago |
|
sw
|
20b4c056a8
|
历史数据：普通作业改为匿评作业
|
10 years ago |
|
huang
|
f041c80d0a
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/users/user_messages.html.erb
db/schema.rb
public/stylesheets/new_user.css
解决冲突
|
10 years ago |
|
sw
|
f04e0c5f84
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
sw
|
a8c5d18069
|
1、之前普通作业更改为匿评作业。。。
2、系统评分为null时默认为0
|
10 years ago |
|
sw
|
5bdb1cd461
|
1、启动匿评、关闭匿评时弹出框位置
2、缺评评分设置报错
|
10 years ago |
|
sw
|
f6f3d83c5e
|
1、老师、学生打分
2、评论及评论的回复功能
|
10 years ago |
|
huang
|
9324d45e2c
|
系统消息发布添加标题功能
|
10 years ago |
|
cxt
|
68338c46e1
|
个人动态按最后更新时间排序
|
10 years ago |
|
sw
|
90d70e7c88
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
84bb5af86f
|
增加教师优先字段
|
10 years ago |
|
Tim
|
5b6ac4564a
|
回复框头像路径改变
|
10 years ago |
|
huang
|
b0ccf9037a
|
邮件邀请：
1、修改私有项目跳入403问题
2、增加同一个用户反复邀请的邮箱提醒。
3、修改邮箱的发送策略
|
10 years ago |
|
lizanle
|
2fa01f32fb
|
schema
|
10 years ago |
|
huang
|
4a7d3c9072
|
系统消息增加长度
|
10 years ago |
|
sw
|
da269ef716
|
发布作业，请先输入作业标题
|
10 years ago |
|
cxt
|
42ddc0bf3c
|
迁移文件
|
10 years ago |
|
cxt
|
9dc3f43af1
|
修改迁移文件
|
10 years ago |
|
cxt
|
312955e5dc
|
迁移文件
|
10 years ago |
|
cxt
|
dbdd68f45d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
585818fe7a
|
讨论区动态重复出现
|
10 years ago |
|
huang
|
dc564c37f1
|
修改系统消息参数
输入内容JS控制
|
10 years ago |
|
huang
|
4d4b48ef99
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
10 years ago |
|
sw
|
cd36965cd1
|
历史编程作业数据补齐
|
10 years ago |
|
lizanle
|
80e38287dd
|
所有baselayout都引入prttefy.css .js
调整资源库宽度
|
10 years ago |
|
huang
|
66251c8d30
|
添加功能：管理员界面发送系统消息
|
10 years ago |
|
sw
|
519f079bcc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
a991500e55
|
登录首页的样式修改
|
10 years ago |
|
sw
|
1cbda41997
|
11
|
10 years ago |
|
sw
|
e4209007b1
|
Merge branch 'guange_homework' into szzh
|
10 years ago |
|
sw
|
3b24bb375a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
sw
|
a29d004fdc
|
没有加入课程的用户进入作业列表报错
|
10 years ago |
|
guange
|
be29bcc8bd
|
模拟答题记入数据库
|
10 years ago |
|
guange
|
9e9f373a76
|
发布作业优化
|
10 years ago |
|
cxt
|
aa0c0dab83
|
添加“我的动态”
|
10 years ago |
|
cxt
|
d667e6359c
|
切换
|
10 years ago |
|
sw
|
d0f7f89db3
|
迁移文件修改
|
10 years ago |
|
sw
|
955ef3d5fd
|
取消打印
|
10 years ago |
|
sw
|
88397d58d0
|
1、讨论区新建帖子时增加权限判断
2、删除历史的匿名用户发布帖子的数据
|
10 years ago |
|
huang
|
b2e25e8afc
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
10 years ago |
|
sw
|
62c657a827
|
用户留言增加登录判断，并且删除匿名用户留言数据
|
10 years ago |
|
sw
|
9ddb4f6683
|
删除匿名用户在缺陷中的回复
|
10 years ago |
|
sw
|
093273968b
|
删除匿名用户在缺陷中的回复
|
10 years ago |
|
huang
|
c579ee51fe
|
增加点击时间表
|
10 years ago |
|
sw
|
fe91ec1a85
|
1、历史数据导致项目动态中部分数据连接到课程相关页面
2、项目缺陷列表显示为整个系统的缺陷
3、用户得分的还原
4、样式调整
|
10 years ago |
|
sw
|
1bda18afff
|
111
|
10 years ago |
|
huang
|
a47c9176b7
|
注释掉消息迁移文件
修改消息html样式
|
10 years ago |
|
huang
|
8b9eabd027
|
迁移文件中添加打印收据
添加未读消息样式
|
10 years ago |
|
huang
|
487881bb92
|
Merge branch 'szzh' into dev_hjq
Conflicts:
public/stylesheets/new_user.css
|
10 years ago |
|
huang
|
48ddee478e
|
默认更新为已读
公共贴吧区分已读和未读消息
|
10 years ago |
|
huang
|
fede611fea
|
鼠标经过显示内容效果
公共贴吧数据迁移
|
10 years ago |
|
huang
|
6dff29f931
|
添加时间迁移
|
10 years ago |
|
huang
|
b5c0d03590
|
添加迁移
代码优化
|
10 years ago |
|
guange
|
a142103091
|
Merge remote-tracking branch 'origin/develop' into guange_homework
|
10 years ago |
|
huang
|
e652e92217
|
新增消息迁移
|
10 years ago |
|
huang
|
7ed93c1d80
|
消息总表数据迁移
|
10 years ago |
|
guange
|
8f426ca040
|
merge
|
10 years ago |
|
huang
|
43170c696c
|
迁移总表时间
|
10 years ago |
|
huang
|
2a17cfc741
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
353e2f5d18
|
添加课程消息迁移
|
10 years ago |
|
sw
|
98d533e8f9
|
1、整理迁移文件
2、个人动态添加与更新判断不正确
|
10 years ago |
|
guange
|
18bfe1fc73
|
jquery升到1.11
|
10 years ago |
|
sw
|
c5b0b4164c
|
迁移文件back
|
10 years ago |
|
huang
|
f438d300dd
|
消息数据迁移（未完）
|
10 years ago |
|
guange
|
1462ea09f3
|
测试代码功能完成
|
10 years ago |
suntao
|
b6d58b1b58
|
样式调整
|
10 years ago |
|
guange
|
ad0b14b768
|
schema
|
10 years ago |
|
sw
|
5b9c9312f5
|
留言界面样式修改
|
10 years ago |
|
huang
|
bc563119d6
|
Merge branch 'sw_new_course' into dev_hjq
Conflicts:
app/controllers/users_controller.rb
public/stylesheets/new_user.css
|
10 years ago |
|
huang
|
1dce1a2a4c
|
老师更新作品评阅消息通知
区分第一次评阅和后面的评阅
|
10 years ago |
|
cxt
|
bd00870eba
|
个人主页
|
10 years ago |
|
sw
|
ffe40b399d
|
个人动态表重构
|
10 years ago |
|
sw
|
44419eff04
|
rake db
|
10 years ago |
|
lizanle
|
256ccedfe8
|
schema
|
10 years ago |
|
ouyangxuhua
|
d7de5fc480
|
更改消息样式
|
10 years ago |
|
huang
|
0da75afc88
|
消息排序（公共表）
|
10 years ago |
|
huang
|
7961e3db6f
|
建立公共表
|
10 years ago |
|
cxt
|
2e5916cf5e
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/controllers/admin_controller.rb
|
10 years ago |
|
huang
|
4af3c9816c
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
2d05d1f7d0
|
0
|
10 years ago |
|
huang
|
d575ce5e5f
|
消息公共表
|
10 years ago |
|
ouyangxuhua
|
f0483b6de8
|
更新新闻viewed
|
10 years ago |
|
sw
|
3b3712891b
|
111
|
10 years ago |
|
sw
|
f6d122e37f
|
Merge branch 'guange_dev' into sw_new_course
|
10 years ago |
|
sw
|
111478ec72
|
Merge branch 'szzh' into sw_new_course
Conflicts:
app/controllers/users_controller.rb
config/routes.rb
|
10 years ago |
|
guange
|
baea29e2f0
|
回复需要点击两次才能显示的问题
|
10 years ago |
|
sw
|
535145f8f2
|
11
|
10 years ago |
