 huang
|
75fecc0402
|
项目删除功能
项目删除权限
课程列表用户颜色
|
2015-12-11 12:53:01 +08:00 |
|
huang
|
9c472b9358
|
课程成员列表乱的问题
|
2015-12-11 11:23:02 +08:00 |
|
huang
|
35c918cb40
|
Merge branch 'hjq_new_course' into develop
|
2015-12-11 11:02:09 +08:00 |
|
huang
|
fbd1b2f541
|
用户留言重复提交问题
|
2015-12-11 10:53:14 +08:00 |
|
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
|
a9510f4869
|
Merge branch 'dev_hjq' into develop
|
2015-12-10 17:29:52 +08:00 |
|
huang
|
ec42e71c70
|
Merge branch 'dev_hjq' of http://git.trustie.net/jacknudt/trustieforge into dev_hjq
|
2015-12-10 17:29:03 +08:00 |
|
huang
|
4f7f4acb1f
|
课程删除
|
2015-12-10 17:26:03 +08:00 |
 ouyangxuhua
|
aab9594ac9
|
1.解决英文版下，组织成员列表编辑成员显示错误；
2.解决在组织文章详情页面，删除文章报错的问题
|
2015-12-10 17:22:59 +08:00 |
|
ouyangxuhua
|
48e7aa78d1
|
项目加载更多样式问题
|
2015-12-10 17:00:24 +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 |
|
ouyangxuhua
|
0a85fbf613
|
1.配置栏目列表，增加类型一列；
2.暂时隐藏类型为“资源”的栏目的链接
|
2015-12-10 15:53:05 +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
|
7ef4b71648
|
Merge branch 'develop' into dev_hjq
|
2015-12-08 09:06:02 +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 |