4056 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
sfb	6f0ff5fc19	merged world editor qt to default	2013-10-28 13:03:08 -05:00
sfb	35cf55adca	Bad logging, content is unsigned const char*, fixed it to use %s and not cast.	2013-10-28 12:58:08 -05:00
sfb	2220c593f5	Bad merge resolution, fixed a couple source files which merged poorly.	2013-10-28 11:24:31 -05:00
sfb	436970dc46	Bad merge resolution, fixed the build files that merged poorly.	2013-10-28 11:24:02 -05:00
Matthew Lagoe	25c7eec853	Merged in botanic/rc-botanic-webdev/rc-botanic-webdev (pull request #43) ... added rrd_graphs directory	2013-10-26 20:59:38 -07:00
Botanic	19086063e2	added rrd_graphs directory	2013-10-26 20:57:16 -07:00
Botanic	5efa0315d6	Merge	2013-10-26 19:12:27 -07:00
Botanic	c50e0cd8a3	config.default.php	2013-10-26 03:19:59 -07:00
Botanic	5b73e366f0	added folder placeholders	2013-10-26 02:04:54 -07:00
Botanic	09a89898f3	added some hgignore settings	2013-10-26 01:11:09 -07:00
Botanic	d467027f11	fixed bad merge	2013-10-26 00:57:50 -07:00
Botanic	906da99801	Merge	2013-10-26 00:50:56 -07:00
Matthew Lagoe	563396d460	Merged in botanic/rc-botanic-webdev (pull request #39) ... additional fix's for AMS	2013-10-25 22:59:57 -07:00
Matthew Lagoe	f9fdbb97f4	Merged in rc-botanic-webdev (pull request #1) ... additional fix's for AMS	2013-10-25 22:55:31 -07:00
Botanic	a984e43be7	added tools dirs to hgignore	2013-10-25 22:40:33 -07:00
Botanic	bf059cccec	Changed installer page to no_visible_elements	2013-10-24 21:58:11 -07:00
Matthew Lagoe	1a55fbb93c	Merged in botanic/rc-botanic-webdev/rc-botanic-webdev (pull request #37) ... Fix's for installer for AMS	2013-10-24 20:27:37 -07:00
Botanic	31a8b188fc	added installer for nel_tool database	2013-10-24 20:25:04 -07:00
Botanic	9640354dd6	fixed css	2013-10-24 05:43:38 -07:00
Botanic	7be3abdb06	made logo clickable	2013-10-24 05:03:01 -07:00
Matthew Lagoe	8bb705d2f9	Merged in botanic/rc-botanic-webdev/rc-botanic-webdev (pull request #36) ... fixed php warnings and errors	2013-10-24 04:45:56 -07:00
Botanic	e3c9670869	fixed more warnings	2013-10-24 04:43:42 -07:00
Botanic	ddb06c7f8c	fixed php warning	2013-10-24 04:10:39 -07:00
Matthew Lagoe	4f9b4a4bd5	Merged in botanic/rc-botanic-webdev/rc-botanic-webdev (pull request #35) ... fixed groups etc	2013-10-24 02:25:28 -07:00
Botanic	aa92d18666	made users a dropdown for adding users to group	2013-10-24 02:21:43 -07:00
Botanic	df0f710e96	fixed missing </div>	2013-10-24 01:25:05 -07:00
Botanic	73dc75fa5b	Fixed Support Groups	2013-10-24 01:12:09 -07:00
Botanic	d47d351122	added option for assigned and unassigned ie "both"	2013-10-23 23:58:34 -07:00
Botanic	32d6f42d29	fixed div in settings template	2013-10-23 18:35:44 -07:00
Matthew Lagoe	4a43ae9ddd	Merged in botanic/rc-botanic-webdev/rc-botanic-webdev (pull request #34) ... fixed some more static non-static warnings	2013-10-23 18:28:43 -07:00
Botanic	f465807b06	fixed some more static non-static warnings	2013-10-23 18:26:59 -07:00
Matthew Lagoe	9ee6e5e4eb	Merged in botanic/rc-botanic-webdev/rc-botanic-webdev (pull request #33) ... fixed php warnings and errors	2013-10-23 18:08:15 -07:00
Botanic	51fdfe97a2	fixed missing index errors	2013-10-23 18:07:09 -07:00
Botanic	c3343a0e0f	fixed groupid if there are no groups	2013-10-23 17:12:47 -07:00
Botanic	d3d406a177	cleanup sync	2013-10-23 17:08:27 -07:00
Botanic	b02584407b	fixed static call to non static	2013-10-23 17:06:42 -07:00
Matthew Lagoe	f8bdbe1b07	Merged in botanic/rc-botanic-webdev/rc-botanic-webdev (pull request #32) ... added fork on linux as well as implimented pid file to check for other running crons	2013-10-23 15:40:57 -07:00
Botanic	8439f8f952	added fork on linux as well as implimented pid file to check for other running crons	2013-10-23 15:26:36 -07:00
Matthew Lagoe	96c9c642a8	Merged in botanic/rc-botanic-webdev/rc-botanic-webdev (pull request #31) ... Implimented lazy cron and fixed syncronize button.	2013-10-23 15:08:21 -07:00
Botanic	7617bd3edc	Implimented lazy cron and fixed syncronize button.	2013-10-23 15:06:41 -07:00
Matthew Lagoe	e85304c042	Merged in botanic/rc-botanic-webdev/rc-botanic-webdev (pull request #30) ... removed 7z and made setup page for AMS	2013-10-23 13:39:58 -07:00
sfb	e9b8e2edba	merge from default	2013-10-23 12:08:09 -05:00
Botanic	1c5480a0e0	added installing nel db	2013-10-22 22:03:33 -07:00
Botanic	b830995450	Fixed path bugs	2013-10-21 23:57:27 -07:00
Botanic	601cbc8fde	remove install.php from sql	2013-10-21 23:31:58 -07:00
Botanic	3c37b2bf13	added installer	2013-10-21 23:31:13 -07:00
Botanic	4e86785fc1	updated TOS url to http://www.gnu.org/licenses/agpl-3.0.html	2013-10-21 23:14:26 -07:00
Botanic	fb37d9a4fb	added config.php to hgignore	2013-10-21 23:03:12 -07:00
Botanic	cbed910d11	added installer for when database is missing	2013-10-21 23:02:01 -07:00
Botanic	96691a1a9b	Moved Android app	2013-10-21 20:05:16 -07:00