 lizanle
|
c34127f21f
|
文件的删除限制加大
如果文件有了历史版本 数据记录不能被删除
如果文件被发送过，或者有了历史版本，硬盘上的文件和数据记录就不能被删除
|
10 years ago |
|
lizanle
|
b7eda83def
|
历史资源功能
|
10 years ago |
 ouyangxuhua
|
3deb5aff43
|
资源栏目权限问题
|
10 years ago |
|
ouyangxuhua
|
e9cedf0eb9
|
删除冗余的迁移文件
|
10 years ago |
|
ouyangxuhua
|
dcfe89c544
|
帖子发送到组织资源栏目，同时增加增删查改功能
|
10 years ago |
|
ouyangxuhua
|
40bf109223
|
给资源栏目增加board
|
10 years ago |
|
lizanle
|
90c63192e6
|
历史资源模型修改
|
10 years ago |
|
lizanle
|
abb19422ff
|
发送资源到组织功能。同时个人资源库也要添加这个功能
|
10 years ago |
|
ouyangxuhua
|
d77625e4e9
|
Merge branch 'develop' into dev_hjq
|
10 years ago |
 huang
|
900d7d62cb
|
邮件按天发送添加提示
|
10 years ago |
|
ouyangxuhua
|
2076c9b449
|
Merge branch 'develop' into dev_hjq
Conflicts:
app/controllers/organizations_controller.rb
app/views/layouts/_footer.html.erb
app/views/layouts/base_org.html.erb
app/views/organizations/_org_activities.html.erb
db/schema.rb
public/stylesheets/new_user.css
public/stylesheets/org.css
public/stylesheets/public.css
|
10 years ago |
|
huang
|
a16d6803ae
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
 Tim
|
b0b4527ea1
|
Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq
Conflicts:
public/stylesheets/org.css
|
10 years ago |
|
ouyangxuhua
|
73d377d06d
|
组织资源栏目显示转发的帖子
|
10 years ago |
|
huang
|
00711f1100
|
issue编辑、添加邮件中去掉token
|
10 years ago |
|
ouyangxuhua
|
b9ae579622
|
将课程帖子转发至组织帖子栏目
|
10 years ago |
|
ouyangxuhua
|
9dc2cb8541
|
添加组织文章附件功能
|
10 years ago |
|
ouyangxuhua
|
2220e0b7cc
|
增加帖子-组织栏目关联表
|
10 years ago |
guange
|
1724ae430e
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
guange
|
bb94a41435
|
红点中包含at的消息
|
10 years ago |
|
huang
|
1a549eda46
|
版本库显示问题
|
10 years ago |
|
huang
|
c381ce177f
|
解决通知太长不能发的问题
|
10 years ago |
|
huang
|
ab1397d982
|
恢复版本
|
10 years ago |
|
huang
|
3de4c7129a
|
版本库读取错误问题
|
10 years ago |
|
guange
|
8c967e6559
|
格式改进
|
10 years ago |
|
guange
|
e8cf5d1042
|
at消息html代码问题
|
10 years ago |
|
lizanle
|
47b20d3639
|
journal不应该算入ForgeActivity
|
10 years ago |
|
guange
|
d703f75c98
|
merge
|
10 years ago |
|
guange
|
eb97f7dfb2
|
merge
|
10 years ago |
|
guange
|
923cb3c84f
|
中文报错
|
10 years ago |
|
guange
|
fc63dfcb7b
|
消息通知
|
10 years ago |
|
guange
|
c0de5d55de
|
加入了issue的at消息提醒
|
10 years ago |
|
huang
|
85d277da0d
|
Merge branch 'develop' into hjq_new_course
|
10 years ago |
|
huang
|
ac8aa9e0a6
|
解决作业留言和课程留言导致的bug
|
10 years ago |
|
huang
|
06e5784436
|
解决英雄榜两个用户同时存在的but
|
10 years ago |
|
guange
|
4ce9eb428e
|
at样式问题
|
10 years ago |
|
huang
|
ea1849e51f
|
去掉邮件token值
|
10 years ago |
|
guange
|
4f57e48b92
|
merge
|
10 years ago |
|
guange
|
d1315e35b5
|
merge
|
10 years ago |
|
guange
|
91b245ad2c
|
lastname为空时也可以加,可以省掉查询extensions的语句
|
10 years ago |
|
lizanle
|
7c114e1a13
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
f028992a18
|
帖子搜索
|
10 years ago |
 cxt
|
7a0828a826
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
502310425b
|
匿评成绩为空
|
10 years ago |
|
huang
|
a791c39b4b
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
e5192c7b1a
|
记录学生作品的提交和编辑记录
|
10 years ago |
|
ouyangxuhua
|
de0b5d1897
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
ouyangxuhua
|
e98338bf22
|
栏目增加资源类型，可以添加文件、删除文件、显示文件等
|
10 years ago |
|
cxt
|
bb2f49439e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
27ed6df9d6
|
Merge branch 'szzh' into develop
|
10 years ago |
|
cxt
|
a3715051b1
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
f880ccd749
|
分组作业
|
10 years ago |
|
huang
|
fbba933a46
|
Merge branch 'hjq_new_course' of http://git.trustie.net/jacknudt/trustieforge into hjq_new_course
|
10 years ago |
|
huang
|
be940ee3aa
|
Merge branch 'develop' into hjq_new_course
|
10 years ago |
|
ouyangxuhua
|
1e652faec7
|
Merge branch 'develop' into dev_hjq
|
10 years ago |
|
lizanle
|
7f866a0b3a
|
课程被删除后不能被搜索
|
10 years ago |
|
huang
|
f2c1595d0d
|
1、同步没成功检测程序
2、注册验证修改
|
10 years ago |
|
cxt
|
4e04df7a8a
|
分组作业的动态显示及关联项目
|
10 years ago |
|
ouyangxuhua
|
78fb8b6254
|
1.编辑或者删除栏目的帖子返回对应页面
|
10 years ago |
|
lizanle
|
2fbad38522
|
优化排序参数
用于排序的字段最好不要分词
不然就是多值字段的排序会浪费大量的内存
|
10 years ago |
|
ouyangxuhua
|
09f0d0201e
|
组织增加栏目发帖功能
|
10 years ago |
|
cxt
|
a9f6e817b4
|
分组作业关联项目
|
10 years ago |
|
huang
|
916d99be82
|
课程删除功能
|
10 years ago |
|
ouyangxuhua
|
a8b7d1b81f
|
回复项目里的message,不增加项目动态及组织动态
|
10 years ago |
|
lizanle
|
ef2ef7111c
|
添加对帖子的全文搜索
|
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 |
|
guange
|
af31946586
|
issue列表开启AT功能
|
10 years ago |
|
huang
|
9d7bc17115
|
Merge branch 'develop' into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
ab4d0e4678
|
组织界面增加分栏
|
10 years ago |
|
huang
|
c72cf55564
|
Merge branch 'develop' into szzh
|
10 years ago |
|
cxt
|
8fe53468e1
|
作品追加附件
|
10 years ago |
|
ouyangxuhua
|
2855c0e409
|
修改项目动态，使其与课程动态及个人动态的样式一致，包括有回复框、过滤菜单、宽度、间距等
|
10 years ago |
|
lizanle
|
6553559929
|
发送消息
|
10 years ago |
|
cxt
|
77e96af78f
|
还原分组作业
|
10 years ago |
|
cxt
|
9c4c90e066
|
Merge branch 'develop' into cxt_course
|
10 years ago |
|
cxt
|
f90ff781ab
|
学生提交作品页面的合作成员弹窗
|
10 years ago |
|
ouyangxuhua
|
cf41b13f3a
|
增加组织表和组织课程表的关联删除
|
10 years ago |
|
lizanle
|
1103a114a0
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
b2bca65025
|
分片默认为5
|
10 years ago |
|
guange
|
52a0da83c4
|
匿名用户留言问题.
|
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 |
|
lizanle
|
96b704e191
|
所有者的更新时间随着被拥有者的改变而改天
譬如course 里边这么写：has_many :boards
boards里边这么写就ok:belongs_to :course,:touch=>true
|
10 years ago |
|
lizanle
|
34ac56e0a0
|
attachment index_document
|
10 years ago |
|
lizanle
|
e728dd55eb
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/models/attachment.rb
db/schema.rb
|
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 |
|
huang
|
ae9f1c704a
|
500问题
|
10 years ago |
|
lizanle
|
e710f443c2
|
全站搜索
|
10 years ago |
|
huang
|
36b1649fbd
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
1cc6e305ed
|
完成新功能模块开发：
1、如果没有成绩则不显示
2、工具框展开没有则不显示
|
10 years ago |
|
huang
|
042b197767
|
课程英雄榜界面调整
动作触发的时候更新总分
更换迁移顺序
|
10 years ago |
|
lizanle
|
7cb39d1754
|
全站搜索
|
10 years ago |
|
lizanle
|
ee47187a61
|
全站搜索
|
10 years ago |
|
huang
|
061a1f602a
|
效果实现
|
10 years ago |
|
huang
|
aca7684414
|
课程英雄榜
各模块动作 触发加分
|
10 years ago |
|
lizanle
|
dcd441a9db
|
全站搜索
|
10 years ago |
|
lizanle
|
4efb660214
|
全站搜索
|
10 years ago |
|
huang
|
c8b1cae947
|
建立贡献榜表及相关关联
部分页面
按总分排序（英雄榜）
部分页面（未完成）
|
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
|
dd148fb7c5
|
Merge branch 'szzh' into sw_new_course
Conflicts:
db/schema.rb
|
10 years ago |
|
ouyangxuhua
|
6068867670
|
项目动态和组织动态删除后，删除相应的组织动态
|
10 years ago |
|
ouyangxuhua
|
a57260aae6
|
修改当“Message”回复对应的组织动态
|
10 years ago |
|
ouyangxuhua
|
5cfc8c2f8d
|
编辑文章后，或者回复文章后，更新组织动态的更新时间
|
10 years ago |
|
ouyangxuhua
|
219774afab
|
将课程动态加入组织动态中
|
10 years ago |
|
ouyangxuhua
|
71bf80c7a5
|
1.创建组织课程关联表，建立相应模型及控制器；
2.在课程设置中，添加加入组中功能；
3.解决添加项目后，组织列表的上一页和下一页链接问题。
|
10 years ago |
|
cxt
|
167d001b3f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
ouyangxuhua
|
de32745eef
|
1.将项目动态数据迁移至组织动态；
2.在组织动态中，按时间倒排显示组织动态；
3.增加我的组织中搜索功能。
|
10 years ago |
|
cxt
|
62d80c27d6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
huang
|
ca8b62b8bd
|
Merge branch 'szzh' into gitlab_guange
|
10 years ago |
|
huang
|
a40e5c5b54
|
frok功能开发--权限还未完成
|
10 years ago |
|
ouyangxuhua
|
78e1ae4188
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
10 years ago |
 sw
