 Bob
|
a06a2d1502
|
#更改数据库
|
2020-10-26 08:59:43 +08:00 |
|
Bob
|
d628da4167
|
#更改数据库
|
2020-10-26 08:58:07 +08:00 |
|
Bob
|
a6b389cf78
|
Merge remote-tracking branch 'origin/master'
|
2020-10-26 06:59:00 +08:00 |
|
Bob
|
b136b98d63
|
#更改数据库
|
2020-10-26 06:58:49 +08:00 |
 baoliang
|
79c454d7b5
|
Merge branch 'master' of http://git.eanbo.cn/xieshen/newmediamonitoring
|
2020-10-26 02:11:44 +08:00 |
|
baoliang
|
31622d81e2
|
add message
|
2020-10-26 02:11:34 +08:00 |
|
Bob
|
00341f9dc6
|
Merge remote-tracking branch 'origin/master'
|
2020-10-26 00:01:00 +08:00 |
|
Bob
|
e0245512c9
|
#更改数据库
|
2020-10-26 00:00:52 +08:00 |
|
baoliang
|
5a2529e12e
|
add message
|
2020-10-25 23:59:04 +08:00 |
|
baoliang
|
bb69aa45bd
|
Merge branch 'master' of http://git.eanbo.cn/xieshen/newmediamonitoring
|
2020-10-25 22:56:36 +08:00 |
|
baoliang
|
3967dadc26
|
add message
|
2020-10-25 22:56:33 +08:00 |
|
Bob
|
7d73ac7c22
|
Merge remote-tracking branch 'origin/master'
|
2020-10-25 22:22:35 +08:00 |
|
Bob
|
3a97945bc1
|
#更改数据库
|
2020-10-25 22:22:21 +08:00 |
|
baoliang
|
26ba6c0a36
|
add message
|
2020-10-25 22:18:41 +08:00 |
|
Bob
|
e4c7110163
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# dashboard/models.py
|
2020-10-25 20:35:48 +08:00 |
|
Bob
|
53d832d922
|
#更改数据库
|
2020-10-25 20:33:21 +08:00 |
|
baoliang
|
6e5880f1ff
|
add message
|
2020-10-25 20:01:49 +08:00 |
|
baoliang
|
bc33d76de2
|
Merge branch 'master' of http://git.eanbo.cn/xieshen/newmediamonitoring
|
2020-10-25 19:49:46 +08:00 |
|
baoliang
|
e5ee913548
|
add message
|
2020-10-25 19:49:42 +08:00 |
|
xieshen
|
a32d01b564
|
#修改
|
2020-10-23 12:04:33 +08:00 |
|
Bob
|
b69741bf1e
|
#更改数据库
|
2020-10-23 08:50:51 +08:00 |
|
xieshen
|
c81516a06f
|
#修改
|
2020-10-22 17:41:31 +08:00 |
|
xieshen
|
b4cd130266
|
#修改
|
2020-10-22 15:21:30 +08:00 |
|
xieshen
|
788750aa0a
|
Merge branch 'master' of http://210.77.77.77/xieshen/newmediamonitoring
|
2020-10-22 15:15:37 +08:00 |
|
xieshen
|
008abe7eba
|
#修改
|
2020-10-22 15:15:02 +08:00 |
|
baoliang
|
3466b6c88b
|
add message
|
2020-10-22 12:05:23 +08:00 |
|
baoliang
|
e964957abc
|
add message
|
2020-10-22 00:29:06 +08:00 |
|
baoliang
|
7ce105c332
|
add message
|
2020-10-21 21:37:19 +08:00 |
|
xieshen
|
156e62fa23
|
#修改
|
2020-10-19 11:41:23 +08:00 |
|
xieshen
|
62503b1605
|
#修改
|
2020-10-17 17:12:56 +08:00 |
|
Bob
|
fb2e227824
|
#更改数据库
|
2020-10-15 11:51:00 +08:00 |
|
Bob
|
9a1f2fc207
|
#更改数据库
|
2020-10-15 11:03:23 +08:00 |
|
Bob
|
de3dea2798
|
#更改数据库
|
2020-10-15 09:06:37 +08:00 |
|
xieshen
|
e79398713f
|
#用户注册修改
|
2020-10-14 16:02:25 +08:00 |
|
baoliang
|
cdb3eb216b
|
add message
|
2020-10-13 22:42:50 +08:00 |
|
baoliang
|
1511e875b9
|
add message
|
2020-10-13 22:33:07 +08:00 |
|
Bob
|
84b8ee5a73
|
#手机验证码
|
2020-10-13 21:33:48 +08:00 |
|
xieshen
|
3c976c69d8
|
#用户注册修改
|
2020-10-13 18:13:08 +08:00 |
|
Bob
|
24bcc589b4
|
#zhuce
|
2020-10-13 14:46:15 +08:00 |
|
xieshen
|
5084800861
|
#用户注册修改
|
2020-10-13 10:56:12 +08:00 |
|
baoliang
|
0150bf4f8d
|
add message
|
2020-10-11 01:42:12 +08:00 |
|
baoliang
|
07188d510a
|
Merge branch 'master' of http://git.eanbo.cn/xieshen/newmediamonitoring
|
2020-10-10 22:44:26 +08:00 |
|
baoliang
|
85c9958a59
|
add task record
|
2020-10-10 22:44:15 +08:00 |
|
xieshen
|
8f50a5cd32
|
#功能修改
|
2020-10-10 15:54:36 +08:00 |
|
baoliang
|
4dc1ff018a
|
add group profile
|
2020-10-10 15:46:04 +08:00 |
|
baoliang
|
65b8c1227d
|
Merge branch 'master' of http://git.eanbo.cn/xieshen/newmediamonitoring
|
2020-10-09 20:09:21 +08:00 |
|
baoliang
|
1b41271a9c
|
refact groupuser
|
2020-10-09 20:09:15 +08:00 |
|
Bob
|
de6670e3ab
|
Merge remote-tracking branch 'origin/master'
|
2020-10-09 09:42:20 +08:00 |
|
Bob
|
ead258943d
|
#监测
|
2020-10-09 09:42:05 +08:00 |
|
baoliang
|
ef4f9d7004
|
add message
|
2020-10-08 15:12:48 +08:00 |
|
Bob
|
3ec3dd1d64
|
Merge remote-tracking branch 'origin/master'
|
2020-09-30 20:30:02 +08:00 |
|
Bob
|
4fd60cc84d
|
#监测
|
2020-09-30 20:29:10 +08:00 |
|
baoliang
|
290a2021ce
|
add reject value
|
2020-09-30 16:02:29 +08:00 |
|
Bob
|
7c25ed8b69
|
#qq
|
2020-09-29 10:48:26 +08:00 |
|
Bob
|
7f776a7ce6
|
#qq
|
2020-09-29 09:49:28 +08:00 |
|
Bob
|
3820e367a9
|
#qq
|
2020-09-26 12:07:48 +08:00 |
|
Bob
|
ed2b213592
|
Merge remote-tracking branch 'origin/master'
|
2020-09-24 14:38:22 +08:00 |
|
Bob
|
2bf9bf052f
|
#qq
|
2020-09-24 14:37:12 +08:00 |
|
baoliang
|
57723444cf
|
add feature
|
2020-09-23 17:47:05 +08:00 |
|
baoliang
|
1e6da135fe
|
add media feature
|
2020-09-22 11:48:12 +08:00 |
|
Bob
|
8f35e873a2
|
Merge remote-tracking branch 'origin/master'
|
2020-09-20 19:22:57 +08:00 |
|
Bob
|
6d6726d21f
|
#qq
|
2020-09-20 19:21:13 +08:00 |
|
baoliang
|
d22da90872
|
add unit
|
2020-09-20 19:20:19 +08:00 |
|
baoliang
|
db70dda253
|
add unit to userprofile
|
2020-09-20 19:14:54 +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 |
|
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
|
accbbc42f1
|
#test
|
2020-09-13 17:30:46 +08:00 |
|
Bob
|
21aa84f95c
|
#test
|
2020-09-13 15:22:31 +08:00 |
|
Bob
|
6bca33946e
|
#test
|
2020-09-13 14:20:15 +08:00 |
|
Bob
|
83d738f489
|
#test
|
2020-09-13 14:06:21 +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
|
fe8e63df7a
|
add media
|
2020-09-04 22:42:41 +08:00 |
|
baoliang
|
85a8b0f96e
|
modify userprofile
|
2020-09-03 17:46:04 +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
|
bfdbe5b4e1
|
#新媒体舆情
|
2020-08-26 10:11:04 +08:00 |
|
Bob
|
ccf4574212
|
#用户登录、数据库修改
|
2020-08-26 09:58:16 +08:00 |
|
Bob
|
1aabd1a5c6
|
#用户登录、数据库修改
|
2020-08-23 12:06:04 +08:00 |
|
Bob
|
2e8820508a
|
#view
|
2020-08-20 22:53:57 +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
|
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
|
9ad42779e0
|
add ignore message
|
2020-08-19 16:02:30 +08:00 |
|
Bob
|
c1497188fa
|
#新媒体管理
|
2020-08-19 10:35:55 +08:00 |
|
Bob
|
fd293ce05c
|
#新媒体管理
|
2020-08-17 18:23:42 +08:00 |
|
Bob
|
fbd99ad1d3
|
#单位管理，群组管理，用户管理
|
2020-08-13 17:55:52 +08:00 |
|
Bob
|
5e6577bada
|
#create
|
2020-07-27 17:38:53 +08:00 |
|
Bob
|
c53871d9fe
|
#create
|
2020-07-24 11:01:32 +08:00 |