 huang
|
f4bda16469
|
fork分支PR
|
2016-08-04 18:30:04 +08:00 |
 yuanke
|
735e6d1b71
|
Merge branch 'weixin_guange' into develop
|
2016-08-04 18:11:35 +08:00 |
|
yuanke
|
491b6fcb72
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-04 18:10:47 +08:00 |
|
yuanke
|
bb46aa4745
|
微信点击已审批模版消息进入界面显示修改
|
2016-08-04 18:09:54 +08:00 |
 Tim
|
1335dc1b76
|
提示文字取消粗体
|
2016-08-04 17:27:53 +08:00 |
|
huang
|
5419103268
|
修改API(gitlab中创建所有pullrequest为Admin的问题)
|
2016-08-04 17:01:19 +08:00 |
|
Tim
|
28a29fa724
|
拖拽删除
|
2016-08-04 16:50:33 +08:00 |
|
yuanke
|
d5df45e8fb
|
项目动态点入详情后返回需回到点入的项目动态处
|
2016-08-04 16:35:07 +08:00 |
 cxt
|
b7c05fed4a
|
首页样式和js调整
|
2016-08-04 16:33:51 +08:00 |
|
huang
|
99fa39371d
|
接受请求ajax刷新
|
2016-08-04 15:36:02 +08:00 |
|
yuanke
|
14ca135586
|
Merge branch 'weixin_guange' into develop
|
2016-08-04 15:33:22 +08:00 |
|
yuanke
|
55afb84aef
|
模版消息标题加上句号，审核模版消息再次点击显示修改
|
2016-08-04 15:32:25 +08:00 |
|
huang
|
9eb084c3bd
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
Conflicts:
app/views/pull_requests/_show.html.erb
|
2016-08-04 15:08:05 +08:00 |
|
huang
|
515649beb6
|
接受PR局部刷新及跳转
|
2016-08-04 15:07:15 +08:00 |
|
Tim
|
33467d3152
|
已处理页面样式；新建时选择项目刷新分支js
|
2016-08-04 15:04:27 +08:00 |
|
yuanke
|
ee019cd364
|
修改测试版微信加入项目审核通知
|
2016-08-04 14:47:39 +08:00 |
|
yuanke
|
88c7018537
|
Merge branch 'weixin_guange' into develop
|
2016-08-04 14:37:50 +08:00 |
|
yuanke
|
e4a414e550
|
微信菜单跳入加入项目和班级界面点取消要能返回公众号界面
|
2016-08-04 14:37:04 +08:00 |
|
huang
|
54a9fadbd1
|
判断合并和未合并的pr
|
2016-08-04 14:24:32 +08:00 |
|
huang
|
362e95d103
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-08-04 14:11:53 +08:00 |
|
huang
|
7084a3fed9
|
新建pull request的时候JS控制标题不能为空
|
2016-08-04 14:11:24 +08:00 |
|
yuanke
|
12a9c95c01
|
微信项目及班级邀请码相关BUG修改
|
2016-08-04 14:07:35 +08:00 |
|
Tim
|
6f1b7f827e
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-08-04 14:05:07 +08:00 |
|
Tim
|
b8a40862ce
|
改变行代码格式化，不折行
|
2016-08-04 14:04:55 +08:00 |
|
huang
|
1f5c4a800f
|
代码没有改动时候提示
|
2016-08-04 11:35:04 +08:00 |
|
yuanke
|
3c2ab32121
|
微信动态分享修改
|
2016-08-04 11:17:50 +08:00 |
|
huang
|
0b3e1f558c
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
Conflicts:
app/views/pull_requests/show.html.erb
|
2016-08-04 11:15:38 +08:00 |
|
huang
|
21747d02a2
|
新建PR成功后JS跳转HTML跳转，相关页面局部刷新，及错误提示
|
2016-08-04 11:13:31 +08:00 |
|
cxt
|
6c7b53f7d4
|
首页左侧栏
|
2016-08-04 11:05:34 +08:00 |
|
yuanke
|
4bae4527a2
|
微信分享URL修改
|
2016-08-04 10:48:13 +08:00 |
|
yuanke
|
aaa1c01eed
|
微信动态分享图片修改
|
2016-08-04 10:47:35 +08:00 |
|
Tim
|
f444d6fab0
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
Conflicts:
app/views/pull_requests/_form.html.erb
|
2016-08-04 10:46:18 +08:00 |
|
Tim
|
cedff021ad
|
分支下拉框样式；改动样式；无合并内容提示
|
2016-08-04 10:44:48 +08:00 |
|
huang
|
a62ede1a33
|
先建pull request及局部刷新
|
2016-08-04 10:08:13 +08:00 |
|
yuanke
|
c0579de57d
|
微信分享内容修改
|
2016-08-04 10:00:55 +08:00 |
|
yuanke
|
13d59be389
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-04 09:09:50 +08:00 |
|
yuanke
|
17c98eb9fe
|
微信分享修改
|
2016-08-04 09:08:18 +08:00 |
|
huang
|
2e91da4f28
|
项目分支获取
|
2016-08-03 17:37:37 +08:00 |
 daiao
|
7f62de59e1
|
优化周二代码审查的代码
|
2016-08-03 17:36:04 +08:00 |
|
huang
|
c20b679c22
|
PR new调整
|
2016-08-03 17:04:02 +08:00 |
|
huang
|
f8b53b8dfc
|
Pull request列表页面分类
|
2016-08-03 16:54:37 +08:00 |
|
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 |