 Bob
|
e2c53a6d3c
|
Merge branch 'master' of http://210.77.77.77/xieshen/newmediamonitoring
# Conflicts:
# NewMediaMonitoring/urls.py
|
2020-09-18 14:52:28 +08:00 |
|
Bob
|
80ae500045
|
Merge branch 'master' of http://210.77.77.77/xieshen/newmediamonitoring
# Conflicts:
# NewMediaMonitoring/urls.py
|
2020-09-18 14:46:54 +08:00 |
|
Bob
|
5ce238d69b
|
Merge branch 'master' of http://210.77.77.77/xieshen/newmediamonitoring
# Conflicts:
# NewMediaMonitoring/urls.py
|
2020-09-18 14:46:01 +08:00 |
|
Bob
|
cd4c5a4cdf
|
Merge branch 'master' of http://210.77.77.77/xieshen/newmediamonitoring
# Conflicts:
# NewMediaMonitoring/urls.py
|
2020-09-18 14:43:47 +08:00 |
|
Bob
|
b8cdaf466b
|
Merge branch 'master' of http://210.77.77.77/xieshen/newmediamonitoring
# Conflicts:
# NewMediaMonitoring/urls.py
|
2020-09-18 14:42:55 +08:00 |
 baoliang
|
3f5928a9cf
|
Merge branch 'master' of http://git.eanbo.cn/xieshen/newmediamonitoring
|
2020-09-18 14:03:55 +08:00 |
|
baoliang
|
4c9c1c6eeb
|
refactor message
|
2020-09-18 14:03:50 +08:00 |
|
Bob
|
6d313c3d22
|
Merge branch 'master' of http://210.77.77.77/xieshen/newmediamonitoring
# Conflicts:
# NewMediaMonitoring/urls.py
|
2020-09-18 10:13:55 +08:00 |
|
baoliang
|
c440f1f509
|
add department/post to userprofile
|
2020-09-17 16:23:27 +08:00 |
|
Bob
|
ce4200e9a3
|
#管理
|
2020-09-17 16:10:13 +08:00 |
|
Bob
|
43f392c73b
|
Merge branch 'master' of http://210.77.77.77/xieshen/newmediamonitoring
|
2020-09-13 17:31:22 +08:00 |
|
Bob
|
accbbc42f1
|
#test
|
2020-09-13 17:30:46 +08:00 |
|
baoliang
|
d77416125a
|
remove wagtial
|
2020-09-13 17:30:14 +08:00 |
|
Bob
|
42c9f4ee9c
|
Merge branch 'master' of http://210.77.77.77/xieshen/newmediamonitoring
|
2020-09-13 15:22:41 +08:00 |
|
Bob
|
21aa84f95c
|
#test
|
2020-09-13 15:22:31 +08:00 |
|
baoliang
|
4fdbf84202
|
Merge branch 'master' of http://git.eanbo.cn/xieshen/newmediamonitoring
|
2020-09-13 15:21:31 +08:00 |
|
baoliang
|
081e7daad6
|
add news
|
2020-09-13 15:21:23 +08:00 |
|
Bob
|
f22e365db1
|
Merge remote-tracking branch 'origin/master'
|
2020-09-13 14:20:25 +08:00 |
|
Bob
|
6bca33946e
|
#test
|
2020-09-13 14:20:15 +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
|
a700ea40ec
|
Merge branch 'master' of http://210.77.77.77/xieshen/newmediamonitoring
|
2020-09-13 14:06:30 +08:00 |
|
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 |