Commit graph

1322 commits

Author SHA1 Message Date
Quitta
f41c9ab65e forgot to push the time-format in config file update! :)
--HG--
branch : quitta-gsoc-2013
2013-07-20 01:04:20 +02:00
Quitta
9d90043a76 fixed error in time elapsed function and removed the queue structure, one queue class would suffice I guess
--HG--
branch : quitta-gsoc-2013
2013-07-19 23:36:34 +02:00
kaetemi
347d4e0940 Some necessary ryzom tools did not build when client and server were unchecked 2013-07-19 18:11:31 +02:00
Quitta
f922b14e30 Outputted time is handled by using the Helpers::outputTime function, this makes changees to the time format easy.
Also made it possible for admins to edit roles directly in the userlist.

--HG--
branch : quitta-gsoc-2013
2013-07-19 16:30:58 +02:00
Quitta
19e26b93a9 Admins/Mods can post hidden replies!
--HG--
branch : quitta-gsoc-2013
2013-07-19 15:59:39 +02:00
Quitta
72d3925b20 Changed DB so a reply has a Hidden field, to make it only show up for admins. Also made it only possible to add mods/admins to the support groups!
--HG--
branch : quitta-gsoc-2013
2013-07-19 11:56:39 +02:00
Quitta
895604e6ac Promoting a user to mod/admin or mod to admin, or demoting mod to user, admin to mod/user is now possible!
--HG--
branch : quitta-gsoc-2013
2013-07-19 03:05:12 +02:00
Quitta
532732a925 fixed some layoutwise stuff, like mods and admins will be shown the same way when replying on a ticket, because users won't be intrested in that anyway
--HG--
branch : quitta-gsoc-2013
2013-07-19 00:37:47 +02:00
Quitta
e170bff5bc made it possible or mod's to watch the support group lists, though not to edit them + fixed userlist
--HG--
branch : quitta-gsoc-2013
2013-07-19 00:12:29 +02:00
Quitta
a9cfd48df9 refactored to admin/mod + changed install file + added mod menu
--HG--
branch : quitta-gsoc-2013
2013-07-18 21:12:03 +02:00
Quitta
32ac588a9b found the @#!$& bug, why on earth did I comment that in the past <,<
--HG--
branch : quitta-gsoc-2013
2013-07-18 15:52:03 +02:00
Quitta
b1836e7944 changed system to mod/admin permissions, though there's still a bug in show_ticket
--HG--
branch : quitta-gsoc-2013
2013-07-18 12:43:33 +02:00
Quitta
be65b89d86 Deletion of support_groups is possible, on delete cascade is pretty cool :D
--HG--
branch : quitta-gsoc-2013
2013-07-16 17:43:55 +02:00
Quitta
2410160c63 Delete a user out of a support_group is possible, have to look up how to do the deletion of a group while keeping referential integrity in mind!
--HG--
branch : quitta-gsoc-2013
2013-07-16 16:43:58 +02:00
Quitta
6e9f53b23d changed layout a bit, this seems better! :)
--HG--
branch : quitta-gsoc-2013
2013-07-16 05:47:31 +02:00
Quitta
465c9c531a It's now possible to add someone to a support group
--HG--
branch : quitta-gsoc-2013
2013-07-16 04:58:54 +02:00
Quitta
ac5c8378bc Show single group and there users almost done
--HG--
branch : quitta-gsoc-2013
2013-07-15 21:18:51 +02:00
Quitta
8d08ff0db0 support group class added + list of support groups added!
--HG--
branch : quitta-gsoc-2013
2013-07-15 17:29:19 +02:00
Quitta
c8607d29cd Updated database and sql model added support group and insupportgroup
--HG--
branch : quitta-gsoc-2013
2013-07-14 23:40:24 +02:00
Quitta
5a8f45f88c # ticket queues, though moving away from this approach
--HG--
branch : quitta-gsoc-2013
2013-07-14 22:33:09 +02:00
Quitta
b64d27a427 ticket queue base added
--HG--
branch : quitta-gsoc-2013
2013-07-14 16:38:36 +02:00
Quitta
16de8b0f3b small fix to make it run on my server
--HG--
branch : quitta-gsoc-2013
2013-07-14 03:05:13 +02:00
Quitta
6f43d4f003 Show single replies works, though the code for it is a bit ugly, have to refactor that though
--HG--
branch : quitta-gsoc-2013
2013-07-13 23:18:49 +02:00
Quitta
c1b7915219 show time elapsed as tooltip, which could be handy, started making the show_reply.tpl
--HG--
branch : quitta-gsoc-2013
2013-07-13 18:04:40 +02:00
Quitta
26faa286bf don't show the textarea for reply when ticket is closed.
--HG--
branch : quitta-gsoc-2013
2013-07-13 17:11:54 +02:00
Quitta
5d2e9dbf96 use language ini files to select correct log thing
--HG--
branch : quitta-gsoc-2013
2013-07-13 16:41:52 +02:00
Quitta
c7e58da11f Show the logs in show_ticket_log
--HG--
branch : quitta-gsoc-2013
2013-07-13 03:46:15 +02:00
Quitta
a8ee2f46f6 started working on the show_ticket_log and encapsulated the createReply of ticket_reply into a ticket class function
--HG--
branch : quitta-gsoc-2013
2013-07-12 20:10:17 +02:00
Quitta
aa26110823 added log system, added ticketupdateStatusandPriority(), using JSON for keeping action etc
--HG--
branch : quitta-gsoc-2013
2013-07-12 19:43:33 +02:00
Quitta
d1475a6eec Changed database all ID's to Unsigned, also added ticket_log table + started working on the class file
--HG--
branch : quitta-gsoc-2013
2013-07-12 14:06:06 +02:00
Quitta
bc238fba7a fixed upper info bar when showing ticket: which contains the initial time, the time passed since latest update, the status, the category and the priority.
DB got updated, ticket has an extra priority field now, to make it easier for admins to make a distinction between tickets! Also made it possible for admins to change the status/priority when replying.

