Commit graph

260 commits

Author SHA1 Message Date
botanic
3471c23eb6 Merge 2014-09-05 22:24:41 -07:00
botanic
2694a99c85 fix missing pcntl_fork func 2014-09-05 22:24:09 -07:00
kaetemi
7499ed408c Add more paranoia 2014-09-06 06:49:42 +02:00
kaetemi
d9ce522e0a Now really, don't execute any scripts here 2014-09-06 06:40:33 +02:00
kaetemi
4765f63328 Saner behaviour to show Forbidden error 2014-09-06 04:55:17 +02:00
kaetemi
510bb2074b Add upgrade script 2014-09-06 04:44:08 +02:00
botanic
4f51c4cdb6 fixed sync to be more robust 2014-09-05 19:38:53 -07:00
botanic
f9c4c3ac1f throw error on non-writable file 2014-09-05 19:26:12 -07:00
botanic
d1a300e751 forgot $AMS_TMPDIR 2014-09-05 19:18:17 -07:00
botanic
1d15bdfab3 Merge 2014-09-05 18:46:33 -07:00
botanic
e7ca564187 Fix 2014-09-05 18:46:13 -07:00
kaetemi
c782592d9d Make files folder safe to use 2014-09-06 03:44:58 +02:00
kaetemi
b638219dbd Make files folder safe to use 2014-09-06 03:43:31 +02:00
kaetemi
0e76ed6386 Protect shard admin auth SQL queries 2014-09-06 01:40:37 +02:00
kaetemi
4a186cc233 Fix version number 2014-09-06 00:38:20 +02:00
kaetemi
5abb581602 Merge 2014-09-06 00:37:29 +02:00
kaetemi
f46cb42bed Create shard admin user in setup 2014-09-06 00:35:28 +02:00
botanic
4b526a4761 Merge 2014-09-05 02:31:56 -07:00
botanic
4368fb7f64 only show powered by and version when admin 2014-09-05 02:30:50 -07:00
botanic
5f5cfd2df6 added version number to ams 2014-09-05 02:27:08 -07:00
kaetemi
2a6edf5c0f Merge 2014-09-05 11:22:47 +02:00
kaetemi
17234d6398 Merge 2014-09-05 11:22:18 +02:00
kaetemi
b273806cf0 Validate setup password 2014-09-05 11:21:21 +02:00
botanic
4ce203b32c remove unecessery printing 2014-09-05 02:21:00 -07:00
botanic
bb38a64e78 fixed some caching 2014-09-05 02:17:19 -07:00
botanic
6ca575ef33 remove errolog 2014-09-05 02:10:32 -07:00
botanic
6b92b85b04 fix sync 2014-09-05 02:10:09 -07:00
kaetemi
daf80ea104 Add basis for database upgrades 2014-09-05 11:07:25 +02:00
botanic
85910829a7 Made filesize friendly 2014-09-05 01:30:54 -07:00
botanic
88afbeac83 remove old file 2014-09-05 01:22:39 -07:00
botanic
42a6c38080 added placeholder 2014-09-05 01:22:19 -07:00
botanic
0076828ee0 added placeholder 2014-09-05 01:21:59 -07:00
botanic
851ffd2bb6 Merge 2014-09-05 01:20:39 -07:00
botanic
cad8ea9592 Fix 2014-09-05 01:20:00 -07:00
kaetemi
856213a2aa Alternative redirect script 2014-09-05 10:11:50 +02:00
kaetemi
927eda9188 Merge 2014-09-05 10:01:20 +02:00
kaetemi
bd5cbd9357 Modularize web setup 2014-09-05 09:57:06 +02:00
botanic
2f4d30dc1b forgot to add variable 2014-09-05 00:52:38 -07:00
botanic
0570aedff7 Fix 2014-09-05 00:50:07 -07:00
botanic
a5f5c0ce37 added new ticket_attachment table to installer properly 2014-09-04 21:34:57 -07:00
botanic
a49a6f7c4b fixed installer 2014-09-04 20:29:45 -07:00
botanic
460298c773 Upload button setup
TODO: add files to database
TODO: hash folder to stick files in
2014-09-04 19:58:04 -07:00
botanic
58a2208fe9 Fix 2014-09-04 17:26:22 -07:00
botanic
6fe49dfe92 fix settings width 2014-09-03 05:27:38 -07:00
botanic
fcbca9c5ed margins in element-style...really? 2014-09-03 05:05:21 -07:00
botanic
0dc2509c0e fix 2014-09-03 05:00:36 -07:00
botanic
0004241718 Merge 2014-09-03 04:42:54 -07:00
botanic
157c286502 fix support group bug and dblayer bug 2014-09-03 04:42:28 -07:00
Matthew Lagoe
fc5d684403 Merged in shubham_meena/ryzomcore (pull request )
documentation for doxygen containing plugin management system
2014-09-03 04:15:02 -07:00
botanic
fa0262bc0a Fix syntax error with unassigned ticket 2014-09-03 04:13:44 -07:00
botanic
fb18ee6f54 fixed language when logged in 2014-09-03 04:03:01 -07:00
botanic
ef2477fa23 updated bootstrap and charisma 2014-09-03 03:22:14 -07:00
botanic
e44cd3d40e updating plugins 2014-09-03 01:28:27 -07:00
botanic
6b484f7cbb Fix path's in plugins 2014-09-03 01:13:08 -07:00
botanic
f29aa60fc7 fixed change email on shard 2014-09-03 00:23:47 -07:00
botanic
ceb1a30e17 Changed to use new throw new SystemExit(); 2014-09-02 23:30:25 -07:00
botanic
6edcdcf65f Merge 2014-09-02 23:26:53 -07:00
botanic
556f246b81 Fix add user in settings 2014-09-02 23:24:41 -07:00
kaetemi
b691fa9694 Crash workaround 2014-09-03 08:18:21 +02:00
kaetemi
2c2f776f3a Remove bad data in sql 2014-09-03 07:38:24 +02:00
kaetemi
88ca2ab7e9 Don't cache redirects 2014-09-03 07:36:10 +02:00
kaetemi
37e0201a5f Throw exception instead of exit. 2014-09-03 07:23:39 +02:00
kaetemi
591a038ad3 Merge 2014-09-03 07:07:55 +02:00
kaetemi
50a3791553 Die, don't exit 2014-09-03 07:06:43 +02:00
botanic
82aaca7eea Merge 2014-09-02 21:40:10 -07:00
botanic
7b27b580b1 Fix 2014-09-02 21:39:35 -07:00
kaetemi
6d98bb0493 Merge 2014-09-03 06:39:20 +02:00
kaetemi
fd59c37eda Force all user ids equal 2014-09-03 06:38:38 +02:00
botanic
e75cb7fabc Fix 2014-09-02 21:32:48 -07:00
botanic
72db8409a5 Merge 2014-09-02 21:26:09 -07:00
botanic
419f8349dd settings page display bug 2014-09-02 21:25:39 -07:00
kaetemi
c008e0b46d Transactions not required here either, actually 2014-09-03 06:16:41 +02:00
kaetemi
4982e7c6c4 Merge 2014-09-03 06:08:08 +02:00
kaetemi
27efa58777 Reduce unnecessary manual transaction commit 2014-09-03 06:07:02 +02:00
botanic
d9a2e44e9e Merge 2014-09-02 21:04:22 -07:00
botanic
099bce3701 missing ) 2014-09-02 21:03:51 -07:00
botanic
220a93a133 updated hgignore as well as fixed php errors 2014-09-02 20:55:51 -07:00
kaetemi
44b8223a5f Disable connection cache workaround 2014-09-03 05:47:47 +02:00
kaetemi
3f9eb61e07 Don't create transactions for SELECT queries 2014-09-03 05:39:16 +02:00
kaetemi
33d7bf5c15 Fix 2014-09-03 05:11:11 +02:00
kaetemi
fdc514b039 Fix 2014-09-03 04:46:08 +02:00
kaetemi
011869167d Only make a single database connection per host, and keep them persistent 2014-09-03 03:51:11 +02:00
kaetemi
379e04dc25 Remove excessive javascript interactivity in AMS 2014-09-03 03:08:57 +02:00
kaetemi
bf7a91b3fc Some more adjustments for DBLayer... 2014-09-03 03:08:22 +02:00
kaetemi
6fed8bad5b Re-use the database connection 2014-09-02 20:39:07 +02:00
kaetemi
6acf67d03b Make login and email unique keys 2014-09-02 20:17:53 +02:00
kaetemi
57781ca616 Remove invalid behaviour with ring databases 2014-09-02 19:56:37 +02:00
kaetemi
6a8e2f314e Move misleading copyright notices to a more appropriate location 2014-09-02 19:01:15 +02:00
kaetemi
aebaac46c8 Web services setup tool, fix 2014-09-02 18:34:09 +02:00
kaetemi
262d9c006b Move SQL files 2014-09-02 14:36:31 +02:00
shubham_meena
74503f666c documentation for doxygen containing plugin management system 2014-08-18 21:43:24 +05:30
shubham_meena
77d9dd967f Improved documentation with doxygen generated doc 2014-08-18 07:13:15 +05:30
botanic
a2312c1e1b updated doxygen 2014-08-15 03:49:39 -07:00
shubham_meena
2c580b97aa Merged in Gsoc14-ryzomAppImprovements (pull request )
Merging Gsoc 14 branch with default
2014-08-15 01:05:39 +05:30
shubham_meena
1b5a6ec066 code modified to accept request through Rest and sending achievments in response 2014-08-15 00:24:31 +05:30
kaetemi
8c58150e83 ryzomcore/v0.9.1 2014-07-29 19:21:25 +02:00
kervala
d02a3d7fe6 Fixed: Use UTF-8 for French translations
Changed: Improved some translations (more to come)
2014-07-19 11:19:34 +02:00
kaetemi
722837e8a9 Disable WG specifics in r2_login script 2014-07-15 15:25:09 +02:00
kaetemi
07d3eba709 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
76dea51b8f fixed with an explicit static_cast. 2013-05-02 14:31:10 -05:00
SirCotare
7e358fe887 re-added api 2013-02-15 17:45:33 +01:00
SirCotare
08fbdfec17 merge from default 2013-02-15 16:29:59 +01:00
SirCotare
cf027d4004 merge from upstream 2013-02-15 16:29:35 +01:00
SirCotare
f8382e4b4f damn that merging... trying to remove malicious api 2013-02-15 16:28:00 +01:00
SirCotare
ba89dc7b94 removed old parser 2013-02-15 16:00:01 +01:00
SirCotare
6130d06541 added missing summary image 2013-02-15 15:19:34 +01:00
SirCotare
4dccc6d201 updated API & achievements tracker to latest live version 2013-02-15 15:04:02 +01:00
SirCotare
b284cbb79c database structure updated 2013-02-15 15:03:12 +01:00
SirCotare
ccf6788cd2 updated achievements app to latest live version 2013-02-15 14:51:41 +01:00
SirCotare
4f1fc4c3e6 updated admin tool to latest live version 2013-02-15 14:50:17 +01:00
mattraykowski
1740fc306c merging 2013-02-12 12:53:19 -06:00
mattraykowski
d285e4c6df merging 2013-02-12 10:28:20 -06:00
mattraykowski
47098b3a63 merge from default 2013-02-12 10:24:22 -06:00
mattraykowski
f7b0dd3a9e fixes - adds the create script for the webig and app_test databases. 2013-02-12 10:09:48 -06:00
kervala
98606fb5b5 Changed: Typo fixes (thanks to Vagrant!) 2013-02-08 13:17:44 +01:00
SirCotare
21739a329d bugfix 2012-12-11 13:10:53 +01:00
SirCotare
f92c72c634 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!
2012-12-10 15:07:13 +01:00
ulukyn
7dba15d533 Changed: Update from Ryzom Team 2012-10-23 17:44:36 +02:00
SirCotare
cdfc7dcd94 tasks may now inherit objectives from their parent tasks 2012-08-22 15:29:29 +02:00
SirCotare
5419e57fc7 final commit gsoc 2012; work continues... 2012-08-20 18:35:10 +02:00
SirCotare
ae59aa9a2d documentation update 2012-08-20 17:41:46 +02:00
SirCotare
f9e03406f1 some cleanup; some bugfix; some documentation 2012-08-20 15:52:35 +02:00
SirCotare
24d386a9d2 repo update to latest version (web app) 2012-08-07 17:41:50 +02:00
SirCotare
74a87842da monday's update :) 2012-07-09 19:10:44 +02:00
SirCotare
3aa6056c01 minor fix in rendering 2012-07-09 12:49:58 +02:00
SirCotare
d0c17c0c65 replaced child node lists with doubly linked lists; various minor changes 2012-07-08 18:11:25 +02:00
SirCotare
4bdd0f4123 admin tool; dev workprint 2012-07-02 18:56:13 +02:00
SirCotare
8b3ea34c5a misc 2012-07-02 18:55:13 +02:00
SirCotare
ef7eff1cc9 some fixes on stuctural API 2012-07-01 22:34:22 +02:00
SirCotare
139b05e22d base class update; AVL trees added; some cleanup 2012-07-01 20:04:01 +02:00
SirCotare
3c8cdc1a54 monday's push_all 2012-06-25 22:00:02 +02:00
SirCotare
75cbc3d815 achievement API for external data access 2012-06-25 21:16:42 +02:00
SirCotare
7391d526c1 admin tool workprint; menu admin almost complete; wip!! 2012-06-25 15:04:51 +02:00
SirCotare
dd4a7f1fd9 major update; these changes were necessary for the admin tool; currently untested - need new testserver with php 5.4 2012-06-25 15:03:14 +02:00
SirCotare
899e5a90d3 some minor rendering fixes; Parentum is now abstract class; various adaptations to allow admin functions to inherit from these base classes 2012-06-24 12:44:24 +02:00
SirCotare
09a48363d3 Parentum interface debugged... 2012-06-21 22:45:27 +02:00
SirCotare
12884dac30 interface for inheritable child generation added 2012-06-21 22:28:51 +02:00
SirCotare
b08d256297 config options added; some cleanup 2012-06-21 22:03:36 +02:00
SirCotare
30677cfe4a and here comes the ingame rendering 2012-06-21 20:55:52 +02:00
SirCotare
a84b0aae5e XMLApi connector initially finished; testing needed 2012-06-18 21:17:44 +02:00
SirCotare
89c0071156 : data retrieval updates, though untested 2012-06-18 19:49:40 +02:00
SirCotare
d007fbab24 added dev flags 2012-06-14 11:23:52 +02:00
SirCotare
7f192c3ed7 achievement admin initial 2012-06-11 18:53:04 +02:00
SirCotare
f0fa5191f9 monday's commit: update on parser (still incomplete); wip datasources; initial monitoring cronjob (done); various minor changes, fixes and so 2012-06-11 18:52:19 +02:00
SirCotare
653c18d879 monday's push_all 2012-06-04 21:23:14 +02:00
SirCotare
39e5da62e6 initial achievement tracker 2012-06-04 00:34:26 +02:00
SirCotare
c0778e9fd9 minor bugfixes with app rendering; added Tieable interface 2012-06-03 23:03:33 +02:00
SirCotare
945b3d695e bugfix in tie logics while rendering 2012-06-03 20:53:01 +02:00
SirCotare
fccddfd3b2 tied achievements added 2012-06-03 15:04:04 +02:00
SirCotare
c1b5cf3cb2 class files moved; some rendering improvements; 2012-05-31 15:15:36 +02:00