Apex Liu
							
						 | 
						
							
							
							
							
								
							
								669fc79eae
								
							
								
							
						 | 
						
							
							
								
								temp.
							
							
							
							
							
						 | 
						
							2017-04-06 18:46:58 +08:00 | 
						
					
				
					
						
							
							
								 
								Apex Liu
							
						 | 
						
							
							
							
							
								
							
								60432f04ae
								
							
								
							
						 | 
						
							
							
								
								remove unnecessary code.
							
							
							
							
							
						 | 
						
							2017-04-05 19:24:08 +08:00 | 
						
					
				
					
						
							
							
								 
								apexliu
							
						 | 
						
							
							
							
							
								
							
								2f315c558b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev'
							
							
							
							
							
							
							
							# Conflicts:
#	build/builder/build-external.py
#	build/builder/build-server.py
#	server/.idea/server.iml 
							
						 | 
						
							2017-04-05 03:44:11 +08:00 | 
						
					
				
					
						
							
							
								 
								apexliu
							
						 | 
						
							
							
							
							
								
							
								f80e12c244
								
							
								
							
						 | 
						
							
							
								
								准备发布版本v2.1.2.1。
							
							
							
							
							
						 | 
						
							2017-03-30 04:39:03 +08:00 | 
						
					
				
					
						
							
							
								 
								apexliu
							
						 | 
						
							
							
							
							
								
							
								61c1b69cd9
								
							
								
							
						 | 
						
							
							
								
								修正web播放录像时的录像文件路径,避免core服务设置了非默认重放文件路径后web出现找不到文件的问题。
							
							
							
							
							
						 | 
						
							2017-03-29 02:56:05 +08:00 | 
						
					
				
					
						
							
							
								 
								apexliu
							
						 | 
						
							
							
							
							
								
							
								349d679742
								
							
								
							
						 | 
						
							
							
								
								fixme: win全新安装并初始化数据库后,必须重启web服务,否则数据库访问总是会失败。
							
							
							
							
							
						 | 
						
							2017-03-28 01:55:29 +08:00 | 
						
					
				
					
						
							
							
								 
								apexliu
							
						 | 
						
							
							
							
							
								
							
								c473b1973b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of github.com:eomsoft/teleport into dev
							
							
							
							
							
							
							
							# Conflicts:
#	server/tp_core/core/main.cpp
#	server/tp_core/core/ts_env.cpp
#	server/tp_core/core/ts_env.h
#	server/www/teleport/app/eom_app/app/db.py 
							
						 | 
						
							2017-03-28 01:16:30 +08:00 | 
						
					
				
					
						
							
							
								 
								Apex Liu
							
						 | 
						
							
							
							
							
								
							
								b3a617614e
								
							
								
							
						 | 
						
							
							
								
								works on linux now.
							
							
							
							
							
						 | 
						
							2017-03-27 17:10:26 +00:00 | 
						
					
				
					
						
							
							
								 
								apexliu
							
						 | 
						
							
							
							
							
								
							
								9af9964330
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of github.com:eomsoft/teleport into dev
							
							
							
							
							
						 | 
						
							2017-03-27 21:29:20 +08:00 | 
						
					
				
					
						
							
							
								 
								apexliu
							
						 | 
						
							
							
							
							
								
							
								91b0d0bfb2
								
							
								
							
						 | 
						
							
							
								
								temp.
							
							
							
							
							
						 | 
						
							2017-03-27 11:54:28 +00:00 | 
						
					
				
					
						
							
							
								 
								apexliu
							
						 | 
						
							
							
							
							
								
							
								914c8be91e
								
							
								
							
						 | 
						
							
							
								
								temp.
							
							
							
							
							
						 | 
						
							2017-03-27 11:52:35 +00:00 | 
						
					
				
					
						
							
							
								 
								Apex Liu
							
						 | 
						
							
							
							
							
								
							
								e535dc4f02
								
							
								
							
						 | 
						
							
							
								
								Update README.md
							
							
							
							
							
						 | 
						
							2017-03-27 07:01:33 +08:00 | 
						
					
				
					
						
							
							
								 
								apexliu
							
						 | 
						
							
							
							
							
								
							
								a592da9626
								
							
								
							
						 | 
						
							
							
								
								修复调整路径带来的小bug。
							
							
							
							
							
						 | 
						
							2017-03-27 05:11:47 +08:00 | 
						
					
				
					
						
							
							
								 
								apexliu
							
						 | 
						
							
							
							
							
								
							
								d3c581a857
								
							
								
							
						 | 
						
							
							
								
								fixme: Windows版本的web服务有问题,一旦从服务管理器中停止,就会自动被删除。
							
							
							
							
							
						 | 
						
							2017-03-27 03:20:51 +08:00 | 
						
					
				
					
						
							
							
								 
								Apex Liu
							
						 | 
						
							
							
							
							
								
							
								38c7f2ad97
								
							
								
							
						 | 
						
							
							
								
								fixme: core on linux, can not found core.ini after install.
							
							
							
							
							
						 | 
						
							2017-03-26 19:12:15 +00:00 | 
						
					
				
					
						
							
							
								 
								apexliu
							
						 | 
						
							
							
							
							
								
							
								08876be3dc
								
							
								
							
						 | 
						
							
							
								
								temp.
							
							
							
							
							
						 | 
						
							2017-03-27 01:30:07 +08:00 | 
						
					
				
					
						
							
							
								 
								Apex Liu
							
						 | 
						
							
							
							
							
								
							
								685cd29edf
								
							
								
							
						 | 
						
							
							
								
								temp.
							
							
							
							
							
						 | 
						
							2017-03-26 16:24:23 +00:00 | 
						
					
				
					
						
							
							
								 
								Apex Liu
							
						 | 
						
							
							
							
							
								
							
								3d4ae79fbb
								
							
								
							
						 | 
						
							
							
								
								temp.
							
							
							
							
							
						 | 
						
							2017-03-24 18:34:34 +00:00 | 
						
					
				
					
						
							
							
								 
								Apex Liu
							
						 | 
						
							
							
							
							
								
							
								9b42a75e62
								
							
								
							
						 | 
						
							
							
								
								temp.
							
							
							
							
							
						 | 
						
							2017-03-24 18:31:09 +00:00 | 
						
					
				
					
						
							
							
								 
								apexliu
							
						 | 
						
							
							
							
							
								
							
								bff60a1f74
								
							
								
							
						 | 
						
							
							
								
								当前数据库版本升级到5,但是升级脚本还需要调整:原来各个表的前缀是ts_,应该保持不变,从v5开始,配置表的名称改为tp_前缀,下一个版本v6则进一步将所有表的前缀改为tp_并且调整字段名称(去除不必要的字段名称前缀)。
							
							
							
							
							
						 | 
						
							2017-03-23 01:51:36 +08:00 | 
						
					
				
					
						
							
							
								 
								Apex Liu
							
						 | 
						
							
							
							
							
								
							
								ba44d6c951
								
							
								
							
						 | 
						
							
							
								
								temp.
							
							
							
							
							
						 | 
						
							2017-03-22 14:16:41 +08:00 | 
						
					
				
					
						
							
							
								 
								apexliu
							
						 | 
						
							
							
							
							
								
							
								1d665769ee
								
							
								
							
						 | 
						
							
							
								
								temp.
							
							
							
							
							
						 | 
						
							2017-03-22 02:13:57 +08:00 | 
						
					
				
					
						
							
							
								 
								apexliu
							
						 | 
						
							
							
							
							
								
							
								2cada368e6
								
							
								
							
						 | 
						
							
							
								
								逐步调整const常量在各个模块中的统一。
							
							
							
							
							
						 | 
						
							2017-03-21 01:19:08 +08:00 | 
						
					
				
					
						
							
							
								 
								apexliu
							
						 | 
						
							
							
							
							
								
							
								738a5cf01e
								
							
								
							
						 | 
						
							
							
								
								temp
							
							
							
							
							
						 | 
						
							2017-03-20 08:47:00 +08:00 | 
						
					
				
					
						
							
							
								 
								ApexLiu
							
						 | 
						
							
							
							
							
								
							
								e80d27c1a3
								
							
								
							
						 | 
						
							
							
								
								升级向导简单测试通过。下一步调整数据表中的字段名(表中的字段名无需加表名称前缀),且将所有操作数据库的地方改为使用新的封装类的方式,为将来支持mysql做准备。
							
							
							
							
							
						 | 
						
							2017-03-19 11:44:09 +08:00 | 
						
					
				
					
						
							
							
								 
								ApexLiu
							
						 | 
						
							
							
							
							
								
							
								112cf02146
								
							
								
							
						 | 
						
							
							
								
								安装和升级向导功能完成,开始测试。
							
							
							
							
							
						 | 
						
							2017-03-19 10:34:39 +08:00 | 
						
					
				
					
						
							
							
								 
								apexliu
							
						 | 
						
							
							
							
							
								
							
								9b59d6ec99
								
							
								
							
						 | 
						
							
							
								
								temp.
							
							
							
							
							
						 | 
						
							2017-03-18 01:34:36 +08:00 | 
						
					
				
					
						
							
							
								 
								Apex Liu
							
						 | 
						
							
							
							
							
								
							
								8a04467e2a
								
							
								
							
						 | 
						
							
							
								
								WEB方式安装向导功能完成,可以从零架设TELEPORT服务了。下一步是升级向导。
							
							
							
							
							
						 | 
						
							2017-03-17 19:15:48 +08:00 | 
						
					
				
					
						
							
							
								 
								apexliu
							
						 | 
						
							
							
							
							
								
							
								054deb839e
								
							
								
							
						 | 
						
							
							
								
								working...
							
							
							
							
							
						 | 
						
							2017-03-17 02:34:45 +08:00 | 
						
					
				
					
						
							
							
								 
								Apex Liu
							
						 | 
						
							
							
							
							
								
							
								f142793394
								
							
								
							
						 | 
						
							
							
								
								temp.
							
							
							
							
							
						 | 
						
							2017-03-16 18:45:31 +08:00 | 
						
					
				
					
						
							
							
								 
								Apex Liu
							
						 | 
						
							
							
							
							
								
							
								61512f287c
								
							
								
							
						 | 
						
							
							
								
								temp.
							
							
							
							
							
						 | 
						
							2017-03-15 17:59:41 +00:00 | 
						
					
				
					
						
							
							
								 
								Apex Liu
							
						 | 
						
							
							
							
							
								
							
								32bea1a67d
								
							
								
							
						 | 
						
							
							
								
								fix bug #10.
							
							
							
							
							
						 | 
						
							2017-03-15 17:57:21 +00:00 | 
						
					
				
					
						
							
							
								 
								Apex Liu
							
						 | 
						
							
							
							
							
								
							
								4af43622d7
								
							
								
							
						 | 
						
							
							
								
								temp.
							
							
							
							
							
						 | 
						
							2017-03-15 18:20:26 +08:00 | 
						
					
				
					
						
							
							
								 
								apexliu
							
						 | 
						
							
							
							
							
								
							
								c7cd8ba1b8
								
							
								
							
						 | 
						
							
							
								
								use libssh-0.7.4 but not the last master branch(still with some bugs).
							
							
							
							
							
						 | 
						
							2017-03-15 18:17:02 +08:00 | 
						
					
				
					
						
							
							
								 
								apexliu
							
						 | 
						
							
							
							
							
								
							
								0e75018a2b
								
							
								
							
						 | 
						
							
							
								
								temp.
							
							
							
							
							
						 | 
						
							2017-03-15 01:24:01 +08:00 | 
						
					
				
					
						
							
							
								 
								Apex Liu
							
						 | 
						
							
							
							
							
								
							
								63b0ad026a
								
							
								
							
						 | 
						
							
							
								
								temp.
							
							
							
							
							
						 | 
						
							2017-03-14 18:36:21 +08:00 | 
						
					
				
					
						
							
							
								 
								apexliu
							
						 | 
						
							
							
							
							
								
							
								09176d78f9
								
							
								
							
						 | 
						
							
							
								
								调整了无数据库、有数据库等情况下普通用户登录与管理员登录时进入维护界面的流程,下一步可以开始开发安装和升级的实际操作界面了。
							
							
							
							
							
						 | 
						
							2017-03-13 23:39:16 +08:00 | 
						
					
				
					
						
							
							
								 
								apexliu
							
						 | 
						
							
							
							
							
								
							
								ac88e72630
								
							
								
							
						 | 
						
							
							
								
								try to add database interface.
							
							
							
							
							
						 | 
						
							2017-03-13 04:49:18 +08:00 | 
						
					
				
					
						
							
							
								 
								apexliu
							
						 | 
						
							
							
							
							
								
							
								9b50a624e0
								
							
								
							
						 | 
						
							
							
								
								整理代码,准备加入安装/升级界面。
							
							
							
							
							
						 | 
						
							2017-03-13 03:01:23 +08:00 | 
						
					
				
					
						
							
							
								 
								apexliu
							
						 | 
						
							
							
							
							
								
							
								4b594ed274
								
							
								
							
						 | 
						
							
							
								
								now we can make final installer package of teleport server for windows with zip format.
							
							
							
							
							
						 | 
						
							2017-03-12 13:02:38 +08:00 | 
						
					
				
					
						
							
							
								 
								apexliu
							
						 | 
						
							
							
							
							
								
							
								f88a21a2b0
								
							
								
							
						 | 
						
							
							
								
								add script to install teleport server on Windows.
							
							
							
							
							
						 | 
						
							2017-03-11 17:23:22 +08:00 | 
						
					
				
					
						
							
							
								 
								Apex Liu
							
						 | 
						
							
							
							
							
								
							
								b90d24e42d
								
							
								
							
						 | 
						
							
							
								
								fix assist memory leak. installer script works with NSIS 3.0.1.
							
							
							
							
							
						 | 
						
							2017-03-10 14:22:04 +08:00 | 
						
					
				
					
						
							
							
								 
								apexliu
							
						 | 
						
							
							
							
							
								
							
								858b24f5c1
								
							
								
							
						 | 
						
							
							
								
								Now we can build everything of teleport on Windows by build script.
							
							
							
							
							
						 | 
						
							2017-03-10 03:31:57 +08:00 | 
						
					
				
					
						
							
							
								 
								apexliu
							
						 | 
						
							
							
							
							
								
							
								d6054ce4a1
								
							
								
							
						 | 
						
							
							
								
								remove unnecessary files, we will generate from download files.
							
							
							
							
							
						 | 
						
							2017-03-10 03:28:43 +08:00 | 
						
					
				
					
						
							
							
								 
								Apex Liu
							
						 | 
						
							
							
							
							
								
							
								be218571c2
								
							
								
							
						 | 
						
							
							
								
								temp.
							
							
							
							
							
						 | 
						
							2017-03-09 17:33:41 +08:00 | 
						
					
				
					
						
							
							
								 
								apexliu
							
						 | 
						
							
							
							
							
								
							
								35569651a3
								
							
								
							
						 | 
						
							
							
								
								temp.
							
							
							
							
							
						 | 
						
							2017-03-09 04:04:01 +08:00 | 
						
					
				
					
						
							
							
								 
								Apex Liu
							
						 | 
						
							
							
							
							
								
							
								83e9b9439e
								
							
								
							
						 | 
						
							
							
								
								temp.
							
							
							
							
							
						 | 
						
							2017-03-08 19:12:37 +08:00 | 
						
					
				
					
						
							
							
								 
								Apex Liu
							
						 | 
						
							
							
							
							
								
							
								86af784330
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of github.com:eomsoft/teleport into dev
							
							
							
							
							
							
							
							# Conflicts:
#	server/www/teleport/app/eom_app/module/record.py 
							
						 | 
						
							2017-03-08 14:27:44 +08:00 | 
						
					
				
					
						
							
							
								 
								Apex Liu
							
						 | 
						
							
							
							
							
								
							
								455e1b534d
								
							
								
							
						 | 
						
							
							
								
								update libssh to 0.7.4.
							
							
							
							
							
						 | 
						
							2017-03-08 14:24:58 +08:00 | 
						
					
				
					
						
							
							
								 
								apexliu
							
						 | 
						
							
							
							
							
								
							
								2d171e0942
								
							
								
							
						 | 
						
							
							
								
								temp.
							
							
							
							
							
						 | 
						
							2017-03-08 03:28:38 +08:00 |