 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
|
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 |
 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 |
 daiao
|
24783705b5
|
Merge branch 'dev_shcool' into develop
|
2016-08-01 16:11:47 +08:00 |
|
daiao
|
0ffeec64e3
|
单位审核bug修复
|
2016-08-01 16:10:57 +08:00 |
|
yuanke
|
dde89b72fa
|
加入项目二维码修改
|
2016-08-01 15:50:21 +08:00 |
|
daiao
|
fc1fc0bd7d
|
单位审核bug修复
|
2016-08-01 15:44:18 +08:00 |
|
yuanke
|
f016027e8f
|
微信加入项目修改
|
2016-08-01 15:35:29 +08:00 |
|
yuanke
|
2c86ae3eb2
|
二维码识别 项目和班级区分
|
2016-08-01 15:09:36 +08:00 |
|
yuanke
|
c1bd3b6bf1
|
增加日志测试
|
2016-08-01 14:30:31 +08:00 |
 cxt
|
18539b45de
|
Merge branch 'dev_shcool' into develop
|
2016-08-01 14:03:58 +08:00 |
|
cxt
|
6d17329a6d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-01 13:58:02 +08:00 |
|
cxt
|
3bc696a597
|
申请学校的更改
|
2016-08-01 13:57:55 +08:00 |
|
daiao
|
5272f20de8
|
单位审核bug的修复
|
2016-08-01 13:56:37 +08:00 |
|
yuanke
|
fa43924330
|
微信项目二维码修改
|
2016-08-01 13:54:10 +08:00 |
|
yuanke
|
84f0069cbd
|
打开项目邀请码信息
|
2016-08-01 11:30:25 +08:00 |
|
yuanke
|
4c9e183cd0
|
微信菜单点击加入项目修改
|
2016-08-01 11:24:27 +08:00 |
|
yuanke
|
bb0bfa21cc
|
加入项目邀请码修改
|
2016-08-01 11:18:01 +08:00 |
|
yuanke
|
f0cf7adcdf
|
加入项目邀请码
|
2016-08-01 11:14:03 +08:00 |
|
huang
|
8a8860bd6c
|
gemfile注释后恢复
|
2016-08-01 09:51:13 +08:00 |
|
huang
|
3feb0680cc
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-01 09:50:31 +08:00 |
|
huang
|
f7e8c5232c
|
个人主页加入项目，如果已经申请了则提示已申请
|
2016-08-01 09:50:05 +08:00 |
|
yuanke
|
f3ae53dc97
|
Merge branch 'develop' into weixin_guange
Conflicts:
public/assets/wechat/app.html
public/assets/wechat/new_project.html
public/javascripts/wechat/directives/ellipsis.js
public/stylesheets/weui/weixin.css
|
2016-08-01 09:21:31 +08:00 |
|
yuanke
|
94a4ee9525
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-01 09:17:18 +08:00 |
|
daiao
|
4004e30216
|
Merge branch 'develop' into dev_shcool
|
2016-08-01 08:43:50 +08:00 |
|
cxt
|
87e3707b52
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-29 23:54:17 +08:00 |
|
cxt
|
0ac906a5cf
|
消息列表报500
|
2016-07-29 23:54:10 +08:00 |
|
daiao
|
8e805d382a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-29 23:50:39 +08:00 |
|
daiao
|
6ea829131b
|
单位列表发送消息样式调整
|
2016-07-29 23:48:12 +08:00 |
|
huang
|
30ce469483
|
申请加入项目删除邮件
|
2016-07-29 23:37:31 +08:00 |
|
daiao
|
15227907ea
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-29 23:23:11 +08:00 |
|
huang
|
07ff420a6a
|
退出项目的时候清楚申请信息
|
2016-07-29 23:23:04 +08:00 |
|
daiao
|
db690bedab
|
单位名称列表缺陷修复
|
2016-07-29 23:22:32 +08:00 |
|
huang
|
21eed9ebb3
|
去掉同意拒绝“：”
|
2016-07-29 23:03:18 +08:00 |
|
huang
|
08b1f0c266
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-29 22:58:43 +08:00 |
|
huang
|
b1fd7048fe
|
报告人员问题
|
2016-07-29 22:58:24 +08:00 |
|
huang
|
97288d4eb4
|
按钮样式
|
2016-07-29 22:51:13 +08:00 |
|
cxt
|
bf529f07a5
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-29 22:49:46 +08:00 |
|
cxt
|
23bb010315
|
课程列表的资源数显示不对
|
2016-07-29 22:49:39 +08:00 |
|
daiao
|
20195d2496
|
Merge branch 'dev_shcool' into develop
|
2016-07-29 22:11:55 +08:00 |
|
yuanke
|
7d0d208676
|
Merge branch 'dev_shcool' of https://git.trustie.net/jacknudt/trustieforge into dev_shcool
|
2016-07-29 22:10:06 +08:00 |
|
yuanke
|
dce84484ff
|
修改单位的省市个人资料省市也得修改
|
2016-07-29 22:09:03 +08:00 |
|
daiao
|
8513ae133e
|
Merge branch 'dev_shcool' into develop
|
2016-07-29 22:07:02 +08:00 |
|
daiao
|
911a769670
|
Merge branch 'develop' into dev_shcool
Conflicts:
app/models/applied_message.rb
|
2016-07-29 22:05:56 +08:00 |