 cxt
|
5d9bde3c95
|
课程发送资源到课程
|
9 years ago |
 yuanke
|
374aa9918c
|
我的资源里面都显示未发布的，新建课程后返回会刷新数据
|
9 years ago |
guange
|
135b6ca64b
|
assets
|
9 years ago |
|
guange
|
7c98e0f392
|
merge
|
9 years ago |
|
guange
|
1413fe82dc
|
merge
|
9 years ago |
|
yuanke
|
c2166811eb
|
修改管理课程界面刷新显示问题
|
9 years ago |
|
yuanke
|
8d8de084ac
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
c6099177a4
|
修改微信发送资源平台不显示发送人的问题，删除班级提示文字不居中的问题等
|
9 years ago |
 txz
|
ea5bd94e99
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
txz
|
9ae7461501
|
资源列表学生进入时也显示为课件；课程tab页样式替换
|
9 years ago |
|
guange
|
3c36e97ff1
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
guange
|
3c23560d77
|
我的资源搜索无效
|
9 years ago |
|
guange
|
068c8967e1
|
新增班级时名称为1个字符时报错
|
9 years ago |
|
yuanke
|
3a2e2c1174
|
未命名课程暂不允许进行课程管理
|
9 years ago |
|
yuanke
|
d38ce793bd
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
bb62ba40b7
|
修改微信权限问题、管理课程界面等
|
9 years ago |
 huang