|
e6cd104ead
|
index界面以及试卷统计相关路由添加
|
10 years ago |
|
ouyangxuhua
|
71e6a8b135
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
70c5b27a43
|
相关路由
|
10 years ago |
|
sw
|
466f3c4cc3
|
数据库修改以及一对一，一对多，多对多等关系的确立
|
10 years ago |
|
ouyangxuhua
|
866c2feaa1
|
修改组织模块的bug
|
10 years ago |
|
sw
|
bbf087fa67
|
数据库的修改以及model数据关系的确定
|
10 years ago |
|
ouyangxuhua
|
6ec27761fb
|
组织功能实现及缺陷修改
|
10 years ago |
|
ouyangxuhua
|
21275e8b7b
|
组织模块功能缺陷修改
|
10 years ago |
|
cxt
|
ab868d7b65
|
课程通知增加置顶
|
10 years ago |
|
ouyangxuhua
|
a3443ba968
|
组织模块功能实现
|
10 years ago |
|
lizanle
|
94367eee82
|
Merge branch 'dev_zanle' into szzh
|
10 years ago |
|
cxt
|
2a82f33227
|
个人首页的留言动态显示不合理
|
10 years ago |
|
lizanle
|
2e092b0d04
|
论坛字符允许扩大为30000个字符，超过两万个字符不允许提交
|
10 years ago |
|
lizanle
|
1edd87f9e0
|
论坛字符允许扩大为20000个字符
|
10 years ago |
|
lizanle
|
4b272b6b9c
|
论坛字符允许扩大为40000个字符
|
10 years ago |
|
ouyangxuhua
|
283af137c6
|
组织模块动态及配置
|
10 years ago |
|
ouyangxuhua
|
eadab840b6
|
建立组织、成员表及模型控制器；
编写创建组织页面。
|
10 years ago |
|
guange
|
be25a57eaf
|
同步用户bug解决
|
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 |
|
cxt
|
c4816a0414
|
名字为空的用户创建博客时博客名称为登录名
|
10 years ago |
|
lizanle
|
ac82910aa5
|
大纲
|
10 years ago |
|
lizanle
|
76ac5a49f2
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
788e900d4a
|
个人博客发博文也要显示动态
个人博客 编辑设置菜单要出现在博客列表的右上方
|
10 years ago |
|
huang
|
4c61e7490b
|
Merge branch 'develop' into gitlab_guange
Conflicts:
db/schema.rb
|
10 years ago |
|
lizanle
|
07a2263b16
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/courses_controller.rb
public/stylesheets/new_user.css
|
10 years ago |
|
ouyangxuhua
|
b0b1a27908
|
1.用户请求加入课程成为老师或者教师时，给课程创建者发送邮件；
2.更新相应消息的状态
|
10 years ago |
|
lizanle
|
eaf4ad354f
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/courses_controller.rb
app/services/courses_service.rb
app/views/courses/join.js.erb
public/stylesheets/new_user.css
|
10 years ago |
|
lizanle
|
2a76461cd1
|
简单博客功能
|
10 years ago |
|
cxt
|
7e21c00aed
|
添加作业的回复功能
|
10 years ago |
|
guange
|
d802992e96
|
merge
|
10 years ago |
|
guange
|
11d1cac40d
|
可以通过gitlab创建项目
|
10 years ago |
|
lizanle
|
0fffed55a6
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
a817c3b81e
|
添加身份
|
10 years ago |
|
huang
|
9e7adaf5bc
|
Merge branch 'dev_hjq' into szzh
|
10 years ago |
|
ouyangxuhua
|
87b4c83247
|
修改不能参与匿评消息的关联删除；
看完消息后，更新相应的字段。
|
10 years ago |
|
huang
|
147cdf3018
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
5a5cf430d3
|
0
|
10 years ago |
|
huang
|
af4523815c
|
课程从公开改成私有
则该课程中所有的资源都变成私有
|
10 years ago |
|
huang
|
1cfa8326aa
|
解决课程作业500问题
|
10 years ago |
|
huang
|
a8f5a7ea48
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
74284e1e71
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
7898208b16
|
私有课程上传资源都为私有
|
10 years ago |
|
ouyangxuhua
|
4deeaa0f34
|
1.增加消息：用户迟交作业时，发送不能参与匿评的消息；
2.增加消息：用户创建课程时，发送创建课程消息。
|
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 |
|
huang
|
464fc461ea
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
b3d15b886a
|
学校的查询与现实问题重做
|
10 years ago |
|
huang
|
554927d517
|
删除项目的时候，项目动态级联删除
|
10 years ago |
|
cxt
|
8abc97ae84
|
个人主页添加个人留言动态
|
10 years ago |
|
cxt
|
b9b7f6fa9e
|
个人主页留言动态的实现
|
10 years ago |
|
huang
|
73898953d9
|
project表添加字段，记录project对应gitlba中project id
|
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 |
|
huang
|
2768317d08
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
654ebfca46
|
项目邀请添加：姓、名、性别
|
10 years ago |
|
huang
|
0064aa4278
|
系统消息不消失
系统消息和普通消息一致，按照时间排序
待优化点：数组排序
|
10 years ago |
|
huang
|
88b8854ed7
|
修改吧主和发帖人消息重复的问题
|
10 years ago |
|
huang
|
1eac300fb7
|
去掉打印结果
|
10 years ago |
|
huang
|
3f6d64877a
|
1、老师发布作业自己能收到
2、关闭给所有人发
3、修改参数member问题
|
10 years ago |
|
huang
|
5b0738a4cb
|
匿评启动失败邮件通知:实现程序及界面
|
10 years ago |
|
huang
|
5f26e331c6
|
缺陷截止时间到了消息通知
|
10 years ago |
|
huang
|
0a1798eb0b
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
c3422460ce
|
匿评失败邮件发送框架
|
10 years ago |
|
huang
|
ba569403c3
|
1、匿评关闭/开启发送对象为所有成员
2、匿评方法封装
3、匿评开启/关闭邮件通知发送对象为课程所有成员
|
10 years ago |
|
huang
|
2873412d1a
|
修改邮件--每天发送-》内容为空的问题
|
10 years ago |
|
cxt
|
9190f0515d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
8c84179650
|
修改issue更新消息重复提示的问题
|
10 years ago |
|
lizanle
|
f54149a5b7
|
发送动态 消息会重复
|
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 |
|
huang
|
e15ea06e2a
|
修改邮件标题
|
10 years ago |
|
guange
|
08eecbd5ec
|
merge
|
10 years ago |
|
huang
|
20465764a7
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
fcf34b5918
|
修复项目配置中“私有” “公开”问题
|
10 years ago |
|
guange
|
0b4c8b05f1
|
JAVA语言支持
|
10 years ago |
|
lizanle
|
531b264a8f
|
Merge branch 'dev_zanle' into szzh
|
10 years ago |
|
huang
|
99473c6880
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/issues/show.html.erb
|
10 years ago |
|
lizanle
|
d512c25c03
|
Merge branch 'szzh' into dev_zanle
Conflicts:
public/javascripts/new_user.js
public/stylesheets/header.css
public/stylesheets/new_user.css
|
10 years ago |
|
lizanle
|
d6c763edb0
|
取消 和 新建 贴吧的按钮都会清空贴吧表单
论坛标题字符长度限定160。是汉字的话只能输入80个
|
10 years ago |
|
sw
|
50817c3d64
|
编译错误时 计算系统评分不正确
|
10 years ago |
|
huang
|
200861cfef
|
完成issue点对点消息通知
|
10 years ago |
|
huang
|
48b93f2113
|
项目缺陷消息点对点发送
回复逻辑优化（未完成）
|
10 years ago |
|
huang
|
b49d19cdb2
|
添加注释
|
10 years ago |
|
sw
|
a54a51c984
|
Merge branch 'guange_homework' into szzh
Conflicts:
app/models/homework_detail_programing.rb
db/schema.rb
|
10 years ago |
|
huang
|
961b2bd564
|
开启/关闭匿评邮件通知
|
10 years ago |
|
guange
|
c99222820e
|
加入了python语言支持
|
10 years ago |
|
huang
|
810c0d8fe5
|
作业开启/关闭匿评邮件通知
|
10 years ago |
|
huang
|
fb76bc8f9a
|
完成项目邀请消息通知及对应页面
解决防注入问题（通过随机6为密码）
|
10 years ago |
|
sw
|
715dc28187
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
sw
|
ec4c7f531d
|
匿评作业成绩计算错误
|
10 years ago |
|
sw
|
1d39df5469
|
C改为大写、编程属性设置的修改
|
10 years ago |
|
huang
|
cfea5e9c89
|
邀请已注册用户 消息邀请信息
|
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 |
|
huang
|
f823046bc3
|
完成课程留言点对点逻辑结构
|
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
|
4b83265508
|
1、编程作业可以修改、删除
2、关闭匿评之后结束匿评按钮样式
3、编程作业成绩计算有问题
4、相关样式修改
5、编程作业作品展开界面功能
|
10 years ago |
|
huang
|
0fead3b801
|
1、课程留言发送对象为老师
2、作业截止时间邮件通知不适用delay_job
3、添加作业截止时间邮件通知界面
|
10 years ago |
|
cxt
|
7254cf4689
|
项目缺陷的属性变化时更新动态表中相应缺陷的最后更新时间
|
10 years ago |
|
sw
|
9c20368274
|
1、系统评分的时候对成绩进行赋值
2、去掉错误的编程得分计算方法
|
10 years ago |
|
huang
|
9324d45e2c
|
系统消息发布添加标题功能
|
10 years ago |
|
huang
|
d00ad2e14d
|
1、作业截止时间邮件通知
2、系统消息通知路由、方法定义
|
10 years ago |
|
ouyangxuhua
|
5155e8794f
|
将课程留言加入消息队列
|
10 years ago |
|
huang
|
b0ccf9037a
|
邮件邀请：
1、修改私有项目跳入403问题
2、增加同一个用户反复邀请的邮箱提醒。
3、修改邮箱的发送策略
|
10 years ago |
|
huang
|
295921c89d
|
邮件：邀请新用户的时候过滤掉邮箱和已注册用户名重叠的问题
|
10 years ago |
|
huang
|
4a7d3c9072
|
系统消息增加长度
|
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
|
27fde3f642
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
4d4b48ef99
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
8c0f9d24f8
|
系统消息没保存成功添加验证
系统消息样式修改
|
10 years ago |
|
guange
|
e9f9dd44b9
|
编程作业的修改功能搞定
|
10 years ago |
|
huang
|
c0437ae992
|
作业截止时间提醒界面！
|
10 years ago |
|
ouyangxuhua
|
0bb8b175e6
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
9e61ceefa9
|
系统消息修改
|
10 years ago |
|
huang
|
92a3d78dcc
|
完成作业截止定时发送消息
|
10 years ago |
|
huang
|
13397363db
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
66251c8d30
|
添加功能：管理员界面发送系统消息
|
10 years ago |
|
ouyangxuhua
|
20bef515da
|
issue周报发送消息给所有管理员
|
10 years ago |
|
guange
|
c413d66c44
|
程序作业打分
|
10 years ago |
|
huang
|
0746408a9d
|
增加用户申请加入项目消息提醒功能（管理员收到消息提醒）
|
10 years ago |
|
guange
|
be29bcc8bd
|
模拟答题记入数据库
|
10 years ago |
|
huang
|
103d61056d
|
完成功能：
1、添加“新的消息”分类
2、新注册用户默认点击时间
|
10 years ago |
|
cxt
|
aa0c0dab83
|
添加“我的动态”
|
10 years ago |
|
huang
|
ecd0056f0a
|
1、完成消息点击记后图标不显示红点的功能。
2、首次登陆以“最后登录时间”为准，后面以点击时间为准
|
10 years ago |
|
huang
|
b2e25e8afc
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
c579ee51fe
|
增加点击时间表
|
10 years ago |
|
sw
|
78cfed2b68
|
缺陷列表过滤修改
|
10 years ago |
|
huang
|
a30ee2cb10
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
10 years ago |
|
huang
|
87387273d8
|
解决消息链接点击一次多一条的问题
|
10 years ago |
|
sw
|
fe91ec1a85
|
1、历史数据导致项目动态中部分数据连接到课程相关页面
2、项目缺陷列表显示为整个系统的缺陷
3、用户得分的还原
4、样式调整
|
10 years ago |
|
huang
|
dd06aa3a92
|
添加为空判断
|
10 years ago |
|
huang
|
487881bb92
|
Merge branch 'szzh' into dev_hjq
Conflicts:
public/stylesheets/new_user.css
|
10 years ago |
|
huang
|
fede611fea
|
鼠标经过显示内容效果
公共贴吧数据迁移
|
10 years ago |
|
huang
|
dbc0688213
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
b5c0d03590
|
添加迁移
代码优化
|
10 years ago |
|
ouyangxuhua
|
5ee53b824d
|
项目中上传资源添加至动态中
|
10 years ago |
|
guange
|
a142103091
|
Merge remote-tracking branch 'origin/develop' into guange_homework
|
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 |
|
huang
|
f438d300dd
|
消息数据迁移（未完）
|
10 years ago |
|
guange
|
e8fe397158
|
added
|
10 years ago |
|
huang
|
d9df8aae28
|
1。缺陷状态更新后，不同状态变更在消息列表中显示方式
2、缺陷指派与缺陷发布者消息冲突问题
3、留言内容的过滤
|
10 years ago |
|
guange
|
1462ea09f3
|
测试代码功能完成
|
10 years ago |
|
huang
|
a7eff50c61
|
消息留言发送：回复东家，回复人和东家只能一人收到消息
|
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 |
|
huang
|
627ca059ca
|
解决issue的更新
和新建问题
|
10 years ago |
|
sw
|
ffe40b399d
|
个人动态表重构
|
10 years ago |
|
huang
|
9096fca298
|
留言消息发送策略
|
10 years ago |
|
huang
|
a83fc1c8d8
|
0
|
10 years ago |
|
huang
|
90c199f15a
|
缺陷更新区别新建
|
10 years ago |
|
huang
|
5306d7e2a4
|
列表排序（未完）
|
10 years ago |
|
huang
|
7961e3db6f
|
建立公共表
|
10 years ago |
|
huang
|
d575ce5e5f
|
消息公共表
|
10 years ago |
|
sw
|
111478ec72
|
Merge branch 'szzh' into sw_new_course
Conflicts:
app/controllers/users_controller.rb
config/routes.rb
|
10 years ago |
|
sw
|
0489b02e54
|
课程留言无法删除
|
10 years ago |
|
lizanle
|
1aa61acd79
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/public.css
|
10 years ago |
|
huang
|
604fe40f84
|
poll after create
|
10 years ago |
|
huang
|
5594295c9e
|
添加问题更新策略
显示更新内容
|
10 years ago |
|
sw
|
2db6696fd4
|
个人动态的级联新增和级联删除
|
10 years ago |
|
lizanle
|
9138f46301
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/users_controller.rb
|
10 years ago |
|
huang
|
953817800a
|
问卷发布后才能提交
|
10 years ago |
|
huang
|
580735ef79
|
修改删除的关联的500问题
|
10 years ago |
|
huang
|
ef45e41a40
|
新消息提醒。表情插入
|
10 years ago |
|
huang
|
893c1c753f
|
修复留言嵌套回复问题
|
10 years ago |
|
huang
|
29b8a9dd9d
|
添加项目新闻回复 消息通知
|
10 years ago |
|
huang
|
ff53840029
|
修改消息中存在的页面bug
|
10 years ago |
|
huang
|
6b847e27d9
|
修正问题
|
10 years ago |
|
huang
|
e4dda89c07
|
消息---用户留言界面
|
10 years ago |
|
sw
|
b52f607b68
|
用户动态 = 参与课程动态 + 参与课程动态
表创建以及相关关系的搭建
|
10 years ago |
|
huang
|
b5682adcd3
|
添加统计数
|
10 years ago |
|
huang
|
192f16ba79
|
修改memo类
添加新的用户留言表结构
|
10 years ago |
|
huang
|
6b6f6e0b0d
|
个人主页留言消息推送
|
10 years ago |
|
huang
|
c8399cdf58
|
去掉forum
|
10 years ago |
|
huang
|
d18d1a9d81
|
用户留言添加
公共讨论区留言修改
|
10 years ago |
|
huang
|
2d282f73cb
|
项目讨论区
|
10 years ago |
|
huang
|
d657e9f3cc
|
新增 公共贴吧 消息通知
|
10 years ago |
|
huang
|
6b55474623
|
作品被评阅
作品被回复
消息通知
|
10 years ago |
|
huang
|
4bc0e0eb69
|
项目模块消息添加
讨论区结构优化
|
10 years ago |
|
lizanle
|
89b9a5c09d
|
资源库
|
10 years ago |
|
huang
|
fc244982bc
|
处理冲突
修改浏览器兼容问题
|
10 years ago |
|
huang
|
9a695b2d09
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/models/poll.rb
|
10 years ago |
|
huang
|
f731af0134
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
9b98bdcf5c
|
1、消息看过则不提示（方法实现）
2、添加消息新按钮
|
10 years ago |
|
huang
|
ed8c4ac906
|
不同类型消息发送
|
10 years ago |
|
huang
|
2cb5292dc1
|
完成课程讨论区消息回复方法
|
10 years ago |
|
huang
|
4013ff486a
|
消息界面调整
|
10 years ago |
|
huang
|
17fad1f291
|
课程（所有消息）--发布作业、新闻、问卷界面
|
10 years ago |
|
huang
|
7ea0fac774
|
1。发布作业消息提醒
2、新建问卷消息提醒
3、消息界面（未完成）
|
10 years ago |
|
sw
|
50fa03d00c
|
发布问卷时，该问卷才显示在动态，取消发布后取消显示该动态
|
10 years ago |
|
huang
|
a5c941f48c
|
课程发布通知消息提示
|
10 years ago |
|
huang
|
b958340ab6
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
0917030395
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
c903325352
|
缺陷状态更新消息提醒
留言消息提醒
|
10 years ago |
|
huang
|
69050b4271
|
指派给自己的缺陷不发送消息提示
|
10 years ago |
|
huang
|
5dd2befe88
|
添加消息看过后即不显示功能
|
10 years ago |
|
huang
|
ee778b5968
|
1、增加issue消息提醒（发送给指派的人）
2、下拉框形式区分消息
3、相关关联
|
10 years ago |
|
sw
|
2f77adfe9c
|
课程动态公共表的完成，去掉课程动态表的与我相关功能，动态的页面显示
|
10 years ago |
|
sw
|
053587bd53
|
课程动态增加课程创建信息的动态
|
10 years ago |
|
sw
|
ce76308864
|
课程动态，历史数据的迁移
|
10 years ago |
|
huang
|
998fe24e49
|
建立forge_messages表
建立user、project关联
|
10 years ago |
|
sw
|
465af5e2d3
|
增加课程动态，以及课程内相关活动时动态的添加
|
10 years ago |
|
huang
|
5f87d5806b
|
解决留言消息提示中遗留的bug
|
10 years ago |
|
huang
|
82747a7690
|
留言添加消息提示
|
10 years ago |
|
guange
|
f082ff745e
|
同步members
|
10 years ago |
|
guange
|
9d8596a14c
|
新增gitlab adapter用于适配gitlab命令
|
10 years ago |
|
sw
|
fe2d621dc3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/helpers/users_helper.rb
|
10 years ago |
|
sw
|
11afcaf17c
|
没有昵称的用户显示为：匿名用户
个人主页留言换行
|
10 years ago |
|
sw
|
f5cfd7258d
|
修改编程作业时，对已通过测试、未通过测试显示的初始化，以及修改时的结果的存储
|
10 years ago |
|
guange
|
909521df54
|
Merge remote-tracking branch 'origin/szzh' into gitlab_guange
|
10 years ago |
|
huang
|
f95fa6b5e7
|
修复：项目名称带点号，issue回复的404问题
项目名称全数字：不能留言等问题
|
10 years ago |
|
huang
|
ed27b6e30f
|
申请加入邮件通知添加自动登录功能
|
10 years ago |
|
guange
|
bf5f7f8d4f
|
加入分支参数
|
10 years ago |
|
guange
|
0a300724d3
|
统计结果改为数组返回
|
10 years ago |
|
guange
|
71970e1942
|
支持按时间段来统计每人的提交量
|
10 years ago |
|
sw
|
01576449c8
|
编译结果显示错误
|
10 years ago |
|
sw
|
5bd1cdc4eb
|
编程作业结果增加错误信息的存储
|
10 years ago |
|
guange
|
7d0a53ec86
|
merge
|
10 years ago |
|
sw
|
cfbd50e474
|
student_work和student_work_test关系：1对多
|
10 years ago |
|
sw
|
9f72b25360
|
编程作业结果显示问题
|
10 years ago |
|
huang
|
5926b2fe81
|
dts测试
|
10 years ago |
|
huang
|
c198a03a90
|
DTS测试工具
|
10 years ago |
 yutao
