ibuler
							
						 
					 | 
					
						
						
							
						
						8e7226d9dc
					 | 
					
						
						
							
							pref: change run_server script
						
						
						
						
						
						
					 | 
					
						2022-09-21 14:09:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ibuler
							
						 
					 | 
					
						
						
							
						
						d8e614c54d
					 | 
					
						
						
							
							[Update] 管理脚本
						
						
						
						
						
						
					 | 
					
						2018-03-19 11:26:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ibuler
							
						 
					 | 
					
						
						
							
						
						2ab26e25cc
					 | 
					
						
						
							
							[Update] 改为supervisor启动
						
						
						
						
						
						
					 | 
					
						2018-03-16 10:43:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								calmzhu
							
						 
					 | 
					
						
						
							
						
						5193ba2e39
					 | 
					
						
						
							
							Update run server.py (#915)
						
						
						
						
						
						
						
						Fix  for not callable error when  config.py not exists 
						
						
					 | 
					
						2018-02-25 20:09:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ibuler
							
						 
					 | 
					
						
						
							
						
						5eef584c7d
					 | 
					
						
						
							
							[Bugfix] 解决打印print失败问题,原因在于运行docker没有tty,也可以添加PYTHONIOENCODING环境变量解决
						
						
						
						
						
						
					 | 
					
						2018-01-01 23:45:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ibuler
							
						 
					 | 
					
						
						
							
						
						f4a39aba00
					 | 
					
						
						
							
							[Debug] 无法print中文
						
						
						
						
						
						
					 | 
					
						2018-01-01 22:00:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ibuler
							
						 
					 | 
					
						
						
							
						
						3300d20c1c
					 | 
					
						
						
							
							[Update] 修改beat 启动,判断pid文件是否存在
						
						
						
						
						
						
					 | 
					
						2018-01-01 21:04:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ibuler
							
						 
					 | 
					
						
						
							
						
						edcafa7275
					 | 
					
						
						
							
							[Update] 修改运行 beat方式
						
						
						
						
						
						
					 | 
					
						2018-01-01 20:54:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ibuler
							
						 
					 | 
					
						
						
							
						
						0b299344a7
					 | 
					
						
						
							
							[Update] 修改database 表现
						
						
						
						
						
						
					 | 
					
						2017-12-31 12:20:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ibuler
							
						 
					 | 
					
						
						
							
						
						7558c2b3e4
					 | 
					
						
						
							
							[Debug] debug print error
						
						
						
						
						
						
					 | 
					
						2017-12-30 23:02:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ibuler
							
						 
					 | 
					
						
						
							
						
						ddd18e10e0
					 | 
					
						
						
							
							[Debug] debug print error
						
						
						
						
						
						
					 | 
					
						2017-12-30 22:53:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ibuler
							
						 
					 | 
					
						
						
							
						
						a755882100
					 | 
					
						
						
							
							[Bugfix] 修复打印中文报错异常
						
						
						
						
						
						
					 | 
					
						2017-12-30 22:26:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ibuler
							
						 
					 | 
					
						
						
							
						
						6586bef84c
					 | 
					
						
						
							
							[Modify] Add access log
						
						
						
						
						
						
					 | 
					
						2017-12-30 20:45:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ibuler
							
						 
					 | 
					
						
						
							
						
						3804ab532d
					 | 
					
						
						
							
							[Update] 修改信号
						
						
						
						
						
						
					 | 
					
						2017-12-29 23:53:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ibuler
							
						 
					 | 
					
						
						
							
						
						b6b0d6a9be
					 | 
					
						
						
							
							[bugfix] Beat start failed, rm pidfile
						
						
						
						
						
						
					 | 
					
						2017-12-28 14:34:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ibuler
							
						 
					 | 
					
						
						
							
						
						f58c45f7be
					 | 
					
						
						
							
							[Update] 修改run celery
						
						
						
						
						
						
					 | 
					
						2017-12-28 11:39:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ibuler
							
						 
					 | 
					
						
						
							
						
						84fa7b5f17
					 | 
					
						
						
							
							[Bugfix] 修改启动脚本,celery beat可能不存在
						
						
						
						
						
						
					 | 
					
						2017-12-28 10:52:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ibuler
							
						 
					 | 
					
						
						
							
						
						8e9ad7d645
					 | 
					
						
						
							
							[Update] 修改runserver运行
						
						
						
						
						
						
					 | 
					
						2017-12-28 01:18:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ibuler
							
						 
					 | 
					
						
						
							
						
						3d705dbeaa
					 | 
					
						
						
							
							[Bugfix] 修复一些bug
						
						
						
						
						
						
					 | 
					
						2017-12-27 00:14:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ibuler
							
						 
					 | 
					
						
						
							
						
						a39e0a1db9
					 | 
					
						
						
							
							[Docker] For docker update
						
						
						
						
						
						
					 | 
					
						2017-12-26 01:54:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ibuler
							
						 
					 | 
					
						
						
							
						
						f4beccddae
					 | 
					
						
						
							
							[Update] 修改注册流程
						
						
						
						
						
						
					 | 
					
						2017-12-25 12:22:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ibuler
							
						 
					 | 
					
						
						
							
						
						8b081cd6b0
					 | 
					
						
						
							
							[Update] 修改 运行脚本
						
						
						
						
						
						
					 | 
					
						2017-12-25 00:36:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ibuler
							
						 
					 | 
					
						
						
							
						
						d0ef1e715e
					 | 
					
						
						
							
							[Add] Add initial migrations
						
						
						
						
						
						
					 | 
					
						2017-12-24 23:21:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ibuler
							
						 
					 | 
					
						
						
							
						
						bf9bb1b973
					 | 
					
						
						
							
							[Update] 修改ops task运行
						
						
						
						
						
						
					 | 
					
						2017-12-24 18:53:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ibuler
							
						 
					 | 
					
						
						
							
						
						30efec1b09
					 | 
					
						
						
							
							[Update] 修改 task 运行机制
						
						
						
						
						
						
					 | 
					
						2017-12-22 21:42:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ibuler
							
						 
					 | 
					
						
						
							
						
						4893c4664d
					 | 
					
						
						
							
							[Update] 修改task定时运行机制
						
						
						
						
						
						
					 | 
					
						2017-12-22 02:08:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ibuler
							
						 
					 | 
					
						
						
							
						
						a320b9e05e
					 | 
					
						
						
							
							[Bugfix] 兼容py3
						
						
						
						
						
						
					 | 
					
						2017-04-07 19:11:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ibuler
							
						 
					 | 
					
						
						
							
						
						92ebe85a3f
					 | 
					
						
						
							
							[Fixture] 详情页添加system user 推送
						
						
						
						
						
						
					 | 
					
						2017-04-05 19:09:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ibuler
							
						 
					 | 
					
						
						
							
						
						240c7db416
					 | 
					
						
						
							
							[Fixture] 添加 rerun function
						
						
						
						
						
						
					 | 
					
						2017-03-14 14:15:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ibuler
							
						 
					 | 
					
						
						
							
						
						a822f667af
					 | 
					
						
						
							
							[Fixture] 完成用户推送task
						
						
						
						
						
						
					 | 
					
						2017-03-09 14:55:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ibuler
							
						 
					 | 
					
						
						
							
						
						ab62bfca7e
					 | 
					
						
						
							
							[Bugfix] 修改一些bug
						
						
						
						
						
						
					 | 
					
						2017-03-04 16:38:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ibuler
							
						 
					 | 
					
						
						
							
						
						9c6c6d6b4c
					 | 
					
						
						
							
							[Feature] 添加Dockerfile
						
						
						
						
						
						
					 | 
					
						2017-01-07 20:07:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Administrator
							
						 
					 | 
					
						
						
							
						
						1bc88e5b11
					 | 
					
						
						
							
							Merge branch 'ansible_api' into ops_dev
						
						
						
						
						
						
						
						# Conflicts:
#	apps/jumpserver/urls.py
#	apps/locale/zh/LC_MESSAGES/django.po
#	apps/templates/_nav.html
#	requirements.txt
#	run_server.py 
						
						
					 | 
					
						2016-11-24 18:22:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Administrator
							
						 
					 | 
					
						
						
							
						
						c289d6a4c5
					 | 
					
						
						
							
							Merge branch 'ansible_api' into ops_dev
						
						
						
						
						
						
						
						# Conflicts:
#	apps/jumpserver/urls.py
#	apps/locale/zh/LC_MESSAGES/django.po
#	apps/templates/_nav.html
#	requirements.txt
#	run_server.py 
						
						
					 | 
					
						2016-11-24 17:57:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ibuler
							
						 
					 | 
					
						
						
							
						
						419876b575
					 | 
					
						
						
							
							Update heatbeat
						
						
						
						
						
						
					 | 
					
						2016-11-13 22:34:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ibuler
							
						 
					 | 
					
						
						
							
						
						47090eb0f7
					 | 
					
						
						
							
							update some user api
						
						
						
						
						
						
					 | 
					
						2016-11-09 23:49:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Administrator
							
						 
					 | 
					
						
						
							
						
						97d7e6cb9b
					 | 
					
						
						
							
							[future] 修改celery 使用eventlet 作为concurrent pool, 添加获取资产硬件信息的 初步接口
						
						
						
						
						
						
					 | 
					
						2016-10-28 17:28:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ibuler
							
						 
					 | 
					
						
						
							
						
						246fcb8efa
					 | 
					
						
						
							
							Modify run_server.py
						
						
						
						
						
						
					 | 
					
						2016-09-04 19:10:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ibuler
							
						 
					 | 
					
						
						
							
						
						10d51ada37
					 | 
					
						
						
							
							Update login error message
						
						
						
						
						
						
					 | 
					
						2016-09-03 00:39:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ibuler
							
						 
					 | 
					
						
						
							
						
						dcff84958f
					 | 
					
						
						
							
							Add run development server script: run_server.py
						
						
						
						
						
						
					 | 
					
						2016-09-01 23:10:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ibuler
							
						 
					 | 
					
						
						
							
						
						3a9cf6c360
					 | 
					
						
						
							
							Add forget password and reset password
						
						
						
						
						
						
					 | 
					
						2016-09-01 23:09:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |