 yuanke
|
08f263128c
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
9d0b5789d9
|
1.修改我的动态博客详情页面显示不了的BUG 2.资源界面切换是暂无XX先隐藏 3. 发送资源不选择班级的提示修改
|
9 years ago |
 txz
|
45b824938e
|
课程讨论区与课程通知详情页面样式更新
|
9 years ago |
guange
|
60367415fa
|
新建课程功能完成
|
9 years ago |
|
txz
|
bd1aae07fd
|
微信动态页面样式更新
|
9 years ago |
 cxt
|
599cedaa18
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/courses.css
public/stylesheets/public.css
|
9 years ago |
|
cxt
|
cc649ae64b
|
课程讨论区、项目讨论区、帖子详情页面的二级回复
|
9 years ago |
|
guange
|
3c295ba5a1
|
merge
|
9 years ago |
|
guange
|
201abd6358
|
assets
|
9 years ago |
|
guange
|
b010ce2e61
|
发送课程完成
|
9 years ago |
 huang
|
3737ef40d0
|
Merge branch 'cxt_course' into develop
Conflicts:
public/stylesheets/courses.css
|
9 years ago |
|
yuanke
|
1bfb2918f0
|
KE间距改回原来的，修改课程大纲附件删除下载问题，修改博客标题与置顶样式问题
|
9 years ago |
|
Tim
|
28c20c966e
|
查看标签页面显示bug
|
9 years ago |
|
cxt
|
e834d09469
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
5a1090c0e1
|
bug修复
|
9 years ago |
|
cxt
|
6867a88a94
|
课程大纲样式调整
|
9 years ago |
|
cxt
|
0ff8f0a774
|
课程大纲的删除和课程大纲描述的删除
|
9 years ago |
|
cxt
|
18d677c5eb
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/courses.css
|
9 years ago |
|
cxt
|
bdaa9983e3
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
a50e15b2ab
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/users/_user_syllabus_list.html.erb
db/schema.rb
|
9 years ago |
|
cxt
|
2c1e0f534c
|
课程大纲
|
9 years ago |
|
yuanke
|
dfd381fc99
|
Merge branch 'yuanke_org' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
yuanke
|
5cc40408ee
|
修改KE单倍行距显示的时候不一致的BUG
|
9 years ago |
|
Tim
|
10f52f110f
|
课程大纲列表点击展开收起，配置按钮链接跳转实现
|
9 years ago |
|
yuanke
|
397c4cc2a5
|
1.重新发送注册邮件修改2.个人资料修改页面修改3.问题反馈处增加直接加入QQ群的按钮
|
9 years ago |
|
cxt
|
4314f6e36a
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
ac4218bfb0
|
课程大纲列表
|
9 years ago |
|
cxt
|
ebb697a49f
|
班级列表、课程大纲的编辑、回复、课程列表
|
9 years ago |
|
guange
|
c248249983
|
注册没有loading图问题
|
9 years ago |
|
guange
|
0bb5c8b5fb
|
注册绑定问题
|
9 years ago |
|
Tim
|
590b879f02
|
追加附件弹框不固定bug修复
|
9 years ago |
|
guange
|
2886bba2bc
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
txz
|
2596231ce7
|
微信新动态样式更新
|
9 years ago |
|
huang
|
2105d2bbdb
|
Merge branch 'develop' into rep_quality
Conflicts:
app/views/repositories/show.html.erb
db/migrate/20160624103411_add_name_to_quality_analyses.rb
db/schema.rb
|
9 years ago |
|
cxt
|
e066445036
|
课程大纲的显示和编辑
|
9 years ago |
|
yuanke
|
376ec39035
|
Merge branch 'develop' into yuanke_org
|
9 years ago |
Your Name
|
a08edcca8a
|
quanxian
|
9 years ago |
|
cxt
|
383483de26
|
课程大纲的左侧栏base，新建课程大纲、新建班级的调整
|
9 years ago |
|
txz
|
b2b6536a0f
|
微信css样式更新
|
9 years ago |
|
guange
|
e9f280b4aa
|
.
|
9 years ago |
|
guange
|
047903ddff
|
重构课程地址
|
9 years ago |
|
guange
|
1e6454efc0
|
加入我的资源
|
9 years ago |
|
guange
|
5477c794ba
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
9 years ago |
|
guange
|
3b383dfa65
|
老师课程界面
|
9 years ago |
|
yuanke
|
11d38fc3e3
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
a83400f233
|
粘贴图片 留言和回复框 保持一直截图都可以粘贴进去
|
9 years ago |
|
yuanke
|
ab99645148
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
dd397a060b
|
修改删除组织成员跨域的BUG
|
9 years ago |
|
guange
|
05f09c4595
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
9 years ago |
|
guange
|
c501af70ba
|
.
|
9 years ago |
|
huang
|
46cde061a6
|
Merge branch 'rep_quality' into develop
Conflicts:
db/schema.rb
public/stylesheets/project.css
public/stylesheets/public.css
|
9 years ago |
|
cxt
|
4f342142e6
|
组织文章的展开更多
|
9 years ago |
|
cxt
|
0611ddcc43
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
9 years ago |
|
guange
|
2c2e1892e5
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
9 years ago |
|
cxt
|
76e7c50bf4
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
9 years ago |
|
guange
|
c39a982093
|
二维码
|
9 years ago |
|
cxt
|
eab000306c
|
动态回复的展开更多、收起，组织文章回复不可用
|
9 years ago |
|
cxt
|
d558a4d357
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
Tim
|
a542ba46a4
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
Tim
|
ec33569033
|
取消拖拽
|
9 years ago |
|
cxt
|
260759e4db
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
guange
|
da09983f9e
|
Merge branch 'weixin_guange' into cxt_course
|
9 years ago |
|
cxt
|
ac629440b1
|
课程邀请码
|
9 years ago |
|
yuanke
|
c6be37020f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
9 years ago |
|
guange
|
485d0e3743
|
ticket处理
|
9 years ago |
|
yuanke
|
c61c14fa97
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
86a5eccae6
|
组织设置中添加成员BUG解决
|
9 years ago |
|
guange
|
e21f4e0b4d
|
merge
|
9 years ago |
|
guange
|
f9075e08ba
|
merge
|
9 years ago |
|
guange
|
d348981721
|
加入邀请码
|
9 years ago |
|
Your Name
|
e17aa4c5d8
|
color
|
9 years ago |
|
Your Name
|
05eb71036d
|
some css to added
|
9 years ago |
|
guange
|
52d4d36097
|
邀请码页面
|
9 years ago |
|
Tim
|
563fb3b459
|
控制table拖拽不靠在一起
|
9 years ago |
|
cxt
|
126bf9c195
|
个人留言、课程留言的二级回复
|
9 years ago |
|
Your Name
|
8438bc7bcd
|
somethint to added
|
9 years ago |
|
huang
|
9f15a8aa4e
|
代码质量分析样式
|
9 years ago |
|
guange
|
7700445c17
|
加入课程
|
9 years ago |
|
yuanke
|
b68e227531
|
没激活的帐号界面
|
9 years ago |
|
guange
|
13273d02de
|
修正了安全问题，不暴露openid
|
9 years ago |
|
cxt
|
1b12c56960
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
cxt
|
3f8beaf97c
|
动态回复banner的代码重构
|
9 years ago |
|
Tim
|
1a4865be09
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
cxt
|
2176ad1ede
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
dc70b40309
|
kindeditor中的a标签属性编辑
|
9 years ago |
|
guange
|
5a8de44c43
|
添加我的班级控制器
|
9 years ago |
|
guange
|
4b813ef535
|
加入班级消息
|
9 years ago |
|
guange
|
62a1b5de7c
|
加入班级更新
|
9 years ago |
|
yuanke
|
301556b9c3
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
d3f3f019a0
|
下拉菜单有时候不显示
|
9 years ago |
|
yuanke
|
fde06a2327
|
更新资源描述样式修改
|
9 years ago |
|
guange
|
4db1df0a4d
|
css
|
9 years ago |
|
guange
|
311f21ee5a
|
css
|
9 years ago |
|
guange
|
b4a3d4a5a2
|
弹出框处理
|
9 years ago |
|
cxt
|
f4d67bc027
|
未读消息弹窗“点击展开”显示10条未读消息
|
9 years ago |
|
guange
|
47c443e59d
|
输入框变大一点
|
9 years ago |
|
Tim
|
3548c23aad
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
cxt
|
048bb7fed5
|
头像下拉菜单、未读消息的延时
|
9 years ago |
|
guange
|
b7230333dc
|
code获取修改
|
9 years ago |
|
guange
|
3f98562c0f
|
打包
|
9 years ago |
|
guange
|
61c117b8cb
|
重构老的代码，本地通过session来存放token, 所有的访问直接用老接口
|
9 years ago |
|
txz
|
b17b92cc3e
|
微信回复后先加载后启用回复按钮
|
9 years ago |
|
yuanke
|
0719313f01
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
7c729107cc
|
KE复制粘贴的时候保留图片的外链
|
9 years ago |
|
guange
|
9d19caa736
|
.
|
9 years ago |
|
guange
|
46018ad388
|
.
|
9 years ago |
|
guange
|
3582849ef3
|
.
|
9 years ago |
|
guange
|
a0c0a65d18
|
绑定用户迁移到接口
|
9 years ago |
|
guange
|
98c6548e39
|
重写登录和注册
|
9 years ago |
|
yuanke
|
f3014c3993
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
huang
|
2464586ed2
|
组织样式问题
|
9 years ago |
|
yuanke
|
948ec58248
|
作业二级回复未登录显示样式问题
|
9 years ago |
|
Tim
|
4b62a39b15
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
txz
|
18df93ba9f
|
微信动态列表界面问题
|
9 years ago |
|
txz
|
acf17d6252
|
微信详情页面链接添加颜色
|
9 years ago |
|
txz
|
994ce342d7
|
微信ul布局优化
|
9 years ago |
|
yuanke
|
d6d9a366f2
|
Merge branch 'develop' into yuanke
Conflicts:
public/stylesheets/new_user.css
|
9 years ago |
|
huang
|
0f17ac0e9e
|
Merge branch 'lingbing' into develop
Conflicts:
app/views/organizations/_org_custom_header.html.erb
|
9 years ago |
|
yuanke
|
c51c73f225
|
所有回复添加未登录提示
|
9 years ago |
|
yuanke
|
747b2007cd
|
项目中未登录提示按钮样式问题
|
9 years ago |
|
huang
|
88b838a89a
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
35ee17c4ca
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
3ae26a6530
|
组织配置页面 名师列表 热门项目 学霸 精品课程的右上角字样只对超级管理员显示,图片显示时如果已经带了链接则不增加点击弹框效果。
|
9 years ago |
|
huang
|
227f2343a4
|
登录注册背景图片替换
|
9 years ago |
|
huang
|
260bef0ebb
|
登录祖册鼠标经过颜色
|
9 years ago |
|
huang
|
006965df50
|
导航背景颜色还原
|
9 years ago |
|
huang
|
3f697355d2
|
chorm浏览器兼容问题
|
9 years ago |
|
huang
|
312fa61489
|
输入框线条
|
9 years ago |
|
huang
|
6707868915
|
登录页面新样式
|
9 years ago |
|
huang
|
d2d15710b5
|
解决chrome浏览器背景黄色问题
|
9 years ago |
|
huang
|
a63dffd9d3
|
资源库导航颜色一致
|
9 years ago |
|
huang
|
d157155cba
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
d4760bcd6d
|
一个像素问题
|
9 years ago |
|
yuanke
|
82ebd1e4c9
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
2781605670
|
课程资源描述增加可编辑
|
9 years ago |
|
Tim
|
24458ecb48
|
table可拖拽，在线测验表格布局优化
|
9 years ago |
|
huang
|
24b12513e5
|
铃铛颜色
|
9 years ago |
|
huang
|
474c183050
|
导航颜色一致
|
9 years ago |
|
huang
|
5e3df51ad9
|
完成新版登录注册
|
9 years ago |
|
huang
|
06f97d5cb7
|
注册页面（未完）
|
9 years ago |
|
cxt
|
43192b8648
|
分组作业的弹框增加人数的验证、点击关闭弹框时还原弹框中的值
|
9 years ago |
|
huang
|
a2c5cc6da1
|
登录界面base及新页面
|
9 years ago |
|
guange
|
ada15b4212
|
格式上的调整, 现在可以分开写,但发布时打成一个js提高性能
|
9 years ago |
|
cxt
|
254e1f44f6
|
评分设置提示的修改与提交时的判断
|
9 years ago |
 Linda
|
01bd394a59
|
门户首页按照祎欣0613版本设计修改
|
9 years ago |
|
guange
|
b1791f4531
|
wechat结构分离
|
9 years ago |
|
txz
|
270399c5da
|
点赞时图标移动修复
|
9 years ago |
|
txz
|
a2450defc6
|
微信作业详情类别文字处理
|
9 years ago |
|
txz
|
962470c582
|
微信文字显示不全bug
|
9 years ago |
|
txz
|
8bbdf3688c
|
微信加入班级css新增
|
9 years ago |
