nimetu
|
6b0e480d34
|
Merged ryzom/ryzomcore into default
|
2013-10-30 19:14:29 +02:00 |
|
sfb
|
d102aed913
|
merged world editor qt to default
|
2013-10-28 13:03:08 -05:00 |
|
sfb
|
92e9e1c760
|
Bad logging, content is unsigned const char*, fixed it to use %s and not cast.
|
2013-10-28 12:58:08 -05:00 |
|
sfb
|
cd2e07ad28
|
Bad merge resolution, fixed a couple source files which merged poorly.
|
2013-10-28 11:24:31 -05:00 |
|
sfb
|
a6c24e7e75
|
Bad merge resolution, fixed the build files that merged poorly.
|
2013-10-28 11:24:02 -05:00 |
|
Matthew Lagoe
|
f5b74dce88
|
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
|
71b6deeb0a
|
added rrd_graphs directory
|
2013-10-26 20:57:16 -07:00 |
|
Botanic
|
c8ea997493
|
Merge
|
2013-10-26 19:12:27 -07:00 |
|
Botanic
|
c3d6ad9d53
|
config.default.php
|
2013-10-26 03:19:59 -07:00 |
|
Botanic
|
5f4358f0bc
|
added folder placeholders
|
2013-10-26 02:04:54 -07:00 |
|
Botanic
|
157000366a
|
added some hgignore settings
|
2013-10-26 01:11:09 -07:00 |
|
Botanic
|
7d1c1f6dd5
|
fixed bad merge
|
2013-10-26 00:57:50 -07:00 |
|
Botanic
|
8eeb5d19ba
|
Merge
|
2013-10-26 00:50:56 -07:00 |
|
Matthew Lagoe
|
124e16fb6a
|
Merged in botanic/rc-botanic-webdev (pull request #39)
additional fix's for AMS
|
2013-10-25 22:59:57 -07:00 |
|
Matthew Lagoe
|
a95fd69712
|
Merged in rc-botanic-webdev (pull request #1)
additional fix's for AMS
|
2013-10-25 22:55:31 -07:00 |
|
Botanic
|
a327746965
|
added tools dirs to hgignore
|
2013-10-25 22:40:33 -07:00 |
|
Botanic
|
e5e1b2754d
|
Changed installer page to no_visible_elements
|
2013-10-24 21:58:11 -07:00 |
|
Matthew Lagoe
|
df3da6f99b
|
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
|
709c99531d
|
added installer for nel_tool database
|
2013-10-24 20:25:04 -07:00 |
|
Botanic
|
1648796f17
|
fixed css
|
2013-10-24 05:43:38 -07:00 |
|
Botanic
|
c35227c01f
|
made logo clickable
|
2013-10-24 05:03:01 -07:00 |
|
Matthew Lagoe
|
3a917562ff
|
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
|
b403893834
|
fixed more warnings
|
2013-10-24 04:43:42 -07:00 |
|
Botanic
|
3c30a1c03b
|
fixed php warning
|
2013-10-24 04:10:39 -07:00 |
|
Matthew Lagoe
|
84d5e2d0bd
|
Merged in botanic/rc-botanic-webdev/rc-botanic-webdev (pull request #35)
fixed groups etc
|
2013-10-24 02:25:28 -07:00 |
|
Botanic
|
2a6c58cb9c
|
made users a dropdown for adding users to group
|
2013-10-24 02:21:43 -07:00 |
|
Botanic
|
1e875568cb
|
fixed missing </div>
|
2013-10-24 01:25:05 -07:00 |
|
Botanic
|
6ada7d9734
|
Fixed Support Groups
|
2013-10-24 01:12:09 -07:00 |
|
Botanic
|
dee1095984
|
added option for assigned and unassigned ie "both"
|
2013-10-23 23:58:34 -07:00 |
|
Botanic
|
2089c55e37
|
fixed div in settings template
|
2013-10-23 18:35:44 -07:00 |
|
Matthew Lagoe
|
6f97c0ade9
|
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
|
91c7e6d44e
|
fixed some more static non-static warnings
|
2013-10-23 18:26:59 -07:00 |
|
Matthew Lagoe
|
9a6f3ba85d
|
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
|
02e104fc7e
|
fixed missing index errors
|
2013-10-23 18:07:09 -07:00 |
|
Botanic
|
0293dbe5ad
|
fixed groupid if there are no groups
|
2013-10-23 17:12:47 -07:00 |
|
Botanic
|
74aeedc681
|
cleanup sync
|
2013-10-23 17:08:27 -07:00 |
|
Botanic
|
51678eb618
|
fixed static call to non static
|
2013-10-23 17:06:42 -07:00 |
|
Matthew Lagoe
|
85ea923269
|
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
|
5ab5b58649
|
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
|
b1642a8e77
|
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
|
4cb47986bb
|
Implimented lazy cron and fixed syncronize button.
|
2013-10-23 15:06:41 -07:00 |
|
Matthew Lagoe
|
09c4314a05
|
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
|
9d00c795fa
|
merge from default
|
2013-10-23 12:08:09 -05:00 |
|
Botanic
|
2861bd9bef
|
added installing nel db
|
2013-10-22 22:03:33 -07:00 |
|
Botanic
|
ef9adb7dbf
|
Fixed path bugs
|
2013-10-21 23:57:27 -07:00 |
|
Botanic
|
60728d34aa
|
remove install.php from sql
|
2013-10-21 23:31:58 -07:00 |
|
Botanic
|
5d702bf37c
|
added installer
|
2013-10-21 23:31:13 -07:00 |
|
Botanic
|
cfb1115d4e
|
updated TOS url to http://www.gnu.org/licenses/agpl-3.0.html
|
2013-10-21 23:14:26 -07:00 |
|
Botanic
|
53f7b660b5
|
added config.php to hgignore
|
2013-10-21 23:03:12 -07:00 |
|
Botanic
|
53b9d945d8
|
added installer for when database is missing
|
2013-10-21 23:02:01 -07:00 |
|