 Bob
|
f20318af67
|
#qq
|
2020-09-25 22:16:56 +08:00 |
|
Bob
|
8a54c0ea48
|
#qq
|
2020-09-25 22:15:45 +08:00 |
 baoliang
|
1d4417d438
|
add feature
|
2020-09-24 14:51:39 +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
|
cfc32c37ee
|
add jsonwebsocket
|
2020-09-22 15:39:33 +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 |
|
baoliang
|
f47cfb0e50
|
refactor message
|
2020-09-19 00:15:12 +08:00 |
|
baoliang
|
7847c45289
|
refactor message
|
2020-09-19 00:11:19 +08:00 |
|
baoliang
|
4dbfe71f70
|
add message
|
2020-09-18 19:09:51 +08:00 |
|
baoliang
|
0c6f2d31f6
|
fix bug
|
2020-09-18 18:26:57 +08:00 |
|
baoliang
|
89109ed6db
|
add taskaddition
|
2020-09-18 15:52:57 +08:00 |
|
baoliang
|
2d7967b990
|
Merge branch 'master' of http://git.eanbo.cn/xieshen/newmediamonitoring
|
2020-09-18 15:52:22 +08:00 |
|
baoliang
|
292c3ee08d
|
add taskaddition
|
2020-09-18 15:52:06 +08:00 |
|
Bob
|
3e8a507c7d
|
Merge remote-tracking branch 'origin/master'
|
2020-09-18 14:53:22 +08:00 |
|
Bob
|
a2787eeaa0
|
Merge branch 'master' of http://210.77.77.77/xieshen/newmediamonitoring
# Conflicts:
# NewMediaMonitoring/urls.py
|
2020-09-18 14:52:56 +08:00 |
|
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 |