5517 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Griatch	fcd51ec8cb	Another collation scheme test	2019-03-20 18:39:51 +01:00
Griatch	cf82c30653	Add pymysql to travis setup	2019-03-20 10:45:09 +01:00
Griatch	88c5e94d30	Change collation to django recommentation for mysql	2019-03-20 08:47:46 +01:00
Griatch	5bcdc7b030	Type on collate statement for travis	2019-03-20 08:36:22 +01:00
Griatch	3dbfb15bd1	Another collation test for mysql	2019-03-20 08:33:52 +01:00
Griatch	2e9ebd6668	Testing another collation option	2019-03-20 08:21:21 +01:00
Griatch	894e85cd18	Test COLLATE option for mysql in travis	2019-03-20 08:12:15 +01:00
Griatch	b52107a8ff	Test with different py3 sub version	2019-03-20 01:01:27 +01:00
Griatch	a36e87af8b	Run collectstatic without input requested	2019-03-20 00:46:28 +01:00
Griatch	1ab8ff76ef	Fix unit test issue with server name when running from mygame settings	2019-03-20 00:41:23 +01:00
Griatch	d459a9b0da	Some more fixes	2019-03-20 00:26:06 +01:00
Griatch	03b711fcfc	Correctly use custom settings file	2019-03-20 00:15:11 +01:00
Griatch	e7b1d475f1	Debug output from settings file	2019-03-20 00:07:14 +01:00
Griatch	546acbed84	Correct bash structure	2019-03-20 00:01:50 +01:00
Griatch	eeea9434e4	Try different envvar reference form	2019-03-19 23:48:05 +01:00
Griatch	7cadc731b7	Split db config files since envvar does not exist across terminals	2019-03-19 23:44:12 +01:00
Griatch	a5ecb2c8b7	Further cleanup of travis build	2019-03-19 23:29:57 +01:00
Griatch	a69b40e67c	More travis debugging	2019-03-19 23:00:02 +01:00
Griatch	8940157618	Fixing further typos galore	2019-03-19 22:45:40 +01:00
Griatch	a075968291	Further changes to mysql create statement	2019-03-19 22:30:51 +01:00
Griatch	7b93c9e832	Specify mysql dbname explicitly	2019-03-19 22:16:26 +01:00
Griatch	50296317b8	Change to different format of mysql input	2019-03-19 22:11:19 +01:00
Griatch	f856d45698	Split sql db create queries	2019-03-19 22:04:51 +01:00
Griatch	2dd47fd01d	Correct typo in db creation string	2019-03-19 22:00:09 +01:00
Griatch	3b42228de7	Add services to travis file	2019-03-19 21:57:09 +01:00
Griatch	326c3528a9	Move db install to later	2019-03-19 21:52:23 +01:00
Griatch	60d161b2bd	Manage to correctly spell 'postgresql' ...	2019-03-19 21:46:36 +01:00
Griatch	461983b951	Correct travis postgres root user	2019-03-19 21:43:19 +01:00
Griatch	1a84e817a7	Correct python version for travis	2019-03-19 21:30:54 +01:00
Griatch	5c1af403ff	Test to expand travis to test more databases	2019-03-19 21:26:54 +01:00
Griatch	6330228b8d	Solved remaining unittest issues with py3	2019-03-19 19:29:33 +01:00
Griatch	d9fafee2fb	Add model_mummy for mocking model data	2019-03-12 19:15:22 +01:00
Griatch	4cbf9a02be	Start converting latest develop unittests to py3	2019-03-04 23:20:07 +01:00
Griatch	aa8429c535	Fix merge conflicts	2019-03-04 22:32:51 +01:00
Griatch	29437ab946	Merge branch 'master' into develop	2019-03-01 20:54:09 +01:00
Griatch	5c3d30b5d6	Add gettxt to Docker image to support i18n devevelopment.	2019-03-01 16:17:33 +01:00
Griatch	8096130709	Add more unittests for launcher	2019-02-27 00:11:38 +01:00
Griatch	a9dde9bd30	Merge branch 'master' into develop	2019-02-26 21:48:32 +01:00
Griatch	d5bf8a2032	Better docstring when exploring flat api	2019-02-26 16:22:53 +01:00
Griatch	e8869e218e	Start expand launcher unit tests	2019-02-26 14:11:24 +01:00
Griatch	2b14b9a406	Merge branch 'master' into develop	2019-02-24 17:28:04 +01:00
Griatch	9654de0069	Merge pull request #1786 from jaggiJ/typo-fix ... Tutorial. Fixes echo message on lack of argument for mobon command.	2019-02-24 17:27:39 +01:00
jaggiJ	59a1d0e76e	Tutorial. Fixes echo message on lack of argument for mobon command.	2019-02-24 12:47:11 +01:00
Griatch	a7013e3a82	Merge branch 'master' into develop	2019-02-24 12:30:55 +01:00
Griatch	a3240e0998	Merge pull request #1782 from jaggiJ/myfixes ... bugfix: barrel(rack_barrel) description before the barrel is even created	2019-02-24 12:30:04 +01:00
Griatch	87932910d2	Reverting change to audit unittests for now, need to fix later	2019-02-23 23:30:16 +01:00
Griatch	cdf5340c51	Merge branch 'master' into develop	2019-02-23 22:31:29 +01:00
Griatch	dd244e7658	Fix health bar unittest	2019-02-23 22:31:06 +01:00
Griatch	b1af5d94dd	Fix health bar unittest	2019-02-23 22:30:40 +01:00
Griatch	8e4b0f4aec	Merge branch 'master' into develop	2019-02-23 22:11:29 +01:00