 cxt
|
78c7db1150
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
|
cxt
|
0222038899
|
缺陷模板消息改为对项目所有人发送、可屏蔽微信模板消息
|
9 years ago |
 Tim
|
c9cc4739aa
|
北斗组织微信块调整
|
9 years ago |
 yuanke
|
23f48b7189
|
项目列表、项目讨论区列表
|
9 years ago |
|
Tim
|
b8d6ca0229
|
北斗组织门户样式更改
|
9 years ago |
 huang
|
17b2e82963
|
banner类型
|
9 years ago |
|
Tim
|
86751e31fb
|
题库加入私有课程题目，可申请使用
|
9 years ago |
|
yuanke
|
43c1120b19
|
课程问答区 项目讨论区列表
|
9 years ago |
|
Tim
|
53e6b41d93
|
北斗登录效果调整
|
9 years ago |
|
huang
|
81210fd475
|
顶部导航及样式
|
9 years ago |
|
huang
|
c1437bb75b
|
北斗界面
|
9 years ago |
|
txz
|
dcb150559e
|
angularjs路径修改
|
9 years ago |
|
yuanke
|
5c5d212193
|
博客列表
|
9 years ago |
|
huang
|
cccc2a7eb7
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
ab8c1a0bad
|
Merge branch 'hjq_beidou' into develop
|
9 years ago |
|
txz
|
0bab42256c
|
微信loading弹框改
|
9 years ago |
|
txz
|
39c64c9198
|
解决冲突
|
9 years ago |
|
txz
|
8e254ff722
|
微信loading弹框
|
9 years ago |
|
yuanke
|
29115bca3a
|
博客列表修改
|
9 years ago |
|
txz
|
0b82bf50c2
|
微信内容中图片正常显示
|
9 years ago |
|
yuanke
|
bc59ce0b60
|
Merge branch 'yuanke' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
yuanke
|
0f5fe51f97
|
1.管理员界面代码测试列表的修改
2.代码查重按钮位置
3.查重结果样式
|
9 years ago |
|
txz
|
d0331da0c2
|
微信最新动态样式调整
|
9 years ago |
|
huang
|
4e4cb309a9
|
版本库目录最新动态
|
9 years ago |
|
huang
|
adc17c5038
|
代码优化
文件目录动态获取接口
文件目录显示样式
|
9 years ago |
|
txz
|
73b89cdde5
|
微信边框，回复点赞样式更改
|
9 years ago |
|
yuanke
|
3dbedcdcbf
|
Merge branch 'yuanke' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
yuanke
|
764dffd95e
|
动态里面加上代码查重
|
9 years ago |
|
huang
|
16bba76f61
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
6027b6d0f5
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
4a8d572cb1
|
项目动态中版本库统计样式
|
9 years ago |
|
yuanke
|
f1090d45ad
|
Merge branch 'cxt_course' into yuanke
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
36e8b05f9c
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
bca0a4bf39
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
yuanke
|
e58f1ab94b
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
998106b37b
|
修改代码查重的一些弹框显示效果等问题
|
9 years ago |
|
Tim
|
f479277a96
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
cxt
|
d948536a10
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
e5b07c6c12
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
|
9 years ago |
|
yuanke
|
ef4b256313
|
Merge branch 'yuanke' into develop
Conflicts:
app/models/homework_common.rb
config/locales/zh.yml
db/schema.rb
|
9 years ago |
|
cxt
|
5e1284605f
|
Merge branch 'hjq_beidou' into cxt_course
Conflicts:
app/views/layouts/new_base_user.html.erb
|
9 years ago |
|
yuanke
|
a8dce5e520
|
代码查重功能增加,管理员界面增加代码测试列表.
|
9 years ago |
|
cxt
|
2befcd6634
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
|
9 years ago |
|
Tim
|
deda05b048
|
作业下拉选择
|
9 years ago |
|
cxt
|
fcd1684658
|
作业列表按更新时间排序 作业列表左上角添加作业的下拉列表
|
9 years ago |
|
huang
|
04849659de
|
版本库统计
|
9 years ago |
|
txz
|
3665597153
|
详情页面排版调整
|
9 years ago |
|
txz
|
f82ad97a68
|
详情页面回复框宽度问题
|
9 years ago |
|
txz
|
0262e3b8ab
|
回复长单词显示问题
|
9 years ago |
|
txz
|
707127631e
|
微信公众号样式调整
|
9 years ago |
guange
|
4e50a9e289
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
guange
|
aa9cb4e579
|
merge
|
9 years ago |
|
txz
|
f3738519e9
|
长单词折行问题
|
9 years ago |
|
huang
|
3501d6f1d6
|
完成组织模块的开发
|
9 years ago |
|
huang
|
2162d7d4b8
|
组织banner上传功能
|
9 years ago |
|
huang
|
86aecd21b9
|
上传图片
|
9 years ago |
 Yiang Gan
