Commit Graph

413 Commits

Author SHA1 Message Date
Bob 83d738f489 #test 2020-09-13 14:06:21 +08:00
baoliang 0aaf61a457 add polls 2020-09-12 15:31:50 +08:00
baoliang 9a51ff4ea5 change new media model 2020-09-11 12:27:32 +08:00
Bob 52f1a7fa43 #test 2020-09-11 12:09:48 +08:00
baoliang 70ede8d96f add feature 2020-09-10 01:21:45 +08:00
baoliang 3ae594d743 add wagtail 2020-09-06 21:44:59 +08:00
baoliang 902186cc83 add icon 2020-09-05 05:57:48 +08:00
baoliang fe8e63df7a add media 2020-09-04 22:42:41 +08:00
baoliang 85a8b0f96e modify userprofile 2020-09-03 17:46:04 +08:00
baoliang 817ec56f84 change database to nmm 2020-09-03 12:46:34 +08:00
baoliang 93346770fd remove django_token 2020-09-03 12:07:09 +08:00
baoliang 64d7b5dfec add django_token to requirements.txt 2020-09-03 12:05:24 +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 168c5b7f41 #新媒体舆情 2020-08-29 10:27:51 +08:00
Bob 09871d14cf #新媒体舆情 2020-08-29 10:23:02 +08:00
Bob c62a91992e Merge branch 'master' of http://210.77.77.77/xieshen/newmediamonitoring 2020-08-29 10:21:26 +08:00
Bob d90770a195 #新媒体舆情 2020-08-29 10:21:12 +08:00
baoliang a9d3f3e6d4 add user login/password 2020-08-28 00:26:34 +08:00
Bob df4aaf1c17 Merge remote-tracking branch '210.77.77.77/master' 2020-08-26 10:11:28 +08:00
Bob bfdbe5b4e1 #新媒体舆情 2020-08-26 10:11:04 +08:00
Bob 6766d295a5 #新媒体舆情 2020-08-26 09:59:17 +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
baoliang 3af6aec8fb add polls 2020-08-24 21:43:19 +08:00
Bob aa1833d3ab #用户登录、数据库修改 2020-08-23 12:10:37 +08:00
Bob f355ddbd7c #用户登录、数据库修改 2020-08-23 12:08:36 +08:00
Bob 1aabd1a5c6 #用户登录、数据库修改 2020-08-23 12:06:04 +08:00
Bob 788ff23716 Merge remote-tracking branch '210.77.77.77/master'
# Conflicts:
#	polls/views.py
2020-08-21 08:50:35 +08:00
Bob 2e8820508a #view 2020-08-20 22:53:57 +08:00
baoliang e5ebc32cd7 add register password recover 2020-08-20 18:34:14 +08:00
baoliang 6e100a1a1a add migrate comment 2020-08-20 16:19:46 +08:00
baoliang 2abc988f16 requirements.txt 2020-08-20 16:13:28 +08:00
Bob 23d2d43d3d #view 2020-08-20 15:51:49 +08:00
Bob 4436fdfae5 #view 2020-08-20 15:50:21 +08:00
wsf 47dfab6250 merge 2020-08-20 15:42:38 +08:00
Bob 8abe1a2f5f #新媒体管理 2020-08-20 15:40:07 +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 d39b158b50 #新媒体管理 2020-08-20 11:38:47 +08:00
Bob 906305ef6a #新媒体管理 2020-08-20 11:34:59 +08:00
Bob 23a09f9079 #新媒体管理 2020-08-20 11:34:37 +08:00
Bob c3cb827215 #新媒体管理 2020-08-20 09:14:48 +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
Bob 6db1b15e8a #新媒体管理 2020-08-20 09:10:39 +08:00