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 |
cxt
|
1882cd8f4f
|
用户姓名不显示
|
2016-04-12 15:42:59 +08:00 |
guange
|
aa9cb4e579
|
merge
|
2016-04-08 10:44:36 +08:00 |
cxt
|
8f7c6f49b7
|
api的修改
|
2016-04-06 14:56:09 +08:00 |
cxt
|
6c527a9a54
|
点赞的api
|
2016-04-06 11:40:05 +08:00 |
huang
|
2162d7d4b8
|
组织banner上传功能
|
2016-04-06 10:40:38 +08:00 |
Yiang Gan
|
af2bd66847
|
回复api
|
2016-04-01 18:23:12 +08:00 |
Yiang Gan
|
536394663a
|
微信消息模板
|
2016-03-31 20:46:36 +08:00 |
huang
|
f662bfa40b
|
组织科配置
|
2016-03-31 17:06:00 +08:00 |
huang
|
c431658333
|
setting中后台编辑
|
2016-03-31 16:19:59 +08:00 |
huang
|
1ccb3a2c41
|
Merge branch 'hjq_beidou' of http://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
db/schema.rb
|
2016-03-31 15:25:24 +08:00 |
huang
|
c6f6030e10
|
组织新样式
|
2016-03-31 15:25:02 +08:00 |
cxt
|
893fad2b48
|
组织配置里的栏目 “排列做成可编辑的”
|
2016-03-31 15:21:40 +08:00 |
huang
|
bded9f2e98
|
图片自动获取功能
|
2016-03-30 18:35:47 +08:00 |
huang
|
7c55356ace
|
组织新界面修改
|
2016-03-30 17:22:23 +08:00 |
Yiang Gan
|
9cebcfdd2d
|
动态api调整
|
2016-03-30 15:51:27 +08:00 |
Yiang Gan
|
4de598873f
|
动态和作业的api
|
2016-03-30 10:32:45 +08:00 |
huang
|
8a6a1b94ee
|
组织资源的统计与权限
|
2016-03-29 20:09:47 +08:00 |
huang
|
d28a46c48a
|
北斗资源库板块
|
2016-03-29 16:45:14 +08:00 |
huang
|
80cd5089a4
|
Merge branch 'develop' into hjq_beidou
Conflicts:
db/schema.rb
|
2016-03-29 13:51:46 +08:00 |
huang
|
2b9ddf3594
|
组织新版
|
2016-03-29 13:43:28 +08:00 |
cxt
|
ed0eb4aff3
|
学生作品详情无法打开
|
2016-03-29 09:24:11 +08:00 |
huang
|
b8463fcca5
|
北斗
|
2016-03-28 16:51:58 +08:00 |
huang
|
8f0038c3ff
|
tag
|
2016-03-25 17:06:59 +08:00 |
huang
|
dea1c13a64
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/migrate/20160324074942_add_index_to_forge_activities.rb
|
2016-03-25 16:33:22 +08:00 |
alan
|
46951f7af9
|
Merge branch 'develop' into alan_develop
Conflicts:
app/views/student_work/_student_work_list.html.erb
app/views/users/_user_activities.html.erb
app/views/users/_user_message_course.html.erb
|
2016-03-25 16:16:55 +08:00 |
ouyangxuhua
|
b581a13736
|
Merge branch 'develop' into ouyangxuhua
|
2016-03-25 15:32:38 +08:00 |
huang
|
ff2340baf9
|
课程统计信息优化
|
2016-03-25 10:42:26 +08:00 |
huang
|
cb4b26762d
|
课程base优化
|
2016-03-25 09:56:45 +08:00 |
alan
|
13e265b7d2
|
优化 layouts/_user_projects 和 layouts/_user_courses页面
|
2016-03-23 18:25:50 +08:00 |
ouyangxuhua
|
1579a86f9f
|
老师给学生的作品打分后,学生再次编辑,要给老师和助教发消息提示
|
2016-03-23 17:19:25 +08:00 |
alan
|
a165657915
|
Merge branch 'develop' into hjq_new_course
|
2016-03-23 14:03:41 +08:00 |
alan
|
9273e37a5b
|
优化SQL查询:1,members与users表关联查询; 2,blogs表单查询
|
2016-03-23 00:04:53 +08:00 |
linchun
|
6284b8d4f9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-18 16:57:59 +08:00 |