|
4088fb9cb4
|
课程作业详情页面
|
9 years ago |
|
huang
|
8f4ff2bf91
|
列表样式问题
|
9 years ago |
|
Yiang Gan
|
392c5708f2
|
作业详情页面
|
9 years ago |
|
huang
|
5866dfb7ff
|
登录
没内容more
logo不加链接
|
9 years ago |
|
huang
|
45343a44b8
|
修改链接
|
9 years ago |
|
huang
|
f662bfa40b
|
组织科配置
|
9 years ago |
|
huang
|
c431658333
|
setting中后台编辑
|
9 years ago |
|
huang
|
0244008b32
|
一些链接和样式
|
9 years ago |
|
huang
|
7c55356ace
|
组织新界面修改
|
9 years ago |
|
huang
|
961a264e05
|
创建时间统一date
|
9 years ago |
|
huang
|
65e80b1978
|
用户图像样式
|
9 years ago |
|
huang
|
2728cccd41
|
Merge branch 'develop' into hjq_beidou
|
9 years ago |
|
huang
|
d28a46c48a
|
北斗资源库板块
|
9 years ago |
 ouyangxuhua
|
74d8dffc14
|
发送功能样式调整
|
9 years ago |
|
huang
|
2b9ddf3594
|
组织新版
|
9 years ago |
|
huang
|
b80bc98fcb
|
组织首页
|
9 years ago |
|
huang
|
4b6b5504ca
|
北斗框架（未完）
|
9 years ago |
|
yuanke
|
674b63d106
|
Merge branch 'develop' into yuanke
Conflicts:
app/views/student_work/_programing_work_show.html.erb
|
9 years ago |
|
yuanke
|
dea947e9ce
|
Merge branch 'develop' into yuanke
Conflicts:
db/schema.rb
public/javascripts/application.js
public/javascripts/homework.js
public/stylesheets/new_user.css
|
9 years ago |
|
yuanke
|
c6361406b5
|
代码评测超时优化
|
9 years ago |
|
cxt
|
f90b25b230
|
作业附件的用户名省略号太早
|
9 years ago |
|
guange
|
fbe1b2dac2
|
Merge branch 'guange_dev' into weixin_guange
# Conflicts:
# Gemfile
# db/schema.rb
|
9 years ago |
|
guange
|
6ae4cd0767
|
merge
|
9 years ago |
|
yuanke
|
a10830c90f
|
Merge branch 'develop' into yuanke
Conflicts:
public/stylesheets/new_user.css
|
9 years ago |
|
cxt
|
54a00ca867
|
题库作业信息框的样式调整
|
9 years ago |
|
ouyangxuhua
|
093c777b23
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/views/users/_user_message_course.html.erb
|
9 years ago |
|
huang
|
7e0aa44b68
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/_user_message_userfeedaback.html.erb
|
9 years ago |
|
huang
|
28cb1755d8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/files/_org_subfield_list.html.erb
db/schema.rb
|
9 years ago |
|
cxt
|
6b8ae56ce4
|
Merge branch 'alan_develop' into develop
|
9 years ago |
|
cxt
|
d72aa3a93c
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/homework_common_controller.rb
app/views/student_work/show.js.erb
public/javascripts/application.js
public/stylesheets/base.css
public/stylesheets/public_new.css
|
9 years ago |
 alan
|
9265186307
|
修改user动态中issue行高，使之与project中的一样
|
9 years ago |
|
ouyangxuhua
|
098844a910
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/helpers/application_helper.rb
app/views/organizations/_org_course_homework.html.erb
app/views/organizations/_org_course_news.html.erb
app/views/organizations/_org_project_issue.html.erb
app/views/organizations/_project_message.html.erb
app/views/organizations/_show_org_document.html.erb
app/views/users/_user_message_course.html.erb
|
9 years ago |
|
huang
|
bf4116906f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/controllers/users_controller.rb
public/stylesheets/public.css
|
9 years ago |
|
cxt
|
5476016b79
|
调整题库高度与资源库一致
|
9 years ago |
|
huang
|
2b21213b7f
|
公共资源库，排序
|
9 years ago |
|
huang
|
3d06d5a503
|
Merge branch 'yuanke' into develop
Conflicts:
public/stylesheets/new_user.css
|
9 years ago |
|
cxt
|
c770fd157c
|
题库：题目描述变窄，缺省文字：【尹刚提供】
|
9 years ago |
 luoquan
|
006731ea61
|
修改以下问题：
KE问题：编辑时行间距挺好，发布后，在项目讨论区中的显示行间距稍微有点挤。
KE问题：缺省的文字颜色：在编辑时是黑色，但发布后就是灰色。应该发布后也是黑色。
|
9 years ago |
|
cxt
|
7d2bb572b2
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/student_work_controller.rb
public/stylesheets/new_user.css
|
9 years ago |
|
cxt
|
12c60547ad
|
题库支持按引用数和发布时间排序
|
9 years ago |
|
luoquan
|
e0922e9b19
|
调整视频播放默认图大小
|
9 years ago |
|
Tim
|
de3a4718ab
|
个人，课程，项目，组织访问量添加
|
9 years ago |
|
luoquan
|
901409ebb4
|
Merge branch 'yuanke' into luoquan
Conflicts:
public/assets/kindeditor/kindeditor.js
|
9 years ago |
|
luoquan
|
1e256add7f
|
媒体播放默认样式
|
9 years ago |