--HG--
branch : quitta-gsoc-2013
2013-07-11 20:31:34 +02:00
Quitta
24b08104f9 added admin function to change setting + changed color of admin bg when they reply + some other fixes
--HG--
branch : quitta-gsoc-2013
2013-07-11 02:39:52 +02:00
Quitta
b1473fad58 ticket reply show correct username, this was harder then expected
--HG--
branch : quitta-gsoc-2013
2013-07-10 22:40:01 +02:00
Quitta
0b72b5cd67 replying on a ticket is now possible though still have to fix the username being shown.
--HG--
branch : quitta-gsoc-2013
2013-07-10 20:46:26 +02:00
Quitta
4afb0b912e forward to show ticket after creating ticket, also build basis for replying on ticket!
--HG--
branch : quitta-gsoc-2013
2013-07-10 13:05:05 +02:00
Quitta
9003f4781a Refacoring of DBLayer seems to work now :)
--HG--
branch : quitta-gsoc-2013
2013-07-10 12:36:14 +02:00
Quitta
f98a4617f0 fixed some hidden error in the syncing
--HG--
branch : quitta-gsoc-2013
2013-07-10 10:28:39 +02:00
Quitta
5e053f3fc4 Also made tickets cickable in the profile page! now let the DBLayer refactoring begin!
--HG--
branch : quitta-gsoc-2013
2013-07-10 10:13:53 +02:00
Quitta
f2d8afaea4 small layout update, before trying to refactor the DBLayer, I want to make sure that I can revert to this point :D
--HG--
branch : quitta-gsoc-2013
2013-07-10 10:10:02 +02:00
Quitta
8981556796 fixed row formatting of the responses
--HG--
branch : quitta-gsoc-2013
2013-07-10 09:44:45 +02:00
Quitta
e4ffdeccc7 forgot to add the files <,<
--HG--
branch : quitta-gsoc-2013
2013-07-10 02:41:21 +02:00
Quitta
5c623e0bd3 Show_Ticket starts to work :)
--HG--
branch : quitta-gsoc-2013
2013-07-10 02:41:03 +02:00
Quitta
fca8eb1ced make_table_with_key_is_id function added to replace and use for like filling the category array, I guess it will be used in the future for a lot of different things
--HG--
branch : quitta-gsoc-2013
2013-07-09 16:34:43 +02:00
Quitta
ba69c5939e added gui_elements class
--HG--
branch : quitta-gsoc-2013
2013-07-09 16:03:52 +02:00
Quitta
9d3317eb0c Show the user his tickets in the user profile screen
--HG--
branch : quitta-gsoc-2013
2013-07-09 01:03:49 +02:00
Quitta
61aebf6b3b show user added, where admins can create a ticket from another user
--HG--
branch : quitta-gsoc-2013
2013-07-08 17:14:03 +02:00
Quitta
1e4daba4ae updated install, added create_Ticket function as wrapper!
--HG--
branch : quitta-gsoc-2013
2013-07-08 14:49:03 +02:00
Quitta
fa07e3cd16 added mennu item for createticket
--HG--
branch : quitta-gsoc-2013
2013-07-08 09:58:29 +02:00
Quitta
21d3bf363b create ticket works, also admins can create other people's tickets
--HG--
branch : quitta-gsoc-2013
2013-07-08 09:40:48 +02:00
Quitta
56fa0bf238 Creation of a ticket (not the content yet though) seems to work
--HG--
branch : quitta-gsoc-2013
2013-07-06 22:38:57 +02:00
Quitta
a81b2dc9b3 woops forgot to add those in last update, also loading all categories from the db works now
--HG--
branch : quitta-gsoc-2013
2013-07-06 19:12:55 +02:00
Quitta
a3b284077c createticket template done + when registering: create ticket_user + when login make session object ticket_user
--HG--
branch : quitta-gsoc-2013
2013-07-06 18:27:25 +02:00
Quitta
ff96e6db5e Added ticket class | added ticket_user class| added ticket_category class. These aren't tested yet, so expect errors and changes! :D
--HG--
branch : quitta-gsoc-2013
2013-07-06 06:09:47 +02:00
Quitta
b163ab7960 Add some default categories
--HG--
branch : quitta-gsoc-2013
2013-07-05 23:00:19 +02:00
Quitta
c045617e98 Added database setup into install
--HG--
branch : quitta-gsoc-2013
2013-07-05 22:28:31 +02:00
Quitta
10cbc0b63b updated the sync and added some new db tabels in the install
--HG--
branch : quitta-gsoc-2013
2013-07-05 03:50:43 +02:00
Quitta
4ee0c06991 Added the DB scheme + png image as reference
--HG--
branch : quitta-gsoc-2013
2013-07-05 00:51:26 +02:00
Quitta
3184941710 Added functionality to update country + gender + added some xss security
--HG--
branch : quitta-gsoc-2013
2013-07-05 00:37:48 +02:00
Quitta
e187da3f6b Made country select code way more easy to handle by using smarty's foreach loop
--HG--
branch : quitta-gsoc-2013
2013-07-04 22:05:26 +02:00
Quitta
537916d828 making install dependent on config file for db name
--HG--
branch : quitta-gsoc-2013
2013-07-04 01:26:55 +02:00
Quitta
93c1998a60 error template added, fixed some small bugs
--HG--
branch : quitta-gsoc-2013
2013-07-03 18:49:23 +02:00
Quitta
0275e11e48 small update, changed the libuserlist so it only shows id and type of the elements in the query db, also only manual syncing is possible when shard db is back online!
--HG--
branch : quitta-gsoc-2013
2013-07-03 06:03:01 +02:00
Quitta
25f479f3d0 added a userlist to browse users and edit their settings as admin
--HG--
branch : quitta-gsoc-2013
2013-07-03 05:57:50 +02:00
Quitta
0b9ad19e35 Change info works, without whiping the other fiels now! :)
--HG--
branch : quitta-gsoc-2013
2013-07-03 03:05:01 +02:00
Quitta
1b8bf17c8b Checking filled in data for change_info has to be updated
--HG--
branch : quitta-gsoc-2013
2013-07-02 16:36:44 +02:00
Quitta
d3b12f74a4 change info page basics
--HG--
branch : quitta-gsoc-2013
2013-07-02 16:07:55 +02:00
Quitta
a1a052dd72 Change email seems to work, also for admin's :)
--HG--
branch : quitta-gsoc-2013
2013-07-02 04:42:12 +02:00
Quitta
2130875539 changepassword works
--HG--
branch : quitta-gsoc-2013
2013-07-02 03:36:49 +02:00
Quitta
75ff3e1ed4 change password is now usable for GM's too by using a GET['id'] param!
--HG--
branch : quitta-gsoc-2013
2013-07-01 23:29:16 +02:00
Quitta
23e9b57703 Settings page layout set!
--HG--
branch : quitta-gsoc-2013
2013-07-01 18:28:37 +02:00
Quitta
a769a985d9 template for changing the settings added, still needs quite some work
--HG--
branch : quitta-gsoc-2013
2013-06-30 05:53:31 +02:00
Quitta
40d6617216 added flags to inlog/logout etc, + added some base translations
--HG--
branch : quitta-gsoc-2013
2013-06-29 20:46:38 +02:00
Quitta
8ff40bb619 added initial admin/admin account when sql/install is executed, also added the admin's functionality: libuserlist
--HG--
branch : quitta-gsoc-2013
2013-06-29 19:05:54 +02:00
Quitta
4f82afa5d0 added libuserlist page, that shows entire list of users in the lib db, admins can remove entry of it and perform manual syncing. Still needs some work though
--HG--
branch : quitta-gsoc-2013
2013-06-29 06:46:10 +02:00
Quitta
a3b3dbd59c Changed the way index handles page requests, also made a folder func, for when a form is submitted and requires a function to be performed and inc for pages that want to perform php code but without a form
--HG--
branch : quitta-gsoc-2013
2013-06-29 05:23:38 +02:00
Quitta
4034c83382 webUsers derived from Users, with www dependent functionality to check if username already in use or email already in use
--HG--
branch : quitta-gsoc-2013
2013-06-29 05:02:54 +02:00
Quitta
76e46c9fc4 add language flags + js for activating them
--HG--
branch : quitta-gsoc-2013
2013-06-28 18:10:02 +02:00
Quitta
4755b7478f messing around and fixing throwing of exceptions in DBLayer
--HG--
branch : quitta-gsoc-2013
2013-06-28 06:18:23 +02:00
Quitta
3b58c56d5b Language stuff supports cookies now and in case a not specified language is given, then it uses the default
--HG--
branch : quitta-gsoc-2013
2013-06-27 20:50:32 +02:00
Quitta
fe70ca714b small test to check if ajax works on the pages, it still seems to work :)
--HG--
branch : quitta-gsoc-2013
2013-06-27 20:18:36 +02:00
Quitta
9a41affe9f dblayer + refactored the db parts
--HG--
branch : quitta-gsoc-2013
2013-06-27 18:06:09 +02:00
Quitta
afd473aaff Syncing basics, need refactoring though
--HG--
branch : quitta-gsoc-2013
2013-06-27 04:54:41 +02:00
Quitta
f9cdc45ed8 show name when logged in in main top bar
--HG--
branch : quitta-gsoc-2013
2013-06-26 17:43:29 +02:00
Quitta
9e6597e937 Added logout, refined login and took it back out of the lib. Added timers to forward after 5 seconds after logout & register. Looks good imo
--HG--
branch : quitta-gsoc-2013
2013-06-26 16:35:33 +02:00
Quitta
c59e3d0b47 feedback on registering early version, also added an installer.php in the previous revision, forgot to mention that
--HG--
branch : quitta-gsoc-2013
2013-06-26 04:03:16 +02:00
Quitta
5a163663cc Reworked register
--HG--
branch : quitta-gsoc-2013
2013-06-26 03:26:25 +02:00
Quitta
e72eac8888 Reworked index.php a little, though something is going wrong with my session variables
--HG--
branch : quitta-gsoc-2013
2013-06-25 21:33:49 +02:00
Quitta
8f2f0a3ad7 Loging in match searching seems to work :)
--HG--
branch : quitta-gsoc-2013
2013-06-25 20:57:10 +02:00
Quitta
761d7b2775 Register seems to work :) Next step permissions and login
--HG--
branch : quitta-gsoc-2013
2013-06-20 01:02:27 +02:00
Quitta
4f822c37fe first attempt to get register up and running
--HG--
branch : quitta-gsoc-2013
2013-06-19 23:53:53 +02:00
Quitta
c22e1de52d small fixes of last night, still have to figure out a way to get the mkdir warning dissapear!
--HG--
branch : quitta-gsoc-2013
2013-06-19 21:05:12 +02:00
Quitta
fb622a9eb7 register refactoring + small bug fixes that went unnoticed before
--HG--
branch : quitta-gsoc-2013
2013-06-19 06:50:08 +02:00
Botanic
321edeff10 add_user example
--HG--
branch : rc-botanic-webdev
2013-06-18 10:48:54 -07:00
Quitta
61c9a3d9a6 show error message + tooltips while registering
--HG--
branch : quitta-gsoc-2013
2013-06-18 16:27:57 +02:00
Quitta
8ee559e662 Damn its early in the morning :D Oh well! Register works with a callback function. shows which fields are correctly filled in and which not yet. It runs quite smooth. Off to bed now!
--HG--
branch : quitta-gsoc-2013
2013-06-18 07:22:24 +02:00
Quitta
79e7b18bc8 Changed register form + tried getting messages passed
--HG--
branch : quitta-gsoc-2013
2013-06-17 21:42:33 +02:00
Quitta
1c4bb138e9 Select automatically if it should load with no_visible_elements on or off + minor updates
--HG--
branch : quitta-gsoc-2013
2013-06-17 16:29:20 +02:00
Botanic
7ef366d11d fix top menu
--HG--
branch : rc-botanic-webdev
2013-06-17 06:57:22 -07:00
Quitta
9806ea6ef0 Trying to intigrate the home template in the inheritance structure of smarty
--HG--
branch : quitta-gsoc-2013
2013-06-17 15:39:55 +02:00
Botanic
983ea23da6 fixed js issue
--HG--
branch : rc-botanic-webdev
2013-06-17 03:08:45 -07:00
Quitta
879f28e45f Tour seems to work here, not sure though
--HG--
branch : quitta-gsoc-2013
2013-06-17 11:03:31 +02:00
Botanic
b1c97cab76 working on help tips
--HG--
branch : rc-botanic-webdev
2013-06-17 00:25:04 -07:00
Botanic
46c1952de6 changed default skin to cerulean and constrained proportions in css
--HG--
branch : rc-botanic-webdev
2013-06-16 23:28:58 -07:00
Botanic
0b8c4968e9 changed index.php to correct file and created charisma index for backup
--HG--
branch : rc-botanic-webdev
2013-06-16 23:13:38 -07:00
Botanic
19f7b3ec9c cleaned up formatting and added custom.css
--HG--
branch : rc-botanic-webdev
2013-06-16 22:57:09 -07:00
Botanic
b596502982 changed to default will override with custom.css
--HG--
branch : rc-botanic-webdev
2013-06-16 22:46:50 -07:00
Botanic
08d3d766a2 updated the index pages with home register and login
--HG--
branch : rc-botanic-webdev
2013-06-16 20:11:11 -07:00
Botanic
7f7c2cfb44 Merge with quitta-gsoc-2013
--HG--
branch : rc-botanic-webdev
2013-06-16 00:59:10 -07:00
Quitta
9f6349843c Fixed layout for register.tpl and login.tpl, it now uses also layout.tpl but with a parameter 'no_visible_elements' => 'TRUE'
--HG--
branch : quitta-gsoc-2013
2013-06-16 01:40:13 +02:00
Botanic
af6dac032b added .tpl.php and removed extra files
--HG--
branch : rc-botanic-webdev
2013-06-15 15:20:16 -07:00
Botanic
1b7f8f8370 Merge with quitta-gsoc-2013
--HG--
branch : rc-botanic-webdev
2013-06-15 15:16:57 -07:00
Quitta
260315d1ef Basic template integration with css
--HG--
branch : quitta-gsoc-2013
2013-06-16 00:13:13 +02:00
Botanic
6973070230 fixed to proper path
--HG--
branch : rc-botanic-webdev
2013-06-15 07:11:03 -07:00
Botanic
d7db141324 changed to use .php not html
--HG--
branch : rc-botanic-webdev
2013-06-15 07:08:38 -07:00
Botanic
4438e87a8c added charisma
--HG--
branch : rc-botanic-webdev
2013-06-15 07:01:11 -07:00
Botanic
900ce13318 forgot global
--HG--
branch : rc-botanic-webdev
2013-06-13 14:41:58 -07:00
Botanic
102a4c3950 auto create folders
--HG--
branch : rc-botanic-webdev
2013-06-13 14:33:23 -07:00
Botanic
1f648910ed latest changes to work on getting registration working
--HG--
branch : rc-botanic-webdev
2013-06-10 04:17:55 -07:00
Botanic
3e2278d692 updated template for registration and setting up add_user functions
--HG--
branch : rc-botanic-webdev
2013-06-07 04:05:28 -07:00
Botanic
40ba525e5a added base drupal module and removed old phtml file
--HG--
branch : rc-botanic-webdev
2013-06-06 23:07:47 -07:00
Botanic
524e338f68 cleaned up templates and got languages working
--HG--
branch : rc-botanic-webdev
2013-06-06 22:59:11 -07:00
Botanic
9ed3f20570 added in smarty, still need to finish making it load the correct template properly
--HG--
branch : rc-botanic-webdev
2013-06-06 21:43:11 -07:00
Botanic
e66c77470f updated files that were not merged
--HG--
branch : rc-botanic-webdev
2013-06-06 03:38:24 -07:00
Botanic
ae9ffef35d fixed thanks kervala
--HG--
branch : rc-botanic-webdev
2013-06-06 01:28:12 -07:00
Botanic
0a3020e971 added in-game template file
--HG--
branch : rc-botanic-webdev
2013-06-05 23:39:33 -07:00
Botanic
4d3acc9cc0 added base class file for sql as well as updated users to use class
--HG--
branch : rc-botanic-webdev
2013-06-05 23:19:40 -07:00
Botanic
c66d9cf225 changed to use class
--HG--
branch : rc-botanic-webdev
2013-06-05 23:10:00 -07:00
Botanic
c256187ead initial work on ams_lib
--HG--
branch : rc-botanic-webdev
2013-06-05 23:04:46 -07:00
Botanic
b76fe233da why the hell make the faster values for "debug only" waiting it so 1990's
--HG--
branch : rc-botanic-webdev
2013-06-05 19:59:53 -07:00
Botanic
26c4b51d01 fixed warning
--HG--
branch : rc-botanic-webdev
2013-06-05 19:43:10 -07:00
Botanic
3439d1063b fixed warning
--HG--
branch : rc-botanic-webdev
2013-06-05 19:27:06 -07:00
Botanic
515a665339 no reason to make people change the logs path every time
--HG--
branch : rc-botanic-webdev
2013-06-05 19:19:09 -07:00
Botanic
e4b24f08da Fixed warnings and logout
--HG--
branch : rc-botanic-webdev
2013-06-05 19:14:53 -07:00
Botanic
ea42101296 No reason to hardcode the path
--HG--
branch : rc-botanic-webdev
2013-06-05 19:14:49 -07:00
Botanic
395c194acc bad eol's
--HG--
branch : rc-botanic-webdev
2013-06-06 02:47:26 -07:00
dfighter1985
d2a7c66e9f Use to .toUTF8() instead of .toStdString().
--HG--
branch : client_config_qt
2013-05-04 21:55:41 +02:00
dfighter1985
e950834079 Merged default
--HG--
branch : client_config_qt
2013-05-04 21:23:55 +02:00
kervala
2aea567fe2 Changed: Moved Ryzom detailed version in client 2013-04-29 14:46:53 +02:00
kervala
f68cda5cd2 Changed: Process EventCloseWindowId by client 2013-04-29 14:44:39 +02:00
kervala
920cbf55ca Fixed: Assign instead of a comparison 2013-04-29 10:34:33 +02:00
kervala
b0e717728b Changed: French comments translated to English 2013-04-29 10:33:33 +02:00
kervala
33c73f3f16 fixes #33 build failure/error using clang 2013-03-26 19:57:00 +01:00
dfighter1985
2bdceaecda Resolved some build errors occuring after previous commit. 2013-02-21 01:25:50 +01:00
mattraykowski
6e309fee7a changed #20 - moved the libwww package discovery and fixed include paths in library project. 2013-02-19 10:04:40 -06:00
dfighter1985
8d54b6f77d MODIFIED: Resolved build error with FINAL_VERSION set. 2013-02-18 01:26:56 +01:00
dfighter1985
ecbcdf388f MODIFIED: Resolved some GCC build errors. 2013-02-17 14:30:05 +01:00
mattraykowski
e7e51f01e0 merging gui editor repo. 2013-02-14 09:53:06 -06:00
mattraykowski
0eeeaa401f removed line from a bad merge of the character achievement code, sorry 2013-02-14 07:47:40 -06:00
dfighter1985
a920c7e261 another merge from mainline 2013-02-14 13:56:05 +01:00
dfighter1985
fcb736c387 Merged mainline default branch changes.
--HG--
branch : gsoc2012-gui-editor
2013-02-14 10:47:10 +01:00