jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
18,355 Commits 98 Branches 0 Tags 0 B
Commit Graph

14782 Commits

Author SHA1 Message Date
huang 148d958de6 隐藏非项目信息的一些修改 2017-01-03 16:21:50 +08:00
huang b9eb320d17 用户注册激活、token值过期添加提示 2017-01-03 15:20:31 +08:00
huang ab77cbff12 admin界面点击配置报500问题 2017-01-03 13:22:35 +08:00
huang 48f3338fbe 统计数 2016-12-30 22:20:29 +08:00
huang 0c8dff30a8 编辑的时候局部刷新 2016-12-30 22:11:16 +08:00
huang 6360f9419f memo详情去掉编辑删除 2016-12-30 22:07:36 +08:00
huang fc5e335429 问吧统计数字不一致的问题 2016-12-30 21:53:55 +08:00
huang faf43bb8ba 问吧样式（数字过多的时候异常） 2016-12-30 21:44:22 +08:00
huang a6b4ec64e2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/controllers/memos_controller.rb
 2016-12-30 21:17:56 +08:00
黄井泉 fd9c423eb7 Merge branch 'develop' into 'develop' 
周五缺陷修复

周五缺陷修复

See merge request !98
 2016-12-30 21:16:08 +08:00
daiao fbfbc0cdeb 问吧样式调整 2016-12-30 21:05:14 +08:00
huang 118772671c 我的组织样式问题 2016-12-30 21:04:38 +08:00
cxt 9d6f75fb3e 竞赛管理员有权限访问竞赛作品关联的私有项目，但访问关联项目的讨论区却报403 2016-12-30 20:59:13 +08:00
huang 8f230c67e0 弹框居中 2016-12-30 20:55:28 +08:00
huang bef4e7be12 处理贴吧同名问题 2016-12-30 20:53:09 +08:00
cxt 055b05bac9 竞赛列表的创建者加上链接 2016-12-30 20:42:41 +08:00
cxt a60c83fe00 超级管理员要有对竞赛通知编辑、删除的权限 2016-12-30 20:35:40 +08:00
huang 6fcf80cd3c 修改统计数字 2016-12-30 20:31:19 +08:00
cxt a5e6ed0d39 竞赛“提交”的相关bug修复 2016-12-30 20:30:45 +08:00
cxt 0f4e3f0189 竞赛：进入通知详情页面后，如图左侧导航的“讨论区”却加亮显示了 2016-12-30 20:29:54 +08:00
huang 82a3ff01ef 贴吧详情统计数修改 2016-12-30 20:14:31 +08:00
cxt 6d894c53d5 竞赛讨论区的置顶和锁定 2016-12-30 19:53:00 +08:00
huang e33c62419a 贴吧编辑的时候tip修改；回复的时候去掉“发布成功”提示 2016-12-30 19:37:18 +08:00
huang 17d4e45acc Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/layouts/_logined_header.html.erb
 2016-12-30 17:33:18 +08:00
huang 2f864dbd99 memo点赞样式问题 2016-12-30 17:25:34 +08:00
huang a69e576fbc 问吧列表也只显示主贴 2016-12-30 17:10:12 +08:00
cxt 2238cef9f1 竞赛提交截止后不可补交作品 2016-12-30 17:04:13 +08:00
daiao 2eaca7312a Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into dev_tieba 2016-12-30 16:52:46 +08:00
daiao 4c8ddde50d 贴吧保存失败提示 2016-12-30 16:52:16 +08:00
huang baaaaf95d8 Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into dev_tieba 
Conflicts:
	config/routes.rb
 2016-12-30 16:51:23 +08:00
cxt 79ba4cd9b7 竞赛社区首页点击竞赛列表后，标签的名称变更了，应该始终显示“竞赛” 2016-12-30 16:45:53 +08:00
cxt 7f7edf53ac 平台超级管理员无法访问私有的竞赛，正确的应该是可以访问并进行操作 2016-12-30 16:43:29 +08:00
cxt cde8a8957c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-30 16:37:43 +08:00
cxt 986fe7db86 竞赛增加讨论区模块 2016-12-30 16:37:20 +08:00
daiao 157d747b57 Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into dev_tieba 2016-12-30 16:22:14 +08:00
daiao f332307cae 更改贴吧描述 2016-12-30 16:12:25 +08:00
huang a30ed19b40 moemo的创建与编辑公共部分封装；按钮过长隐藏 2016-12-30 15:52:08 +08:00
daiao 44acf1a383 贴吧的左侧导航栏样式调整，并调整新建贴吧提示样式 2016-12-30 15:34:01 +08:00
huang d9b6294883 解决个别user点击个人主页项目500问题 2016-12-30 15:14:52 +08:00
huang 2c7e7bed0b Merge branch 'develop' into dev_tieba 2016-12-30 15:04:43 +08:00
huang 58162dab95 问吧帖子编辑 2016-12-30 14:53:02 +08:00
daiao a8d16a15de 去除贴吧右侧tag 2016-12-30 14:20:01 +08:00
cxt 6ba5f124e3 竞赛相关icon更换 2016-12-30 13:58:40 +08:00
cxt d1fbaa27b9 竞赛 ：作品--》提交 2016-12-30 13:58:09 +08:00
huang 48645e1d43 Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into dev_tieba 2016-12-30 13:55:10 +08:00
huang 912752d646 问吧编辑的时候ajax局部刷新 2016-12-30 13:54:42 +08:00
daiao cc7f6b7d55 Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into dev_tieba 2016-12-30 13:50:37 +08:00
daiao 70e8e51a5e 问吧-贴吧右侧js调整 2016-12-30 13:49:57 +08:00
huang 53cd3a197b 问吧编辑和新建代码封装 2016-12-30 13:47:31 +08:00
daiao e883194eaf Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into dev_tieba 2016-12-30 11:33:06 +08:00