Commit Graph

3885 Commits (dc3515592e47ff28712045727c8811ace330125a)
 

Author SHA1 Message Date
sfb d9e2b1bfea merged world editor qt to default 11 years ago
sfb 59abfb8a1d Bad logging, content is unsigned const char*, fixed it to use %s and not cast.
--HG--
branch : gsoc2011-worldeditorqt
11 years ago
sfb df7110d2d6 Bad merge resolution, fixed a couple source files which merged poorly.
--HG--
branch : gsoc2011-worldeditorqt
11 years ago
sfb d86f150caa Bad merge resolution, fixed the build files that merged poorly.
--HG--
branch : gsoc2011-worldeditorqt
11 years ago
Matthew Lagoe 61f021f635 Merged in botanic/rc-botanic-webdev/rc-botanic-webdev (pull request #43)
added rrd_graphs directory
11 years ago
Botanic 9e67d9ea09 added rrd_graphs directory
--HG--
branch : rc-botanic-webdev
11 years ago
Botanic 6de2de2cd8 Merge 11 years ago
Botanic 4c5832204f config.default.php 11 years ago
Botanic 3e692705ea added folder placeholders 11 years ago
Botanic 55fd851648 added some hgignore settings 11 years ago
Botanic 7381de073e fixed bad merge 11 years ago
Botanic 057fe3e0f7 Merge 11 years ago
Matthew Lagoe c3697b9f53 Merged in botanic/rc-botanic-webdev (pull request #39)
additional fix's for AMS
11 years ago
Matthew Lagoe 5f42b877c4 Merged in rc-botanic-webdev (pull request #1)
additional fix's for AMS
11 years ago
Botanic e0d199d052 added tools dirs to hgignore 11 years ago
Botanic b6de1eca23 Changed installer page to no_visible_elements
--HG--
branch : rc-botanic-webdev
11 years ago
Matthew Lagoe 96a64cb395 Merged in botanic/rc-botanic-webdev/rc-botanic-webdev (pull request #37)
Fix's for installer for AMS
11 years ago
Botanic 284884c573 added installer for nel_tool database
--HG--
branch : rc-botanic-webdev
11 years ago
Botanic a3cbd69d3b fixed css
--HG--
branch : rc-botanic-webdev
11 years ago
Botanic 03a1dc39af made logo clickable
--HG--
branch : rc-botanic-webdev
11 years ago
Matthew Lagoe 1de126eb51 Merged in botanic/rc-botanic-webdev/rc-botanic-webdev (pull request #36)
fixed php warnings and errors
11 years ago
Botanic 2d174cf15c fixed more warnings
--HG--
branch : rc-botanic-webdev
11 years ago
Botanic b8fdefe10d fixed php warning
--HG--
branch : rc-botanic-webdev
11 years ago
Matthew Lagoe 36cb9a76e4 Merged in botanic/rc-botanic-webdev/rc-botanic-webdev (pull request #35)
fixed groups etc
11 years ago
Botanic 04619a39a9 made users a dropdown for adding users to group
--HG--
branch : rc-botanic-webdev
11 years ago
Botanic 632a6f2929 fixed missing </div>
--HG--
branch : rc-botanic-webdev
11 years ago
Botanic 91c4784752 Fixed Support Groups
--HG--
branch : rc-botanic-webdev
11 years ago
Botanic 81d1cf93fb added option for assigned and unassigned ie "both"
--HG--
branch : rc-botanic-webdev
11 years ago
Botanic d1913cbfc5 fixed div in settings template
--HG--
branch : rc-botanic-webdev
11 years ago
Matthew Lagoe 0787cb4957 Merged in botanic/rc-botanic-webdev/rc-botanic-webdev (pull request #34)
fixed some more static non-static warnings
11 years ago
Botanic c4e79a8246 fixed some more static non-static warnings
--HG--
branch : rc-botanic-webdev
11 years ago
Matthew Lagoe 89b58b2e4e Merged in botanic/rc-botanic-webdev/rc-botanic-webdev (pull request #33)
fixed php warnings and errors
11 years ago
Botanic 6b266fd808 fixed missing index errors
--HG--
branch : rc-botanic-webdev
11 years ago
Botanic 8ca55f955e fixed groupid if there are no groups
--HG--
branch : rc-botanic-webdev
11 years ago
Botanic 677c8fa251 cleanup sync
--HG--
branch : rc-botanic-webdev
11 years ago
Botanic 3dbb08f1d1 fixed static call to non static
--HG--
branch : rc-botanic-webdev
11 years ago
Matthew Lagoe 09559b3478 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
11 years ago
Botanic 95c5b9e1a8 added fork on linux as well as implimented pid file to check for other running crons
--HG--
branch : rc-botanic-webdev
11 years ago
Matthew Lagoe 8b7917e825 Merged in botanic/rc-botanic-webdev/rc-botanic-webdev (pull request #31)
Implimented lazy cron and fixed syncronize button.
11 years ago
Botanic 72290313a4 Implimented lazy cron and fixed syncronize button.
--HG--
branch : rc-botanic-webdev
11 years ago
Matthew Lagoe 9ed39d1cad Merged in botanic/rc-botanic-webdev/rc-botanic-webdev (pull request #30)
removed 7z and made setup page for AMS
11 years ago
sfb 892ed1ed3d merge from default
--HG--
branch : gsoc2011-worldeditorqt
11 years ago
Botanic 08ee2b8abc added installing nel db
--HG--
branch : rc-botanic-webdev
11 years ago
Botanic 54d13d93d0 Fixed path bugs
--HG--
branch : rc-botanic-webdev
11 years ago
Botanic 16bd70c50a remove install.php from sql
--HG--
branch : rc-botanic-webdev
11 years ago
Botanic fd012e9cda added installer
--HG--
branch : rc-botanic-webdev
11 years ago
Botanic 457f2f703f updated TOS url to http://www.gnu.org/licenses/agpl-3.0.html
--HG--
branch : rc-botanic-webdev
11 years ago
Botanic 39199221a2 added config.php to hgignore
--HG--
branch : rc-botanic-webdev
11 years ago
Botanic 7a7191e981 added installer for when database is missing
--HG--
branch : rc-botanic-webdev
11 years ago
Botanic 32c729f38e Moved Android app
--HG--
branch : rc-botanic-webdev
11 years ago