 yuanke
|
708cb35fd2
|
增加一个弹框的通用接口pop_up_box
|
9 years ago |
 Tim
|
fbbda96c60
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
Tim
|
fa788ced1b
|
资源库添加私有资源
|
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 |
|
yuanke
|
6056505f96
|
复制粘贴时将图片所带链接删掉
|
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 |
|
huang
|
0d2a7d8bfd
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
e8afcf9157
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/helpers/organizations_helper.rb
app/views/organizations/_org_subfield_rightM2.html.erb
|
9 years ago |
|
Tim
|
d384d1e2b4
|
名师榜样式调整
|
9 years ago |
|
yuanke
|
be97675aed
|
没带图片类型的图片不让点击放大看!
|
9 years ago |
|
txz
|
8d338cff9e
|
微信锁定帖子关闭回复
|
9 years ago |
|
huang
|
41214bd762
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
huang
|
1cd74121ae
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
a67ee38ac9
|
将复制粘贴的图片 链接及class都去掉
|
9 years ago |
|
huang
|
33a3b22430
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
public/stylesheets/org2.css
|
9 years ago |
|
yuanke
|
fc0f92738d
|
复制粘贴时将图片所带链接去掉
|
9 years ago |
|
cxt
|
402976cf40
|
课程留言的回复防止多次提交
|
9 years ago |
|
yuanke
|
80c6edd2d3
|
KE过滤html代码的时候表格的颜色等样式不能被过滤掉
|
9 years ago |
|
Tim
|
dc92e821a3
|
名师榜样式调整
|
9 years ago |
|
huang
|
7759670fa1
|
Merge branch 'yuanke' into develop
Conflicts:
Gemfile
public/stylesheets/new_user.css
|
9 years ago |
|
yuanke
|
a1323e3d76
|
表格问题
|
9 years ago |
|
Tim
|
61470c9bd4
|
名师榜css样式添加
|
9 years ago |
|
cxt
|
17497cd74e
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
cxt
|
f1821e54e1
|
通知和新闻详情页面的回复点击多次不会提交表单多次
|
9 years ago |
|
Tim
|
51a6727b07
|
名师榜样式
|
9 years ago |
 Linda
