Commit Graph

37 Commits

Author SHA1 Message Date
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
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 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
Bob ce4200e9a3 #管理 2020-09-17 16:10:13 +08:00
baoliang d77416125a remove wagtial 2020-09-13 17:30:14 +08:00
baoliang 081e7daad6 add news 2020-09-13 15:21:23 +08:00
baoliang e5bb97a04b add cms model 2020-09-13 14:06:58 +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
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 09871d14cf #新媒体舆情 2020-08-29 10:23:02 +08:00
baoliang a9d3f3e6d4 add user login/password 2020-08-28 00:26:34 +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 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
wsf fd3520c736 fixed untracked files 2020-08-20 15:38:42 +08:00
baoliang b031dab5c5 add polls 2020-08-20 00:39:10 +08:00
baoliang 3659ffeff7 fixed untracked files 2020-08-19 22:37:31 +08:00
baoliang c297c37b70 add token 2020-08-19 22:35:24 +08:00