3009 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Botanic	545b6c12b3	Merge with quitta-gsoc-2013	2013-06-15 15:16:57 -07:00
Quitta	a5f6716f88	Basic template integration with css	2013-06-16 00:13:13 +02:00
Quitta	80b64fa9fa	Merge with rc-botanic-webdev	2013-06-15 16:14:50 +02:00
Botanic	55ae58511a	fixed to proper path	2013-06-15 07:11:03 -07:00
Botanic	6b6313fa52	changed to use .php not html	2013-06-15 07:08:38 -07:00
Botanic	ac753b17a0	added charisma	2013-06-15 07:01:11 -07:00
Quitta	4f404ee773	Merge with rc-botanic-webdev	2013-06-13 23:43:58 +02:00
Botanic	80e8daa0be	forgot global	2013-06-13 14:41:58 -07:00
Quitta	55372aef84	Merge with rc-botanic-webdev	2013-06-13 23:36:07 +02:00
Botanic	e657d24824	auto create folders	2013-06-13 14:33:23 -07:00
Quitta	39580a0680	Merge with rc-botanic-webdev	2013-06-10 13:20:42 +02:00
Botanic	aad9d74e40	latest changes to work on getting registration working	2013-06-10 04:17:55 -07:00
Botanic	d476f58a94	updated template for registration and setting up add_user functions	2013-06-07 04:05:28 -07:00
Botanic	80e7f92637	added base drupal module and removed old phtml file	2013-06-06 23:07:47 -07:00
Botanic	931d59d420	cleaned up templates and got languages working	2013-06-06 22:59:11 -07:00
Botanic	f02620b4ff	added in smarty, still need to finish making it load the correct template properly	2013-06-06 21:43:11 -07:00
Quitta	ebf1869a9e	Merge with default	2013-06-06 23:55:04 +02:00
Quitta	fa4f7c5598	Merge with rc-botanic-webdev	2013-06-06 23:54:41 +02:00
Quitta	6777128d98	initial branch creation	2013-06-06 23:53:34 +02:00
Botanic	89ae4f94de	updated files that were not merged	2013-06-06 03:38:24 -07:00
Botanic	1d34a0a467	fixed thanks kervala	2013-06-06 01:28:12 -07:00
Botanic	accab3c755	Merge with rc-botanic-webdev	2013-06-06 02:57:41 -07:00
Botanic	d6e146e864	fixed thanks kervala	2013-06-06 01:28:12 -07:00
Botanic	409376af8d	added in-game template file	2013-06-05 23:39:33 -07:00
Botanic	1b276e849a	added base class file for sql as well as updated users to use class	2013-06-05 23:19:40 -07:00
Botanic	b4ec05e9b3	changed to use class	2013-06-05 23:10:00 -07:00
Botanic	09c1ac3828	added old to hgignore	2013-06-05 23:08:57 -07:00
Botanic	bc25fb664d	initial work on ams_lib	2013-06-05 23:04:46 -07:00
Botanic	c2119e322d	why the hell make the faster values for "debug only" waiting it so 1990's	2013-06-05 19:59:53 -07:00
Botanic	e0bcc7802c	fixed warning	2013-06-05 19:43:10 -07:00
Botanic	82af1c860e	fixed warning	2013-06-05 19:27:06 -07:00
Botanic	e289da824f	no reason to make people change the logs path every time	2013-06-05 19:19:09 -07:00
Botanic	e68ab3ca71	Fixed warnings and logout	2013-06-05 19:14:53 -07:00
Botanic	fe343431a2	No reason to hardcode the path	2013-06-05 19:14:49 -07:00
Botanic	eea5ceaa11	Fixed warnings and logout	2013-06-05 19:14:53 -07:00
Botanic	ba0561766f	no reason to make people change the logs path every time	2013-06-05 19:19:09 -07:00
Botanic	69a12addb2	fixed warning	2013-06-05 19:27:06 -07:00
Botanic	f2b47b2efe	fixed warning	2013-06-05 19:43:10 -07:00
Botanic	6ccf7df354	why the hell make the faster values for "debug only" waiting it so 1990's	2013-06-05 19:59:53 -07:00
Botanic	8eb1a7c88f	bad eol	2013-06-06 02:56:48 -07:00
Botanic	d9e85cba47	No reason to hardcode the path	2013-06-05 19:14:49 -07:00
Botanic	b22b2a174e	bad eol's	2013-06-06 02:47:26 -07:00
dfighter1985	a88a4ad992	FIXED: GUI not showing up because of the interface user functions not getting registered, because of a file linking issue.	2013-06-05 03:29:34 +02:00
dfighter1985	ed0dc8e9b5	Merged client_config_qt.	2013-05-04 22:23:53 +02:00
dfighter1985	3f5d46e8fd	Merged default	2013-05-04 21:56:21 +02:00
dfighter1985	ab7d2c1a53	Use to .toUTF8() instead of .toStdString().	2013-05-04 21:55:41 +02:00
dfighter1985	29793ee97b	Merged default	2013-05-04 21:23:55 +02:00
Dzmitry Kamiahin	7ddd062666	Fixed self-comparsion in ps.	2013-05-04 01:57:53 +03:00
sfb	ff3cc0a05e	merge	2013-05-02 14:38:49 -05:00
kaetemi	a50ffb5de5	This should fix #41. It was creating the unknown for the new type and then returning a new sheet for the requested unknown	2013-05-02 21:37:15 +02:00