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

197 Commits

Author SHA1 Message Date
daiao 7d085e4930 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dev_tieba 
Conflicts:
	app/views/forums/_right_bar.html.erb
 2017-01-03 15:50:56 +08:00
huang 0c8dff30a8 编辑的时候局部刷新 2016-12-30 22:11:16 +08:00
huang fc5e335429 问吧统计数字不一致的问题 2016-12-30 21:53:55 +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
daiao fbfbc0cdeb 问吧样式调整 2016-12-30 21:05:14 +08:00
huang 8f230c67e0 弹框居中 2016-12-30 20:55:28 +08:00
huang bef4e7be12 处理贴吧同名问题 2016-12-30 20:53:09 +08:00
huang e33c62419a 贴吧编辑的时候tip修改；回复的时候去掉“发布成功”提示 2016-12-30 19:37:18 +08:00
daiao 23dc37d5d2 点击右侧贴吧名，跳新页面 2016-12-30 17:26:47 +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
daiao 44acf1a383 贴吧的左侧导航栏样式调整，并调整新建贴吧提示样式 2016-12-30 15:34:01 +08:00
huang 2c7e7bed0b Merge branch 'develop' into dev_tieba 2016-12-30 15:04:43 +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
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
daiao 37d82f6c8a 问吧的贴吧右上角标签，编辑和删除js 2016-12-30 11:32:32 +08:00
huang 11135bfabf 问吧编辑 2016-12-30 11:30:40 +08:00
daiao 16e1f0c701 导航栏“帮助中心”改为“问吧”，并调整帖子展示内容的高度 2016-12-30 10:45:22 +08:00
huang 6c86f655fd 贴吧没数据的显示 2016-12-30 10:44:28 +08:00
huang fd291850ae 问吧帖子权限控制 2016-12-30 10:21:00 +08:00
huang a7bf421df8 Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into dev_tieba 2016-12-30 10:03:10 +08:00
daiao b2bafe9c94 新建贴吧页面功能 2016-12-30 10:00:33 +08:00
huang c22ee7664f 邮件显示内容距离调整 2016-12-30 09:45:03 +08:00
huang 365c9f810c memo新建 2016-12-29 18:02:56 +08:00
huang edee7adae3 Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into dev_tieba 2016-12-29 17:19:27 +08:00
huang aa2dcb6719 先建帖子的时候添加返回按钮 2016-12-29 17:18:56 +08:00
huang e8cc1633d3 问吧一些改进 2016-12-29 17:15:54 +08:00
daiao 5137c1b4f2 新建贴吧页面样式调整 2016-12-29 17:10:26 +08:00
huang 3bdf26c63e 问吧位置加链接 2016-12-29 17:07:34 +08:00
huang 6cd4e9e71d 问吧详情页面优化 2016-12-29 16:39:39 +08:00
huang 134bdcebf2 问吧 index页面优化 2016-12-29 16:21:39 +08:00
huang 9fcd5b48ed forum index页面分页及排序 2016-12-29 15:57:52 +08:00
daiao 143e33a891 问吧分页样式调整 2016-12-29 15:13:55 +08:00
daiao c8807b29ca 贴吧帖子的内容，设置高度限制（可点击“展开”与“收起”） 2016-12-29 15:01:21 +08:00
huang f733e2a276 注册激活页面代码重构，及添加新的字体 2016-12-29 14:38:03 +08:00
daiao ba08bbf906 贴吧右侧的贴吧列表页面 2016-12-29 13:52:45 +08:00
huang b2a53b65f8 邮件激活页面，并添加留言功能 2016-12-29 10:47:35 +08:00
huang a423909a71 完成memo详情相关页面及功能 2016-12-28 16:18:47 +08:00
huang da88c43e95 完成问吧 memo新建及 forum详情页面相关功能 2016-12-28 15:24:26 +08:00
huang c3aa69029e 完成问吧idex页面及新家贴吧 2016-12-28 11:05:05 +08:00
huang fe20c45c26 新建贴吧弹框 2016-12-27 17:12:42 +08:00
huang 465b3e7b52 问吧 base框架 2016-12-27 16:09:09 +08:00
huang 616e7a2a11 公共贴吧 2016-12-27 12:12:07 +08:00
huang 735cdb6a46 公共贴吧 2016-12-27 10:41:28 +08:00
cxt 3f35b7f806 贴吧回复改版 2016-11-29 09:36:38 +08:00
yuanke 7dc0ba005e Merge branch 'dev_shcool' into develop 
Conflicts:
	app/views/issues/index.html.erb
	app/views/users/_course_newslist.html.erb
 2016-10-13 14:37:37 +08:00
cxt 5a725dd074 去掉公共贴吧为空时的提示信息 2016-10-10 15:39:53 +08:00
daiao 673b68f2a2 修复：在公共贴吧，新建贴吧总提示“提拔名称已存在”的问题 2016-09-19 13:37:18 +08:00