4276 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
botanic	f7d338bdf6	Fix syntax error with unassigned ticket	2014-09-03 04:13:44 -07:00
botanic	8e46cd7ab9	fixed language when logged in	2014-09-03 04:03:01 -07:00
botanic	f15d151fbd	updated bootstrap and charisma	2014-09-03 03:22:14 -07:00
botanic	f21fa61d5f	updating plugins	2014-09-03 01:28:27 -07:00
botanic	e373874bbf	Fix path's in plugins	2014-09-03 01:13:08 -07:00
botanic	912a15c1bd	fixed change email on shard	2014-09-03 00:23:47 -07:00
botanic	e2882d1b9f	Changed to use new throw new SystemExit();	2014-09-02 23:30:25 -07:00
botanic	fe8cb3595a	Merge	2014-09-02 23:26:53 -07:00
botanic	ea9324bd51	Fix add user in settings	2014-09-02 23:24:41 -07:00
kaetemi	54435b9258	Crash workaround	2014-09-03 08:18:21 +02:00
kaetemi	7edf900a2e	Remove bad data in sql	2014-09-03 07:38:24 +02:00
kaetemi	9c26f8e345	Don't cache redirects	2014-09-03 07:36:10 +02:00
kaetemi	41e0baca84	Throw exception instead of exit.	2014-09-03 07:23:39 +02:00
kaetemi	7a62843aee	Merge	2014-09-03 07:07:55 +02:00
kaetemi	71302bf982	Die, don't exit	2014-09-03 07:06:43 +02:00
botanic	441ede1cad	Merge	2014-09-02 21:40:10 -07:00
botanic	b081d97b3c	Fix #181	2014-09-02 21:39:35 -07:00
kaetemi	d9dac55a28	Merge	2014-09-03 06:39:20 +02:00
kaetemi	f920da3873	Force all user ids equal	2014-09-03 06:38:38 +02:00
botanic	c13264c207	Fix #182	2014-09-02 21:32:48 -07:00
botanic	5c63089b0a	Merge	2014-09-02 21:26:09 -07:00
botanic	5d6a38ec16	settings page display bug	2014-09-02 21:25:39 -07:00
kaetemi	2b2ffb8052	Transactions not required here either, actually	2014-09-03 06:16:41 +02:00
kaetemi	5954b96813	Merge	2014-09-03 06:08:08 +02:00
kaetemi	41385c3b8c	Reduce unnecessary manual transaction commit	2014-09-03 06:07:02 +02:00
botanic	a533354df8	Merge	2014-09-02 21:04:22 -07:00
botanic	110b36dd4a	missing )	2014-09-02 21:03:51 -07:00
botanic	dee11a74c9	updated hgignore as well as fixed php errors	2014-09-02 20:55:51 -07:00
kaetemi	d4423d956f	Disable connection cache workaround	2014-09-03 05:47:47 +02:00
kaetemi	a120179e75	Don't create transactions for SELECT queries	2014-09-03 05:39:16 +02:00
kaetemi	3ddf42f0ef	Fix #180	2014-09-03 05:11:11 +02:00
kaetemi	04ef076448	Fix #180	2014-09-03 04:46:08 +02:00
kaetemi	978c09b029	Only make a single database connection per host, and keep them persistent	2014-09-03 03:51:11 +02:00
kaetemi	75c5232dcf	Remove excessive javascript interactivity in AMS	2014-09-03 03:08:57 +02:00
kaetemi	340fae54ed	Some more adjustments for DBLayer...	2014-09-03 03:08:22 +02:00
kaetemi	afe03367d9	Re-use the database connection	2014-09-02 20:39:07 +02:00
kaetemi	dfc65485ec	Make login and email unique keys	2014-09-02 20:17:53 +02:00
kaetemi	2bc60334c1	Remove invalid behaviour with ring databases	2014-09-02 19:56:37 +02:00
kaetemi	b64ab2c828	Move misleading copyright notices to a more appropriate location	2014-09-02 19:01:15 +02:00
kaetemi	75dc4fc779	Web services setup tool, fix #141	2014-09-02 18:34:09 +02:00
kaetemi	b500066026	Move SQL files	2014-09-02 14:36:31 +02:00
kervala	3625818283	Fixed: EOL	2014-08-30 16:21:25 +02:00
kervala	687927ba10	Changed: Preserve attributes when copying files in Application Bundle	2014-08-30 16:20:36 +02:00
kervala	f57380f19b	Changed: Including malloc/malloc.h is useless	2014-08-27 11:21:47 +02:00
kervala	bb324e80b4	Fixed: Use ...ARBPROC declarations for ARB_occlusion_query (to fix a conflict with official OpenGL headers under Mac OS X)	2014-08-27 11:19:20 +02:00
kervala	8d3ea38ffc	Fixed: Compilation under Mac OS X (malloc is already aligned on 16 bytes and memalign doesn't exist)	2014-08-27 11:16:30 +02:00
kaetemi	4402e2134c	Remove warnings, ref #177	2014-08-26 13:48:34 +02:00
kaetemi	031cd3b68d	Adjust casts, ref #177	2014-08-26 13:33:18 +02:00
kaetemi	2a27139594	Inventory bug workaround, ref #177	2014-08-25 15:32:00 +02:00
kaetemi	573fb44088	Link group_wheel.cpp, ref #176	2014-08-25 14:56:29 +02:00