|
679ad8406d
|
课程主页
|
10 years ago |
|
yutao
|
f4b88dce70
|
个人主页
|
10 years ago |
|
sw
|
a7666af597
|
Merge branch 'yutao' into szzh
Conflicts:
app/controllers/users_controller.rb
|
10 years ago |
|
yutao
|
2efb4833f2
|
个人主页
|
10 years ago |
|
sw
|
1f6ed64e54
|
删除作品时，删除作品的点赞数
|
10 years ago |
|
yutao
|
8d858cccfc
|
个人主页
|
10 years ago |
|
sw
|
93905f2f32
|
界面显示
|
10 years ago |
|
yutao
|
87ab758ec5
|
个人主页->动态
|
10 years ago |
|
guange
|
006ed66d7a
|
新注册用户可以同步到gitlab
|
10 years ago |
|
sw
|
67c054e3af
|
Merge branch 'szzh' into sw_new_course
|
10 years ago |
|
sw
|
0b66097bfb
|
增加每份编程作品的测试结果的记录
|
10 years ago |
|
yutao
|
00c50d8114
|
个人主页->访客
|
10 years ago |
|
guange
|
3614c6ee9b
|
project同步
|
10 years ago |
|
sw
|
cf4c6c83d3
|
作业积分改为总分
|
10 years ago |
|
huang
|
dae15840b8
|
新注册用户邮件默认缺省值按天发送
|
10 years ago |
|
huang
|
7ebdf4a08d
|
issue列表增加优先级
修改issue列表界面
|
10 years ago |
|
huang
|
3e88d62ba6
|
修改课程附件问题
|
10 years ago |
|
huang
|
02805fd145
|
1、修改邮件显示样式及国际化
2、发布作业代码更新
|
10 years ago |
|
huang
|
162fcc7ff4
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
0430a0e810
|
修改journals查询错误
|
10 years ago |
|
huang
|
6da8cf237d
|
邮件按天发送，内容按课程划分
|
10 years ago |
|
huang
|
b5badbd25f
|
项目中邮件通知按项目排序
|
10 years ago |
|
huang
|
f8a35d2f97
|
邮件：缺陷按项目排序
|
10 years ago |
|
yutao
|
0a0f5d98db
|
课程动态 加入 与我相关
|
10 years ago |
|
huang
|
e986ee4e4e
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/issues/_edit.html.erb
|
10 years ago |
|
huang
|
def0e892af
|
解决公共贴吧发布内容过长500错误
|
10 years ago |
|
huang
|
39eb6a5f7c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
af59cd9ba7
|
1、项目issue区分主贴和回帖
2、引用模式修改
|
10 years ago |
|
sw
|
749b9c4429
|
项目列表根据ID排序
|
10 years ago |
|
huang
|
dd33210d05
|
区分缺陷回复合主贴
|
10 years ago |
|
huang
|
4092077923
|
不同课程邮件多条记录按desc排序
|
10 years ago |
|
huang
|
2f8c8ea6ca
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
sw
|
1c10775619
|
Merge branch 'guange_dev' into szzh
|
10 years ago |
|
huang
|
64da95e900
|
去掉冗余代码
|
10 years ago |
|
sw
|
8a3a0af20f
|
学生列表作业积分弹框内容
|
10 years ago |
|
huang
|
28e9c090ec
|
实时发送：发布作业邮件通知
|
10 years ago |
|
guange
|
f58b530484
|
给课程活动慢加上缓存，并且加入了开关
|
10 years ago |
|
huang
|
cf9455e465
|
课程发布作业添加到邮件中
|
10 years ago |
|
huang
|
e1b059b3d2
|
上传项目资源添加到邮件按天发送
|
10 years ago |
|
huang
|
c8884c6fd4
|
修改邀请用户url，隐藏userid防止注入
|
10 years ago |
|
huang
|
59dcfcbb1a
|
添加邮件回复（课程通知、项目新闻、缺陷更新回复）页面
|
10 years ago |
|
huang
|
4bb674bcae
|
课程通知、项目新闻回复 邮件查询语句
|
10 years ago |
|
huang
|
014f830b1d
|
添加issue回复邮件发送内容
|
10 years ago |
|
huang
|
aacd3af1fe
|
缺陷状态更新后，按天发送邮件通知
|
10 years ago |
|
sw
|
21a9a67bfc
|
移除bid
|
10 years ago |
|
huang
|
5c36cf5c9d
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
a4f1edcdee
|
更新：wiki项目其它成员可以收到；
项目、课程留言其它成员可以收到
邮件显示页面国际化
|
10 years ago |
|
sw
|
b44f5ef522
|
弹出框显示为作业名称
|
10 years ago |
|
sw
|
f956b27953
|
作业积分显示平均分
|
10 years ago |
|
huang
|
7bf4cfd218
|
修改个人留言在按天发送中查询条件
|
10 years ago |
|
huang
|
15697e05ed
|
按天发送中添加项目留言
|
10 years ago |
|
huang
|
c72f522493
|
邮件按天发送中添加wiki
|
10 years ago |
|
huang
|
0d9bdae5b0
|
邮件按天发送新界面
|
10 years ago |
|
huang
|
05a77caeda
|
去掉讨论区重复及统计数量错误
|
10 years ago |
|
huang
|
999e96a857
|
取消掉打印attachment
|
10 years ago |
|
huang
|
52f7c66ff0
|
修复课程讨论区中邮件通知重复的问题
|
10 years ago |
|
sw
|
1a3a23b0ed
|
BId已取消留言功能
|
10 years ago |
|
huang
|
c85fd9f7b8
|
处理新作业模块的冲突
|
10 years ago |
|
sw
|
f675211642
|
学生作品列表，没有真实姓名就显示login，作品附件导出也一样
|
10 years ago |
|
guange
|
971755c74a
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
sw
|
1cff2a85e9
|
Merge branch 'dev_hjq' into szzh
|
10 years ago |
|
huang
|
0c19199be9
|
按天发送中添加项目新闻
|
10 years ago |
|
yutao
|
cd0752f5da
|
课程讨论区动态与我相关
|
10 years ago |
|
huang
|
52bbb92c9f
|
课程通知邮件内容显示修改（新编辑器下不能使用）
|
10 years ago |
|
huang
|
c39e0bf3db
|
项目成员邀请添加：
邀请等待
已邀请的成员列表
|
10 years ago |
|
guange
|
444658d0b3
|
转换变为既时转换
|
10 years ago |
|
guange
|
d3baada893
|
在更新Attachments时也要更新
|
10 years ago |
|
guange
|
3f9c5764e9
|
.
|
10 years ago |
|
guange
|
d2eb51bbb6
|
只处理资源库的文件
|
10 years ago |
|
huang
|
e40f1a570e
|
添加邮件邀请成员列表
|
10 years ago |
|
huang
|
9e0a986fe9
|
项目、课程讨论区邮件提醒查询修改
|
10 years ago |
|
huang
|
0354e65497
|
修改issues邮件通知查询语句
|
10 years ago |
|
guange
|
87e7db1a4b
|
添加附件时转换office文档
|
10 years ago |
|
sw
|
e6af34e9f8
|
学生列表显示
|
10 years ago |
|
sw
|
cc5171bc1d
|
解决冲突
|
10 years ago |
|
sw
|
bd6a057008
|
老师布置作业加入个人动态
|
10 years ago |
|
sw
|
79f4e286cf
|
老师删除作业保报错
|
10 years ago |
|
sw
|
66c02f0667
|
1、新编辑器增加HomeworkCommon的Type
2、老师创建作业加入老师个人动态
|
10 years ago |
|
huang
|
64e56eca8e
|
邮件提醒，修改项目论坛提醒不全
|
10 years ago |
|
huang
|
6cddb59a4a
|
修改邮件提醒：项目缺陷动态不能收到
|
10 years ago |
|
sw
|
e4046851cf
|
1、作品列表 学号、姓名过长会换行
2、作品作业相关数据迁移
3、student_work缺少字段project_id
|
10 years ago |
|
huang
|
7197c33be4
|
注释掉暂时未完成的功能
|
10 years ago |
|
huang
|
697f891546
|
私有项目邮件邀请权限认证
|
10 years ago |
|
huang
|
ee7c1eff32
|
修改已注册用户邮件邀请异常
|
10 years ago |
|
huang
|
d9ae9c8061
|
修改邮件通知提醒（邀请：未激活
点击链接：激活并加入项目）
|
10 years ago |
|
huang
|
cae882b3d6
|
新增邮件状态表
相关关联
|
10 years ago |
|
sw
|
2bb59ffd79
|
1、作品评论回复以及相关界面刷新
2、调整回复框宽度
|
10 years ago |
|
sw
|
a0324f5e39
|
增加评分回复，以及相关显示
评分回复真实信息显示
评分回复以及回复删除
|
10 years ago |
|
huang
|
67061d0ee5
|
允许新建重名项目
|
10 years ago |
|
huang
|
a3fd541119
|
优化邮件邀请新用户、已注册用户
|
10 years ago |
|
sw
|
6ac97f2c34
|
1、迁移文件增加回滚方法
2、作品表增加所属项目字段
|
10 years ago |
|
sw
|
40f6295609
|
1、新建作业功能完成
2、修改新建作业时传递参数不完整
3、进入编辑作业界面，部分界面显示的初始化
4、提交新建作业按钮
|
10 years ago |
|
sw
|
a7fd5b950d
|
1、老师新建作业界面，数据i初始化
2、部分help方法添加
|
10 years ago |
|
sw
|
7684a6b253
|
1、实现作业列表展示页面
2、新建作业、修改作业、开启/关闭匿评路由以及页面跳转
3、注释掉bid相关的路由
4、作品列表、新建作品、修改作品、删除作品路由及页面跳转
|
10 years ago |
|
sw
|
dc1971f507
|
学生作品详细得分表，以及相关的关系
|
10 years ago |
|
sw
|
08b469fa3c
|
学生作品匿评分配表
|
10 years ago |
|
sw
|
3abfaed081
|
学生提交作品表，以及相关的关系
|
10 years ago |
|
sw
|
bb3e0c4c7e
|
手动评分作业、编程作业相关表的添加以及关系的定义
|
10 years ago |
|
sw
|
7bfd7755f7
|
增加手动评分相关表，以及关系的定义
|
10 years ago |
|
sw
|
a43a6289e4
|
新的老师布置的作业表添加，以及相关关系定义
|
10 years ago |
|
guange
|
092af28476
|
修正编辑器在火狐下粘贴不成功
|
10 years ago |
|
guange
|
461d9cc183
|
将autologin默认过期时间改为两个月
|
10 years ago |
|
guange
|
5c4ad1ce7d
|
merge
|
10 years ago |
 alanlong9278
