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

1540 Commits

Author SHA1 Message Date
huang 67f0cad331 组织网站动态新页面 2016-06-08 09:40:05 +08:00
huang 9c01bb63e7 配置页面管理员栏目权限控制 2016-06-07 17:36:33 +08:00
huang c5bccf1adb 组织动态按更新时间排序 2016-06-07 16:02:46 +08:00
huang 59988f17da 帖子目录界面 2016-06-07 14:48:43 +08:00
huang bfa447c195 未登录状态下anonymos改为未登录 2016-06-06 15:11:07 +08:00
huang edbe882cc9 管理员栏目其它成员不可见 2016-06-03 15:56:04 +08:00
huang b128ba5257 Merge branch 'hjq_beidou' into develop 
Conflicts:
	app/views/layouts/base_org2.html.erb
 2016-06-03 14:58:37 +08:00
huang e726a362d8 组织配置页面状态的更新 2016-06-03 14:56:38 +08:00
huang 1e34a4f174 显示样式一级添加二级目录权限 2016-06-03 14:43:20 +08:00
huang fa2437cdf6 添加课程学期 2016-06-03 14:28:12 +08:00
huang 3af115ee54 组织新版样式，及方法优化 2016-06-03 12:42:02 +08:00
huang ca3b072f85 热门项目按照项目得分排序及设置界面中默认设置 2016-06-03 10:31:29 +08:00
huang 257165dbaf 模式二中添加课程定配 2016-06-02 21:32:56 +08:00
huang 0b3ec0322f 右一模式 2016-06-02 18:41:00 +08:00
huang 76732a3034 新模式有一 2016-06-02 13:17:38 +08:00
huang 27a9170318 组织添加设为精品项目，热门课程 2016-06-01 17:38:41 +08:00
cxt 0cc8cb9928 刚提交的回复时间显示为“刚刚” 2016-06-01 08:57:27 +08:00
huang 91ae3d8b39 Merge branch 'develop' into hjq_beidou 
Conflicts:
	db/schema.rb
 2016-05-31 18:38:05 +08:00
huang a96fafd704 模式三（未完） 2016-05-31 18:37:21 +08:00
huang 8d56d8556f 完成模式6 2016-05-31 16:03:48 +08:00
huang bb7204846f 新版资源类型定制模式6 2016-05-31 14:41:50 +08:00
cxt 796125bd1c 修改微信端的时间提示 2016-05-31 14:18:40 +08:00
huang c369b271a0 组织管理员配置后的权限控制及局部刷新 2016-05-31 11:24:47 +08:00
huang c333a0c55d 组织管理员提供学霸功能 2016-05-31 10:31:08 +08:00
huang c57c575c84 新版组织静态页面模板 2016-05-30 16:24:51 +08:00
huang afedaf3fe5 组织资源历史版本下载权限问题 2016-05-27 10:48:28 +08:00
huang 7b6a62e972 历史版本下载403问题 2016-05-27 10:34:57 +08:00
huang d1e11d4260 代码审查后代码简化 2016-05-25 08:58:58 +08:00
huang eead7962cf 资源申请权限控制 2016-05-21 11:39:50 +08:00
huang b0e4ed5ab3 请求分享如果自己在项目的话则不需要申请 2016-05-20 17:40:18 +08:00
huang 13ac7ef273 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-05-20 15:37:02 +08:00
cxt 6aa20c9edf 消息通知的内容没有过滤用Tab键空格引起的特殊符号 2016-05-20 11:12:37 +08:00
huang 3985c190bf Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-05-19 16:01:07 +08:00
cxt 0f2f4717b6 作业列表增加序号和翻页、按创建时间倒排 2016-05-19 13:50:45 +08:00
huang 11bc6b1e6c 配置500问题 2016-05-17 10:18:24 +08:00
huang 5ee6c9e5d3 子域名添加成员问题 2016-05-16 18:08:05 +08:00
guange f217b3f510 去除用户名域名 2016-05-14 16:00:04 +08:00
huang 79e57e2b7f 代码和并冲突处理及连接参数 2016-05-13 17:00:25 +08:00
huang e8afcf9157 Merge branch 'hjq_beidou' into develop 
Conflicts:
	app/helpers/organizations_helper.rb
	app/views/organizations/_org_subfield_rightM2.html.erb
 2016-05-13 16:56:02 +08:00
