 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 |
