Commit Graph

19597 Commits

Author SHA1 Message Date
Jasder d37e026d68 FIX create project revision 2019-11-12 17:23:38 +08:00
Jasder 69bdb65ec7 ADD init some licenses and ignores 2019-11-12 16:53:04 +08:00
Jasder 5466b44757 ADD some fields to projects table 2019-11-12 15:36:36 +08:00
Jasder b8557840c8 ADD model Ignore 2019-11-12 15:30:22 +08:00
Jasder 3b22ad0a54 ADD model License 2019-11-12 15:27:59 +08:00
Jasder 4f8e992fb1 Merge branch 'dev-homepage-revision' into dev_project_new 2019-11-12 10:32:37 +08:00
Jasder 36a11d9690 ADD trustie home edit 2019-11-12 10:20:26 +08:00
Jasder 33cc2f2b15 FIX 众包学习平台更改为'众包标注平台' 2019-11-11 17:03:21 +08:00
Jasder 30becc226c FIX delete file 2019-11-11 16:26:13 +08:00
Jasder 3ec29f29c0 FIX educoder plateform url bug 2019-11-11 16:25:46 +08:00
caishi 06e60fc853 fix 2019-11-11 15:40:45 +08:00
Jasder 01b0f6beea Merge branch 'dev_project_new' of http://git.trustie.net/jacknudt/trustieforge into dev_project_new 2019-11-11 14:35:51 +08:00
caishi 0bce630c8c 项目主页 2019-11-11 09:20:56 +08:00
Jasder 49bbefac2e FIX created_on sort 2019-11-08 23:16:54 +08:00
Jasder 3b8f5eb906 FIX bug 2019-11-08 23:12:19 +08:00
Jasder ba663b26ab FIX gemfile version bug 2019-11-08 18:12:54 +08:00
Jasder b4bca51a85 Merge branch 'dev-homepage-revision' of http://git.trustie.net/jacknudt/trustieforge into dev-homepage-revision 2019-11-08 18:02:00 +08:00
Jasder a46ae51006 ADD project list and search by name 2019-11-08 18:01:48 +08:00
Jasder ce0d1e5f2e ADD ransack gem 2019-11-08 18:01:28 +08:00
Jasder dd0fafe533 ADD some field to projects table 2019-11-08 18:01:04 +08:00
caishi 04236f338c lost 2019-11-08 11:47:05 +08:00
caishi 29e65d2f1c 博客 2019-11-07 18:09:18 +08:00
caishi a8510bb4da 博客 2019-11-07 18:08:53 +08:00
caishi 97d90bdcd4 项目新建页面改版 2019-11-07 15:48:43 +08:00
Jasder 65ebeaed25 ADD model ProjectLanguage and associations 2019-11-07 11:31:45 +08:00
Jasder edd8780607 ADD a tree structure to model ProjectCategory 2019-11-07 11:20:42 +08:00
Jasder d16faf40af ADD model ProjectCategory 2019-11-07 11:15:41 +08:00
SylorHuang 6180774d9b Merge branch 'dev-homepage-revision' of http://git.trustie.net/jacknudt/trustieforge into dev-homepage-revision 2019-11-07 09:04:39 +08:00
SylorHuang 82956b37dd 消息的部分优化 2019-11-07 09:04:33 +08:00
Jasder dce8c2f776 FIX change homes_path 2019-11-06 17:57:44 +08:00
SylorHuang 5a061f1ca2 private_messages 页面新增loading图标 2019-11-06 14:56:42 +08:00
SylorHuang 2c0e26499e Merge branch 'dev_new_head' into dev-homepage-revision 2019-11-06 14:41:46 +08:00
SylorHuang 7f29a13fab add myimgh48 css 2019-11-06 14:41:30 +08:00
SylorHuang b988cb0a54 Merge branch 'dev_new_head' into dev-homepage-revision 2019-11-06 14:35:46 +08:00
SylorHuang 8d55788cd0 个人主页待办事项及底部的部分信息 2019-11-06 14:27:35 +08:00
caishi bfcc9c6b38 nyan 2019-11-04 15:26:54 +08:00
caishi b0ecc9f819 nyan 2019-11-04 15:25:22 +08:00
caishi 61b844dfd4 个人主页左侧 2019-11-04 15:05:13 +08:00
caishi ce3792b219 Merge branch 'dev-homepage-revision' of http://git.trustie.net/jacknudt/trustieforge into dev_new_head
# Conflicts:
#	app/views/users/_user_message_left.html.erb
2019-11-04 14:59:18 +08:00
Jasder b4a8cfc363 FIX merge 2019-11-04 14:55:22 +08:00
caishi 8cce8438a1 Merge branch 'dev-homepage-revision' into dev_new_head
# Conflicts:
#	app/views/users/_user_message_left.html.erb
2019-11-04 14:37:41 +08:00
Jasder 17b9c06027 FIX only show read messages count 2019-11-01 17:27:48 +08:00
Jasder 21dfac44ab FIX 解决KE编辑器导致Latex公式显示不正常的bug -MathJax 2019-11-01 16:14:26 +08:00
Jasder da73c34c5a Merge branch 'dev-homepage-revision' of http://git.trustie.net/jacknudt/trustieforge into dev-homepage-revision 2019-11-01 11:07:09 +08:00
Jasder ade760d2dd ADD blog url 2019-11-01 11:04:54 +08:00
SylorHuang 9523a8304e 私信添加提醒 2019-10-30 09:44:40 +08:00
SylorHuang 4555eba8e7 私信的功能完成 2019-10-29 19:03:37 +08:00
SylorHuang 14353bceb6 私信的页面的完成 2019-10-29 19:01:56 +08:00
caishi 96816ffb5d 待办事项页面 2019-10-29 17:32:35 +08:00
caishi 3ab74de0eb Merge branch 'dev-homepage-revision' into dev_new_head 2019-10-29 11:25:01 +08:00