 huang
|
3985c190bf
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
 txz
|
66042cb3c9
|
debug false
|
9 years ago |
|
txz
|
e2f3ba8e7d
|
微信问题修改
|
9 years ago |
 cxt
|
28edaf2246
|
课程/项目留言：快速点击提交按钮重复产生多条记录的问题
|
9 years ago |
 yuanke
|
0ac7163b05
|
KE修改居中换行居中消失的问题
|
9 years ago |
|
yuanke
|
93fb4441d8
|
代码测试改用新的提示框
|
9 years ago |
|
yuanke
|
c0de43ecc0
|
修改KE字体间距问题，代码测试出错提示。
|
9 years ago |
|
yuanke
|
025d07e6a4
|
代码测试编译信息长度限制不小心注释了
|
9 years ago |
|
yuanke
|
708cb35fd2
|
增加一个弹框的通用接口pop_up_box
|
9 years ago |
|
yuanke
|
24b969e781
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
huang
|
0cc9a9e4c5
|
Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke
|
9 years ago |
|
cxt
|
c2efb7bdda
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
55c9faaf7b
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
cxt
|
5204e01ee8
|
课程留言回复的还原
|
9 years ago |
|
yuanke
|
2c7a964470
|
复制粘贴图片相关
|
9 years ago |
|
yuanke
|
be97675aed
|
没带图片类型的图片不让点击放大看!
|
9 years ago |
|
huang
|
41214bd762
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
huang
|
33a3b22430
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
public/stylesheets/org2.css
|
9 years ago |
|
cxt
|
402976cf40
|
课程留言的回复防止多次提交
|
9 years ago |
|
huang
|
7759670fa1
|
Merge branch 'yuanke' into develop
Conflicts:
Gemfile
public/stylesheets/new_user.css
|
9 years ago |
|
cxt
|
f1821e54e1
|
通知和新闻详情页面的回复点击多次不会提交表单多次
|
9 years ago |
|
yuanke
|
c31d4dc3bd
|
我要回复字不消失
|
9 years ago |
|
huang
|
ad2f12c9d0
|
名师列表搜索功能
|
9 years ago |
|
cxt
|
7481d96166
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/admin_controller.rb
config/routes.rb
lib/redmine.rb
|
9 years ago |
|
cxt
|
d232a5241e
|
新建课程报404
|
9 years ago |
|
txz
|
a1afd0dc96
|
微信回复多次点击，仅第一次生效
|
9 years ago |
|
cxt
|
11017d72c5
|
老师对作品的评分可为空
|
9 years ago |
|
huang
|
6ba4b9dfa2
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
34ea7662b2
|
将内容省略显示的固定字数改为传参
|
9 years ago |
|
huang
|
d212d4f4c5
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
bcb02e49d3
|
课程问答区的名片显示
|
9 years ago |
|
huang
|
8446fbe39a
|
Merge branch 'weixin_guange' into develop
Conflicts:
app/services/wechat_service.rb
public/stylesheets/weui/weixin.css
|
9 years ago |
|
huang
|
a602a6aa63
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_course_message.html.erb
|
9 years ago |
|
cxt
|
ada4407e63
|
局部刷新后 名片不显示
|
9 years ago |
|
txz
|
de8b303b93
|
微信数据请求时显示加载中
|
9 years ago |
|
yuanke
|
1353c27f64
|
Merge branch 'yuanke' into develop
Conflicts:
app/helpers/application_helper.rb
|
9 years ago |
|
yuanke
|
789f3906a5
|
课程列表，列表描述内容去掉空格
|
9 years ago |
|
yuanke
|
1da8288fe7
|
列表显示修改
|
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
|
4258790453
|
Merge branch 'hjq_beidou' into yuanke_1
Conflicts:
db/schema.rb
public/stylesheets/project.css
|
9 years ago |
|
cxt
|
0222038899
|
缺陷模板消息改为对项目所有人发送、可屏蔽微信模板消息
|
9 years ago |
|
huang
|
81210fd475
|
顶部导航及样式
|
9 years ago |
|
cxt
|
b86669d49c
|
微信模板消息的详情页面
|
9 years ago |
|
txz
|
dcb150559e
|
angularjs路径修改
|
9 years ago |
|
yuanke
|
016177a078
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
f6a5ffc6a5
|
测试代码的时候点击一下然后按钮消失等结果返回才出现
|
9 years ago |
|
txz
|
2345eb9d64
|
路径修改
|
9 years ago |
|
txz
|
0bab42256c
|
微信loading弹框改
|
9 years ago |
|
txz
|
8e254ff722
|
微信loading弹框
|
9 years ago |
|
yuanke
|
dc3837da76
|
Merge branch 'cxt_course' into yuanke
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
b07c3947d6
|
Merge branch 'cxt_course' into develop
|
10 years ago |
|
cxt
|
8611fbbdec
|
新建课程界面中关于学时的输入提示不合理，提示为只能输入数字，但是输入负数或小数时不能执行提交操作，应该修改为只能输入正整数。
|
10 years ago |
|
yuanke
|
f1090d45ad
|
Merge branch 'cxt_course' into yuanke
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
d948536a10
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
e5b07c6c12
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
|
10 years ago |
|
yuanke
|
ef4b256313
|
Merge branch 'yuanke' into develop
Conflicts:
app/models/homework_common.rb
config/locales/zh.yml
db/schema.rb
|
10 years ago |
|
yuanke
|
a8dce5e520
|
代码查重功能增加,管理员界面增加代码测试列表.
|
10 years ago |
|
txz
|
13576ca477
|
app.js
|
10 years ago |
|
huang
|
adf6cca435
|
完成代码行数的提交和统计
|
10 years ago |
|
cxt
|
f5122d7ef0
|
微信url切换到正式版
|
10 years ago |
|
cxt
|
a6f4b7f505
|
测试版
|
10 years ago |
|
cxt
|
e420be8ee9
|
Merge branch 'weixin_guange' into develop
Conflicts:
app/models/blog_comment.rb
|
10 years ago |
|
cxt
|
1882cd8f4f
|
用户姓名不显示
|
10 years ago |
|
txz
|
3665597153
|
详情页面排版调整
|
10 years ago |
guange
|
7c5d62b8a8
|
头像url不显示
|
10 years ago |
|
guange
|
73ad787e23
|
修改到正式版
|
10 years ago |
|
guange
|
cadb5f3f15
|
更换服务器至test.course.trustie.net
|
10 years ago |
|
cxt
|
007fee95bd
|
作业和留言回复的模板消息
|
10 years ago |
|
cxt
|
3f365e75b5
|
讨论区的模板消息
|
10 years ago |
|
cxt
|
b6adaf61db
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
|
cxt
|
930d95f8b5
|
私有动态不显示的问题
|
10 years ago |
|
txz
|
02a5e7752d
|
微信环境切换
|
10 years ago |
|
cxt
|
281fcf315f
|
点击模板消息页面为空
|
10 years ago |
|
cxt
|
89330f9e40
|
调试
|
10 years ago |
|
cxt
|
d6daa906b6
|
回复
|
10 years ago |
|
cxt
|
fcddaf403c
|
删除博客为空的数据
|
10 years ago |
|
guange
|
ef317089f1
|
错误信息打印到日志
|
10 years ago |
|
guange
|
a35511195a
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
|
guange
|
abf4a80942
|
错误信息打印到日志
|
10 years ago |
|
cxt
|
eee7b89388
|
项目动态
|
10 years ago |
|
txz
|
707127631e
|
微信公众号样式调整
|
10 years ago |
|
guange
|
4e50a9e289
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
|
guange
|
aa9cb4e579
|
merge
|
10 years ago |
|
cxt
|
1503686ddb
|
无更多动态时不显示更多
|
10 years ago |
|
cxt
|
bb71d1c322
|
调试模式
|
10 years ago |
|
txz
|
411a8be8b8
|
点击展开
|
10 years ago |
|
txz
|
139a7931ee
|
点赞功能修改
|
10 years ago |
|
cxt
|
60c8320f82
|
praise api的修改
|
10 years ago |
|
txz
|
938bf48d08
|
点赞功能修改
|
10 years ago |
|
cxt
|
2fe32fda61
|
点赞的js
|
10 years ago |
|
txz
|
eb996280a6
|
点赞功能
|
10 years ago |
|
cxt
|
f1783c06a2
|
详情页面传参openid
|
10 years ago |
|
txz
|
3008c0c44d
|
activities.html冲突解决
|
10 years ago |
|
txz
|
0b1b08bd3d
|
点赞
|
10 years ago |
|
guange
|
80f47476cb
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
# Conflicts:
# public/javascripts/wechat/app.js
|
10 years ago |
|
guange
|
99f39696d0
|
点击展开功能完成
|
10 years ago |
|
txz
|
6d8ffabb39
|
代码优化
|
10 years ago |
|
guange
|
8ac8e1c9e5
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
|
guange
|
79dcd48d8c
|
重构
|
10 years ago |
|
txz
|
8e1473a484
|
点赞代码优化等
|
10 years ago |