huang 39c753fd25 名师列表排序 2016-05-13 16:54:27 +08:00
huang 467ee60657 名师默认显示5个，没有则不显示 2016-05-13 15:37:04 +08:00
huang 33a3b22430 Merge branch 'hjq_beidou' into develop 
Conflicts:
	db/schema.rb
	public/stylesheets/org2.css
 2016-05-13 15:12:26 +08:00
huang 3853d5b7ad 右三模式定制 2016-05-13 13:39:44 +08:00
cxt 0f61994252 点击作业动态优秀排行中学生链接，在打开的作品列表中自动定位到该学生作品并默认打开该作品 2016-05-12 17:49:07 +08:00
cxt 7481d96166 Merge branch 'develop' into cxt_course 
Conflicts:
	app/controllers/admin_controller.rb
	config/routes.rb
	lib/redmine.rb
 2016-05-12 10:40:35 +08:00
cxt 5baf467d13 作品评分不覆盖 2016-05-10 15:26:08 +08:00
huang cabac5914c 学生统计数 2016-05-10 13:41:21 +08:00
huang 99d9a28828 名师榜sql查询 2016-05-10 11:33:02 +08:00
huang 5880a12290 sql查询 2016-05-10 10:00:28 +08:00
huang 6474444cc7 用户连接 id变成用户名 2016-05-10 09:00:59 +08:00
huang a98678e001 列表中类型显示方法封装 2016-05-09 15:00:50 +08:00
huang 878bcc8cf1 栏目创建类型添加老师、学生类型 2016-05-09 14:43:28 +08:00
cxt b8f7672424 项目动态的更新时间更新到作业动态中 2016-05-06 22:02:45 +08:00
huang 00d0bc0ce1 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-05-06 22:02:22 +08:00
huang 0a989daf31 Merge branch 'cxt_course' into develop 
Conflicts:
	app/helpers/application_helper.rb
	public/stylesheets/courses.css
	public/stylesheets/new_user.css
 2016-05-06 18:12:08 +08:00
cxt 10d26f89d9 作业列表的二级回复 2016-05-06 17:36:28 +08:00
huang c3a016607b 解决冲突 2016-05-06 10:39:37 +08:00
huang 9e0176bc55 Merge branch 'hjq_beidou' into develop 
Conflicts:
	app/controllers/organizations_controller.rb
	app/helpers/organizations_helper.rb
	db/schema.rb
	public/images/homepage_icon.png
	public/stylesheets/new_user.css
 2016-05-06 10:16:56 +08:00
huang 0b43fb5502 隐藏可见及箭头的局部刷新 2016-05-06 09:49:15 +08:00
huang 231f8f3526 二级目录中设置了隐藏，鼠标经过的时候不显示内容及 框框 2016-05-05 21:23:34 +08:00
huang a0ea2c7e5d 模式二3在配置整合 2016-05-05 10:05:53 +08:00
huang ccea42cc8b 项目和课程的动态只参与五种配置 2016-05-04 19:47:44 +08:00
huang 8dfe95dfd1 配置页面新建二级域名样式 2016-05-04 15:50:53 +08:00
huang 5e8ff06140 Merge branch 'yuanke' into develop 2016-05-03 17:15:46 +08:00
cxt 1cad1626e0 解决冲突 2016-04-29 20:31:31 +08:00
yuanke b199a6b8b2 列表人气排序修改 2016-04-29 19:24:20 +08:00
yuanke 1353c27f64 Merge branch 'yuanke' into develop 
Conflicts:
	app/helpers/application_helper.rb
 2016-04-29 15:54:37 +08:00
