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

9175 Commits

Author SHA1 Message Date
cxt 0ff8f0a774 课程大纲的删除和课程大纲描述的删除 2016-07-01 16:25:52 +08:00
cxt 25b5d74a42 课程大纲的修改 2016-07-01 15:25:30 +08:00
cxt afe16cc99c 课程大纲列表的js调整 2016-07-01 14:13:40 +08:00
Tim def0d79271 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	app/views/users/_user_syllabus_list.html.erb
 2016-07-01 13:56:07 +08:00
Tim 7633761bbe 课程大纲列表展开收起js 2016-07-01 13:54:00 +08:00
cxt 3b7679b254 课程大纲列表 2016-07-01 11:29:03 +08:00
cxt a50e15b2ab Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	app/views/users/_user_syllabus_list.html.erb
	db/schema.rb
 2016-07-01 11:15:03 +08:00
cxt 2c1e0f534c 课程大纲 2016-07-01 11:11:53 +08:00
Tim 10f52f110f 课程大纲列表点击展开收起，配置按钮链接跳转实现 2016-06-30 16:12:25 +08:00
cxt ac4218bfb0 课程大纲列表 2016-06-30 15:36:46 +08:00
cxt ebb697a49f 班级列表、课程大纲的编辑、回复、课程列表 2016-06-30 10:44:11 +08:00
cxt e066445036 课程大纲的显示和编辑 2016-06-29 10:45:56 +08:00
cxt 383483de26 课程大纲的左侧栏base，新建课程大纲、新建班级的调整 2016-06-28 15:13:04 +08:00
huang 46cde061a6 Merge branch 'rep_quality' into develop 
Conflicts:
	db/schema.rb
	public/stylesheets/project.css
	public/stylesheets/public.css
 2016-06-24 19:17:26 +08:00
Your Name c658296e2b config 2016-06-24 19:12:07 +08:00
cxt f984a01cdc 跳转协议问题 2016-06-24 18:50:47 +08:00
Your Name 537f152562 0 2016-06-24 18:47:54 +08:00
cxt 8d5501615c 加入课程的样式调整 2016-06-24 18:09:18 +08:00
cxt 492b2f895c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-24 17:58:56 +08:00
cxt 4f342142e6 组织文章的展开更多 2016-06-24 17:58:50 +08:00
Your Name e5ad64831a 0 2016-06-24 17:50:26 +08:00
huang 6bc4dec636 列表界面 2016-06-24 17:46:21 +08:00
Your Name 244c178758 666 2016-06-24 17:39:10 +08:00
yuanke e3c094cb07 Merge branch 'yuanke' into develop 2016-06-24 17:19:25 +08:00
yuanke f1682edf64 修改创建贴吧BUG 2016-06-24 17:18:04 +08:00
cxt b2f939fa92 代码调整 2016-06-24 17:01:35 +08:00
cxt 0611ddcc43 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/users/_reply_to.html.erb
 2016-06-24 16:54:19 +08:00
guange 2c2e1892e5 Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-06-24 16:53:58 +08:00
cxt 76e7c50bf4 Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/users/_reply_to.html.erb
 2016-06-24 16:52:00 +08:00
guange c39a982093 二维码 2016-06-24 16:51:40 +08:00
cxt eab000306c 动态回复的展开更多、收起，组织文章回复不可用 2016-06-24 16:38:36 +08:00
Your Name eae70f9c71 some config 2016-06-24 16:18:17 +08:00
cxt d558a4d357 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-06-24 16:12:31 +08:00
cxt afc8fad7fd 通过邀请码加入课程 2016-06-24 16:12:24 +08:00
Tim a542ba46a4 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-06-24 15:55:07 +08:00
Tim ec33569033 取消拖拽 2016-06-24 15:54:56 +08:00
huang 4ea210a05b 重复改成代码重复 2016-06-24 15:46:04 +08:00
cxt 260759e4db Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-06-24 15:36:03 +08:00
guange da09983f9e Merge branch 'weixin_guange' into cxt_course 2016-06-24 15:34:32 +08:00
cxt ac629440b1 课程邀请码 2016-06-24 15:33:45 +08:00
huang 09b78fc546 中文 2016-06-24 15:13:09 +08:00
yuanke c6be37020f Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/users/_reply_to.html.erb
 2016-06-24 15:11:52 +08:00
Your Name 06fe02890f index for sonar result 2016-06-24 14:59:17 +08:00
yuanke c61c14fa97 Merge branch 'yuanke' into develop 2016-06-24 14:35:59 +08:00
yuanke 86a5eccae6 组织设置中添加成员BUG解决 2016-06-24 14:16:39 +08:00
yuanke 64d87b7398 修改组织添加成员的BUG 2016-06-24 13:50:28 +08:00
Your Name 128f6721be stoped the zhizhen 2016-06-24 13:00:02 +08:00
Your Name de80403e8d add address to config 2016-06-24 12:38:39 +08:00
Your Name e4e0e7b166 helper 2016-06-24 12:17:05 +08:00
yuanke 2a971c3bc6 修改有的组织添加成员的BUG 2016-06-24 11:24:48 +08:00