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 |
|
Botanic
|
39199221a2
|
added config.php to hgignore
--HG--
branch : rc-botanic-webdev
|
2013-10-21 23:03:12 -07:00 |
|
Botanic
|
7a7191e981
|
added installer for when database is missing
--HG--
branch : rc-botanic-webdev
|
2013-10-21 23:02:01 -07:00 |
|
Botanic
|
32c729f38e
|
Moved Android app
--HG--
branch : rc-botanic-webdev
|
2013-10-21 20:05:16 -07:00 |
|
Botanic
|
9d4ae89d49
|
Merge with default
--HG--
branch : rc-botanic-webdev
|
2013-10-21 20:03:01 -07:00 |
|
kervala
|
28b9fbe8bc
|
Changed: Search for default installation paths under Windows
|
2013-10-21 17:50:21 +02:00 |
|
Matt Raykowski
|
0001719d99
|
Merged in DJanssens/quitta-ryzomcore (pull request #25)
Ryzom AMS - GSOC Project
|
2013-10-19 16:02:52 -05:00 |
|
Botanic
|
04221c3696
|
changed to tabs
|
2013-10-18 02:25:48 -07:00 |
|
Botanic
|
31ca25b00b
|
connection failure message if mysql conneciton fails
|
2013-10-18 01:51:30 -07:00 |
|
kervala
|
c180c06d7f
|
Removed: Backup files
|
2013-10-13 13:34:38 +02:00 |
|
kaetemi
|
563afd027c
|
Fix #67 bad NELID in vertex program parser
|
2013-10-06 20:06:53 +02:00 |
|
kervala
|
eb3c58cce9
|
Fixed: Use multiarch library path under Linux
|
2013-09-30 09:11:35 +02:00 |
|
kervala
|
30b0f25587
|
Fixed: server_share needs MySQL headers
|
2013-09-29 20:33:07 +02:00 |
|
kervala
|
652915412f
|
Changed: Link to opengl library
|
2013-09-29 18:11:05 +02:00 |
|
kervala
|
de43ea8d86
|
Fixed: Some warnings
|
2013-09-29 16:26:24 +02:00 |
|