 yuanke
|
1353c27f64
|
Merge branch 'yuanke' into develop
Conflicts:
app/helpers/application_helper.rb
|
9 years ago |
|
yuanke
|
f8abd46ae9
|
列表修改
|
9 years ago |
|
yuanke
|
789f3906a5
|
课程列表，列表描述内容去掉空格
|
9 years ago |
|
yuanke
|
196501bc39
|
项目列表问题
|
9 years ago |
|
yuanke
|
1da8288fe7
|
列表显示修改
|
9 years ago |
|
yuanke
|
f185c59e90
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
2cb9f0cd05
|
组织还原
|
9 years ago |
|
yuanke
|
b3fdc45a04
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/student_work_controller.rb
config/locales/zh.yml
db/schema.rb
|
9 years ago |
|
yuanke
|
54a8e6871c
|
问答区列表修改
|
9 years ago |
|
yuanke
|
a893f88ede
|
微信模版本地丢了
|
9 years ago |
|
yuanke
|
dc53b86a4e
|
Merge branch 'cxt_course' into yuanke
Conflicts:
app/controllers/student_work_controller.rb
db/schema.rb
|
9 years ago |
|
yuanke
|
647e6a7f92
|
Merge branch 'yuanke' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
config/locales/zh.yml
db/schema.rb
|
9 years ago |
|
yuanke
|
22fc31eb82
|
先把隐藏课程信息的功能去掉
|
9 years ago |
|
yuanke
|
bcca1366e9
|
Merge branch 'yuanke_1' into yuanke
|
9 years ago |
|
yuanke
|
dd00533084
|
帖子显示三行好点
|
9 years ago |
|
yuanke
|
c729c1252d
|
项目、课程列表显示修改
|
9 years ago |
 cxt
|
3aa891acf6
|
Merge branch 'cxt_course' into develop
Conflicts:
app/controllers/student_work_controller.rb
app/views/praise_tread/_praise.html.erb
db/schema.rb
|
9 years ago |
|
cxt
|
698dfdab4a
|
组织点赞不能用
|
9 years ago |
|
cxt
|
766026e3cf
|
教师评分为最终评分
|
9 years ago |
|
yuanke
|
c357971e8a
|
课程列表、项目列表等修改
|
9 years ago |
|
yuanke
|
4258790453
|
Merge branch 'hjq_beidou' into yuanke_1
Conflicts:
db/schema.rb
public/stylesheets/project.css
|
9 years ago |
|
yuanke
|
dac717bd97
|
列表左边菜单收缩
|
9 years ago |
 huang
|
811c3a065e
|
完成左中一模块定制
|
9 years ago |
|
huang
|
ddf1e6f2db
|
组织模式3完成
|
9 years ago |
|
huang
|
70fa3fddfd
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
huang
|
cded1802cc
|
右上模块定制完成
|
9 years ago |
|
cxt
|
78c7db1150
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
|
cxt
|
df0a7bbf34
|
冲突
|
9 years ago |
|
cxt
|
0222038899
|
缺陷模板消息改为对项目所有人发送、可屏蔽微信模板消息
|
9 years ago |
|
yuanke
|
aabb969588
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
yuanke
|
51245d44fa
|
编程作业未发布是 由于代码查重按钮的原因导致布局问题。
|
9 years ago |
 Tim
|
c9cc4739aa
|
北斗组织微信块调整
|
9 years ago |
|
yuanke
|
23f48b7189
|
项目列表、项目讨论区列表
|
9 years ago |
|
huang
|
b6f5bfc450
|
右下版本模块定制
|
9 years ago |
|
Tim
|
c8dde5565e
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
app/views/layouts/base_org2.html.erb
|
9 years ago |
|
Tim
|
b8d6ca0229
|
北斗组织门户样式更改
|
9 years ago |
|
huang
|
b589d5b2ff
|
末班六定配完成
|
9 years ago |
|
huang
|
17b2e82963
|
banner类型
|
9 years ago |
|
Tim
|
86751e31fb
|
题库加入私有课程题目，可申请使用
|
9 years ago |
|
yuanke
|
43c1120b19
|
课程问答区 项目讨论区列表
|
9 years ago |
|
huang
|
32d7927eb9
|
组织新界面
|
9 years ago |
|
huang
|
76f93a54c6
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
app/helpers/organizations_helper.rb
app/views/layouts/base_org2.html.erb
app/views/organizations/_org_content.html.erb
|
9 years ago |
|
huang
|
d8f71da1fb
|
完成模块8配置
|
9 years ago |
guange
|
cc9825e6a2
|
将wechat放到项目里面
|
9 years ago |
|
Tim
|
9ba0d50f26
|
拉代码更新
|
9 years ago |
|
Tim
|
23a6604e47
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
app/views/layouts/base_org2.html.erb
|
9 years ago |
|
Tim
|
53e6b41d93
|
北斗登录效果调整
|
9 years ago |
|
cxt
|
49a7e2ce1d
|
关注和绑定登录后发送欢迎消息
|
9 years ago |
|
guange
|
5a60702412
|
删除1234567
|
9 years ago |
|
guange
|
98f84bb0ab
|
Merge remote-tracking branch 'origin/develop' into guange_dev
|
9 years ago |