|
ef8b127225
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
public/javascripts/application.js
|
9 years ago |
|
txz
|
ed39b4b4f1
|
动态：创建班级；学生进入资源也显示课件；已有班级和新增班级颜色区分
|
9 years ago |
|
yuanke
|
06f7594680
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
cxt
|
37dd447fcb
|
Merge branch 'daiao_dev' into cxt_course
Conflicts:
app/views/admin/courses.html.erb
public/stylesheets/new_user.css
|
9 years ago |
|
cxt
|
da7509f64c
|
课程大纲的优化
|
9 years ago |
|
guange
|
a2ba65956c
|
.
|
9 years ago |
|
yuanke
|
3a6470b1f3
|
删除班级时增加提示确定信息
|
9 years ago |
|
guange
|
7859bf9c32
|
.
|
9 years ago |
|
guange
|
a17a6ed596
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
guange
|
10789d2505
|
added alert2
|
9 years ago |
|
cxt
|
a99b03ff76
|
管理员界面增加配置课程
|
9 years ago |
|
yuanke
|
9d46040f7a
|
课程列表 + - 按钮增加效果，资源发送界面课程列表显示和课程列表界面保持一直
|
9 years ago |
|
yuanke
|
6fe8d7ddf5
|
点击图片弹框右下角统一用“关闭”
|
9 years ago |
|
yuanke
|
b994e786ab
|
我的动态中三类动态之间切换的效果
|
9 years ago |
|
cxt
|
c5840d75da
|
Merge branch 'daiao_dev' into cxt_course
Conflicts:
db/schema.rb
|
9 years ago |
|
yuanke
|
d49bc8b114
|
发送课程的时候提示语修改
|
9 years ago |
|
yuanke
|
da19bbd3a0
|
优化了下修改资料界面的代码
|
9 years ago |
|
guange
|
373e3d3422
|
merge
|
9 years ago |
|
guange
|
48fb02a2d6
|
管理课程
|
9 years ago |
|
yuanke
|
9d0b5789d9
|
1.修改我的动态博客详情页面显示不了的BUG 2.资源界面切换是暂无XX先隐藏 3. 发送资源不选择班级的提示修改
|
9 years ago |
|
guange
|
60367415fa
|
新建课程功能完成
|
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 |
|
cxt
|
e834d09469
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
0ff8f0a774
|
课程大纲的删除和课程大纲描述的删除
|
9 years ago |
|
cxt
|
bdaa9983e3
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
2c1e0f534c
|
课程大纲
|
9 years ago |
|
cxt
|
ac4218bfb0
|
课程大纲列表
|
9 years ago |
|
guange
|
0bb5c8b5fb
|
注册绑定问题
|
9 years ago |
|
cxt
|
e066445036
|
课程大纲的显示和编辑
|
9 years ago |
|
cxt
|
383483de26
|
课程大纲的左侧栏base，新建课程大纲、新建班级的调整
|
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
|
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 |
|
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 |
|
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
|
86a5eccae6
|
组织设置中添加成员BUG解决
|
9 years ago |
|
guange
|
e21f4e0b4d
|
merge
|
9 years ago |
|
guange
|
f9075e08ba
|
merge
|
9 years ago |
|
guange
|
d348981721
|
加入邀请码
|
9 years ago |
|
guange
|
52d4d36097
|
邀请码页面
|
9 years ago |
|
Tim
|
563fb3b459
|
控制table拖拽不靠在一起
|
9 years ago |
|
cxt
|
126bf9c195
|
个人留言、课程留言的二级回复
|
9 years ago |
|
guange
|
7700445c17
|
加入课程
|
9 years ago |
|
guange
|
13273d02de
|
修正了安全问题，不暴露openid
|
9 years ago |
|
guange
|
5a8de44c43
|
添加我的班级控制器
|
9 years ago |
|
guange
|
b4a3d4a5a2
|
弹出框处理
|
9 years ago |
|
Tim
|
3548c23aad
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
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 |
|
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 |
|
Tim
|
4b62a39b15
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
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 |
|
yuanke
|
82ebd1e4c9
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
2781605670
|
课程资源描述增加可编辑
|
9 years ago |
|
Tim
|
24458ecb48
|
table可拖拽，在线测验表格布局优化
|
9 years ago |
|
huang
|
5e3df51ad9
|
完成新版登录注册
|
9 years ago |
|
huang
|
06f97d5cb7
|
注册页面（未完）
|
9 years ago |
|
cxt
|
43192b8648
|
分组作业的弹框增加人数的验证、点击关闭弹框时还原弹框中的值
|
9 years ago |
|
guange
|
ada15b4212
|
格式上的调整, 现在可以分开写,但发布时打成一个js提高性能
|
9 years ago |
|
cxt
|
254e1f44f6
|
评分设置提示的修改与提交时的判断
|
9 years ago |
|
guange
|
b1791f4531
|
wechat结构分离
|
9 years ago |
|
guange
|
d3d31ca3a2
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
9 years ago |
|
guange
|
d3c45fd133
|
使用jquery1.3比较小
|
9 years ago |
|
guange
|
36fedd4d15
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
guange
|
793b651393
|
压缩angularjs
|
9 years ago |
|
txz
|
5f26e9e3ee
|
微信回复文字格式不一致，微信回复换行处理
|
9 years ago |
|
huang
|
3e3c300273
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
b6eb5a3668
|
还原作品列表的拖动
|
9 years ago |
|
yuanke
|
ec39c16c66
|
Merge branch 'develop' into yuanke
|
9 years ago |
|
yuanke
|
5999189f3a
|
1.视频根据http还是https分类显示。
2.表格内容超出表格的改为换行。
3.有些浏览器缩进仍然显示方框。
|
9 years ago |
|
guange
|
8b05b33e38
|
不刷新返回
|
9 years ago |
|
guange
|
1251e31061
|
不刷新返回
|
9 years ago |
|
guange
|
37975552c9
|
base
|
9 years ago |
|
guange
|
5b34f498c9
|
base
|
9 years ago |
|
guange
|
fbfb382d78
|
base
|
9 years ago |
|
guange
|
f993fa87ff
|
base
|
9 years ago |
|
guange
|
8fb88dfdea
|
base
|
9 years ago |
|
guange
|
5fe41d80e9
|
base
|
9 years ago |
|
guange
|
b01a671fb4
|
base
|
9 years ago |
|
guange
|
eee8a8adb6
|
fix
|
9 years ago |
|
guange
|
33780759a9
|
修改为html5mode
|
9 years ago |
|
cxt
|
de58cfb5e5
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
cxt
|
196c92f9c4
|
动态回复最多只加赞三条，点击展开更多时才加载余下的回复
|
9 years ago |
|
guange
|
f5da2ba5f6
|
将current page提前
|
9 years ago |
|
Tim
|
1d44116841
|
作品列表可拖拽
|
9 years ago |
|
Tim
|
253d9da345
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
yuanke
|
1173bb9039
|
Merge branch 'develop' into yuanke
|
9 years ago |
|
yuanke
|
4c92e73cf1
|
根据http和https显示视频
|
9 years ago |
|
huang
|
4367cf2233
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
huang
|
b128ba5257
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/views/layouts/base_org2.html.erb
|
9 years ago |
|
huang
|
a71c4a50bb
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
0eb6dbe48a
|
Merge branch 'huang_temp2' into develop
Conflicts:
app/views/layouts/base_org2.html.erb
|
9 years ago |
|
cxt
|
184c17d52f
|
“显示明码”弹出undefined
|
9 years ago |
|
yuanke
|
c3c639aa77
|
超链接颜色修改
|
9 years ago |
|
huang
|
ba344a86b5
|
颜色
|
9 years ago |
|
cxt
|
2431ef6986
|
模板消息引起的问题
|
9 years ago |
|
yuanke
|
0d38fa53a2
|
1.issue编辑器定下最高高度到了改为滚动条
2.提问和建议修改提示语
3.KE插入代码框去掉我要回复字样
4.自动识别URL优化可识别？ 和cn等
5.KE缩进修改等
|
9 years ago |
|
Tim
|
ed46ca0735
|
可拖拽作业列表
|
9 years ago |
|
cxt
|
b20dc06e23
|
微信测试版配置修改
|
9 years ago |
|
cxt
|
747128750c
|
Merge branch 'weixin_guange' into cxt_course
|
9 years ago |
|
huang
|
e5eeba90f6
|
组织精品课程，热门项目
|
9 years ago |
|
huang
|
27a9170318
|
组织添加设为精品项目，热门课程
|
9 years ago |
|
Tim
|
308f247c71
|
可拖拽调整
|
9 years ago |
|
Tim
|
3b55e9e39b
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/student_work/_evaluation_un_title.html.erb
app/views/student_work/_evaluation_un_work.html.erb
|
9 years ago |
|
Tim
|
513fe1a93d
|
作品列表可拖拽
|
9 years ago |
|
guange
|
51d3fc3aad
|
更多修复
|
9 years ago |
|
guange
|
ceffa6c2c8
|
更多修复
|
9 years ago |
|
guange
|
03357388bd
|
更多修复
|
9 years ago |
|
guange
|
553a02c89d
|
更多修复
|
9 years ago |
|
guange
|
c26d544772
|
更多修复
|
9 years ago |
|
guange
|
c9eddad45d
|
更多修复
|
9 years ago |
|
guange
|
32ffd2a5b5
|
返回优化完成
|
9 years ago |
|
guange
|
48b36e5d16
|
优化返回刷新
|
9 years ago |
|
guange
|
814fde878e
|
从后台获取openid即可
|
9 years ago |
|
guange
|
13d11e2239
|
用户动态如果没有绑定则跳到绑定页面.
|
9 years ago |
|
guange
|
4815dc3c7b
|
用户动态如果没有绑定则跳到绑定页面.
|
9 years ago |
|
cxt
|
8540b48091
|
未绑定微信账号时点击“最新动态”出现提示信息
|
9 years ago |
|
cxt
|
d4c0e9754a
|
课程描述展开后应显示“收起描述信息”
|
9 years ago |
|
yuanke
|
5b7011e07b
|
Merge branch 'develop' into yuanke
|
9 years ago |
|
yuanke
|
9d9e2ff613
|
自动识别URL正则匹配修改
|
9 years ago |
|
Tim
|
5f27519c67
|
table可拖拽
|
9 years ago |
|
yuanke
|
cfc3751f6f
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
huang
|
213b0f75b0
|
Merge branch 'hjq_resource' into develop
|
9 years ago |
|
huang
|
ab4aa0f06f
|
公共资源多个资源发送功能
|
9 years ago |
|
yuanke
|
54e62c778a
|
保证python编程的中文注释可用
|
9 years ago |
|
txz
|
1c95e76209
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
huang
|
0a7d1f1efc
|
公共资源库添加资源多个发送功能，修复项目、课程多个发送的bug
|
9 years ago |
|
cxt
|
d9bd13c2fc
|
复制课程报500
|
9 years ago |
|
txz
|
921b01e8e3
|
输入框支持文字内容滑动
|
9 years ago |
|
yuanke
|
fcaa9666e2
|
KE内容自动识别网址加上超链接时把颜色也加上
|
9 years ago |
|
cxt
|
b1a58ecfb8
|
Merge branch 'weixin_guange' into develop
Conflicts:
1234567
|
9 years ago |
|
txz
|
29ceb7b8e9
|
微信图标清晰问题，回复点赞右对齐
|
9 years ago |
|
txz
|
2a0b35a1b3
|
微信回复框高度随文字增减
|
9 years ago |
|
yuanke
|
5eff3db9e8
|
1.问答区时间排序BUG修复、只显示更新时间、发贴人放左下角、内容截断一点
2.KE编辑器输入内容时需有一点下边距
3.KE中编辑使用段落显示时有颜色的问题
|
9 years ago |
|
txz
|
103af96ac2
|
替换加载中gif图
|
9 years ago |
|
yuanke
|
6d7eca487f
|
将KE的newlineTag：'br' 改为'p',方便识别网址
|
9 years ago |
|
yuanke
|
ded5f8f861
|
页面中显示KE内容的地方都加上自动识别网址的函数
|
9 years ago |
|
yuanke
|
5b0ef6ada0
|
Merge branch 'develop' into yuanke
|
9 years ago |
|
yuanke
|
6e749f49e4
|
Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke
|
9 years ago |
|
yuanke
|
7da1418069
|
自动识别URL
|
9 years ago |
|
huang
|
4857769c49
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
huang
|
fe54a19940
|
Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke
Conflicts:
app/views/blogs/_article.html.erb
app/views/users/_project_boardlist.html.erb
public/stylesheets/new_user.css
|
9 years ago |
|
huang
|
faf5e89cc2
|
Merge branch 'weixin_guange' into develop
Conflicts:
1234567
app/views/blogs/_article.html.erb
db/schema.rb
|
9 years ago |
|
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
|
9 years ago |
|
cxt
|
8611fbbdec
|
新建课程界面中关于学时的输入提示不合理，提示为只能输入数字，但是输入负数或小数时不能执行提交操作，应该修改为只能输入正整数。
|
9 years ago |
|
yuanke
|
f1090d45ad
|
Merge branch 'cxt_course' into yuanke
Conflicts:
db/schema.rb
|
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 |
|
yuanke
|
a8dce5e520
|
代码查重功能增加,管理员界面增加代码测试列表.
|
9 years ago |
|
txz
|
13576ca477
|
app.js
|
9 years ago |
|
huang
|
adf6cca435
|
完成代码行数的提交和统计
|
9 years ago |
|
cxt
|
f5122d7ef0
|
微信url切换到正式版
|
9 years ago |
|
cxt
|
a6f4b7f505
|
测试版
|
9 years ago |
|
cxt
|
e420be8ee9
|
Merge branch 'weixin_guange' into develop
Conflicts:
app/models/blog_comment.rb
|
9 years ago |
|
cxt
|
1882cd8f4f
|
用户姓名不显示
|
9 years ago |
|
txz
|
3665597153
|
详情页面排版调整
|
9 years ago |
|
guange
|
7c5d62b8a8
|
头像url不显示
|
9 years ago |
|
guange
|
73ad787e23
|
修改到正式版
|
9 years ago |
|
guange
|
cadb5f3f15
|
更换服务器至test.course.trustie.net
|
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 |
|
cxt
|
89330f9e40
|
调试
|
9 years ago |
|
cxt
|
d6daa906b6
|
回复
|
9 years ago |
|
cxt
|
fcddaf403c
|
删除博客为空的数据
|
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 |
|
cxt
|
1503686ddb
|
无更多动态时不显示更多
|
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
|
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 |
|
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 |
|
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
|
c9687a8764
|
课程通知详情页面
|
9 years ago |
|
txz
|
feb0014bf8
|
作业详情页面
|
9 years ago |
|
txz
|
18cda892d9
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
cxt
|
be30ac889b
|
冲突
|
9 years ago |
