Commit graph

166 commits

Author SHA1 Message Date
botanic
c968a95734 margins in element-style...really? 2014-09-03 05:05:21 -07:00
botanic
12ccb08de2 fix #185 2014-09-03 05:00:36 -07:00
botanic
071530251e Merge 2014-09-03 04:42:54 -07:00
botanic
9855aecc25 fix support group bug and dblayer bug 2014-09-03 04:42:28 -07:00
Matthew Lagoe
617b5f84f0 Merged in shubham_meena/ryzomcore (pull request #71)
documentation for doxygen containing plugin management system
2014-09-03 04:15:02 -07:00
botanic
f7d338bdf6 Fix syntax error with unassigned ticket 2014-09-03 04:13:44 -07:00
botanic
8e46cd7ab9 fixed language when logged in 2014-09-03 04:03:01 -07:00
botanic
f15d151fbd updated bootstrap and charisma 2014-09-03 03:22:14 -07:00
botanic
f21fa61d5f updating plugins 2014-09-03 01:28:27 -07:00
botanic
e373874bbf Fix path's in plugins 2014-09-03 01:13:08 -07:00
botanic
912a15c1bd fixed change email on shard 2014-09-03 00:23:47 -07:00
botanic
e2882d1b9f Changed to use new throw new SystemExit(); 2014-09-02 23:30:25 -07:00
botanic
fe8cb3595a Merge 2014-09-02 23:26:53 -07:00
botanic
ea9324bd51 Fix add user in settings 2014-09-02 23:24:41 -07:00
kaetemi
54435b9258 Crash workaround 2014-09-03 08:18:21 +02:00
kaetemi
7edf900a2e Remove bad data in sql 2014-09-03 07:38:24 +02:00
kaetemi
9c26f8e345 Don't cache redirects 2014-09-03 07:36:10 +02:00
kaetemi
41e0baca84 Throw exception instead of exit. 2014-09-03 07:23:39 +02:00
kaetemi
7a62843aee Merge 2014-09-03 07:07:55 +02:00
kaetemi
71302bf982 Die, don't exit 2014-09-03 07:06:43 +02:00
botanic
441ede1cad Merge 2014-09-02 21:40:10 -07:00
botanic
b081d97b3c Fix #181 2014-09-02 21:39:35 -07:00
kaetemi
d9dac55a28 Merge 2014-09-03 06:39:20 +02:00
kaetemi
f920da3873 Force all user ids equal 2014-09-03 06:38:38 +02:00
botanic
c13264c207 Fix #182 2014-09-02 21:32:48 -07:00
botanic
5c63089b0a Merge 2014-09-02 21:26:09 -07:00
botanic
5d6a38ec16 settings page display bug 2014-09-02 21:25:39 -07:00
kaetemi
2b2ffb8052 Transactions not required here either, actually 2014-09-03 06:16:41 +02:00
kaetemi
5954b96813 Merge 2014-09-03 06:08:08 +02:00
kaetemi
41385c3b8c Reduce unnecessary manual transaction commit 2014-09-03 06:07:02 +02:00
botanic
a533354df8 Merge 2014-09-02 21:04:22 -07:00
botanic
110b36dd4a missing ) 2014-09-02 21:03:51 -07:00
botanic
dee11a74c9 updated hgignore as well as fixed php errors 2014-09-02 20:55:51 -07:00
kaetemi
d4423d956f Disable connection cache workaround 2014-09-03 05:47:47 +02:00
kaetemi
a120179e75 Don't create transactions for SELECT queries 2014-09-03 05:39:16 +02:00
kaetemi
3ddf42f0ef Fix #180 2014-09-03 05:11:11 +02:00
kaetemi
04ef076448 Fix #180 2014-09-03 04:46:08 +02:00
kaetemi
978c09b029 Only make a single database connection per host, and keep them persistent 2014-09-03 03:51:11 +02:00
kaetemi
75c5232dcf Remove excessive javascript interactivity in AMS 2014-09-03 03:08:57 +02:00
kaetemi
340fae54ed Some more adjustments for DBLayer... 2014-09-03 03:08:22 +02:00
kaetemi
afe03367d9 Re-use the database connection 2014-09-02 20:39:07 +02:00
kaetemi
dfc65485ec Make login and email unique keys 2014-09-02 20:17:53 +02:00
kaetemi
2bc60334c1 Remove invalid behaviour with ring databases 2014-09-02 19:56:37 +02:00
kaetemi
b64ab2c828 Move misleading copyright notices to a more appropriate location 2014-09-02 19:01:15 +02:00
kaetemi
75dc4fc779 Web services setup tool, fix #141 2014-09-02 18:34:09 +02:00
kaetemi
b500066026 Move SQL files 2014-09-02 14:36:31 +02:00
shubham_meena
d75473f567 documentation for doxygen containing plugin management system 2014-08-18 21:43:24 +05:30
shubham_meena
c9f54c3806 Improved documentation with doxygen generated doc 2014-08-18 07:13:15 +05:30
botanic
4b871c43f5 updated doxygen 2014-08-15 03:49:39 -07:00
shubham_meena
2a2c2b1d67 Merged in Gsoc14-ryzomAppImprovements (pull request #1)
Merging Gsoc 14 branch with default
2014-08-15 01:05:39 +05:30
shubham_meena
ee6db8ef7f code modified to accept request through Rest and sending achievments in response
--HG--
branch : Gsoc14-ryzomAppImprovements
2014-08-15 00:24:31 +05:30
kaetemi
8e7a3b27d7 ryzomcore/v0.9.1 2014-07-29 19:21:25 +02:00
kervala
42eeb9ad59 Fixed: Use UTF-8 for French translations
Changed: Improved some translations (more to come)
2014-07-19 11:19:34 +02:00
kaetemi
ca4c302c6a Disable WG specifics in r2_login script 2014-07-15 15:25:09 +02:00
kaetemi
3f5eedf040 Restructure web. IMPORTANT! This moves all web files to a new central directory. Update your configuration if necessary 2014-07-14 20:27:46 +02:00
sfb
8fe6eee93c fixed #40 with an explicit static_cast. 2013-05-02 14:31:10 -05:00
SirCotare
44681d3663 #1470 re-added api
--HG--
branch : gsoc2012-achievements
2013-02-15 17:45:33 +01:00
SirCotare
3cf378c5e7 merge from default
--HG--
branch : gsoc2012-achievements
2013-02-15 16:29:59 +01:00
SirCotare
12db371ce0 merge from upstream
--HG--
branch : gsoc2012-achievements
2013-02-15 16:29:35 +01:00
SirCotare
b7d56fc85e #1470 damn that merging... trying to remove malicious api
--HG--
branch : gsoc2012-achievements
2013-02-15 16:28:00 +01:00
SirCotare
64aa976411 #1470 removed old parser
--HG--
branch : gsoc2012-achievements
2013-02-15 16:00:01 +01:00
SirCotare
1dbd080eda #1470 added missing summary image
--HG--
branch : gsoc2012-achievements
2013-02-15 15:19:34 +01:00
SirCotare
51cc279942 #1470 updated API & achievements tracker to latest live version
--HG--
branch : gsoc2012-achievements
2013-02-15 15:04:02 +01:00
SirCotare
2d73e89682 #1470 database structure updated
--HG--
branch : gsoc2012-achievements
2013-02-15 15:03:12 +01:00
SirCotare
6017025058 #1470 updated achievements app to latest live version
--HG--
branch : gsoc2012-achievements
2013-02-15 14:51:41 +01:00
SirCotare
598adb8489 #1470 updated admin tool to latest live version
--HG--
branch : gsoc2012-achievements
2013-02-15 14:50:17 +01:00
mattraykowski
de3371cae9 merging 2013-02-12 12:53:19 -06:00
mattraykowski
cd2134e671 merging 2013-02-12 10:28:20 -06:00
mattraykowski
8ced186cfd merge from default
--HG--
branch : gsoc2012-achievements
2013-02-12 10:24:22 -06:00
mattraykowski
c87d8a7fe0 fixes #18 - adds the create script for the webig and app_test databases. 2013-02-12 10:09:48 -06:00
kervala
45c8b20f39 Changed: Typo fixes (thanks to Vagrant!) 2013-02-08 13:17:44 +01:00
SirCotare
cffdcc5339 #1470 bugfix
--HG--
branch : gsoc2012-achievements
2012-12-11 13:10:53 +01:00
SirCotare
9283736c91 #1470 This is a huge update. It contains all changes we made to the system on the
official ryzom servers. I removed non open source content though. So this version
is running on live servers and works!

--HG--
branch : gsoc2012-achievements
2012-12-10 15:07:13 +01:00
ulukyn
41c00b9b48 Changed: Update from Ryzom Team 2012-10-23 17:44:36 +02:00
SirCotare
d39db0a4fd #1470 tasks may now inherit objectives from their parent tasks
--HG--
branch : gsoc2012-achievements
2012-08-22 15:29:29 +02:00
SirCotare
00a6c623e8 #1470 final commit gsoc 2012; work continues...
--HG--
branch : gsoc2012-achievements
2012-08-20 18:35:10 +02:00
SirCotare
d3b7289e56 #1470 documentation update
--HG--
branch : gsoc2012-achievements
2012-08-20 17:41:46 +02:00
SirCotare
c888a5249e #1470 some cleanup; some bugfix; some documentation
--HG--
branch : gsoc2012-achievements
2012-08-20 15:52:35 +02:00
SirCotare
c6c47d6d88 #1470 repo update to latest version (web app)
--HG--
branch : gsoc2012-achievements
2012-08-07 17:41:50 +02:00
SirCotare
96949830e6 #1470 monday's update :)
--HG--
branch : gsoc2012-achievements
2012-07-09 19:10:44 +02:00
SirCotare
5d53924912 #1470 minor fix in rendering
--HG--
branch : gsoc2012-achievements
2012-07-09 12:49:58 +02:00
SirCotare
2fb14c96eb #1740 replaced child node lists with doubly linked lists; various minor changes
--HG--
branch : gsoc2012-achievements
2012-07-08 18:11:25 +02:00
SirCotare
ec524af567 #1470 admin tool; dev workprint
--HG--
branch : gsoc2012-achievements
2012-07-02 18:56:13 +02:00
SirCotare
6a32131dd8 #1470 misc
--HG--
branch : gsoc2012-achievements
2012-07-02 18:55:13 +02:00
SirCotare
964ce26025 #1470 some fixes on stuctural API
--HG--
branch : gsoc2012-achievements
2012-07-01 22:34:22 +02:00
SirCotare
ad0bbe922f #1470 base class update; AVL trees added; some cleanup
--HG--
branch : gsoc2012-achievements
2012-07-01 20:04:01 +02:00
SirCotare
a02851452b #1470 monday's push_all
--HG--
branch : gsoc2012-achievements
2012-06-25 22:00:02 +02:00
SirCotare
a42d6d9a76 #1470 achievement API for external data access
--HG--
branch : gsoc2012-achievements
2012-06-25 21:16:42 +02:00
SirCotare
7d976a22ad #1470 admin tool workprint; menu admin almost complete; wip!!
--HG--
branch : gsoc2012-achievements
2012-06-25 15:04:51 +02:00
SirCotare
a3d40de283 #1470 major update; these changes were necessary for the admin tool; currently untested - need new testserver with php 5.4
--HG--
branch : gsoc2012-achievements
2012-06-25 15:03:14 +02:00
SirCotare
a874eb6f04 #1470 some minor rendering fixes; Parentum is now abstract class; various adaptations to allow admin functions to inherit from these base classes
--HG--
branch : gsoc2012-achievements
2012-06-24 12:44:24 +02:00
SirCotare
7d140cb037 #1470 Parentum interface debugged...
--HG--
branch : gsoc2012-achievements
2012-06-21 22:45:27 +02:00
SirCotare
8886ed94b7 #1470 interface for inheritable child generation added
--HG--
branch : gsoc2012-achievements
2012-06-21 22:28:51 +02:00
SirCotare
139be8d7dd #1470 config options added; some cleanup
--HG--
branch : gsoc2012-achievements
2012-06-21 22:03:36 +02:00
SirCotare
3056f7b8e7 #1470 and here comes the ingame rendering
--HG--
branch : gsoc2012-achievements
2012-06-21 20:55:52 +02:00
SirCotare
bd822e3827 #1470 XMLApi connector initially finished; testing needed
--HG--
branch : gsoc2012-achievements
2012-06-18 21:17:44 +02:00
SirCotare
4e806d0956 #1470: data retrieval updates, though untested
--HG--
branch : gsoc2012-achievements
2012-06-18 19:49:40 +02:00
SirCotare
f39db9b0ca #1470 added dev flags
--HG--
branch : gsoc2012-achievements
2012-06-14 11:23:52 +02:00
SirCotare
c37c08ef53 #1470 achievement admin initial
--HG--
branch : gsoc2012-achievements
2012-06-11 18:53:04 +02:00
SirCotare
8aeabcd247 #1470 monday's commit: update on parser (still incomplete); wip datasources; initial monitoring cronjob (done); various minor changes, fixes and so
--HG--
branch : gsoc2012-achievements
2012-06-11 18:52:19 +02:00