 houxiang
|
ad891aea39
|
分支合并
|
10 years ago |
|
houxiang
|
6b481c8961
|
mute the fork function by hx
|
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
|
3af96c96e7
|
finalize the commit_counts problems by hx
|
10 years ago |
|
houxiang
|
b3d36705d2
|
modify the commit_count by hx
|
10 years ago |
|
huang
|
39455f9f8a
|
作业重复提交问题
|
10 years ago |
|
houxiang
|
56519389d2
|
add binarysearch for commit_count by hx
|
10 years ago |
 cxt
|
89f8f5f383
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
b10fbcde8c
|
取消发布和发布测验
|
10 years ago |
|
huang
|
dd148fb7c5
|
Merge branch 'szzh' into sw_new_course
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
2435f06f44
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
huang
|
8b29002a0f
|
修改得分规则
|
10 years ago |
|
cxt
|
c36ec99ff6
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
9ca336a70a
|
发布和取消发布
|
10 years ago |
|
huang
|
c0dfc17b19
|
修改状态更新
|
10 years ago |
|
huang
|
da55b00da7
|
删除插入问题
|
10 years ago |
|
huang
|
a3122a9a2c
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
huang
|
aa36c927d3
|
0
|
10 years ago |
|
cxt
|
c07e2fe2d2
|
发布试卷
|
10 years ago |
|
cxt
|
98297da226
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
c9ba57f64b
|
去掉关闭、导入等功能
|
10 years ago |
|
huang
|
bb726e3475
|
提交答案验证
|
10 years ago |
|
huang
|
d1e0e0fd30
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
huang
|
97485ca221
|
修改show逻辑
提交问卷后学生页面显示
|
10 years ago |
|
cxt
|
332ace0f34
|
列表
|
10 years ago |
|
cxt
|
d4d2adddb2
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/controllers/exercise_controller.rb
|
10 years ago |
|
cxt
|
eee63b2495
|
提交前验证数据不为空
|
10 years ago |
|
huang
|
ed86e3ee5a
|
三种类型题目计算总分
|
10 years ago |
 ouyangxuhua
|
5cfc8c2f8d
|
编辑文章后，或者回复文章后，更新组织动态的更新时间
|
10 years ago |
|
huang
|
db46e5e4af
|
问卷得分统计
|
10 years ago |
|
ouyangxuhua
|
dcbdea9bb5
|
1.修复文章详细列表删除后，页面报错的问题；
2.文章详情页面中，文章回复显示中回复人丢失问题修复
|
10 years ago |
|
huang
|
cb3f0d1c97
|
按类型分类，序号递增
|
10 years ago |
|
huang
|
07ee819370
|
学生多选答题
|
10 years ago |
|
huang
|
302dfaf933
|
新建万卷初始showresult
|
10 years ago |
|
huang
|
469e71e77d
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
huang
|
13af6e64b2
|
修改允许学生查看参数
|
10 years ago |
|
cxt
|
99945d5bb5
|
学生答题界面的修改
|
10 years ago |
|
ouyangxuhua
|
e01a7c2627
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
b10ff36c51
|
1.组织文章和成员访问权限控制；
2.修改编辑文章不能提交的问题。
|
10 years ago |
|
huang
|
3deebf2006
|
show
|
10 years ago |
|
ouyangxuhua
|
40a44c3568
|
增加文章二级回复功能
|
10 years ago |
|
huang
|
08c7eb8d40
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
huang
|
81e2827277
|
解决参数为空的bug
|
10 years ago |
|
cxt
|
20f7560b07
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
9aee23507c
|
学生答题页面、答题结果页面、老师的试卷页面
|
10 years ago |
|
huang
|
74343a4929
|
发布问卷、取消问卷
|
10 years ago |
|
huang
|
87e7a51278
|
删除
|
10 years ago |
|
huang
|
7ab0f4764a
|
主管题插入删除更新
|
10 years ago |
|
cxt
|
27c88fda4f
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/views/exercise/_edit_single.html.erb
|
10 years ago |
|
cxt
|
2c1b03079b
|
学生测验界面
|
10 years ago |
|
huang
|
02f6b636cd
|
完成更新功能
|
10 years ago |
|
huang
|
f3614999da
|
gi
|
10 years ago |
|
huang
|
841ebb7846
|
简单题更新，未完
|
10 years ago |
 lizanle
|
dffabce806
|
Merge branch 'dev_zanle' into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
houxiang
|
fdedcbfa81
|
增加了注释
|
10 years ago |
 Gan Yi.ang
