Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity
3657 commits 14 branches 1 tag 255 MiB
Commit graph

3657 commits

This branch
This branch
All branches
Author SHA1 Message Date
Botanic
6dfafa7ae1 Merge 2013-11-02 16:35:26 -07:00
kervala
588d262dbf Fixed: MFC can't be found 2013-10-30 20:46:19 +01:00
nimetu
5080e466fc Merged ryzom/ryzomcore into default 2013-10-30 19:14:29 +02:00
sfb
d9e2b1bfea merged world editor qt to default 2013-10-28 13:03:08 -05:00
sfb
59abfb8a1d Bad logging, content is unsigned const char*, fixed it to use %s and not cast. 
--HG--
branch : gsoc2011-worldeditorqt
 2013-10-28 12:58:08 -05:00
sfb
df7110d2d6 Bad merge resolution, fixed a couple source files which merged poorly. 
--HG--
branch : gsoc2011-worldeditorqt
 2013-10-28 11:24:31 -05:00
sfb
d86f150caa Bad merge resolution, fixed the build files that merged poorly. 
--HG--
branch : gsoc2011-worldeditorqt
 2013-10-28 11:24:02 -05:00
Matthew Lagoe
61f021f635 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
9e67d9ea09 added rrd_graphs directory 
--HG--
branch : rc-botanic-webdev
 2013-10-26 20:57:16 -07:00
Botanic
6de2de2cd8 Merge 2013-10-26 19:12:27 -07:00
Botanic
4c5832204f config.default.php 2013-10-26 03:19:59 -07:00
Botanic
3e692705ea added folder placeholders 2013-10-26 02:04:54 -07:00
Botanic
55fd851648 added some hgignore settings 2013-10-26 01:11:09 -07:00
Botanic
7381de073e fixed bad merge 2013-10-26 00:57:50 -07:00
Botanic
057fe3e0f7 Merge 2013-10-26 00:50:56 -07:00
Matthew Lagoe
c3697b9f53 Merged in botanic/rc-botanic-webdev (pull request #39) 
additional fix's for AMS
 2013-10-25 22:59:57 -07:00
Matthew Lagoe
5f42b877c4 Merged in rc-botanic-webdev (pull request #1) 
additional fix's for AMS
 2013-10-25 22:55:31 -07:00
Botanic
e0d199d052 added tools dirs to hgignore 2013-10-25 22:40:33 -07:00
Botanic
b6de1eca23 Changed installer page to no_visible_elements 
--HG--
branch : rc-botanic-webdev
 2013-10-24 21:58:11 -07:00
Matthew Lagoe
96a64cb395 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
284884c573 added installer for nel_tool database 
--HG--
branch : rc-botanic-webdev
 2013-10-24 20:25:04 -07:00
Botanic
a3cbd69d3b fixed css 
--HG--
branch : rc-botanic-webdev
 2013-10-24 05:43:38 -07:00
Botanic
03a1dc39af made logo clickable 
--HG--
branch : rc-botanic-webdev
 2013-10-24 05:03:01 -07:00
Matthew Lagoe
1de126eb51 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
2d174cf15c fixed more warnings 
--HG--
branch : rc-botanic-webdev
 2013-10-24 04:43:42 -07:00
Botanic
b8fdefe10d fixed php warning 
--HG--
branch : rc-botanic-webdev
 2013-10-24 04:10:39 -07:00
Matthew Lagoe
36cb9a76e4 Merged in botanic/rc-botanic-webdev/rc-botanic-webdev (pull request #35) 
fixed groups etc
 2013-10-24 02:25:28 -07:00
Botanic
04619a39a9 made users a dropdown for adding users to group 
--HG--
branch : rc-botanic-webdev
 2013-10-24 02:21:43 -07:00
Botanic
632a6f2929 fixed missing </div> 
--HG--
branch : rc-botanic-webdev
 2013-10-24 01:25:05 -07:00
Botanic
91c4784752 Fixed Support Groups 
--HG--
branch : rc-botanic-webdev
 2013-10-24 01:12:09 -07:00
Botanic
81d1cf93fb added option for assigned and unassigned ie "both" 
--HG--
branch : rc-botanic-webdev
 2013-10-23 23:58:34 -07:00
Botanic
d1913cbfc5 fixed div in settings template 
--HG--
branch : rc-botanic-webdev
 2013-10-23 18:35:44 -07:00
Matthew Lagoe
0787cb4957 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
c4e79a8246 fixed some more static non-static warnings 
--HG--
branch : rc-botanic-webdev
 2013-10-23 18:26:59 -07:00
Matthew Lagoe
89b58b2e4e 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
6b266fd808 fixed missing index errors 
--HG--
branch : rc-botanic-webdev
 2013-10-23 18:07:09 -07:00
Botanic
8ca55f955e fixed groupid if there are no groups 
--HG--
branch : rc-botanic-webdev
 2013-10-23 17:12:47 -07:00
Botanic
677c8fa251 cleanup sync 
--HG--
branch : rc-botanic-webdev
 2013-10-23 17:08:27 -07:00
Botanic
3dbb08f1d1 fixed static call to non static 
--HG--
branch : rc-botanic-webdev
 2013-10-23 17:06:42 -07:00
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
 2013-10-23 15:40:57 -07:00
Botanic
95c5b9e1a8 added fork on linux as well as implimented pid file to check for other running crons 
--HG--
branch : rc-botanic-webdev
 2013-10-23 15:26:36 -07:00
Matthew Lagoe
8b7917e825 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
72290313a4 Implimented lazy cron and fixed syncronize button. 
--HG--
branch : rc-botanic-webdev
 2013-10-23 15:06:41 -07:00
Matthew Lagoe
9ed39d1cad 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
892ed1ed3d merge from default 
--HG--
branch : gsoc2011-worldeditorqt
 2013-10-23 12:08:09 -05:00
Botanic
08ee2b8abc added installing nel db 
--HG--
branch : rc-botanic-webdev
 2013-10-22 22:03:33 -07:00
Botanic
54d13d93d0 Fixed path bugs 
--HG--
branch : rc-botanic-webdev
 2013-10-21 23:57:27 -07:00
Botanic
16bd70c50a remove install.php from sql 
--HG--
branch : rc-botanic-webdev
 2013-10-21 23:31:58 -07:00
Botanic
fd012e9cda added installer 
--HG--
branch : rc-botanic-webdev
 2013-10-21 23:31:13 -07:00
Botanic
457f2f703f updated TOS url to http://www.gnu.org/licenses/agpl-3.0.html 
--HG--
branch : rc-botanic-webdev
 2013-10-21 23:14:26 -07:00