Commit Graph

16 Commits

Author SHA1 Message Date
baoliang 1e6da135fe add media feature 2020-09-22 11:48:12 +08:00
baoliang db70dda253 add unit to userprofile 2020-09-20 19:14:54 +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 292c3ee08d add taskaddition 2020-09-18 15:52:06 +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
baoliang 081e7daad6 add news 2020-09-13 15:21:23 +08:00
baoliang 0aaf61a457 add polls 2020-09-12 15:31:50 +08:00
baoliang 70ede8d96f add feature 2020-09-10 01:21:45 +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 95ab5af8a4 merge settings 2020-09-03 12:03:19 +08:00