|
f6bfd7824d
|
优化查看commits那个页面
|
10 years ago |
|
huang
|
a900c70e76
|
试题更新
|
10 years ago |
|
huang
|
bc47382115
|
用户提交答卷后，给出得分
|
10 years ago |
|
ouyangxuhua
|
478a534c96
|
1.将课程动态加入组织动态的过滤条件中；
2.创建文章成功后，给出信息提醒
|
10 years ago |
|
huang
|
2296a2f50c
|
添加学生提交作业
老师发布作业功能
|
10 years ago |
|
huang
|
8cf22767f9
|
新建问答题
|
10 years ago |
|
huang
|
8e4b2bd7d4
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
huang
|
1606e9ddab
|
0
|
10 years ago |
|
cxt
|
28f7390595
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
3d3d50f1ea
|
编辑
|
10 years ago |
|
huang
|
ac95e1584c
|
问卷删除功能
|
10 years ago |
|
ouyangxuhua
|
af981f841e
|
添加组织时，翻页提醒功能改善
|
10 years ago |
|
houxiang
|
4a9da97f9b
|
modify by hx add commit_count_detail_show
|
10 years ago |
|
houxiang
|
fe3fbacdbc
|
modify commit count show
|
10 years ago |
|
huang
|
cd2d947cb2
|
多项选择标准答案
|
10 years ago |
|
ouyangxuhua
|
219774afab
|
将课程动态加入组织动态中
|
10 years ago |
|
huang
|
de17ffa605
|
区分答案大小写
|
10 years ago |
|
cxt
|
0405d4eee6
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
249b15751d
|
新建多选题
|
10 years ago |
|
huang
|
7f5fa7fb6f
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/helpers/exercise_helper.rb
解决冲突
|
10 years ago |
|
huang
|
25344ef0de
|
show方法
|
10 years ago |
|
huang
|
deb0f151c4
|
单选数字转换
|
10 years ago |
|
cxt
|
c5c16e25b6
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
ouyangxuhua
|
fc7e41ebf9
|
1.在项目和课程在关联和删除关联组织后，翻页能链接到正确的位置
|
10 years ago |
|
lizanle
|
60fda5e391
|
火狐MathJax显示公式错误，还是不能不用图形字体
|
10 years ago |
|
cxt
|
265fe08b2c
|
在线测验
|
10 years ago |
|
huang
|
282c7f5bd2
|
修改添加题目相关
|
10 years ago |
|
huang
|
02db1b7e14
|
问卷添加标准答案
|
10 years ago |
|
huang
|
9cf5a92a44
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
huang
|
221a73309f
|
index页面删掉无效的测试
|
10 years ago |
|
cxt
|
452cf1c854
|
测验
|
10 years ago |
|
cxt
|
2c9c87c3c6
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/controllers/exercise_controller.rb
|
10 years ago |
|
cxt
|
bb99a11c37
|
页面修改
|
10 years ago |
|
huang
|
f316f43d6d
|
修改edit界面无法找到的问题
|
10 years ago |
|
huang
|
3cdda2a60a
|
修改创建方式
|
10 years ago |
|
huang
|
9935cfea44
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
huang
|
99f4483a16
|
删除问卷（未完）
|
10 years ago |
|
cxt
|
b3e6bf40ff
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
cc08e5e32e
|
保存测验信息
|
10 years ago |
|
huang
|
4a0865ab76
|
添加和编辑题目
|
10 years ago |
|
ouyangxuhua
|
71bf80c7a5
|
1.创建组织课程关联表，建立相应模型及控制器；
2.在课程设置中，添加加入组中功能；
3.解决添加项目后，组织列表的上一页和下一页链接问题。
|
10 years ago |
|
huang
|
651f6565be
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/controllers/exercise_controller.rb
处理冲突
|
10 years ago |
|
huang
|
23ca20692f
|
问卷部分方法
|
10 years ago |
|
cxt
|
034a92bb7b
|
新建测验页面
|
10 years ago |
|
huang
|
0316bf698f
|
exercise新增、update
|
10 years ago |
|
ouyangxuhua
|
8aeae831b8
|
项目配置中添加组织后，更新组织列表，而不是隐藏
|
10 years ago |
|
ouyangxuhua
|
6f5cb8f142
|
增加组织动态的过滤功能，组织动态包括项目动态和组织的动态
|
10 years ago |
|
ouyangxuhua
|
fba461f94a
|
增加组织模块中项目讨论区的回复功能
|
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
|
bd6a1a9d49
|
增加组织动态中的项目问题的回复框
|
10 years ago |
|
ouyangxuhua
|
10dedcb7be
|
增加组织成员加入时间
|
10 years ago |
|
ouyangxuhua
|
de32745eef
|
1.将项目动态数据迁移至组织动态；
2.在组织动态中，按时间倒排显示组织动态；
3.增加我的组织中搜索功能。
|
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 |
|
huang
|
ca8b62b8bd
|
Merge branch 'szzh' into gitlab_guange
|
10 years ago |
|
huang
|
50dfe5ce8b
|
修正接口 项目owner为当前用户，同步gitlab端用户
|
10 years ago |
|
ouyangxuhua
|
f5460d1126
|
组织动态添加项目动态
|
10 years ago |
|
ouyangxuhua
|
c9a7a94767
|
组织动态添加项目动态
|
10 years ago |
|
ouyangxuhua
|
1e1c210939
|
组织动态添加项目动态
|
10 years ago |
|
ouyangxuhua
|
38acb4230e
|
组织动态添加项目动态
|
10 years ago |
|
huang
|
f32cae9012
|
fork fileter修正
|
10 years ago |
|
lizanle
|
56613b6358
|
增加项目的显示
|
10 years ago |
|
huang
|
ddbc9003c2
|
每个用户不能创建同名版本库
不同的用户可以创建不同版本库
更新fork接口方法
|
10 years ago |
|
ouyangxuhua
|
a5a413eda0
|
动态查询sql错误
|
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 |
|
ouyangxuhua
|
022c656db6
|
修复项目加入组织的bug
|
10 years ago |
|
sw
|
70c5b27a43
|
相关路由
|
10 years ago |
|
ouyangxuhua
|
3451ced888
|
添加我的组织页面及修改bug
|
10 years ago |
|
ouyangxuhua
|
866c2feaa1
|
修改组织模块的bug
|
10 years ago |
|
lizanle
|
e7d53f5e16
|
课程资源上传允许多选tag
|
10 years ago |
|
ouyangxuhua
|
5aea2250c4
|
组织加入成员时，如果没有选择用户，弹窗给出提示
|
10 years ago |
|
ouyangxuhua
|
6ec27761fb
|
组织功能实现及缺陷修改
|
10 years ago |
|
ouyangxuhua
|
21275e8b7b
|
组织模块功能缺陷修改
|
10 years ago |
|
cxt
|
7a93fddb83
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
ab868d7b65
|
课程通知增加置顶
|
10 years ago |
|
ouyangxuhua
|
d508cfa381
|
组织模块功能实现
|
10 years ago |
|
ouyangxuhua
|
a3443ba968
|
组织模块功能实现
|
10 years ago |
|
huang
|
2596f0a788
|
优化权限代码
|
10 years ago |
|
huang
|
3aa73fba35
|
Gitlab权限修改
更新项目Gitlab同步更新
|
10 years ago |
|
cxt
|
2a82f33227
|
个人首页的留言动态显示不合理
|
10 years ago |
|
cxt
|
6232bbb5e7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
463262e838
|
提交作品时立马弹框
|
10 years ago |
|
lizanle
|
f229d18776
|
在课程 项目 上传资源后跳转到对应的资源库界面
|
10 years ago |
|
lizanle
|
1e33e38fe2
|
token不对的话，那就跳转到登陆页面
|
10 years ago |
|
lizanle
|
7aff7bc20b
|
回退
|
10 years ago |
|
lizanle
|
bf1333ece9
|
登陆退出偶尔报500
|
10 years ago |
|
cxt
|
5d03a27170
|
启动匿评和关闭匿评时自动刷新该动态
|
10 years ago |
|
cxt
|
c08c327f73
|
火狐浏览器下课程作业的回复无法自动刷新
|
10 years ago |
|
cxt
|
cab8c02113
|
学生提交作品后弹出作品信息的确认框
|
10 years ago |
|
ouyangxuhua
|
283af137c6
|
组织模块动态及配置
|
10 years ago |
|
cxt
|
8e3b04f9e3
|
禁用匿评&&作业截止&&作品已提交 学生可查看所有作品列表
|
10 years ago |
|
cxt
|
1b988a0a7f
|
作品提交完成后弹出作品信息对话框
|
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 |
|
cxt
|
c8eb0a076f
|
编辑作业时点击取消和发送按钮后的页面跳转
|
10 years ago |
|
ouyangxuhua
|
3f289dcd74
|
org开发部分（未完）
|
10 years ago |
|
huang
|
6e7950983b
|
1、数据任务迁移
2、添加commits总数统计
|
10 years ago |
|
ouyangxuhua
|
eadab840b6
|
建立组织、成员表及模型控制器；
编写创建组织页面。
|
10 years ago |
|
huang
|
a4209bc9f7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
7f3d44ce63
|
代码优化：gitlab和trustie分离
|
10 years ago |
|
lizanle
|
594a1b01ef
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
3360a25a42
|
项目 主页 资源上传 不要翻页，直接弹出资源弹出框
|
10 years ago |
|
huang
|
e5574b2f00
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
36d61cd82f
|
添加历史记录迁移
|
10 years ago |
|
huang
|
4d5d012ecf
|
版本库相关界面调整
|
10 years ago |
|
ouyangxuhua
|
7980d92ff7
|
搜索课程，使结果按照开课时间、创建时间倒排
|
10 years ago |
|
huang
|
83486c745e
|
1、如果没有新增版本库，点击链接跳至配置--新增
2、已创建过gitlab项目则跳至gitlab 版本库
|
10 years ago |
guange
|
fa0332babd
|
只有在同步项目时才同步用户
|
10 years ago |
|
huang
|
48d0553e8f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
2b89244f52
|
修改用户url问题
解决urlhttp重复问题
|
10 years ago |
|
cxt
|
97de8b584c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
3bb56f1606
|
教辅可查看未发布的作业
|
10 years ago |
|
lizanle
|
b7a6bc3614
|
outline url
|
10 years ago |
|
huang
|
89507b2b47
|
版本库域名写入配置文件中
|
10 years ago |
|
lizanle
|
ae6fe6f9a7
|
申请加入课程，允许身份覆盖
|
10 years ago |
|
lizanle
|
8531ab51ab
|
取消大纲不删除博客
|
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
|
4d7ca63a12
|
添加一个参数控制
在课程首页设置大纲不跳转
在大纲展示页面设置大纲，跳转大纲页面
|
10 years ago |
|
lizanle
|
00157b4302
|
大纲设置的图标改动 ，添加删除动作
|
10 years ago |
|
huang
|
470fb3bfa6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
57f37acecc
|
提交情况统计
提交接口修改
|
10 years ago |
|
lizanle
|
0815cde772
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
578bb2537d
|
课程大纲功能
|
10 years ago |
|
huang
|
0158fe023d
|
修改 最近一次提交记录 接口
数据同步 validate类型控制
|
10 years ago |
|
ouyangxuhua
|
f26707e381
|
增加课程成员，给该老师也发送消息；
修改增加成员或删除成员消息的内容
|
10 years ago |
|
huang
|
331461465f
|
Merge branch 'szzh' into gitlab_guange
|
10 years ago |
|
huang
|
df8d2f8dd4
|
gitlab调用commits接口
|
10 years ago |
|
lizanle
|
a747983a51
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
ac82910aa5
|
大纲
|
10 years ago |
|
ouyangxuhua
|
b11aaa545a
|
老师将课程成员拉入或者移出项目时，给出相应的消息通知
|
10 years ago |
|
ouyangxuhua
|
4f64859b14
|
没有关注的人，sql报错
|
10 years ago |
|
lizanle
|
0de97fb9ef
|
如果没有关注的人，sql会报错
|
10 years ago |
|
lizanle
|
eaba915598
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
lizanle
|
c2be8b4eec
|
课程大纲界面
|
10 years ago |
|
cxt
|
4f8bea35f5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
d851364e70
|
匿评开启前学生能看到提交的作品数
|
10 years ago |
|
lizanle
|
55e5826fef
|
回复的时候要更新activity的的更新时间
|
10 years ago |
|
lizanle
|
76ac5a49f2
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
788e900d4a
|
个人博客发博文也要显示动态
个人博客 编辑设置菜单要出现在博客列表的右上方
|
10 years ago |
|
cxt
|
86354028ed
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
b1284cbf55
|
个人动态和课程动态中的作业添加配置菜单
|
10 years ago |
|
huang
|
4c61e7490b
|
Merge branch 'develop' into gitlab_guange
Conflicts:
db/schema.rb
|
10 years ago |
|
ouyangxuhua
|
e13d157f7f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
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 |
|
guange
|
9303dfd5ae
|
IE下载xls乱码问题
|
10 years ago |
|
huang
|
7970a46469
|
1、添加功能：依据分支切换显示不同的提交记录
2、切换分支刷新页面
3、版本库显示页面修稿
|
10 years ago |
|
ouyangxuhua
|
268575ceec
|
加入课程申请样式调整
|
10 years ago |
|
lizanle
|
0cad264620
|
elsif写错了
|
10 years ago |
|
ouyangxuhua
|
b0b1a27908
|
1.用户请求加入课程成为老师或者教师时，给课程创建者发送邮件；
2.更新相应消息的状态
|
10 years ago |
|
lizanle
|
6c5c7988dc
|
博客删除报错的问题
|
10 years ago |
|
huang
|
34a8d0890c
|
相政新界面
|
10 years ago |
|
ouyangxuhua
|
5fb1291bf8
|
消息状态修改
|
10 years ago |
|
ouyangxuhua
|
d509ef01e8
|
更新用户申请加入项目以及反馈的消息的状态
|
10 years ago |
|
lizanle
|
69bc26033e
|
防止url删减报错
url博客内容长度限制改为20000
|
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 |
|
ouyangxuhua
|
586cde6f87
|
更新用户申请成为课程的老师或教辅消息的状态
|
10 years ago |
|
lizanle
|
2a76461cd1
|
简单博客功能
|
10 years ago |
|
lizanle
|
cf83209c58
|
原来的提交被覆盖了。
|
10 years ago |
|
huang
|
0a4fd92d8c
|
查看代码，显示在project右侧
翻滚
代码展示编辑状态（颜色区分样式）
|
10 years ago |
|
lizanle
|
b27a0f2e51
|
学校分页
|
10 years ago |
|
lizanle
|
0be91202d7
|
学校分页
|
10 years ago |
|
lizanle
|
9d89da7e66
|
课程加入消息错误
|
10 years ago |
|
huang
|
2221fb4d7a
|
committers跳转问题
按钮样式
|
10 years ago |
|
cxt
|
fde4ce74ba
|
作业配置菜单增加评分设置
|
10 years ago |
|
huang
|
bd793a00fe
|
贡献者页面
|
10 years ago |
|
ouyangxuhua
|
4b8c65d12e
|
消息处理
|
10 years ago |
|
huang
|
c7204576cc
|
版本库创建人为projectowner
修改新的版本库地址
|
10 years ago |
|
huang
|
57e48d4921
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
|
10 years ago |
|
huang
|
1157dcaa06
|
版本库summary
文件目录
新版本库地址
按分支显示提交记录
相关界面
|
10 years ago |
|
cxt
|
7e21c00aed
|
添加作业的回复功能
|
10 years ago |
|
guange
|
d802992e96
|
merge
|
10 years ago |
|
guange
|
11d1cac40d
|
可以通过gitlab创建项目
|
10 years ago |
|
lizanle
|
75ee45b2d1
|
消息已阅！
|
10 years ago |
|
lizanle
|
e44d95cca5
|
添加申请课程的加入身份
|
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 |
|
lizanle
|
9330418668
|
学校列表div 下拉分页
|
10 years ago |
|
huang
|
dc5721497e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
1f1a8e0770
|
管理员修改学校的功能
|
10 years ago |
|
huang
|
a8f5a7ea48
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
efbae1f003
|
修改作业消息的内容：把“你”统一改成“您”；发布作业是本人的话，改成“您发布了作业”，而非“某某老师发布了作业”等
|
10 years ago |
|
ouyangxuhua
|
4deeaa0f34
|
1.增加消息：用户迟交作业时，发送不能参与匿评的消息；
2.增加消息：用户创建课程时，发送创建课程消息。
|
10 years ago |
|
lizanle
|
cf0fd2022d
|
课程创建动态 项目创建动态
|
10 years ago |
|
huang
|
64fa435a3a
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
|
10 years ago |
|
huang
|
f189e3cde8
|
0
|
10 years ago |
|
guange
|
74fd461fac
|
.
|
10 years ago |
|
guange
|
acbd690bc6
|
添加转换页面
|
10 years ago |
|
huang
|
765d2b875d
|
还原目录显示
|
10 years ago |
|
huang
|
b1ba6d576a
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
10 years ago |
|
lizanle
|
707244886c
|
学校列表分页
|
10 years ago |
|
ouyangxuhua
|
2160d508f3
|
1.更改加入项目以及移出项目消息的提示；
2.对于发布作业消息，当作业消息为空时，不显示；
3.消息列表中，“全部”改成“所有消息”
|
10 years ago |
|
ouyangxuhua
|
2f2ad38cdf
|
1.用户被拉入项目，发送相应消息给该用户；
2.用户被移出项目，发送消息给该用户。
|
10 years ago |
|
huang
|
150ee3d28d
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
10 years ago |
|
lizanle
|
bbd3999ab2
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
e3a660cf18
|
添加学校
|
10 years ago |
|
cxt
|
0f0351b343
|
解决冲突
|
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 |
|
cxt
|
8ea5d98b6c
|
课程讨论区发布帖子、编辑帖子的实现
|
10 years ago |
|
huang
|
464fc461ea
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
6b7800c36b
|
Merge branch 'dev_hjq' into szzh
|
10 years ago |
|
lizanle
|
b3d15b886a
|
学校的查询与现实问题重做
|
10 years ago |
|
huang
|
d0ea49d1e9
|
解决项目讨论区置顶功能不能使用问题
|
10 years ago |
|
huang
|
9399063886
|
创建版本库控制层及国际化
|
10 years ago |
|
huang
|
61bcdd4643
|
只允许创建一个版本库
|
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 |
|
huang
|
8ab04c652f
|
Merge branch 'develop' into gitlab_guange
|
10 years ago |
|
guange
|
af03d6c00c
|
IE11乱码问题
|
10 years ago |
|
huang
|
9eb498dbc4
|
版本库 文件目录（未完成--）
|
10 years ago |
|
cxt
|
3ebbcedf1b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
guange
|
5b2fb66468
|
解决ie11下载乱码问题
|
10 years ago |
|
cxt
|
53a7b1dda4
|
课程讨论区动态按最后更新时间排序
|
10 years ago |
|
huang
|
73898953d9
|
project表添加字段，记录project对应gitlba中project id
|
10 years ago |
|
cxt
|
03e8c3802d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
ebb7ed1f1a
|
讨论区单个帖子页面的二级回复
|
10 years ago |
|
lizanle
|
cb4d62d3b6
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
c85e1401f0
|
引用资源支持多页选择
|
10 years ago |
|
ouyangxuhua
|
155dff7e27
|
1.增加消息列表对应的图标；
|
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
|
47de084a6c
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
a0f0ecf86d
|
修改未读消息500问题
|
10 years ago |
|
huang
|
ebe1afd489
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
2518305959
|
项目删除跳转修改；项目删除提示修改
|
10 years ago |
|
ouyangxuhua
|
77581d46eb
|
1.将所有类型的消息都列出来；
2.修复当消息为空时，浏览器端报错的问题。
|
10 years ago |
|
cxt
|
c6cca9f17e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
0f6ea47792
|
课程讨论区的列表显示
|
10 years ago |
|
sw
|
7c825baf19
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
f4b92e110f
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
sw
|
ff5e167e3c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
829e94c563
|
enter可修改tag name并且只修改一次
|
10 years ago |
|
sw
|
e6bb599a6c
|
TAG批量修改完成
|
10 years ago |
|
ouyangxuhua
|
c4c005a39b
|
修改获取所有消息的排序算法，使用数据库的order
|
10 years ago |
|
huang
|
2768317d08
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
7b18c14aa3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
654ebfca46
|
项目邀请添加：姓、名、性别
|
10 years ago |
|
ouyangxuhua
|
28bbbb1508
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
8841b5221b
|
消息显示内容修改
|
10 years ago |
|
lizanle
|
b51066694e
|
全部 按钮
|
10 years ago |
|
huang
|
fce872a6a5
|
优化issue显示代码
|
10 years ago |
|
lizanle
|
b8be9c6425
|
批量修改tag
|
10 years ago |
|
huang
|
2aeebfe645
|
优化数组排序
有序排序
|
10 years ago |
|
huang
|
0064aa4278
|
系统消息不消失
系统消息和普通消息一致，按照时间排序
待优化点：数组排序
|
10 years ago |
|
huang
|
6179e455d2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
e054f8045c
|
去掉Git的中英文说明
新的提交代码指定入口
|
10 years ago |
|
lizanle
|
7cbee4cd53
|
编辑tag有时候不能用
|
10 years ago |
|
sw
|
11314a5366
|
第二个人打分之后，评分结果的样式
|
10 years ago |
|
sw
|
87e4bfdd3f
|
课程内导入作业却将作业发布到被导入的课程
|
10 years ago |
|
sw
|
a3ce43c3d5
|
去掉与我相关
|
10 years ago |
|
sw
|
9beaba0aac
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
16333d69f7
|
文件列表
|
10 years ago |
|
cxt
|
7057247700
|
首页项目动态讨论区回复无法刷新
|
10 years ago |
|
huang
|
18d028bb7e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
0ecfb7b935
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
3d9dcfe250
|
作业的最后更新时间为作品的最新提交时间
|
10 years ago |
|
huang
|
da4b00e56c
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
sw
|
ad4fc50fbb
|
1、引入资源到作业移除部分css
2、课程内点击作业列表加载更多
|
10 years ago |
|
sw
|
9a5dba7773
|
课程内发布、修改、删除作业后跳转仍在课程内的作业列表
|
10 years ago |
|
sw
|
35b1bc8069
|
课程内作业列表界面修改
|
10 years ago |
|
huang
|
0a1798eb0b
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
ba569403c3
|
1、匿评关闭/开启发送对象为所有成员
2、匿评方法封装
3、匿评开启/关闭邮件通知发送对象为课程所有成员
|
10 years ago |
|
cxt
|
be932e3b1b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
c81e07d588
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
lizanle
|
39c5571d73
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
c3d829a68f
|
名称检查
|
10 years ago |
|
ouyangxuhua
|
31c5cf2163
|
1.将作品评论、回复作品评论等加入至作业消息列表
|
10 years ago |
|
cxt
|
223bac373f
|
课程动态的数据迁移
|
10 years ago |
|
sw
|
6c62b44b59
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
befd8d66f6
|
编辑名称检查
|
10 years ago |
|
sw
|
709e099770
|
增加部分作业关联表的判断
|
10 years ago |
|
huang
|
8886bda790
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
44c097dbaf
|
1、issue回复添加新的编辑器
2、解决issue回复含有html问题
3、解决项目动态中含有html问题
|
10 years ago |
|
lizanle
|
f99ccf724c
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
c1bd17b07e
|
项目论坛发帖排序比较乱。 去掉置顶功能（发帖的功能里原来有置顶按钮。现在没有了。所以排序也要取消）
|
10 years ago |
|
huang
|
20465764a7
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
1e8cb91ab4
|
boards
|
10 years ago |
|
cxt
|
15b45e6706
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/header.css
public/stylesheets/new_user.css
public/stylesheets/public_new.css
|
10 years ago |
|
huang
|
fcf34b5918
|
修复项目配置中“私有” “公开”问题
|
10 years ago |
|
cxt
|
bb0db1e21d
|
课程动态页面
|
10 years ago |
|
huang
|
38ba47f8c8
|
讨论区结构修改
任务中添加：自动开启/关闭匿评消息通知
匿评开启失败消息通知
|
10 years ago |
|
lizanle
|
531b264a8f
|
Merge branch 'dev_zanle' into szzh
|
10 years ago |
|
lizanle
|
9f22eed093
|
帖子的名称也要修改
|
10 years ago |
|
huang
|
99473c6880
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/issues/show.html.erb
|
10 years ago |
|
huang
|
6449b2563b
|
1、去掉项目隐藏代码库的功能
2、同步圈子的描述
3、圈子JS实现
|
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
|
b9ff46f8d0
|
帖子的编辑与删除
|
10 years ago |
|
huang
|
b94c57691a
|
项目新建重构
项目先建添加项目类型
|
10 years ago |
|
sw
|
fa13ccfaa8
|
匿评参数设置功能完成
|
10 years ago |
|
lizanle
|
272d9fa527
|
论坛的标签可修改
|
10 years ago |
|
huang
|
8d64114c58
|
留言引用样式调整
|
10 years ago |
|
lizanle
|
b4561fa68d
|
资源库标签 上方的tag重命名的话，所有的含有该tag的资源的那个标签页要重命名
|
10 years ago |
|
sw
|
9d2b58738e
|
分班过滤功能
|
10 years ago |
|
sw
|
90536efa1e
|
课程内姓名学号邮箱过滤，各种排序 改为js刷新页面
|
10 years ago |
|
huang
|
48b93f2113
|
项目缺陷消息点对点发送
回复逻辑优化（未完成）
|
10 years ago |
|
sw
|
7a62b7f13d
|
增加匿评开启时间和匿评关闭时间，并对其业务逻辑进行js的控制。以及这两个值得修改
|
10 years ago |
|
lizanle
|
553c1396dd
|
帖子创建不成功 给出原因
帖子发布时长度检查
|
10 years ago |
|
huang
|
d9620e416e
|
优化“全部设为已读” 代码
|
10 years ago |
|
huang
|
6e9db8b922
|
封装点击按钮时间
|
10 years ago |
|
huang
|
fb034090d7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/projects_controller.rb
app/views/users/user_messages.html.erb
解决冲突
|
10 years ago |
|
huang
|
14acdef0cb
|
消息列表中增加权限判断
|
10 years ago |
|
huang
|
b207c231f7
|
1、消息“同意加入”添加权限控制，项目成员不显示
2、区别项目成员和非项目成员的不同样式
3、访问项目和成员列表--则设置项目邀请消息为已读
|
10 years ago |
|
lizanle
|
11714868b7
|
贴吧不能新建成功的时候 也没有给出任何提示
|
10 years ago |
|
sw
|
b623894976
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
ccd19021ae
|
课程动态回复之后，编辑器变宽
|
10 years ago |
|
huang
|
42745092c5
|
设置权限，其他人不能访问我的消息列表
|
10 years ago |
|
lizanle
|
46c806900e
|
贴吧列表和主题列表 按不同的规则排序的时候，如果翻页了，又回到了综合排序的问题
|
10 years ago |
|
huang
|
c8f2430004
|
系统消息每页显示10个
|
10 years ago |
|
huang
|
c9bedb2362
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
961b2bd564
|
开启/关闭匿评邮件通知
|
10 years ago |
|
sw
|
7ba27026ae
|
教师在课程内编辑、删除作业之后仍然跳转回当前课程作业列表
|
10 years ago |
|
lizanle
|
b621449406
|
帖子过滤错误
|
10 years ago |
|
lizanle
|
422e07fa48
|
帖子展示错误
|
10 years ago |
|
huang
|
810c0d8fe5
|
作业开启/关闭匿评邮件通知
|
10 years ago |
|
huang
|
fb76bc8f9a
|
完成项目邀请消息通知及对应页面
解决防注入问题（通过随机6为密码）
|
10 years ago |
|
sw
|
05f7bf9634
|
test1
|
10 years ago |
|
huang
|
ff2e3e168d
|
开启/关闭匿评消息通知
|
10 years ago |
|
lizanle
|
9443c139f0
|
update forum
|
10 years ago |
|
huang
|
ba2474e480
|
关闭匿评消息
|
10 years ago |
|
huang
|
cfea5e9c89
|
邀请已注册用户 消息邀请信息
|
10 years ago |
|
huang
|
c3223982cd
|
修改系统消息链接跳转
|
10 years ago |
|
huang
|
81743143c2
|
优化用户留言页面
|
10 years ago |
|
huang
|
90bf4a7c99
|
系统消息样式冲突问题
|
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
|
8eb2c75cbc
|
1、编程作业修改评分比例之后成绩计算问题
2、关闭匿评之后样式
|
10 years ago |
|
sw
|
859fe01c52
|
1、编程作业无法导出缺评、匿评列表
2、编程作业评分设置初始值
|
10 years ago |
|
sw
|
4b83265508
|
1、编程作业可以修改、删除
2、关闭匿评之后结束匿评按钮样式
3、编程作业成绩计算有问题
4、相关样式修改
5、编程作业作品展开界面功能
|
10 years ago |
|
sw
|
a8c5d18069
|
1、之前普通作业更改为匿评作业。。。
2、系统评分为null时默认为0
|
10 years ago |
|
sw
|
5bdb1cd461
|
1、启动匿评、关闭匿评时弹出框位置
2、缺评评分设置报错
|
10 years ago |
|
sw
|
7cc5ce92c6
|
完成评分比例设置功能
|
10 years ago |
|
sw
|
cc7a752623
|
到处附件、缺评、匿评、成绩列表
|
10 years ago |
|
sw
|
b8cb422268
|
排序功能
|
10 years ago |
|
sw
|
9c20368274
|
1、系统评分的时候对成绩进行赋值
2、去掉错误的编程得分计算方法
|
10 years ago |
|
sw
|
f6f3d83c5e
|
1、老师、学生打分
2、评论及评论的回复功能
|
10 years ago |
|
huang
|
9324d45e2c
|
系统消息发布添加标题功能
|
10 years ago |
|
huang
|
d00ad2e14d
|
1、作业截止时间邮件通知
2、系统消息通知路由、方法定义
|
10 years ago |
|
sw
|
c4abe6b413
|
shou页面的展示以及留言功能
|
10 years ago |
|
cxt
|
68338c46e1
|
个人动态按最后更新时间排序
|
10 years ago |
|
huang
|
b9fc410802
|
添加系统消息单独新页面
|
10 years ago |
|
sw
|
53d6c6853d
|
作品列表的显示
|
10 years ago |
|
huang
|
b5f4b1dd96
|
功能：24小时内系统消息显示
|
10 years ago |
|
huang
|
7cdebab5e5
|
1、修改系统消息样式
2、解决新注册用户系统消息红点不显示问题
3、调整消息样式
|
10 years ago |
|
sw
|
efdd717c3c
|
成绩计算算法的实现
|
10 years ago |
|
sw
|
84bb5af86f
|
增加教师优先字段
|
10 years ago |
|
sw
|
1ed1957899
|
教辅评分、系统评分、学生匿评 比例默认设置
|
10 years ago |
|
sw
|
22d4499f8f
|
缺评、迟交扣分还是改为 直接扣多少分
|
10 years ago |
|
sw
|
9a859d28bf
|
增加匿评时作品的显示
|
10 years ago |
|
huang
|
67f7fc7de3
|
注释掉“邀请系统注册用户”，因为邀请用户中已经包含该功能
|
10 years ago |
|
huang
|
d602e62119
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
c9d52571f0
|
1、项目邀请中添加两种特殊情况的判断。
2、完成邀请状态列表界面。
3、优化之前的邀请状态逻辑。
|
10 years ago |
|
sw
|
939a010adb
|
静态页面添加
|
10 years ago |
|
ouyangxuhua
|
30e703b9bf
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
e463be04c3
|
课程留言更新
|
10 years ago |
|
huang
|
b43acd3a46
|
邀请用户加入项目：
特殊情况：用户登录名=邮箱名，用户修改邮箱，此时将用户作为条件邀请
|
10 years ago |
|
huang
|
78ca55f121
|
优化邮件邀请策略
|
10 years ago |
|
sw
|
5f08ecc7e3
|
1、作业的开启匿评、关闭匿评功能
2、提交作品时，迟交扣分、缺评扣分的计算--->改为只计算数量
3、
|
10 years ago |
|
sw
|
4a959523c1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
b0ccf9037a
|
邮件邀请：
1、修改私有项目跳入403问题
2、增加同一个用户反复邀请的邮箱提醒。
3、修改邮箱的发送策略
|
10 years ago |
|
sw
|
cd96fd99a8
|
快速创建项目
|
10 years ago |
|
huang
|
295921c89d
|
邮件：邀请新用户的时候过滤掉邮箱和已注册用户名重叠的问题
|
10 years ago |
|
lizanle
|
71c0bd9b43
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
1ae302621f
|
课程资源的标签库可点击更改
|
10 years ago |
|
huang
|
4a7d3c9072
|
系统消息增加长度
|
10 years ago |
|
sw
|
b31104007a
|
Merge branch 'szzh' into develop
|
10 years ago |
|
cxt
|
86f0889f5b
|
"我的动态"显示当前用户的个人动态
|
10 years ago |
|
cxt
|
dbdd68f45d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
27fde3f642
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
dc564c37f1
|
修改系统消息参数
输入内容JS控制
|
10 years ago |
|
sw
|
37f235c2ab
|
导入编程作业
|
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 |
|
guange
|
37e1b6d2a1
|
Merge remote-tracking branch 'origin/szzh' into guange_homework
|
10 years ago |
|
cxt
|
7d6b9005a4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
1855adb037
|
未登录用户不能访问新建课程页面
|
10 years ago |
|
sw
|
cd36965cd1
|
历史编程作业数据补齐
|
10 years ago |
|
sw
|
7db774eedb
|
新建作业时，匿评相关属性为作业必须属性
|
10 years ago |
|
huang
|
cc3990de44
|
修改发系统消息后跳转路劲
|
10 years ago |
|
sw
|
a94521f2e1
|
编辑普通作业功能完成
|
10 years ago |
|
sw
|
66636efda9
|
修改普通作业
|
10 years ago |
|
sw
|
93b179c958
|
修改普通作业
|
10 years ago |
|
ouyangxuhua
|
596c512d0a
|
系统消息
|
10 years ago |
|
guange
|
a29ab60481
|
老师的测试结果能显示出来
|
10 years ago |
|
sw
|
1d9fda7eeb
|
Merge branch 'guange_homework' into develop
|
10 years ago |
|
sw
|
a18a014943
|
Merge branch 'szzh' into develop
|
10 years ago |
|
huang
|
0aa8c5b5cc
|
完成系统消息通知功能
|
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
|
30efa6c8c7
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
20bef515da
|
issue周报发送消息给所有管理员
|
10 years ago |
|
huang
|
146d877254
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
1a6f81f302
|
用户申请，区分已读和未读
|
10 years ago |
|
sw
|
068b03cd8f
|
Merge branch 'guange_homework' of http://repository.trustie.net/xianbo/trustie2 into guange_homework
|
10 years ago |
|
guange
|
c413d66c44
|
程序作业打分
|
10 years ago |
|
ouyangxuhua
|
71f8fca68b
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
a7f2f0a6d2
|
项目版本库错误提示信息设置为flash.now[:error]
|
10 years ago |
|
huang
|
06753497bb
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
0746408a9d
|
增加用户申请加入项目消息提醒功能（管理员收到消息提醒）
|
10 years ago |
|
sw
|
2e59584031
|
作业编辑功能按钮、加入课程、项目等按钮样式
|
10 years ago |
|
ouyangxuhua
|
bff50aa769
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
ae2aa2fedd
|
完成消息所有逻辑功能
|
10 years ago |
|
sw
|
2dacc882df
|
test
|
10 years ago |
|
sw
|
e4209007b1
|
Merge branch 'guange_homework' into szzh
|
10 years ago |
|
huang
|
4c73e00eaf
|
作品消息状态更新
|
10 years ago |
|
ouyangxuhua
|
550b263c2c
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
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 |
|
ouyangxuhua
|
fb6688265c
|
wiki删除后跳转
|
10 years ago |
|
huang
|
103d61056d
|
完成功能：
1、添加“新的消息”分类
2、新注册用户默认点击时间
|
10 years ago |
|
cxt
|
aa0c0dab83
|
添加“我的动态”
|
10 years ago |
|
huang
|
ecd0056f0a
|
1、完成消息点击记后图标不显示红点的功能。
2、首次登陆以“最后登录时间”为准，后面以点击时间为准
|
10 years ago |
|
huang
|
ed5f14c9eb
|
添加点击对应方法
|
10 years ago |
|
sw
|
88397d58d0
|
1、讨论区新建帖子时增加权限判断
2、删除历史的匿名用户发布帖子的数据
|
10 years ago |
|
sw
|
62c657a827
|
用户留言增加登录判断，并且删除匿名用户留言数据
|
10 years ago |
|
huang
|
b771cc0fe1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
abf053fc99
|
Merge branch 'develop' into szzh
|
10 years ago |
|
sw
|
970de3374c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
b89218a1b3
|
消息列表添加未读消息统计和“全部设为已读”功能
个人留言添加登录验证功能
|
10 years ago |
|
sw
|
089c4ab490
|
1、用户只可查看自己的作业界面
2、发布作业增加权限判断和登录判断
|
10 years ago |
|
sw
|
29379788fe
|
个人动态里回复缺陷留言增加登录判断
|
10 years ago |
|
lizanle
|
da43b00ddf
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
08fd7e125f
|
作业从资源库引入作者为别人的资源不能删除bug
|
10 years ago |
|
cxt
|
55758c3c2f
|
筛选掉未发布的问卷动态
|
10 years ago |
|
sw
|
fe91ec1a85
|
1、历史数据导致项目动态中部分数据连接到课程相关页面
2、项目缺陷列表显示为整个系统的缺陷
3、用户得分的还原
4、样式调整
|
10 years ago |
|
guange
|
921d2fc422
|
erge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
guange
|
6063f39eac
|
修改作业的一些链接和跳转问题
|
10 years ago |
|
huang
|
f1431b27fc
|
Merge branch 'develop' into szzh
Conflicts:
app/views/users/user_messages.html.erb
|
10 years ago |
|
huang
|
bf2e63b7be
|
去掉消息界面“未读”和已读
|
10 years ago |
|
guange
|
a0c611378b
|
提交作业跳转报错
|
10 years ago |
|
guange
|
d07873cdf0
|
时间格式修改
|
10 years ago |
|
guange
|
bacb5f859b
|
merge
|
10 years ago |
|
guange
|
a69cee4b26
|
老师测试功能
|
10 years ago |
|
sw
|
5be3a9e03f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
893ae35039
|
新建作品、编辑作品界面修改
|
10 years ago |
|
sw
|
6a6fbea446
|
提交作品样式
|
10 years ago |
|
huang
|
8b9eabd027
|
迁移文件中添加打印收据
添加未读消息样式
|
10 years ago |
|
guange
|
dd4e67ebdb
|
使用新的作业提交界面
|
10 years ago |
|
huang
|
4c76292e5e
|
message--viewed
|
10 years ago |
|
huang
|
43f99c45e8
|
消息
|
10 years ago |
|
huang
|
487881bb92
|
Merge branch 'szzh' into dev_hjq
Conflicts:
public/stylesheets/new_user.css
|
10 years ago |
|
huang
|
a2079dc6e3
|
用户留言消息状态更新
|
10 years ago |
|
huang
|
61455bdb4b
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
87956ee48c
|
用户留言消息区分已读和未读
|
10 years ago |
|
ouyangxuhua
|
192c5735cb
|
贴吧帖子已读更新
|
10 years ago |
|
sw
|
3b153766f6
|
过滤之后点击展开更多相关BUG
|
10 years ago |
|
huang
|
48ddee478e
|
默认更新为已读
公共贴吧区分已读和未读消息
|
10 years ago |
|
huang
|
0e4019be2f
|
修复时间乱的问题
|
10 years ago |
|
huang
|
d980513551
|
添加查看通知/新闻的消息状态更新
|
10 years ago |
|
huang
|
e89fbd2c8e
|
过滤条件改为同种类型过滤
|
10 years ago |
|
cxt
|
d845b8373a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
21565b74fe
|
冲突
|
10 years ago |
|
guange
|
8ad521d4ab
|
merge
|
10 years ago |
|
guange
|
41f9daed6d
|
编程作业放入到users controller
|
10 years ago |
|
cxt
|
d4dfd97b97
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
4a1b2fbbd6
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
b2eb846a23
|
关于我们
隐藏招聘信息
联系我们改为服务协议
|
10 years ago |
|
sw
|
5f42ce4c80
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_course_message.html.erb
app/views/users/_course_news.html.erb
app/views/users/_project_issue.html.erb
app/views/users/_project_message.html.erb
|
10 years ago |
|
sw
|
00a8dc94c3
|
缺陷的回复功能
|
10 years ago |
|
lizanle
|
7223e6c91c
|
引用发送资源时刷新资源列表和统计
|
10 years ago |
|
sw
|
b1de662338
|
讨论区回复功能，修改引用样式
|
10 years ago |
|
lizanle
|
b3e3737fb5
|
发布作业时从资源库选择资源功能
|
10 years ago |
|
sw
|
84ff3450d2
|
在动态中回复通知动态
|
10 years ago |
|
sw
|
b3919256fa
|
111
|
10 years ago |
|
lizanle
|
5b40628a5b
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
9ca1234324
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
guange
|
a142103091
|
Merge remote-tracking branch 'origin/develop' into guange_homework
|
10 years ago |
|
sw
|
7a4d562773
|
课程主页，项目主页 500
|
10 years ago |
|
sw
|
8be7509b33
|
课程、竞赛主页跳转到个人主页
|
10 years ago |
|
guange
|
8f426ca040
|
merge
|
10 years ago |
|
sw
|
655054a8ad
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
ac60fdf0b6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
de5dd08b55
|
登录之后跳到个人主页
|
10 years ago |
|
sw
|
9437188c9b
|
登录界面enter键监听
|
10 years ago |
|
cxt
|
5ddefe21b8
|
个人主页3080账户动态异常bug
|
10 years ago |
|
lizanle
|
244d5165e2
|
登录之后跳到个人主页
|
10 years ago |
|
lizanle
|
3a21c4e2fa
|
登录之后跳到个人主页
|
10 years ago |
|
lizanle
|
acbf58837a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
ad8bd379a1
|
用户资源过滤
|
10 years ago |
|
sw
|
4ade77f3d0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
guange
|
18bfe1fc73
|
jquery升到1.11
|
10 years ago |
|
lizanle
|
2b7beaeae8
|
上次登录的地址用户id变为当前用户id
|
10 years ago |
|
sw
|
86e9ec068f
|
新建作业时，作业截止时间为空
|
10 years ago |
|
cxt
|
c650c83f82
|
个人主页报500、动态显示错位的bug修复
|
10 years ago |
|
guange
|
e8fe397158
|
added
|
10 years ago |
|
huang
|
3a25f44d83
|
Merge branch 'dev_hjq' into szzh
|
10 years ago |
|
sw
|
014881bd42
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/new_user.css
|
10 years ago |
|
sw
|
76ec0d5d48
|
资源库导入资源到作业静态页面
|
10 years ago |
|
huang
|
5384e7eee8
|
消息每种类型为空的时候给出提示
|
10 years ago |
|
guange
|
1d8fdbf8f1
|
可以提交答案
|
10 years ago |
|
huang
|
9bc491227b
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
guange
|
1462ea09f3
|
测试代码功能完成
|
10 years ago |
|
sw
|
462b0a82a0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
2fa03c3102
|
导入作业功能完成
|
10 years ago |
|
lizanle
|
f9651d853c
|
资源每页显示的个数
|
10 years ago |
|
sw
|
007a39b5d5
|
作业列表的过滤查询
|
10 years ago |
|
huang
|
9709692a08
|
修改消息每页的显示个数
|
10 years ago |
|
guange
|
5fb2989427
|
Merge remote-tracking branch 'origin/szzh' into homework
|
10 years ago |
|
sw
|
c5ad5a3a5a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
1b9da8d963
|
消息添加分页功能
|
10 years ago |
|
sw
|
cb5abc6d74
|
导入作业弹框
|
10 years ago |
|
lizanle
|
7916ca2ee3
|
密码重置
|
10 years ago |
|
lizanle
|
d99c1dd72a
|
重置密码的base错了。
|
10 years ago |
|
lizanle
|
54c849cccb
|
发送资源的时候不选任何课程项目的时候不要弹出框发送成功
|
10 years ago |
|
guange
|
3ae4d01284
|
.
|
10 years ago |
|
guange
|
b9e08b22cd
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
guange
|
631283ae79
|
remove grack
|
10 years ago |
|
sw
|
19dc9de60f
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
a7ce1168db
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
caec5e5490
|
个人主页动态
|
10 years ago |
|
sw
|
db70425d99
|
Merge branch 'szzh' into sw_new_course
|
10 years ago |
|
sw
|
e4a36b9be2
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
lizanle
|
82b86ea14f
|
Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
|
10 years ago |
|
lizanle
|
733876743e
|
服务协议 忘记密码
|
10 years ago |
|
sw
|
dafc128f34
|
增加部分默认参数的设置
|
10 years ago |
|
sw
|
650d0c8cb5
|
匿评分配数量默认为3
|
10 years ago |
|
sw
|
b7cbb9b0c2
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/controllers/users_controller.rb
public/stylesheets/new_user.css
|
10 years ago |
|
sw
|
049e27f15f
|
发布作业功能
|
10 years ago |
|
huang
|
85b90f9958
|
消息代码清理
|
10 years ago |
|
lizanle
|
ba9a64360e
|
Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
|
10 years ago |
|
lizanle
|
65b5b467d4
|
服务协议
|
10 years ago |
|
huang
|
a54de0c8fb
|
Merge branch 'dev_hjq' into sw_new_course
|
10 years ago |
|
lizanle
|
ccfd69602c
|
服务协议
|
10 years ago |
|
huang
|
b824c3fa46
|
1、去掉多余的代码
2、消息样式列表过宽显示跨行问题
|
10 years ago |
|
huang
|
6a986b98d9
|
Merge branch 'sw_new_course' into dev_hjq
Conflicts:
app/controllers/users_controller.rb
|
10 years ago |
|
lizanle
|
f43e312fbb
|
Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
|
10 years ago |
|
lizanle
|
a53b9f9049
|
留言模块
|
10 years ago |
|
cxt
|
eed1939d2f
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
048319ef8e
|
个人主页
|
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 |
|
sw
|
47b20a7633
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
sw
|
8247a29b85
|
只有admin用户可以修改个人简介
|
10 years ago |
|
lizanle
|
d500ea0790
|
关注人数变化
|
10 years ago |
|
lizanle
|
d735eee4a3
|
关注和取消关注
|
10 years ago |
|
lizanle
|
4ee571e586
|
Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
|
10 years ago |
|
lizanle
|
cf12ee877e
|
编辑资料的时候个人说明隐藏
|
10 years ago |
|
cxt
|
fce523606c
|
个人主页
|
10 years ago |
|
cxt
|
e4c9f05c7b
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
bd00870eba
|
个人主页
|
10 years ago |
|
sw
|
56a1283033
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
sw
|
d8b87ccc37
|
作业列表滚动到底部显示下面10条作业
|
10 years ago |
|
lizanle
|
5c43c902c4
|
编辑资料css
|
10 years ago |
|
lizanle
|
70e9d75cc6
|
登陆后的搜索
|
10 years ago |
|
ouyangxuhua
|
24f26749c0
|
修改memo对应的memo_messages的viewed字段
|
10 years ago |
|
ouyangxuhua
|
0056fa9db3
|
修改了课程问卷的link_to以及对应的course_messages的viewed字段
|
10 years ago |
|
ouyangxuhua
|
f56d9ed265
|
设置作业对应的forge_messages表的viewed字段
|
10 years ago |
|
lizanle
|
c360bdaf7d
|
logout
|
10 years ago |
|
lizanle
|
79bd438c87
|
Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
|
10 years ago |
|
lizanle
|
f2e406a416
|
登陆注册按钮改为页面跳转
|
10 years ago |
|
sw
|
0d9a397453
|
登录、未登录搜索条件选择js
用户主页 show方法改造
|
10 years ago |
|
sw
|
c8b1bb5d64
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
097d52c07a
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
4915f7977e
|
个人动态
|
10 years ago |
|
lizanle
|
8917a67c7c
|
Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
|
10 years ago |
|
lizanle
|
d25971f546
|
登陆界面
|
10 years ago |
|
sw
|
c93bc5be40
|
作业列表效果显示
|
10 years ago |
|
huang
|
4c974266b8
|
没消息显示！
|
10 years ago |
|
huang
|
64e54cda75
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
3ecdb2940b
|
去掉统计信息
|
10 years ago |
|
ouyangxuhua
|
32e67a3cb1
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
12c3f5a723
|
消息讨论区viewed字段更新
|
10 years ago |
|
huang
|
bff139b9a7
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
0da75afc88
|
消息排序（公共表）
|
10 years ago |
|
ouyangxuhua
|
354cb52339
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
d83ed09617
|
更新viewed字段
|
10 years ago |
|
huang
|
5306d7e2a4
|
列表排序（未完）
|
10 years ago |
|
sw
|
4bf92d0737
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
sw
|
3ea198dc3d
|
标题栏作业界面静态页面的添加
|
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 |
|
ouyangxuhua
|
b7a473a1b2
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
cxt
|
51c2f595d1
|
个人主页动态
|
10 years ago |
|
ouyangxuhua
|
f0483b6de8
|
更新新闻viewed
|
10 years ago |
|
ouyangxuhua
|
bf596d7b4b
|
更新新闻viewed字段
|
10 years ago |
|
lizanle
|
5bf7aeb430
|
资源库css小改动
|
10 years ago |
|
lizanle
|
39b022f696
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
public/stylesheets/new_public.css
|
10 years ago |
|
lizanle
|
614743d8d4
|
登陆界面
|
10 years ago |
|
huang
|
f26ccac3b9
|
Merge branch 'sw_new_course' into dev_hjq
|
10 years ago |
|
sw
|
5fcb97b990
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
public/stylesheets/new_public.css
|
10 years ago |
|
sw
|
7f2f2c5d40
|
个人主页，项目更多功能
|
10 years ago |
|
sw
|
2d75fea96b
|
课程点击更多按钮显示
|
10 years ago |
|
lizanle
|
9a2e9a4ad2
|
Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
|
10 years ago |
|
lizanle
|
5628a43578
|
资源库和新版个人中心整合
|
10 years ago |
|
huang
|
3858e87482
|
user留言类型
|
10 years ago |
|
huang
|
aadfd16e6a
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
374c596a50
|
添加新图标，新base
|
10 years ago |
|
ouyangxuhua
|
b2ac4e8e1f
|
项目消息问题
|
10 years ago |
|
sw
|
f6d122e37f
|
Merge branch 'guange_dev' into sw_new_course
|
10 years ago |
|
sw
|
08ab08d064
|
Merge branch 'develop' into sw_new_course
|
10 years ago |
