Commit Graph

32 Commits

Author SHA1 Message Date
baoliang 292c3ee08d add taskaddition 2020-09-18 15:52:06 +08:00
Bob ce4200e9a3 #管理 2020-09-17 16:10:13 +08:00
baoliang d77416125a remove wagtial 2020-09-13 17:30:14 +08:00
baoliang 381dd498c7 Merge branch 'master' of http://git.eanbo.cn/xieshen/newmediamonitoring 2020-09-13 14:07:09 +08:00
baoliang e5bb97a04b add cms model 2020-09-13 14:06:58 +08:00
Bob 83d738f489 #test 2020-09-13 14:06:21 +08:00
baoliang 3ae594d743 add wagtail 2020-09-06 21:44:59 +08:00
baoliang 817ec56f84 change database to nmm 2020-09-03 12:46:34 +08:00
baoliang 95ab5af8a4 merge settings 2020-09-03 12:03:19 +08:00
baoliang 3ea33ec78e merge deploy 2020-09-03 11:02:53 +08:00
baoliang 3116f4bcd0 add chat 2020-09-03 10:56:28 +08:00
xieshen de079fade2 fix deloy 2020-09-03 10:55:44 +08:00
Bob d90770a195 #新媒体舆情 2020-08-29 10:21:12 +08:00
Bob df4aaf1c17 Merge remote-tracking branch '210.77.77.77/master' 2020-08-26 10:11:28 +08:00
Bob ccf4574212 #用户登录、数据库修改 2020-08-26 09:58:16 +08:00
baoliang 8656fc52a1 move mod_wsgi to passenger_wsgi 2020-08-24 22:35:47 +08:00
Bob aa1833d3ab #用户登录、数据库修改 2020-08-23 12:10:37 +08:00
Bob 1aabd1a5c6 #用户登录、数据库修改 2020-08-23 12:06:04 +08:00
wsf fd3520c736 fixed untracked files 2020-08-20 15:38:42 +08:00
Bob d62223cdc0 #新媒体管理 2020-08-20 15:20:26 +08:00
Bob faa2882a73 #新媒体管理 2020-08-20 15:13:33 +08:00
Bob 8df6b476f9 #新媒体管理 2020-08-20 11:52:39 +08:00
Bob 906305ef6a #新媒体管理 2020-08-20 11:34:59 +08:00
Bob 23a09f9079 #新媒体管理 2020-08-20 11:34:37 +08:00
Bob 5001e7a7bf Merge remote-tracking branch '210.77.77.77/master'
# Conflicts:
#	.idea/workspace.xml
2020-08-20 09:13:03 +08:00
Bob 3714c5b465 #新媒体管理 2020-08-20 09:12:20 +08:00
baoliang 3659ffeff7 fixed untracked files 2020-08-19 22:37:31 +08:00
baoliang e1d317a812 fixed untracked files 2020-08-19 18:43:27 +08:00
baoliang e17bbc4f78 add gitignore 2020-08-19 16:06:47 +08:00
baoliang 9ad42779e0 add ignore message 2020-08-19 16:02:30 +08:00
Bob 5e6577bada #create 2020-07-27 17:38:53 +08:00
Bob c53871d9fe #create 2020-07-24 11:01:32 +08:00