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

12018 Commits

Author SHA1 Message Date
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
guange 7df9fe7d60 Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-06-24 17:37:11 +08:00
guange b5bfe40693 . 2016-06-24 17:35:55 +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
guange 9e61f2229e Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-06-24 17:15:10 +08:00
guange 084b545be9 修改为正式版 2016-06-24 17:14:58 +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
guange 4436e87c84 . 2016-06-24 16:35:27 +08:00
cxt c0e58d19fa 导出的作业成绩中的缺评、迟交扣分应与作品列表的一致 2016-06-24 16:25:29 +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
guange 657e506071 . 2016-06-24 15:45:50 +08:00
guange 9a9f6400da . 2016-06-24 15:42:00 +08:00
guange c522d7160c . 2016-06-24 15:40:27 +08:00
guange 9ec1f916b6 . 2016-06-24 15:38:46 +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
guange 7e2482167d . 2016-06-24 15:31:45 +08:00
guange 16a9f017b6 error 2016-06-24 15:28:44 +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
guange 485d0e3743 ticket处理 2016-06-24 14:59:50 +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
guange d348981721 加入邀请码 2016-06-24 13:29:36 +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
cxt 2959391438 作业列表：没有作业时下拉框被点击后，显示一条记录：目前尚未发布作业 2016-06-24 11:20:48 +08:00
Your Name e17aa4c5d8 color 2016-06-24 11:20:39 +08:00
cxt a41d18dd0e 编程作业的作品详情在顶部增加“收起” 2016-06-24 11:02:29 +08:00
cxt bd3277681c 分组作业的作业成绩导出、学生列表的导出 2016-06-24 10:50:40 +08:00
Your Name 580b232d62 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-06-24 10:47:28 +08:00
Your Name 05eb71036d some css to added 2016-06-24 10:47:24 +08:00
huang a0635bbb2d 所占百分比 2016-06-24 10:47:21 +08:00
huang dcd2aa7848 参考临界值 2016-06-24 10:05:49 +08:00
Your Name e6b263feb5 issues from sonar 2016-06-24 09:58:51 +08:00
guange 52d4d36097 邀请码页面 2016-06-24 09:01:12 +08:00
Your Name 0dc1a1c047 get status 2016-06-23 18:24:22 +08:00
huang eca189335b 统计图 2016-06-23 17:40:27 +08:00
cxt e457593416 作品列表--导出作业成绩：excel中增加缺评扣分、迟交扣分情况 2016-06-23 17:34:46 +08:00
Your Name 53b9cbee72 added hightcharts and added some api for sonar 2016-06-23 17:21:18 +08:00
cxt 8940c5f4ca 禁用匿评的作品列表不应显示“导出匿评情况、导出缺评情况”链接 2016-06-23 15:05:16 +08:00
Your Name 3964631ed1 hight charts 2016-06-23 14:58:09 +08:00
huang 5cf108030f hight char钟表图 2016-06-23 14:48:55 +08:00
cxt 126bf9c195 个人留言、课程留言的二级回复 2016-06-23 14:47:22 +08:00
Your Name 8438bc7bcd somethint to added 2016-06-23 14:31:23 +08:00
huang 723540044d 检测列表页面 2016-06-23 13:59:45 +08:00
huang ad6e3c3364 质量分析权限 2016-06-23 13:52:03 +08:00
Your Name 3fe5d9a1a3 get date froma sonar 2016-06-23 11:24:58 +08:00
huang 9f15a8aa4e 代码质量分析样式 2016-06-22 17:40:13 +08:00
guange d466b09f3f . 2016-06-22 17:20:34 +08:00
Your Name ce6e6116b5 get data from sonar API 2016-06-22 17:09:54 +08:00
guange 1470cafe57 . 2016-06-22 17:09:49 +08:00
guange 9b42b4e7f7 . 2016-06-22 17:04:01 +08:00
guange fc5895e74f . 2016-06-22 17:02:33 +08:00
guange 40217d5c56 . 2016-06-22 16:57:01 +08:00
guange 0929d2ac28 . 2016-06-22 16:48:34 +08:00
guange 7700445c17 加入课程 2016-06-22 16:42:20 +08:00
guange 8129e29d5b . 2016-06-22 12:52:26 +08:00
guange f791f37205 . 2016-06-22 12:36:46 +08:00
guange 5b087179eb . 2016-06-22 12:31:47 +08:00
guange 833c5a5ede . 2016-06-22 12:27:23 +08:00
guange 4663f48496 修改跳转菜单 2016-06-22 12:13:50 +08:00
guange 13273d02de 修正了安全问题，不暴露openid 2016-06-22 12:11:34 +08:00
Your Name 2275fe6d23 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-06-22 11:26:03 +08:00
Your Name 9e7cde6056 stable version for sonar 2016-06-22 11:25:59 +08:00
guange b6892cfc2d 把angularjs换成7牛cdn 2016-06-22 10:00:07 +08:00
huang 494b69c89b sonar数据获取 2016-06-22 09:12:57 +08:00
cxt 1b12c56960 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-06-21 16:53:36 +08:00
cxt 3f8beaf97c 动态回复banner的代码重构 2016-06-21 16:53:31 +08:00
huang dee53a1383 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 
Conflicts:
	app/views/repositories/_quality_analyses.html.erb
 2016-06-21 16:51:58 +08:00
huang e3b6bd19e1 修改质量分支控制器名 2016-06-21 16:50:45 +08:00
Your Name 26b7c3e70b aqulity analysis 2016-06-21 16:46:34 +08:00
Tim fd765b1d73 设置课程大纲弹框js控制 2016-06-21 15:17:24 +08:00
cxt 7e25ec1a00 登录报500 2016-06-21 15:07:37 +08:00
Tim 1a4865be09 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-06-21 15:03:51 +08:00
cxt 44334913ee 未读消息弹窗漏了一条消息 2016-06-21 14:28:26 +08:00
cxt 4a12b56223 Merge branch 'cxt_course' into develop 2016-06-21 13:58:50 +08:00
cxt c4cea93a44 消息列表的“展开更多”指针手势修改 2016-06-21 13:58:17 +08:00
cxt 2176ad1ede Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-21 11:18:37 +08:00
cxt 53614197aa Merge branch 'cxt_course' into develop 2016-06-21 11:18:28 +08:00
cxt 4f80e259e8 消息弹窗的延时显示 2016-06-21 11:16:45 +08:00