 cxt
|
62e28f638c
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/layouts/_course_base_info.html.erb
app/views/layouts/base_projects.html.erb
app/views/layouts/new_base_user.html.erb
|
2016-08-26 14:33:18 +08:00 |
|
cxt
|
774b5eca89
|
课程和项目的头像点击可编辑
|
2016-08-26 14:31:14 +08:00 |
 yuanke
|
fcf6325761
|
Merge branch 'weixin_guange' into develop
|
2016-08-26 14:04:22 +08:00 |
|
yuanke
|
2a6321cd9e
|
发布帖子标题长度改为128
|
2016-08-26 14:03:09 +08:00 |
 Tim
|
a8f30fe85f
|
个人主页，课程，项目头像、logo增加编辑按钮
|
2016-08-26 11:31:54 +08:00 |
 daiao
|
ee9b0dbdcf
|
Merge branch 'dev_shcool' into develop
|
2016-08-26 10:16:38 +08:00 |
|
daiao
|
d37cbaad61
|
1.完善资料流程优化；2.基本资料从业者单位保存丢失问题
|
2016-08-26 10:14:48 +08:00 |
|
yuanke
|
4cf1bedbe1
|
Merge branch 'weixin_guange' into develop
|
2016-08-26 10:12:02 +08:00 |
|
yuanke
|
82779c99ea
|
字符串去掉空白时，空格不去掉。
|
2016-08-26 09:59:00 +08:00 |
|
cxt
|
f4b5a5cf4e
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-08-26 09:23:33 +08:00 |
|
Tim
|
fbad4ecd8a
|
班级页面logo及行间距调整；测导航数字大小背景调整
|
2016-08-25 17:52:19 +08:00 |
|
Tim
|
3e78dec32a
|
将课程、项目公用类放至public.css中
|
2016-08-25 16:07:57 +08:00 |
|
cxt
|
cb5e5f18ce
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-08-25 15:59:15 +08:00 |
|
cxt
|
b33136c59b
|
班级问答区改成讨论区
|
2016-08-25 15:59:09 +08:00 |
|
yuanke
|
038975fdf7
|
Merge branch 'weixin_guange' into develop
|
2016-08-25 15:57:01 +08:00 |
|
Tim
|
27678d09f6
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-08-25 15:55:49 +08:00 |
|
daiao
|
6a4f239961
|
Merge branch 'develop' into dev_shcool
|
2016-08-25 15:55:37 +08:00 |
|
Tim
|
df1039cd09
|
项目收藏按钮位置调整
|
2016-08-25 15:55:36 +08:00 |
|
yuanke
|
ea238cd407
|
微信班级发布问题改为发起讨论
|
2016-08-25 15:45:39 +08:00 |
|
cxt
|
d8117f9576
|
作品列表页面中分组作业关联项目的综合评分应与项目首页的评分一致
|
2016-08-25 15:43:11 +08:00 |
|
yuanke
|
d0ce2c360e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-25 15:39:53 +08:00 |
|
yuanke
|
589df7e498
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-25 15:34:22 +08:00 |
|
yuanke
|
5b73e7dc19
|
修改发布帖子标题的长度及班级动态中不显示头像
|
2016-08-25 15:34:13 +08:00 |
|
daiao
|
758aaca12a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-25 15:29:19 +08:00 |
|
daiao
|
a466fdd64e
|
强制修改基本资料：申请单位点击确定后，进入主页面；提问按钮不可用
|
2016-08-25 15:29:04 +08:00 |
|
Tim
|
6b4e25520d
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-25 14:30:50 +08:00 |
|
Tim
|
78123b5db7
|
iphone设备输入时，自动定位到输入框
|
2016-08-25 14:30:42 +08:00 |
|
yuanke
|
bb2a1de98c
|
资源详情返回更多按钮BUG修改
|
2016-08-25 14:26:31 +08:00 |
|
yuanke
|
fd2021a1fe
|
微信资源界面发送后返回处理
|
2016-08-25 14:05:21 +08:00 |
|
Tim
|
ae09d7ff27
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-25 13:39:13 +08:00 |
|
Tim
|
bb935e42a8
|
发帖时，标题字符限制；发布按钮不遮住输入框
|
2016-08-25 13:39:02 +08:00 |
|
cxt
|
60beb2abab
|
首页左侧班级和项目列表的收藏功能
|
2016-08-25 11:30:47 +08:00 |
|
yuanke
|
6abdb47ec5
|
模版消息标点
|
2016-08-25 11:25:51 +08:00 |
|
yuanke
|
aa11f39b2d
|
Merge branch 'develop' into weixin_guange
Conflicts:
public/assets/wechat/class.html
public/javascripts/wechat/controllers/class.js
|
2016-08-25 11:24:27 +08:00 |
|
yuanke
|
3673ed3f1d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-25 10:55:59 +08:00 |
|
yuanke
|
4932b9fad8
|
班级留言不显示
|
2016-08-25 10:55:22 +08:00 |
 huang
|
61fe0fc77c
|
项目讨论区发帖时 标题为空 内容为空给出提示
|
2016-08-25 10:50:18 +08:00 |
|
huang
|
3778871f58
|
issue在项目动态、列表、用户动态中删除回复添加提示
|
2016-08-25 10:39:16 +08:00 |
|
huang
|
4c292c77e8
|
Merge branch 'develop' into rep_quality
|
2016-08-25 10:05:09 +08:00 |
|
huang
|
69301a1120
|
Pull reques登录提示（权限控制）
|
2016-08-25 10:04:51 +08:00 |
|
yuanke
|
f35c3e8528
|
微信新闻、issue增加二级回复等
|
2016-08-25 09:45:23 +08:00 |
|
huang
|
799c451921
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-25 09:20:46 +08:00 |
|
cxt
|
21c48ea383
|
at所有人
|
2016-08-24 17:46:18 +08:00 |
|
huang
|
80c6132ba5
|
Merge branch 'rep_quality' into develop
|
2016-08-24 17:39:44 +08:00 |
|
huang
|
7493de1334
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-08-24 17:38:40 +08:00 |
|
huang
|
0cc59260cd
|
modified sonar list form of language
|
2016-08-24 17:35:04 +08:00 |
|
cxt
|
56b74b755b
|
取消收藏
|
2016-08-24 17:30:30 +08:00 |
|
huang
|
8cc60ef1e8
|
delete some language of quality_analysis
|
2016-08-24 17:28:55 +08:00 |
|
Tim
|
7682a4d45d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-24 17:03:11 +08:00 |
|
Tim
|
a13ec60173
|
修复无效的css
|
2016-08-24 17:02:59 +08:00 |