 guange
|
08e193ea3c
|
添加微信用户表
|
2016-01-19 11:51:37 +08:00 |
|
guange
|
40047ff818
|
添加菜单事件
|
2016-01-19 11:51:26 +08:00 |
|
guange
|
9f667588c4
|
添加菜单
|
2016-01-19 11:50:59 +08:00 |
|
guange
|
080cc71912
|
wechat 路由修改
|
2016-01-16 11:59:09 +08:00 |
|
guange
|
5f6a3cac04
|
wechat init
|
2016-01-16 11:54:59 +08:00 |
|
guange
|
932b0923b1
|
change wechat to guange2015
|
2016-01-15 23:49:03 +08:00 |
|
guange
|
744b246930
|
配置修改
|
2016-01-15 23:15:06 +08:00 |
|
guange
|
62c2085d61
|
merge
|
2016-01-15 22:45:16 +08:00 |
|
guange
|
b68eab23ea
|
merge
|
2016-01-15 17:03:32 +08:00 |
|
guange
|
587d347178
|
added wechat
|
2016-01-15 17:01:30 +08:00 |
 huang
|
eecdc26b2f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/organizations/_org_course_homework.html.erb
app/views/users/_user_homework_detail.html.erb
|
2016-01-15 15:42:36 +08:00 |
|
huang
|
86516df88a
|
Merge branch 'cxt_course' of http://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/helpers/application_helper.rb
|
2016-01-15 15:41:02 +08:00 |
|
huang
|
c936304314
|
课程默认收起
|
2016-01-15 15:37:17 +08:00 |
 Tim
|
50849baade
|
侧导航“+”号图标调小
|
2016-01-15 15:27:03 +08:00 |
 ouyangxuhua
|
b9359b1cee
|
显示url申请
|
2016-01-15 13:15:17 +08:00 |
|
huang
|
b6ae14a1ce
|
课程更多字体12
|
2016-01-15 12:51:50 +08:00 |
|
huang
|
81b32ea643
|
点击铃铛弹出新tab页
|
2016-01-15 12:39:38 +08:00 |
|
huang
|
18bc8215e3
|
路由冲突
|
2016-01-15 11:35:27 +08:00 |
|
huang
|
c6357181c4
|
Merge branch 'szzh' into develop
|
2016-01-15 11:16:30 +08:00 |
|
huang
|
2a31cc91fe
|
Merge branch 'develop' into szzh
Conflicts:
config/routes.rb
|
2016-01-15 11:15:47 +08:00 |
|
huang
|
64f972770f
|
添加board和attachment数据迁移
|
2016-01-15 10:41:34 +08:00 |
|
ouyangxuhua
|
16a3a7d06d
|
隐藏url定制
|
2016-01-14 21:42:28 +08:00 |
|
ouyangxuhua
|
def640cd31
|
Merge branch 'dev_hjq' into develop
|
2016-01-14 21:31:29 +08:00 |
|
ouyangxuhua
|
7ad377f458
|
修改一些bug
|
2016-01-14 21:29:43 +08:00 |
|
huang
|
20d550e755
|
提交次数默认值为空的数据处理
|
2016-01-14 21:25:36 +08:00 |
 cxt
|
0be6e36020
|
缺陷、通知、个人留言动态的点赞
|
2016-01-14 21:07:05 +08:00 |
|
huang
|
733c65d7fd
|
Merge branch 'hjq_new_course' into develop
|
2016-01-14 20:48:37 +08:00 |
|
huang
|
9bbb1e0f90
|
修改fork时候项目ID问题
|
2016-01-14 20:48:12 +08:00 |
|
guange
|
c8b52db6f9
|
merge
|
2016-01-14 20:38:37 +08:00 |
|
guange
|
c298adda7c
|
子域名路由实现
|
2016-01-14 20:37:56 +08:00 |
|
huang
|
f11a458d95
|
Merge branch 'develop' into hjq_new_course
|
2016-01-14 19:52:42 +08:00 |
|
huang
|
831f678390
|
Merge branch 'szzh' into develop
|
2016-01-14 18:41:04 +08:00 |
|
ouyangxuhua
|
5097f19ec8
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
app/views/layouts/_user_projects.html.erb
app/views/projects/set_public_or_private.js.erb
|
2016-01-14 18:30:05 +08:00 |
|
ouyangxuhua
|
1c62edbed4
|
项目设为私有title更新
|
2016-01-14 18:26:36 +08:00 |
|
huang
|
71e155d83a
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-01-14 18:26:26 +08:00 |
|
huang
|
4eb113f2c4
|
Merge branch 'develop' into szzh
|
2016-01-14 18:26:21 +08:00 |
|
huang
|
a114b7525d
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
2016-01-14 18:25:56 +08:00 |
|
huang
|
b3e6f6acd5
|
项目删除附件问题
项目得分添加讨论回复计算
|
2016-01-14 18:25:42 +08:00 |
|
cxt
|
894c97304c
|
冲突
|
2016-01-14 18:24:07 +08:00 |
|
cxt
|
25cc959576
|
Merge branch 'szzh' into develop
Conflicts:
app/views/layouts/_user_courses.html.erb
app/views/org_subfields/show.html.erb
app/views/organizations/_subfield_list.html.erb
app/views/users/_resource_share_for_orgs.html.erb
|
2016-01-14 18:22:57 +08:00 |
|
ouyangxuhua
|
ff9ac244b7
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-01-14 18:13:37 +08:00 |
|
ouyangxuhua
|
3697d74d48
|
子域名路由配置
|
2016-01-14 18:13:17 +08:00 |
|
cxt
|
57cfe49602
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-01-14 18:08:19 +08:00 |
|
cxt
|
cef9fd96cd
|
组织帖子的动态点赞
|
2016-01-14 18:05:58 +08:00 |
|
ouyangxuhua
|
0f0f1ae056
|
Merge branch 'dev_hjq' into szzh
Conflicts:
db/schema.rb
|
2016-01-14 17:54:16 +08:00 |
|
ouyangxuhua
|
276b07df8a
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-01-14 17:53:22 +08:00 |
|
ouyangxuhua
|
6b7ce68e4a
|
各种bug解决
|
2016-01-14 17:52:48 +08:00 |
|
huang
|
09d2796ca7
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
public/stylesheets/new_user.css
处理冲突
|
2016-01-14 17:35:25 +08:00 |
|
huang
|
5e5634bee8
|
Merge branch 'szzh' into develop
|
2016-01-14 17:34:10 +08:00 |
|
huang
|
82cfeaf409
|
Merge branch 'hjq_new_course' into szzh
|
2016-01-14 17:33:42 +08:00 |