 huang
|
01b21ceda1
|
项目留言重复提交问题
|
2015-12-11 09:52:17 +08:00 |
|
huang
|
1ba0dae3c4
|
修复课程留言重复提交问题
|
2015-12-11 09:42:19 +08:00 |
|
huang
|
670df76c70
|
注释掉项目邀请加入功能
|
2015-12-10 20:24:42 +08:00 |
|
huang
|
9710731a2c
|
课程配置添加登录名
|
2015-12-10 20:03:59 +08:00 |
|
huang
|
c7b2c9e3af
|
课程删除功能
admin中课程列表取消删除按钮
|
2015-12-10 18:59:54 +08:00 |
|
huang
|
4f7f4acb1f
|
课程删除
|
2015-12-10 17:26:03 +08:00 |
|
huang
|
fbba933a46
|
Merge branch 'hjq_new_course' of http://git.trustie.net/jacknudt/trustieforge into hjq_new_course
|
2015-12-10 16:09:42 +08:00 |
|
huang
|
be940ee3aa
|
Merge branch 'develop' into hjq_new_course
|
2015-12-10 16:09:36 +08:00 |
|
huang
|
dbadbf8621
|
修改密码gitlab同步
|
2015-12-10 15:54:44 +08:00 |
|
huang
|
74fe2607f3
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
2015-12-10 10:58:34 +08:00 |
 ouyangxuhua
|
1e652faec7
|
Merge branch 'develop' into dev_hjq
|
2015-12-10 10:55:59 +08:00 |
|
huang
|
4e0b442309
|
修改邮箱的时候同步到gitlab
|
2015-12-10 10:50:15 +08:00 |
 lizanle
|
433059e1bc
|
schema
|
2015-12-10 10:12:54 +08:00 |
|
lizanle
|
7f866a0b3a
|
课程被删除后不能被搜索
|
2015-12-10 10:00:14 +08:00 |
|
ouyangxuhua
|
2f7260cba2
|
1.在栏目表中增加field_type(类型)字段；
2.在组织配置-》栏目，增加栏目类型。
|
2015-12-09 17:24:59 +08:00 |
|
huang
|
db582fd639
|
修改不同分支之间的显示最新提交状态
|
2015-12-09 17:08:03 +08:00 |
|
huang
|
f2c1595d0d
|
1、同步没成功检测程序
2、注册验证修改
|
2015-12-09 16:57:12 +08:00 |
|
ouyangxuhua
|
78fb8b6254
|
1.编辑或者删除栏目的帖子返回对应页面
|
2015-12-09 16:19:52 +08:00 |
|
ouyangxuhua
|
1a7a97dbc5
|
引用了ke的页面下方存在一个可见的uploadbutton
|
2015-12-09 15:53:36 +08:00 |
 cxt
|
f2f81d5243
|
作品列表的代码缩进
|
2015-12-09 10:52:56 +08:00 |
|
ouyangxuhua
|
333c0e41a0
|
1.栏目增加新建帖子功能；
2.点击某栏目，显示相应的动态；
3.编辑栏目里的文章后，返回相应的栏目动态。
|
2015-12-09 10:48:15 +08:00 |
|
ouyangxuhua
|
09f0d0201e
|
组织增加栏目发帖功能
|
2015-12-09 09:23:22 +08:00 |
|
huang
|
319ced51a0
|
Merge branch 'gitlab_guange' into develop
|
2015-12-08 17:16:50 +08:00 |
|
huang
|
ac9f13c842
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
Conflicts:
app/views/repositories/show.html.erb
db/schema.rb
处理冲突
|
2015-12-08 17:13:50 +08:00 |
|
huang
|
20eb88b6e2
|
Merge branch 'gitlab_guange' into develop
|
2015-12-08 16:54:51 +08:00 |
|
huang
|
da04607859
|
Merge branch 'gitlab_guange' of http://git.trustie.net/jacknudt/trustieforge into gitlab_guange
|
2015-12-08 16:53:56 +08:00 |
|
huang
|
99c5a19ff9
|
Merge branch 'develop' into gitlab_guange
|
2015-12-08 16:53:43 +08:00 |
|
huang
|
916d99be82
|
课程删除功能
|
2015-12-08 16:45:26 +08:00 |
 houxiang
|
56cb83ffba
|
版本库首页没有统计commit_count，具体的详情页在开始统计
|
2015-12-08 15:56:31 +08:00 |
|
ouyangxuhua
|
1881e18742
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-12-08 15:31:17 +08:00 |
|
ouyangxuhua
|
bb7bcf46a9
|
1.设置首页后，跳转至组织首页
|
2015-12-08 15:30:58 +08:00 |
|
huang
|
42f5b86d95
|
添加字段删除课程
|
2015-12-08 10:32:10 +08:00 |
Gan Yi.ang
|
58c76e7c1c
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-12-08 10:15:09 +08:00 |
|
huang
|
7c34122ff6
|
fork的时候如果用户没有同步，则自动同步
|
2015-12-08 09:46:29 +08:00 |
|
huang
|
068c305c06
|
Merge branch 'hjq_new_course' of http://repository.trustie.net/xianbo/trustie2 into hjq_new_course
Conflicts:
app/views/courses/member.html.erb
app/views/courses/settings.html.erb
app/views/repositories/show.html.erb
db/schema.rb
处理冲突
|
2015-12-08 09:10:21 +08:00 |
|
huang
|
19472f4ae5
|
Merge branch 'dev_hjq' into develop
|
2015-12-07 17:31:53 +08:00 |
|
huang
|
07e414a2cd
|
Merge branch 'develop' into dev_hjq
|
2015-12-07 17:31:03 +08:00 |
|
huang
|
298bf037ad
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-12-07 17:25:51 +08:00 |
|
huang
|
3459164e64
|
过滤条件样式
|
2015-12-07 17:25:32 +08:00 |
|
ouyangxuhua
|
8b14e7c549
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-12-07 17:19:52 +08:00 |
|
ouyangxuhua
|
5198f4dde4
|
Merge branch 'dev_hjq' into develop
|
2015-12-07 17:19:26 +08:00 |
|
ouyangxuhua
|
9d6b4783df
|
删除组织配置栏目的组织首页项
|
2015-12-07 17:18:46 +08:00 |
|
huang
|
5f6d9f2425
|
项目动态新样式
|
2015-12-07 17:14:13 +08:00 |
|
ouyangxuhua
|
a8b7d1b81f
|
回复项目里的message,不增加项目动态及组织动态
|
2015-12-07 17:11:30 +08:00 |
|
huang
|
91fa3f6fab
|
解决项目样式冲突问题
|
2015-12-07 16:52:23 +08:00 |
|
ouyangxuhua
|
e45ce0fb95
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-12-07 15:52:32 +08:00 |
|
ouyangxuhua
|
76db95aa03
|
1.组织页面中，退出后刷新组织页面；
2.组织页面中，点击“个人主页”，打开新的页面；
3.组织页面页首部分，用户名不链接用户页面。
|
2015-12-07 15:52:13 +08:00 |
|
cxt
|
c8f4149206
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-12-07 15:18:43 +08:00 |
|
cxt
|
8e999ed9f0
|
作业动态的回复删除功能只在鼠标进入时显示
|
2015-12-07 15:18:32 +08:00 |
|
huang
|
5eb249515c
|
版本库显示样式
|
2015-12-07 15:12:30 +08:00 |