Commit graph

4269 commits

Author SHA1 Message Date
botanic
a162da4479 Merge 2014-09-02 23:26:53 -07:00
botanic
a7cfa39ff0 Fix add user in settings 2014-09-02 23:24:41 -07:00
kaetemi
708ccff3e1 Crash workaround 2014-09-03 08:18:21 +02:00
kaetemi
bd812fc723 Remove bad data in sql 2014-09-03 07:38:24 +02:00
kaetemi
5053969491 Don't cache redirects 2014-09-03 07:36:10 +02:00
kaetemi
3f3319c40e Throw exception instead of exit. 2014-09-03 07:23:39 +02:00
kaetemi
a43ff6e64e Merge 2014-09-03 07:07:55 +02:00
kaetemi
9d8c2748fe Die, don't exit 2014-09-03 07:06:43 +02:00
botanic
e879f1449a Merge 2014-09-02 21:40:10 -07:00
botanic
8fe1648707 Fix #181 2014-09-02 21:39:35 -07:00
kaetemi
51150a5c21 Merge 2014-09-03 06:39:20 +02:00
kaetemi
2abd6053d8 Force all user ids equal 2014-09-03 06:38:38 +02:00
botanic
addd6dbb4f Fix #182 2014-09-02 21:32:48 -07:00
botanic
f3e8cd66ed Merge 2014-09-02 21:26:09 -07:00
botanic
169a6b0590 settings page display bug 2014-09-02 21:25:39 -07:00
kaetemi
db1f8a81a4 Transactions not required here either, actually 2014-09-03 06:16:41 +02:00
kaetemi
3d4cf1e6ec Merge 2014-09-03 06:08:08 +02:00
kaetemi
d148e70fb4 Reduce unnecessary manual transaction commit 2014-09-03 06:07:02 +02:00
botanic
07afbeea37 Merge 2014-09-02 21:04:22 -07:00
botanic
ad9be87379 missing ) 2014-09-02 21:03:51 -07:00
botanic
7873e107d9 updated hgignore as well as fixed php errors 2014-09-02 20:55:51 -07:00
kaetemi
4deda41e19 Disable connection cache workaround 2014-09-03 05:47:47 +02:00
kaetemi
330aa32c97 Don't create transactions for SELECT queries 2014-09-03 05:39:16 +02:00
kaetemi
d169f9c331 Fix #180 2014-09-03 05:11:11 +02:00
kaetemi
d3c3b6ed00 Fix #180 2014-09-03 04:46:08 +02:00
kaetemi
9f44b039d2 Only make a single database connection per host, and keep them persistent 2014-09-03 03:51:11 +02:00
kaetemi
7f180c3295 Remove excessive javascript interactivity in AMS 2014-09-03 03:08:57 +02:00
kaetemi
4f79a96dea Some more adjustments for DBLayer... 2014-09-03 03:08:22 +02:00
kaetemi
e6820c7ac3 Re-use the database connection 2014-09-02 20:39:07 +02:00
kaetemi
e228dd4602 Make login and email unique keys 2014-09-02 20:17:53 +02:00
kaetemi
3e06bf376f Remove invalid behaviour with ring databases 2014-09-02 19:56:37 +02:00
kaetemi
f0d994edd4 Move misleading copyright notices to a more appropriate location 2014-09-02 19:01:15 +02:00
kaetemi
10a6775993 Web services setup tool, fix #141 2014-09-02 18:34:09 +02:00
kaetemi
ca9dfefc11 Move SQL files 2014-09-02 14:36:31 +02:00
kervala
e57d3c4cf9 Fixed: EOL 2014-08-30 16:21:25 +02:00
kervala
47cdef97a9 Changed: Preserve attributes when copying files in Application Bundle 2014-08-30 16:20:36 +02:00
kervala
9cee4d65fc Changed: Including malloc/malloc.h is useless 2014-08-27 11:21:47 +02:00
kervala
81d9ccb3cc Fixed: Use ...ARBPROC declarations for ARB_occlusion_query (to fix a conflict with official OpenGL headers under Mac OS X) 2014-08-27 11:19:20 +02:00
kervala
3777d38bcb Fixed: Compilation under Mac OS X (malloc is already aligned on 16 bytes and memalign doesn't exist) 2014-08-27 11:16:30 +02:00
kaetemi
09ed249fe9 Remove warnings, ref #177 2014-08-26 13:48:34 +02:00
kaetemi
985bb2d985 Adjust casts, ref #177 2014-08-26 13:33:18 +02:00
kaetemi
ba0317e4cf Inventory bug workaround, ref #177 2014-08-25 15:32:00 +02:00
kaetemi
f9bc294f03 Link group_wheel.cpp, ref #176 2014-08-25 14:56:29 +02:00
kaetemi
bbb0134d44 EOL 2014-08-19 15:42:42 +02:00
kaetemi
900be17061 EOL 2014-08-19 15:38:16 +02:00
kaetemi
914b35dd4b EOL 2014-08-19 15:37:31 +02:00
Laszlo Kis-Adam
e20f693754 Merged in dfighter1985/ryzomcore/gsoc2014-dfighter (pull request #72)
GSOC2014 tools commits
2014-08-19 00:59:26 +02:00
dfighter1985
99e8b5c749 Merged default. 2014-08-19 00:33:03 +02:00
kaetemi
8412739105 Merge 2014-08-18 21:14:27 +02:00
kaetemi
1ebe2c62b4 Crashfix in case pacs_prim are exported into .ig 2014-08-18 20:23:27 +02:00