 yuanke
|
24a0bfea77
|
分享修改
|
2016-08-12 12:05:14 +08:00 |
|
yuanke
|
3a000a360a
|
appid 修改
|
2016-08-11 17:30:06 +08:00 |
|
yuanke
|
4e6c58ae37
|
动态点提交如果没绑定则自动创建一个帐号绑定，然后注册的时候将已绑定的用户信息修改为注册的信息
|
2016-08-11 17:22:48 +08:00 |
 Tim
|
f4445619d2
|
题库预览弹框样式调整
|
2016-08-11 11:02:40 +08:00 |
|
Tim
|
59a76c3b9a
|
调整组织上传资源弹窗位置
|
2016-08-11 10:47:22 +08:00 |
|
Tim
|
83323e7d18
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-10 17:19:42 +08:00 |
|
Tim
|
ba7f9ed735
|
班级、项目侧导航文字缩小
|
2016-08-10 17:19:32 +08:00 |
 cxt
|
0ed508a887
|
题库预览弹窗的调整
|
2016-08-09 17:09:36 +08:00 |
|
cxt
|
8de8035441
|
班级首页顶部加上主讲老师的链接
|
2016-08-09 16:17:58 +08:00 |
|
cxt
|
65f6b0fc70
|
新建课程报500
|
2016-08-09 15:50:23 +08:00 |
|
cxt
|
4a527dc84e
|
Merge branch 'cs_optimize_txz' into develop
|
2016-08-09 15:25:01 +08:00 |
|
cxt
|
547aae0743
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-09 10:40:25 +08:00 |
|
cxt
|
2951259d23
|
左侧项目列表的展开
|
2016-08-09 10:40:00 +08:00 |
|
cxt
|
153e02c4fa
|
消息列表报500
|
2016-08-09 10:39:32 +08:00 |
|
cxt
|
40dc9b761f
|
未配置课程的班级报404
|
2016-08-09 10:39:12 +08:00 |
 huang
|
ecc6f5601e
|
接受请求后显示admin问题
|
2016-08-05 20:14:19 +08:00 |
|
huang
|
2bdf3d573b
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-05 19:45:06 +08:00 |
|
huang
|
20fac3852d
|
合并信息
|
2016-08-05 19:44:52 +08:00 |
 daiao
|
85c16ca9e8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-05 19:02:41 +08:00 |
|
daiao
|
e89d7398aa
|
申请管理消息通知
|
2016-08-05 19:02:05 +08:00 |
|
cxt
|
90e480f7e9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-05 18:52:39 +08:00 |
|
cxt
|
5b8883960b
|
Merge branch 'cxt_course' into develop
|
2016-08-05 18:52:09 +08:00 |
|
Tim
|
0200590a70
|
待处理合并无更新内容时，页尾显示偏移bug
|
2016-08-05 18:42:14 +08:00 |
|
cxt
|
d3db6719eb
|
“我的作业”中编辑作业不跳转到“题库”，而是返回到“我的作业”
|
2016-08-05 18:41:32 +08:00 |
|
huang
|
910fe0f48c
|
css
|
2016-08-05 18:23:03 +08:00 |
|
huang
|
f54eafce76
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-05 18:12:29 +08:00 |
|
huang
|
a46aba1491
|
样式调整
|
2016-08-05 18:12:08 +08:00 |
|
Tim
|
ee1d30b277
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-05 18:01:23 +08:00 |
|
Tim
|
cd30f94d72
|
题库发送预览弹框位置及可拖拽js更新
|
2016-08-05 18:01:11 +08:00 |
|
huang
|
42e616bdea
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-05 18:00:32 +08:00 |
|
huang
|
7c484b4f4a
|
页面显示问题
|
2016-08-05 18:00:10 +08:00 |
|
Tim
|
d4f08f6498
|
课程logo替换，邀请码样式更改，班级路径显示主讲教师
|
2016-08-05 17:30:13 +08:00 |
|
cxt
|
ea4f0d7d9d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-05 16:52:01 +08:00 |
|
cxt
|
aaaeb4b8da
|
子域名申请消息报错
|
2016-08-05 16:51:51 +08:00 |
|
huang
|
3afdeda4d3
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-05 16:42:44 +08:00 |
|
huang
|
af7e507279
|
合并权限
|
2016-08-05 16:42:06 +08:00 |
|
huang
|
3ef2509d27
|
报告人员加入项目不用提醒
|
2016-08-05 16:35:22 +08:00 |
|
cxt
|
e7e873e0df
|
Merge branch 'dev_shcool' into develop
Conflicts:
app/helpers/users_helper.rb
|
2016-08-05 16:32:10 +08:00 |
|
cxt
|
fb5a969fd3
|
消息弹窗
|
2016-08-05 16:30:08 +08:00 |
|
cxt
|
3178700131
|
Merge branch 'cxt_course' into develop
|
2016-08-05 16:14:56 +08:00 |
|
daiao
|
7fbca5f260
|
单位审查消息及其BUG修复
|
2016-08-05 16:14:26 +08:00 |
|
cxt
|
0d86a28c54
|
我的作业
|
2016-08-05 16:12:53 +08:00 |
|
huang
|
dd768c2913
|
Merge branch 'cs_optimize_txz' into develop
Conflicts:
public/stylesheets/css/common.css
|
2016-08-05 15:30:03 +08:00 |
|
huang
|
81ce93e88b
|
Merge branch 'rep_quality' into develop
|
2016-08-05 15:28:39 +08:00 |
|
huang
|
43a4e0a2bf
|
fork成功不跳转提示
|
2016-08-05 15:23:52 +08:00 |
|
huang
|
308b050612
|
link to路由问题
|
2016-08-05 14:43:44 +08:00 |
|
huang
|
b62ac02c15
|
自身分支创建PR修改
|
2016-08-05 14:19:09 +08:00 |
|
Tim
|
56452d69f4
|
侧导航字体大小，颜色更改
|
2016-08-05 14:11:35 +08:00 |
|
huang
|
4ec8cc9a50
|
PR新建相关功能完善
|
2016-08-05 11:19:36 +08:00 |
|
huang
|
f3c0c25d76
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-08-05 11:10:59 +08:00 |