 Tim
|
7b6675ed6a
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
Conflicts:
public/assets/wechat/join_project.html
|
2016-08-03 16:41:15 +08:00 |
|
Tim
|
950b18c250
|
加入班级提示
|
2016-08-03 16:39:22 +08:00 |
 yuanke
|
29e707a88d
|
微信加入项目修改、二级回复三个回复时多了个边框BUG修改等
|
2016-08-03 16:31:33 +08:00 |
 huang
|
9f9eed2e27
|
隐藏编辑功能
|
2016-08-03 16:05:29 +08:00 |
|
huang
|
22a8adb64e
|
添加统计数目
|
2016-08-03 16:02:42 +08:00 |
|
huang
|
b8cccdffda
|
完成changes数据获取及展示
|
2016-08-03 15:56:07 +08:00 |
|
huang
|
8e329db4d8
|
pull request commits样式调整
|
2016-08-03 15:16:28 +08:00 |
|
huang
|
27e755a0a9
|
数据获取及展示
|
2016-08-03 15:06:10 +08:00 |
 cxt
|
f262447ff1
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/users/user_homeworks.html.erb
|
2016-08-03 15:01:43 +08:00 |
|
cxt
|
cecf917764
|
从题库选用作业时增加提示：“您选中的题是“我收到的作业”，不能选用”
|
2016-08-03 15:00:16 +08:00 |
|
Tim
|
a5fe620452
|
题库翻页居中对齐
|
2016-08-03 14:57:02 +08:00 |
|
yuanke
|
a34272027e
|
微信菜单及项目班级审核修改
|
2016-08-03 14:55:54 +08:00 |
|
huang
|
0a9224d036
|
每次请求提交的代码
|
2016-08-03 14:43:27 +08:00 |
|
cxt
|
bae775ec34
|
题库的搜索调整
|
2016-08-03 14:06:47 +08:00 |
|
huang
|
be081f5c66
|
添加Api（提交内容，改动）及相关方法路由
|
2016-08-03 13:57:59 +08:00 |
|
cxt
|
acc3ba121f
|
测试集的显示、新版分页
|
2016-08-03 13:46:59 +08:00 |
|
cxt
|
718b13e6c1
|
新版题库
|
2016-08-03 11:12:55 +08:00 |
|
huang
|
1cb6809bdf
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
Conflicts:
app/views/pull_requests/new.html.erb
|
2016-08-03 11:09:14 +08:00 |
|
huang
|
182c861b30
|
创建pull request
|
2016-08-03 11:07:49 +08:00 |
|
Tim
|
e7fa38e52c
|
pull request show页面
|
2016-08-03 11:00:31 +08:00 |
|
yuanke
|
6ee6cdf28f
|
微信项目加入审核修改
|
2016-08-03 10:56:55 +08:00 |
 daiao
|
5f969c6593
|
单位审核相关Bug修复
|
2016-08-03 10:36:03 +08:00 |
|
yuanke
|
65719add19
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-03 09:37:36 +08:00 |
|
yuanke
|
4ab2427827
|
微信项目及课程申请审核相关功能
|
2016-08-03 09:37:24 +08:00 |
 guange
|
6f2b84570f
|
去除调试模式
|
2016-08-02 17:48:51 +08:00 |
|
guange
|
56d6f4b9bc
|
定制分享内容
|
2016-08-02 17:36:59 +08:00 |
|
guange
|
2a67ec5407
|
配置登录页菜单
|
2016-08-02 17:27:40 +08:00 |
|
guange
|
2632f7aa59
|
引入wechat js sdk
|
2016-08-02 17:01:10 +08:00 |
|
huang
|
5e9c27b63d
|
代码封装
|
2016-08-02 16:38:56 +08:00 |
|
Tim
|
b91bb1f0d2
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-08-02 16:37:41 +08:00 |
|
Tim
|
c8dce2c2fc
|
请求处理页面
|
2016-08-02 16:37:30 +08:00 |
|
huang
|
56a444dac0
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-08-02 16:34:31 +08:00 |
|
huang
|
3ce1ac80b4
|
pull_request ---> new
|
2016-08-02 16:34:20 +08:00 |
|
Tim
|
09f25588a8
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-08-02 16:10:34 +08:00 |
|
Tim
|
7e440596ab
|
新建请求，js效果
|
2016-08-02 16:10:25 +08:00 |
|
huang
|
20bdd23665
|
pull requtst show
|
2016-08-02 16:06:51 +08:00 |
|
yuanke
|
a4281b4934
|
Merge branch 'develop' into weixin_guange
|
2016-08-02 15:51:29 +08:00 |
|
yuanke
|
13c46fc938
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-02 15:50:27 +08:00 |
|
yuanke
|
614e877e6e
|
微信项目和班级加入修改
|
2016-08-02 15:50:15 +08:00 |
|
huang
|
d286d3fe06
|
pullrequest头部
|
2016-08-02 15:44:25 +08:00 |
|
Tim
|
3e95b070d0
|
合并请求代码
|
2016-08-02 15:00:05 +08:00 |
|
huang
|
7658844a28
|
鼠标经过弹框消息提示
|
2016-08-02 14:53:33 +08:00 |
|
huang
|
5e4a659cba
|
gemfile
|
2016-08-02 13:04:40 +08:00 |
|
huang
|
94b36e227c
|
申请加入项目消息刷新，同时更新其它管理员的消息状态
|
2016-08-02 13:03:33 +08:00 |
|
huang
|
0b113bb985
|
项目邀请码识别小写
|
2016-08-02 11:25:19 +08:00 |
|
Tim
|
65d4af1307
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-08-02 10:03:57 +08:00 |
|
Tim
|
9af8757ceb
|
项目合并请求
|
2016-08-02 10:03:42 +08:00 |
|
daiao
|
7d7c8bcd8c
|
Merge branch 'develop' into dev_shcool
|
2016-08-01 19:55:40 +08:00 |
|
guange
|
a1d3bbbfa9
|
解决ruby2.3执行sql出错的bug
|
2016-08-01 19:17:16 +08:00 |
|
guange
|
fc38ef6a3f
|
增加了一个查看服务器内网ip的middleware，利于以后分析问题，headers为X-Response-Ip
|
2016-08-01 19:16:51 +08:00 |