|
336b59f606
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
.gitignore
Gemfile
app/views/issues/index.html.erb
app/views/layouts/_base_feedback.html.erb
app/views/tags/_tag_name.html.erb
Signed-off-by: alanlong9278 <547533434@qq.com>
|
10 years ago |
|
guange
|
31c78d295e
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
guange
|
86af233042
|
修正autologin多终端登录问题
|
10 years ago |
|
huang
|
888cd508c4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
76b4ae24da
|
修改邮件邀请--邮件名
修改成用户点击同意按钮后才能加入项目
|
10 years ago |
|
sw
|
74a85e1601
|
Merge branch 'szzh' into guange_dev
|
10 years ago |
|
huang
|
119e540373
|
邮件邀请系统已注册的用户
|
10 years ago |
|
guange
|
49389ebe28
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
guange
|
dbccf9034d
|
邮件加入日志
|
10 years ago |
|
huang
|
73798a0da4
|
修改邮件两次点击500错误
增加功能：在点击提交时代码后自动创建用户
用户自动登录功能
|
10 years ago |
|
guange
|
8384eff7f2
|
delayed_job条件错误
|
10 years ago |
|
sw
|
387ab567d2
|
Merge branch 'szzh' into guange_dev
|
10 years ago |
|
sw
|
9b15cbd6ee
|
1、老师评分、学生匿评增加附件上传，可上传批改后的作业
2、修改作业列表作业数不显示
|
10 years ago |
|
guange
|
38ec84cde9
|
将删除版本库的操作置入后台
|
10 years ago |
|
guange
|
273b360b51
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
sw
|
0970182cd5
|
当教师只评分不评论时，学生可以进行回复
修改作业评论回复框样式不正确，修改项目用户反馈框显示不正确
|
10 years ago |
|
guange
|
86347cab89
|
现在可以通过rake redmine📧test[guange] 发送测试邮件
|
10 years ago |
|
guange
|
828d2caefa
|
邮件加入三个邮件设置
|
10 years ago |
|
guange
|
3f9abf170e
|
#2363 按天发送邮件相关标题修改
|
10 years ago |
|
huang
|
681546b860
|
缺陷上传附件显示
项目邮件邀（未完成，需切换分支）
|
10 years ago |
whimlex
|
6195f0a150
|
课程动态添加问卷发布，为通过问卷动态访问课程问卷做权限判断
|
10 years ago |
|
huang
|
95c5e6ac83
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/helpers/application_helper.rb
app/helpers/files_helper.rb
app/helpers/members_helper.rb
app/models/journals_for_message.rb
app/models/mailer.rb
app/models/user.rb
app/views/attachments/_form.html.erb
app/views/bids/_new_homework_form.html.erb
app/views/boards/_project_show.html.erb
app/views/courses/_courses_jours.html.erb
app/views/courses/feedback.html.erb
app/views/courses/new_homework.html.erb
app/views/courses/settings.html.erb
app/views/issues/_list.html.erb
app/views/issues/new.html.erb
app/views/messages/_project_show.html.erb
app/views/messages/edit.html.erb
app/views/news/_project_news.html.erb
app/views/projects/invite_members.html.erb
app/views/projects/settings/_modules.html.erb
app/views/projects/show.html.erb
config/configuration.yml
config/locales/zh.yml
db/schema.rb
public/assets/kindeditor/kindeditor.js
public/javascripts/course.js
public/stylesheets/courses.css
public/stylesheets/public.css
|
10 years ago |
|
alanlong9278
|
b704555628
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
.gitignore
Gemfile
app/controllers/discuss_demos_controller.rb
app/models/user.rb
app/views/bids/_bid_homework_show.html.erb
app/views/issues/index.html.erb
app/views/layouts/_base_feedback.html.erb
app/views/poll/publish_poll.js.erb
app/views/poll/republish_poll.js.erb
public/javascripts/application.js
Signed-off-by: alanlong9278 <547533434@qq.com>
|
10 years ago |
|
alanlong9278
|
a51ba0c104
|
Signed-off-by: alanlong9278 <547533434@qq.com>
|
10 years ago |
|
huang
|
4acad8088e
|
缺陷最新显示最上面
代码优化
|
10 years ago |
|
sw
|
81cbb76d78
|
课程/项目--添加成员：用真实姓名搜索用户时，需要在姓和名之间加个空格才可以搜到
|
10 years ago |
|
whimlex
|
cf4451e998
|
pre标签换行；contest主页样式调整
|
10 years ago |
|
whimlex
|
ccff6c27b0
|
#2170项目--新闻：评论新闻返回异常undefined method `split' for nil:NilClass
|
10 years ago |
|
guange
|
123fa079b3
|
smtp配置放入production
|
10 years ago |
|
guange
|
c489d2400b
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
guange
|
5a876d9df1
|
邮件发送时，单个收件人会报错
|
10 years ago |
|
whimlex
|
e030c12be8
|
课程动态计数和显示统一；问卷计数对学生和老师和显示统一；课程资源库排序
|
10 years ago |
|
huang
|
12eaac5683
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/boards/_project_show.html.erb
public/javascripts/course.js
处理冲突
修改项目动态分页
项目到航天中添加“新建项目”
|
10 years ago |
|
lizanle
|
452e299966
|
删除demo代码
|
10 years ago |
|
guange
|
113e11f6cd
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
app/models/comment.rb
app/models/message.rb
app/models/news.rb
|
10 years ago |
|
lizanle
|
ceb6af7365
|
课程相关模块添加编辑器
|
10 years ago |
|
guange
|
56df5ce9a7
|
优化zip重复打包问题
|
11 years ago |
|
guange
|
9cefb9f339
|
每日发送取日期不对
|
11 years ago |
|
guange
|
0099ab9f9a
|
去除以前的邮件规则
|
11 years ago |
|
guange
|
243bac8fed
|
除了mail_notification == all 的，其他都不即时发邮件
|
11 years ago |
|
guange
|
3ea33aa847
|
新建news报500
|
11 years ago |
|
guange
|
89e0602983
|
邮件发送去除 observer, 一句代码的功能隐藏在别的文件里，很难注意到
|
11 years ago |
|
guange
|
27e123f9fd
|
const_defined?小错误
|
11 years ago |
|
guange
|
02e83ea776
|
将邮件发送放到后台进程中
|
11 years ago |
|
guange
|
efdfa67c64
|
日报homework created_on to created_at
|
11 years ago |
|
guange
|
c1ed8bd36d
|
#2096 course、forge的邮件通知系统，改为可以每日一报、一事一报、不报
|
11 years ago |
|
lizanle
|
b95f479c17
|
级联删除资源
|
11 years ago |
|
lizanle
|
a4f1b9c625
|
model中会有许多kindeditor的资源
|
11 years ago |
|
huang
|
525a6394ca
|
1、公共贴吧邮件提醒
2、浏览器版本过低提醒（样式需要再调试）
|
11 years ago |
|
guange
|
e007920cb6
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
Gemfile
app/views/attachments/_form.html.erb
|
11 years ago |
|
whimlex
|
b95852dfcd
|
附件上传国际化：修改页面一些bug：用户主页个人得分身份信息修改
|
11 years ago |
 z9hang
|
9d686349da
|
用户搜索接口添加按昵称或姓名搜索
|
11 years ago |
|
lizanle
|
da69443913
|
需要插入资源上传的时候插入数据库记录
|
11 years ago |
|
lizanle
|
39cbeced87
|
model类
|
11 years ago |
|
lizanle
|
0c86ba210d
|
Merge remote-tracking branch 'origin/szzh' into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
lizanle
|
4817b3106e
|
kindeditor资源类
|
11 years ago |
|
lizanle
|
5c4a62dcc4
|
DiscussDemo代码
|
11 years ago |
|
guange
|
08eae0e5eb
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
guange
|
ab6c21314d
|
#1503 老师发布的作业可以在课程动态中显示了
|
11 years ago |