yuanke f8abd46ae9 列表修改 2016-04-29 15:52:44 +08:00
yuanke 1da8288fe7 列表显示修改 2016-04-29 13:42:58 +08:00
huang 1685449381 二级目录框架及结构 2016-04-28 17:36:29 +08:00
yuanke f185c59e90 Merge branch 'yuanke' into develop 2016-04-28 14:33:30 +08:00
yuanke 2cb9f0cd05 组织还原 2016-04-28 14:31:40 +08:00
yuanke dc53b86a4e Merge branch 'cxt_course' into yuanke 
Conflicts:
	app/controllers/student_work_controller.rb
	db/schema.rb
 2016-04-28 10:49:05 +08:00
yuanke 647e6a7f92 Merge branch 'yuanke' into develop 
Conflicts:
	app/views/layouts/new_base_user.html.erb
	config/locales/zh.yml
	db/schema.rb
 2016-04-28 10:45:57 +08:00
huang 9fbf713709 完成组织二级域名 2016-04-27 17:02:44 +08:00
cxt 3aa891acf6 Merge branch 'cxt_course' into develop 
Conflicts:
	app/controllers/student_work_controller.rb
	app/views/praise_tread/_praise.html.erb
	db/schema.rb
 2016-04-27 16:27:55 +08:00
cxt 766026e3cf 教师评分为最终评分 2016-04-27 16:21:35 +08:00
yuanke 4258790453 Merge branch 'hjq_beidou' into yuanke_1 
Conflicts:
	db/schema.rb
	public/stylesheets/project.css
 2016-04-27 14:30:28 +08:00
cxt 78c7db1150 Merge branch 'weixin_guange' into develop 2016-04-27 10:36:24 +08:00
cxt 0222038899 缺陷模板消息改为对项目所有人发送、可屏蔽微信模板消息 2016-04-27 10:28:36 +08:00
huang d8f71da1fb 完成模块8配置 2016-04-26 11:01:12 +08:00
huang 255d7e07bc 北斗新界面样式 2016-04-25 18:54:21 +08:00
huang dae6a5ecae 配置八种类型更新 2016-04-25 16:00:52 +08:00
cxt da73d2b004 Merge branch 'cxt_course' into develop 2016-04-22 12:40:20 +08:00
cxt 9b4c275869 作品动态添加追加附件功能 2016-04-22 11:27:30 +08:00
huang cccc2a7eb7 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-21 16:21:49 +08:00
huang ab8c1a0bad Merge branch 'hjq_beidou' into develop 2016-04-21 16:21:39 +08:00
huang e8048f8eb7 完成版本库时间UTC与北京时间的转换 
时间国际化问题
 2016-04-21 10:09:52 +08:00
cxt 06f15735fe Merge branch 'weixin_guange' into develop 2016-04-20 15:15:54 +08:00
cxt ef987d6bf7 模板消息中有html标签 2016-04-20 10:44:54 +08:00
huang ad3d27d6b0 版本库文件目录 2016-04-19 10:21:12 +08:00
huang adc17c5038 代码优化 
文件目录动态获取接口
文件目录显示样式
 2016-04-19 09:34:55 +08:00
huang 7259d607dc Merge branch 'hjq_beidou' into develop 2016-04-18 15:38:11 +08:00
huang 8064fe6c46 讨论区新建帖子代码优化 2016-04-18 15:37:32 +08:00
cxt e5b07c6c12 Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/layouts/new_base_user.html.erb
 2016-04-14 12:33:11 +08:00
cxt 5e1284605f Merge branch 'hjq_beidou' into cxt_course 
Conflicts:
	app/views/layouts/new_base_user.html.erb
 2016-04-14 11:29:26 +08:00
huang acf4e15f09 统计数左侧刷新 2016-04-14 10:26:25 +08:00
cxt 2befcd6634 Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/layouts/new_base_user.html.erb
 2016-04-13 16:52:52 +08:00
cxt 062af3c57a 作业积分出现负分 2016-04-13 16:11:57 +08:00
cxt 70afbb3323 姓名的判断、 2016-04-12 15:46:56 +08:00