|
a2418396dd
|
邦本库zip下载样式界面
|
9 years ago |
|
cxt
|
cc92105da9
|
作品列表添加序号及样式调整
|
9 years ago |
|
yuanke
|
c31d4dc3bd
|
我要回复字不消失
|
9 years ago |
|
yuanke
|
a39702f962
|
图片自动上传，代码测试编译错误过长。
|
9 years ago |
|
Tim
|
2ac201ffdd
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
Tim
|
565d5e3bcc
|
作业测验列表html代码重构，添加序号列
|
9 years ago |
|
huang
|
ad2f12c9d0
|
名师列表搜索功能
|
9 years ago |
|
cxt
|
ac5a9c87ac
|
消息通知中的“同意|拒绝”调整宽度
|
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 |
|
huang
|
3dde8bd25a
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
huang
|
52c8593b09
|
组织教师列表sql优化
|
9 years ago |
|
Tim
|
7957beb64a
|
发送至按钮样式控制
|
9 years ago |
|
cxt
|
d232a5241e
|
新建课程报404
|
9 years ago |
|
yuanke
|
135e02504e
|
图片自动上传
|
9 years ago |
|
txz
|
a1afd0dc96
|
微信回复多次点击，仅第一次生效
|
9 years ago |
|
cxt
|
5baf467d13
|
作品评分不覆盖
|
9 years ago |
|
yuanke
|
e502aa7c43
|
KE表格项目问题，自动上传图片做了一点
|
9 years ago |
|
cxt
|
11017d72c5
|
老师对作品的评分可为空
|
9 years ago |
|
Tim
|
c8e0ffbdae
|
左二和右二文字隐藏时的更多显示
|
9 years ago |
|
Tim
|
2461a5c918
|
组织门户二级目录位置重新设置
|
9 years ago |
|
Tim
|
b32693ca2a
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
Tim
|
cf1cf58bab
|
组织门户二级目录添加分栏"|"以及登录未登录位置控制
|
9 years ago |
|
huang
|
fc36e4c01e
|
教师列表
|
9 years ago |
|
huang
|
e8c458c163
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
350e3f8eb4
|
表格颜色问题没改好暂时还原之前的
|
9 years ago |
|
huang
|
3469d928d8
|
图片变的很大问题
|
9 years ago |
|
huang
|
23a23fd085
|
组织logo上传图片
|
9 years ago |
|
huang
|
f4a5aeec07
|
样式优化
|
9 years ago |
|
huang
|
0a989daf31
|
Merge branch 'cxt_course' into develop
Conflicts:
app/helpers/application_helper.rb
public/stylesheets/courses.css
public/stylesheets/new_user.css
|
9 years ago |
|
huang
|
6ba4b9dfa2
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
34ea7662b2
|
将内容省略显示的固定字数改为传参
|
9 years ago |
|
cxt
|
10d26f89d9
|
作业列表的二级回复
|
9 years ago |
|
huang
|
b40a112015
|
配置页面一级域名超过的时候显示样式
|
9 years ago |
|
huang
|
9c18b37349
|
Merge branch 'hjq_beidou' into develop
|
9 years ago |
|
Tim
|
c3aec4d115
|
组织一级栏目名称过长时溢出
|
9 years ago |
|
huang
|
7f9a327166
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/views/sub_document_comments/show.html.erb
|
9 years ago |
|
Tim
|
cd95ed0558
|
二级回复展开更多效果实现
|
9 years ago |
|
yuanke
|
d32e07bda9
|
项目符号有的地方多余，issue详情里面项目符号显示为数字改为圆点.
|
9 years ago |
|
huang
|
df1c70880a
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_homework_repository.html.erb
public/stylesheets/new_user.css
|
9 years ago |
|
huang
|
572a051b04
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/users_controller.rb
app/views/blogs/_article.html.erb
app/views/layouts/new_base_user.html.erb
|
9 years ago |
|
yuanke
|
a863c143f3
|
收缩箭头修改
|
9 years ago |
|
huang
|
9e0176bc55
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/controllers/organizations_controller.rb
app/helpers/organizations_helper.rb
db/schema.rb
public/images/homepage_icon.png
public/stylesheets/new_user.css
|
9 years ago |
|
Tim
|
4bf1883ba2
|
组织门户导航栏二级显隐
|
9 years ago |
|
yuanke
|
283a83013c
|
KE 修改项目符号、表格颜色问题
|
9 years ago |
|
Tim
|
d0f97275cc
|
组织二级栏目显隐效果
|
9 years ago |
|
cxt
|
55718f2d44
|
设置课程大纲时若博客标题太长以省略号结束
|
9 years ago |
|
Tim
|
c3514f5b6a
|
二级栏目名长度控制
|
9 years ago |
|
Tim
|
787dbaaffc
|
二维码处文字样式处理
|
9 years ago |
|
Tim
|
abbbe9b7d6
|
二级子目录样式处理
|
9 years ago |
|
cxt
|
6c184b9248
|
题库的分享请求
|
9 years ago |
|
huang
|
65a907bc99
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
app/views/layouts/base_sub_domain.html.erb
|
9 years ago |
|
huang
|
8a14ce004f
|
以弹框模式显示二级目录
|
9 years ago |
|
Linda
|
cbec7cc8f8
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
app/views/layouts/base_sub_domain.html.erb
|
9 years ago |
|
Linda
|
0fc142d822
|
组织配置logo样式
|
9 years ago |
|
Tim
|
714deebe21
|
二级导航调整
|
9 years ago |
|
huang
|
7fbf6f4011
|
模式二帖子列表添加分页
|
9 years ago |
|
cxt
|
ff160ff793
|
题库的申请改为绿色按钮
|
9 years ago |
|
huang
|
d212d4f4c5
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
d3e3e9d22b
|
补交作品的样式
|
9 years ago |
|
cxt
|
bcb02e49d3
|
课程问答区的名片显示
|
9 years ago |
|
huang
|
5e8ff06140
|
Merge branch 'yuanke' into develop
|
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
|
5f24fb6496
|
锁的样式修改
|
9 years ago |
|
cxt
|
14a539bd0a
|
样式冲突
|
9 years ago |
|
cxt
|
a9cb556a20
|
题库的切换报500
|
9 years ago |
|
Tim
|
56a4a64d09
|
北斗详情翻页更改；位置超出省略号
|
9 years ago |
|
Tim
|
1f87d105d0
|
添加二级目录弹窗，翻页css
|
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 |
|
Tim
|
ebe6004833
|
组织二级目录添加列表
|
9 years ago |
|
Tim
|
5c795b92ee
|
图片百分百显示； 默认大图尺寸调整
|
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 |
|
huang
|
ae8bb8e83b
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
huang
|
b596c0d66f
|
二级目录的创建等
|
9 years ago |
|
yuanke
|
c729c1252d
|
项目、课程列表显示修改
|
9 years ago |
|
Tim
|
024667d035
|
title多行实现省略号效果，默认页面不对齐显示问题，高度控制，标题单行省略显示等
|
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 |
|
Tim
|
5d44dc5bba
|
滚动栏js效果修改
|
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 |
|
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 |
|
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 |
|
Tim
|
53e6b41d93
|
北斗登录效果调整
|
9 years ago |
|
huang
|
81210fd475
|
顶部导航及样式
|
9 years ago |
|
cxt
|
b86669d49c
|
微信模板消息的详情页面
|
9 years ago |
|
huang
|
c1437bb75b
|
北斗界面
|
9 years ago |
|
txz
|
dcb150559e
|
angularjs路径修改
|
9 years ago |
|
yuanke
|
6191c3636d
|
Merge branch 'yuanke' into yuanke_1
Conflicts:
public/javascripts/homework.js
|
9 years ago |
|
yuanke
|
016177a078
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
f6a5ffc6a5
|
测试代码的时候点击一下然后按钮消失等结果返回才出现
|
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
|
2345eb9d64
|
路径修改
|
9 years ago |
|
txz
|
0bab42256c
|
微信loading弹框改
|
9 years ago |
|
txz
|
39c64c9198
|
解决冲突
|
9 years ago |
|
txz
|
8e254ff722
|
微信loading弹框
|
9 years ago |
|
txz
|
6e6a29cfa6
|
api路径更改
|
9 years ago |
|
yuanke
|
29115bca3a
|
博客列表修改
|
9 years ago |
|
txz
|
0b82bf50c2
|
微信内容中图片正常显示
|
9 years ago |
|
txz
|
282e1b41e1
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
txz
|
6957c24da5
|
微信最新动态页面调整
|
9 years ago |
|
yuanke
|
dc3837da76
|
Merge branch 'cxt_course' into yuanke
Conflicts:
db/schema.rb
|
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 |
|
cxt
|
51478bd232
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
b07c3947d6
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
8611fbbdec
|
新建课程界面中关于学时的输入提示不合理，提示为只能输入数字，但是输入负数或小数时不能执行提交操作，应该修改为只能输入正整数。
|
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 |
|
txz
|
13576ca477
|
app.js
|
9 years ago |
|
huang
|
adf6cca435
|
完成代码行数的提交和统计
|
9 years ago |
|
cxt
|
2befcd6634
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
|
9 years ago |
|
cxt
|
f5122d7ef0
|
微信url切换到正式版
|
9 years ago |
|
Tim
|
deda05b048
|
作业下拉选择
|
9 years ago |
|
cxt
|
fcd1684658
|
作业列表按更新时间排序 作业列表左上角添加作业的下拉列表
|
9 years ago |
|
cxt
|
a6f4b7f505
|
测试版
|
9 years ago |
|
huang
|
04849659de
|
版本库统计
|
9 years ago |
|
cxt
|
e420be8ee9
|
Merge branch 'weixin_guange' into develop
Conflicts:
app/models/blog_comment.rb
|
9 years ago |
|
txz
|
38c182d76a
|
作业发布者真名为空时，显示昵称
|
9 years ago |
|
cxt
|
1882cd8f4f
|
用户姓名不显示
|
9 years ago |
|
txz
|
3665597153
|
详情页面排版调整
|
9 years ago |
|
txz
|
a6fcb072c0
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
txz
|
f82ad97a68
|
详情页面回复框宽度问题
|
9 years ago |
guange
|
7c5d62b8a8
|
头像url不显示
|
9 years ago |
|
guange
|
18f5f08bb7
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
|
guange
|
73ad787e23
|
修改到正式版
|
9 years ago |
|
guange
|
cadb5f3f15
|
更换服务器至test.course.trustie.net
|
9 years ago |
|
huang
|
a2a3d6b6b9
|
Merge remote-tracking branch 'remotes/origin/weixin_guange' into develop
Conflicts:
app/models/blog_comment.rb
|
9 years ago |
|
cxt
|
c041f742c1
|
缺陷和留言的回复
|
9 years ago |
|
cxt
|
007fee95bd
|
作业和留言回复的模板消息
|
9 years ago |
|
cxt
|
3f365e75b5
|
讨论区的模板消息
|
9 years ago |
|
cxt
|
b6adaf61db
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
cxt
|
930d95f8b5
|
私有动态不显示的问题
|
9 years ago |
|
txz
|
02a5e7752d
|
微信环境切换
|
9 years ago |
|
cxt
|
281fcf315f
|
点击模板消息页面为空
|
9 years ago |
|
huang
|
cd9ad535f5
|
1、修改默认图片
2、作品弹框问题
|
9 years ago |
|
txz
|
0262e3b8ab
|
回复长单词显示问题
|
9 years ago |
|
cxt
|
89330f9e40
|
调试
|
9 years ago |
|
cxt
|
d6daa906b6
|
回复
|
9 years ago |
|
cxt
|
de8d630fc1
|
解决冲突
|
9 years ago |
|
cxt
|
fcddaf403c
|
删除博客为空的数据
|
9 years ago |
|
txz
|
c88e924843
|
博客留言html内容转义
|
9 years ago |
|
cxt
|
1cb1835a1a
|
动态
|
9 years ago |
|
cxt
|
c5048d7c72
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
cxt
|
e007ee58ef
|
博客动态
|
9 years ago |
|
guange
|
ef317089f1
|
错误信息打印到日志
|
9 years ago |
|
guange
|
a35511195a
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
guange
|
abf4a80942
|
错误信息打印到日志
|
9 years ago |
|
cxt
|
eee7b89388
|
项目动态
|
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
|
4ab96586de
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
txz
|
f3738519e9
|
长单词折行问题
|
9 years ago |
|
cxt
|
1503686ddb
|
无更多动态时不显示更多
|
9 years ago |
|
huang
|
3501d6f1d6
|
完成组织模块的开发
|
9 years ago |
|
cxt
|
bb71d1c322
|
调试模式
|
9 years ago |
|
txz
|
411a8be8b8
|
点击展开
|
9 years ago |
|
txz
|
139a7931ee
|
点赞功能修改
|
9 years ago |
|
cxt
|
60c8320f82
|
praise api的修改
|
9 years ago |
|
txz
|
938bf48d08
|
点赞功能修改
|
9 years ago |
|
cxt
|
2fe32fda61
|
点赞的js
|
9 years ago |
|
txz
|
eb996280a6
|
点赞功能
|
9 years ago |
|
cxt
|
f1783c06a2
|
详情页面传参openid
|
9 years ago |
|
txz
|
3008c0c44d
|
activities.html冲突解决
|
9 years ago |
|
txz
|
0b1b08bd3d
|
点赞
|
9 years ago |
|
guange
|
80f47476cb
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
# Conflicts:
# public/javascripts/wechat/app.js
|
9 years ago |
|
guange
|
99f39696d0
|
点击展开功能完成
|
9 years ago |
|
txz
|
572d84b55d
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
txz
|
6d8ffabb39
|
代码优化
|
9 years ago |
|
guange
|
8ac8e1c9e5
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
guange
|
79dcd48d8c
|
重构
|
9 years ago |
|
cxt
|
a0e95976ac
|
详情页面的点赞
|
9 years ago |
|
cxt
|
edb18bd1b8
|
api提供has_praise
|
9 years ago |
|
txz
|
8e1473a484
|
点赞代码优化等
|
9 years ago |
|
txz
|
ec47fb1949
|
项目缺陷详情页面修改
|
9 years ago |
|
txz
|
a1ef398b9d
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
txz
|
422621759e
|
项目讨论区详情修改
|
9 years ago |
|
cxt
|
20bb8c1e09
|
留言详情页面
|
9 years ago |
|
cxt
|
7cc98db541
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
cxt
|
2ede6e2b9d
|
博客详情页面
|
9 years ago |
|
txz
|
6115e374bf
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
txz
|
a1a9dbd8a3
|
项目讨论区详情页面
|
9 years ago |
|
guange
|
42bd2dcfc5
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
# Conflicts:
# public/javascripts/wechat/app.js
|
9 years ago |
|
guange
|
3ee79a6889
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
# Conflicts:
# public/javascripts/wechat/app.js
|
9 years ago |
|
guange
|
70c2c9cc9f
|
把activities列表存起来,防止返回时页面变空
|
9 years ago |
|
txz
|
468f3ae63e
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
txz
|
c9687a8764
|
课程通知详情页面
|
9 years ago |
|
cxt
|
e46c963931
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
