4276 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
botanic	fa0262bc0a	Fix syntax error with unassigned ticket	2014-09-03 04:13:44 -07:00
botanic	fb18ee6f54	fixed language when logged in	2014-09-03 04:03:01 -07:00
botanic	ef2477fa23	updated bootstrap and charisma	2014-09-03 03:22:14 -07:00
botanic	e44cd3d40e	updating plugins	2014-09-03 01:28:27 -07:00
botanic	6b484f7cbb	Fix path's in plugins	2014-09-03 01:13:08 -07:00
botanic	f29aa60fc7	fixed change email on shard	2014-09-03 00:23:47 -07:00
botanic	ceb1a30e17	Changed to use new throw new SystemExit();	2014-09-02 23:30:25 -07:00
botanic	6edcdcf65f	Merge	2014-09-02 23:26:53 -07:00
botanic	556f246b81	Fix add user in settings	2014-09-02 23:24:41 -07:00
kaetemi	b691fa9694	Crash workaround	2014-09-03 08:18:21 +02:00
kaetemi	2c2f776f3a	Remove bad data in sql	2014-09-03 07:38:24 +02:00
kaetemi	88ca2ab7e9	Don't cache redirects	2014-09-03 07:36:10 +02:00
kaetemi	37e0201a5f	Throw exception instead of exit.	2014-09-03 07:23:39 +02:00
kaetemi	591a038ad3	Merge	2014-09-03 07:07:55 +02:00
kaetemi	50a3791553	Die, don't exit	2014-09-03 07:06:43 +02:00
botanic	82aaca7eea	Merge	2014-09-02 21:40:10 -07:00
botanic	7b27b580b1	Fix #181	2014-09-02 21:39:35 -07:00
kaetemi	6d98bb0493	Merge	2014-09-03 06:39:20 +02:00
kaetemi	fd59c37eda	Force all user ids equal	2014-09-03 06:38:38 +02:00
botanic	e75cb7fabc	Fix #182	2014-09-02 21:32:48 -07:00
botanic	72db8409a5	Merge	2014-09-02 21:26:09 -07:00
botanic	419f8349dd	settings page display bug	2014-09-02 21:25:39 -07:00
kaetemi	c008e0b46d	Transactions not required here either, actually	2014-09-03 06:16:41 +02:00
kaetemi	4982e7c6c4	Merge	2014-09-03 06:08:08 +02:00
kaetemi	27efa58777	Reduce unnecessary manual transaction commit	2014-09-03 06:07:02 +02:00
botanic	d9a2e44e9e	Merge	2014-09-02 21:04:22 -07:00
botanic	099bce3701	missing )	2014-09-02 21:03:51 -07:00
botanic	220a93a133	updated hgignore as well as fixed php errors	2014-09-02 20:55:51 -07:00
kaetemi	44b8223a5f	Disable connection cache workaround	2014-09-03 05:47:47 +02:00
kaetemi	3f9eb61e07	Don't create transactions for SELECT queries	2014-09-03 05:39:16 +02:00
kaetemi	33d7bf5c15	Fix #180	2014-09-03 05:11:11 +02:00
kaetemi	fdc514b039	Fix #180	2014-09-03 04:46:08 +02:00
kaetemi	011869167d	Only make a single database connection per host, and keep them persistent	2014-09-03 03:51:11 +02:00
kaetemi	379e04dc25	Remove excessive javascript interactivity in AMS	2014-09-03 03:08:57 +02:00
kaetemi	bf7a91b3fc	Some more adjustments for DBLayer...	2014-09-03 03:08:22 +02:00
kaetemi	6fed8bad5b	Re-use the database connection	2014-09-02 20:39:07 +02:00
kaetemi	6acf67d03b	Make login and email unique keys	2014-09-02 20:17:53 +02:00
kaetemi	57781ca616	Remove invalid behaviour with ring databases	2014-09-02 19:56:37 +02:00
kaetemi	6a8e2f314e	Move misleading copyright notices to a more appropriate location	2014-09-02 19:01:15 +02:00
kaetemi	aebaac46c8	Web services setup tool, fix #141	2014-09-02 18:34:09 +02:00
kaetemi	262d9c006b	Move SQL files	2014-09-02 14:36:31 +02:00
kervala	4d50808bfe	Fixed: EOL	2014-08-30 16:21:25 +02:00
kervala	63d62391a7	Changed: Preserve attributes when copying files in Application Bundle	2014-08-30 16:20:36 +02:00
kervala	5e8c5d2102	Changed: Including malloc/malloc.h is useless	2014-08-27 11:21:47 +02:00
kervala	891e0d1bd7	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	05be67e263	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	f601e916bf	Remove warnings, ref #177	2014-08-26 13:48:34 +02:00
kaetemi	d02891b939	Adjust casts, ref #177	2014-08-26 13:33:18 +02:00
kaetemi	429219db7a	Inventory bug workaround, ref #177	2014-08-25 15:32:00 +02:00
kaetemi	119c931738	Link group_wheel.cpp, ref #176	2014-08-25 14:56:29 +02:00