661 commits

Author	SHA1	Message	Date
Quitta	1867c9d196	started working on the module + small addition	2013-09-02 04:15:18 +02:00
Quitta	362e395779	small bug fix	2013-09-01 18:15:41 +02:00
Quitta	01f6d6fabd	ingame dashboard also fixed!	2013-08-29 22:19:37 +02:00
Quitta	a86f192c84	dashboard added that shows the newest ticket, the amount of tickets in your todo list and tickets waiting on YOUR response	2013-08-29 05:01:47 +02:00
Quitta	600b016e1d	added images in the ingame part, added config properties & fixed time bug in queues page	2013-08-29 02:08:05 +02:00
Quitta	2f07d292e5	Fancified outgame show info page and made ingame info page	2013-08-28 22:24:47 +02:00
Quitta	a795c58256	ticket showing works outgame, but needs fancyfying :D	2013-08-28 05:31:06 +02:00
Quitta	fa86db3cc7	updated, stroing to the db seems to work!	2013-08-28 02:24:08 +02:00
Quitta	52f90e9261	ticket_info class done, however I think I better add a field to the Ticket DB, instead the way I do it now..	2013-08-27 22:54:45 +02:00
Quitta	420bb064c6	ticket_info class almost done	2013-08-27 19:08:10 +02:00
Quitta	d6c8483029	Finaly got it to working again..	2013-08-26 17:25:28 +02:00
Quitta	dabf1da618	added language support however, something is broken :/	2013-08-26 11:34:51 +02:00
Quitta	c6ce0a188a	mailing refactored	2013-08-26 05:37:55 +02:00
Quitta	d147cc681c	#mailing languages setup	2013-08-25 17:49:01 +02:00
Quitta	e9f3a560a8	rewrote language handling + language is now stored in the db and the value is based on the users language flag clicked (or default) or the ingame language	2013-08-25 06:27:44 +02:00
Quitta	845719fd29	receive messages setting is added to the ingame layout	2013-08-25 01:22:24 +02:00
Quitta	bce43b641e	Inagme layout for modifying group email stuff is fixed	2013-08-24 17:19:46 +02:00
Quitta	59ae5ce380	Fixed sgroup_liist ingame layout..	2013-08-24 15:56:16 +02:00
Quitta	2cf3441ab8	put mail cron related debug info into a log file specified in config.php	2013-08-20 04:33:23 +02:00
Quitta	78aa1074af	fixing a lot of mail bug problems	2013-08-20 02:08:12 +02:00
Quitta	72a0c8303c	Added encryption by using the openSSL functionality to encrypt the email passwords in the db	2013-08-19 20:22:01 +02:00
Quitta	ba0e8e2d51	Users can specify if they want to receive or dont want to receive tickt updates!	2013-08-19 00:02:55 +02:00
Quitta	e0d9ff8628	fixed dirty error in queue's that didn't allow me to assing/unassign after creating a queue	2013-08-18 03:39:35 +02:00
Quitta	83d4a89e46	fixed some nasty errors + made it show the entire replied message	2013-08-18 02:49:58 +02:00
Quitta	2a7f13c8d8	response is being sent from the correct support group atm	2013-08-18 02:17:02 +02:00
Quitta	b765b0133d	made 3 options for incomming mail: reply on ticket, new ticket and nothing related to that. When it's nothing related to that the mail will stay in the mailbox untill it get's manually read and deleted!	2013-08-17 19:07:00 +02:00
Quitta	993973441a	creating new tickets over email works	2013-08-17 03:06:22 +02:00
Quitta	70fdf0dc74	Hanle multiple mailaccounts	2013-08-16 22:24:11 +02:00
Quitta	420454f7f3	sending mail with supportgroup ID is possible	2013-08-16 21:43:39 +02:00
Quitta	141f40835f	Functionality to modify mailsettings of a support group.	2013-08-16 05:37:38 +02:00
Quitta	e169978d13	add email related stuff to support groups	2013-08-16 03:40:59 +02:00
Quitta	759ee63e9f	ticket mail system basis works	2013-08-13 17:16:43 +02:00
Quitta	9ac1f5ffb4	ticket hanling function added	2013-08-12 23:56:58 +02:00
Quitta	188552a135	not sure if I should keep the task creation or not, will ask Botanic tomorrow	2013-08-12 05:14:00 +02:00
Quitta	7206e19c20	ready to do the imap part	2013-08-12 01:11:48 +02:00
Quitta	0d57ff53e8	basis seems to run in terminal, however mail() doesn't work yet	2013-08-11 03:55:07 +02:00
Quitta	74cfcdaac2	ready for testing the send mail functionality :)	2013-08-11 02:29:31 +02:00
Quitta	784fd5ecea	updates to the mail_handler	2013-08-10 13:59:36 +02:00
Quitta	6b4deea068	added mail_handler class (from Botanic) still needs to be reworked + added show queue template	2013-08-10 01:46:21 +02:00
Quitta	7a051a8068	more elements per page!	2013-08-06 06:07:49 +02:00
Quitta	a2b83bb6c7	userlist ingame works + fixed a bug in demoting/promoting users with roles, which was looking at the wrong id	2013-08-06 04:31:01 +02:00
Quitta	2d863042e5	I think I'm done refactoring the queues	2013-08-06 01:00:17 +02:00
Quitta	c38605f74c	refactor queue's part 1	2013-08-05 22:35:22 +02:00
Quitta	6faceea785	userlist works with pagination	2013-08-05 21:12:58 +02:00
Quitta	528f6d858a	refactoring webusers.php	2013-08-05 17:31:36 +02:00
Quitta	cee8bbc495	renamed libuserlist to syncing, which is more appropriate, also made pagination work! so Now I can start to use it ingame too!	2013-08-05 05:37:18 +02:00
Quitta	e5d5cfe0cc	pagination seems to work! :)	2013-08-05 05:27:19 +02:00
Quitta	d1795c32f8	generic pagination with debugging for testing it atm	2013-08-05 04:37:20 +02:00
Quitta	7fea272d82	Pagination class added, not tested yet :D	2013-08-04 20:27:07 +02:00
Quitta	5ab79d3185	languages handling done	2013-08-03 18:59:21 +02:00
Quitta	dee33cda06	color scheme configuration with colors loaed from ingame_layout.ini	2013-08-03 05:00:39 +02:00
Quitta	2ab086183d	fixed assigning/unassigning and sending empty messages	2013-08-03 04:00:41 +02:00
Quitta	0310bbd680	forgot to add the files	2013-08-02 19:44:28 +02:00
Quitta	1de3c2b40c	log + reply ingame page	2013-08-02 19:43:43 +02:00
Quitta	47861c19d3	show ticket layout is done,though some unpleasant bugs turned up	2013-08-02 17:03:26 +02:00
Quitta	28847b88f1	show ticket save before going to bed	2013-08-02 05:27:00 +02:00
Quitta	461681ec33	Added the android app of Botanic :)	2013-08-02 04:47:33 +02:00
Quitta	99a50c00be	basis for show ticket	2013-08-01 23:10:26 +02:00
Quitta	3c2b2ef53d	added db parameter to the syncing	2013-08-01 18:20:40 +02:00
Quitta	e4d6228055	Added support group pages ingame layout + layout of the #menu's and managed to get a AMS-Home button in the top that would bring the page back to the dashboard!	2013-08-01 04:48:40 +02:00
DJanssens	70a98da8a8	autologin works	2013-07-31 15:08:35 -07:00
Quitta	b3b39bd15f	login.tpl hided between my not yet pushed files! You evil login.tpl :D that might fix the auto login problem	2013-07-31 22:38:47 +02:00
Quitta	471b4b2904	Merge	2013-07-31 22:29:09 +02:00
Quitta	b97824e0af	change home button	2013-07-31 22:27:59 +02:00
DJanssens	af10295644	test	2013-07-31 13:03:12 -07:00
Quitta	e3625bc4e4	Merge with default	2013-07-31 16:17:29 +02:00
Quitta	3c85cd86b9	made the config file more general + seemed some simple <br>'s in the textarea solved it! thank you mr wireshark!	2013-07-31 16:09:39 +02:00
Quitta	efe5213887	create ticket almost done, sadly textarea isn't really helping because can't specify #rows	2013-07-31 03:31:50 +02:00
Quitta	49cb5fe731	settings finished	2013-07-31 02:09:21 +02:00
Quitta	93af1b2fde	settings page is starting to look nice	2013-07-31 01:19:57 +02:00
Quitta	8368f37357	finally got some basic layout starting to look good!	2013-07-30 20:18:01 +02:00
Quitta	ba72925b86	working o the basic layout	2013-07-30 19:13:32 +02:00
Quitta	8903abf8d8	trying to get basic layout done + removed the sidebar + added a scrollbar + the home button needs correct text.	2013-07-30 17:31:28 +02:00
Quitta	0bf8c4d526	fix for getting client working + possibly auto login for ingame part	2013-07-30 01:46:56 +02:00
kaetemi	48205c63be	Remove some world editor leveldesign data	2013-07-24 23:36:41 +02:00
kaetemi	135cc4844f	Remove build gamedata workspace	2013-07-24 22:49:01 +02:00
kaetemi	da53f11c73	Use tags for pacs prim export	2013-07-24 20:51:38 +02:00
Quitta	501a734f74	Merge with default	2013-07-24 13:14:27 +02:00
Quitta	6d5db47669	queue creator works also added a few extra default queues	2013-07-23 23:38:06 +02:00
Quitta	03e526cc1e	queue selector written with javascript functionality	2013-07-23 21:50:39 +02:00
Quitta	10cc131bad	Added another row of info to the show_ticket where the user to whom the ticket is assigned to and also cleaned up the right side, so user can also assign & unassign while browsing a ticket :)	2013-07-23 03:16:19 +02:00
Quitta	5ece94a577	when the ticket starter replies on a ticket the ticket status changes to waiting for support automatically!	2013-07-22 22:58:12 +02:00
Quitta	d34f9378c5	updated logging, when ticket is assigned/unassigned or forwarded, then it will be logged!	2013-07-22 20:33:34 +02:00
Quitta	f37483c357	showing in the queue to what support_group the ticket is sent to, also made the query bigger and changed the todo query as primary!	2013-07-22 18:22:21 +02:00
Quitta	95806fa9f4	Forward works, though needs refinement! also is shown in ticket info bar	2013-07-22 14:51:42 +02:00
Quitta	84e6a8290f	forgot to add tge class	2013-07-22 13:19:21 +02:00
Quitta	47de1db21b	class for forwarding + db update	2013-07-22 13:19:07 +02:00
Quitta	d2578c7589	Big Query that makes it possible to see the todo list, also had to fix the assign/unassign	2013-07-21 17:56:24 +02:00
Quitta	10e98deade	made the todo queue	2013-07-21 15:38:22 +02:00
Quitta	e50cfa46a1	People can assign and unassign to a ticket	2013-07-21 03:49:31 +02:00
Quitta	3e049aa0c8	in the show queue, it also shows the assigned users name :)	2013-07-20 14:45:05 +02:00
Quitta	4898e8a6af	base class for assigned added	2013-07-20 13:19:14 +02:00
Quitta	7fe955affd	forgot to push the time-format in config file update! :)	2013-07-20 01:04:20 +02:00
Quitta	d8c10c658c	fixed error in time elapsed function and removed the queue structure, one queue class would suffice I guess	2013-07-19 23:36:34 +02:00
kaetemi	32553f4d87	Some necessary ryzom tools did not build when client and server were unchecked	2013-07-19 18:11:31 +02:00
Quitta	50f32e5e1c	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.	2013-07-19 16:30:58 +02:00
Quitta	b54d74ea81	Admins/Mods can post hidden replies!	2013-07-19 15:59:39 +02:00
Quitta	6b711f4381	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!	2013-07-19 11:56:39 +02:00
Quitta	6ec1450d26	Promoting a user to mod/admin or mod to admin, or demoting mod to user, admin to mod/user is now possible!	2013-07-19 03:05:12 +02:00
Quitta	a74de873c3	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	2013-07-19 00:37:47 +02:00
Quitta	c1132373e3	made it possible or mod's to watch the support group lists, though not to edit them + fixed userlist	2013-07-19 00:12:29 +02:00
Quitta	bbe74c8fba	refactored to admin/mod + changed install file + added mod menu	2013-07-18 21:12:03 +02:00
Quitta	2f39522002	found the @#!$& bug, why on earth did I comment that in the past <,<	2013-07-18 15:52:03 +02:00
Quitta	b994a8279d	changed system to mod/admin permissions, though there's still a bug in show_ticket	2013-07-18 12:43:33 +02:00
Quitta	8353b2a99a	Deletion of support_groups is possible, on delete cascade is pretty cool :D	2013-07-16 17:43:55 +02:00
Quitta	5b7f0fe95e	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!	2013-07-16 16:43:58 +02:00
Quitta	cbd3588203	changed layout a bit, this seems better! :)	2013-07-16 05:47:31 +02:00
Quitta	b0564d35d8	It's now possible to add someone to a support group	2013-07-16 04:58:54 +02:00
Quitta	f0da13a60e	Show single group and there users almost done	2013-07-15 21:18:51 +02:00
Quitta	3553cc6cac	support group class added + list of support groups added!	2013-07-15 17:29:19 +02:00
Quitta	fe896339d6	Updated database and sql model added support group and insupportgroup	2013-07-14 23:40:24 +02:00
Quitta	af2986ff01	# ticket queues, though moving away from this approach	2013-07-14 22:33:09 +02:00
Quitta	ea80798bd0	ticket queue base added	2013-07-14 16:38:36 +02:00
Quitta	34c688ee27	small fix to make it run on my server	2013-07-14 03:05:13 +02:00
Quitta	c912daecae	Show single replies works, though the code for it is a bit ugly, have to refactor that though	2013-07-13 23:18:49 +02:00
Quitta	15237002aa	show time elapsed as tooltip, which could be handy, started making the show_reply.tpl	2013-07-13 18:04:40 +02:00
Quitta	3f5eaae687	don't show the textarea for reply when ticket is closed.	2013-07-13 17:11:54 +02:00
Quitta	66cec1fb7a	use language ini files to select correct log thing	2013-07-13 16:41:52 +02:00
Quitta	80c846050d	Show the logs in show_ticket_log	2013-07-13 03:46:15 +02:00
Quitta	2a85eb6367	started working on the show_ticket_log and encapsulated the createReply of ticket_reply into a ticket class function	2013-07-12 20:10:17 +02:00
Quitta	5dc0266e15	added log system, added ticketupdateStatusandPriority(), using JSON for keeping action etc	2013-07-12 19:43:33 +02:00
Quitta	6fdf04566a	Changed database all ID's to Unsigned, also added ticket_log table + started working on the class file	2013-07-12 14:06:06 +02:00
Quitta	3e5222ff1b	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.	2013-07-11 20:31:34 +02:00
Quitta	be66aa7cef	added admin function to change setting + changed color of admin bg when they reply + some other fixes	2013-07-11 02:39:52 +02:00
Quitta	e1a7e13c4e	ticket reply show correct username, this was harder then expected	2013-07-10 22:40:01 +02:00
Quitta	51f4bd1ded	replying on a ticket is now possible though still have to fix the username being shown.	2013-07-10 20:46:26 +02:00
Quitta	23df1f8479	forward to show ticket after creating ticket, also build basis for replying on ticket!	2013-07-10 13:05:05 +02:00
Quitta	423982a9d1	Refacoring of DBLayer seems to work now :)	2013-07-10 12:36:14 +02:00
Quitta	18bc121efd	fixed some hidden error in the syncing	2013-07-10 10:28:39 +02:00
Quitta	9ff6af3f88	Also made tickets cickable in the profile page! now let the DBLayer refactoring begin!	2013-07-10 10:13:53 +02:00
Quitta	0da0cf9da8	small layout update, before trying to refactor the DBLayer, I want to make sure that I can revert to this point :D	2013-07-10 10:10:02 +02:00
Quitta	4ab2c46091	fixed row formatting of the responses	2013-07-10 09:44:45 +02:00
Quitta	8dc95d2604	forgot to add the files <,<	2013-07-10 02:41:21 +02:00
Quitta	5ab7000c5f	Show_Ticket starts to work :)	2013-07-10 02:41:03 +02:00
Quitta	683e04d79e	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	2013-07-09 16:34:43 +02:00
Quitta	bcf79ab6fa	added gui_elements class	2013-07-09 16:03:52 +02:00
Quitta	d414021506	Show the user his tickets in the user profile screen	2013-07-09 01:03:49 +02:00
Quitta	52e07f04fc	show user added, where admins can create a ticket from another user	2013-07-08 17:14:03 +02:00
Quitta	371e83876c	updated install, added create_Ticket function as wrapper!	2013-07-08 14:49:03 +02:00
Quitta	9f623e3225	added mennu item for createticket	2013-07-08 09:58:29 +02:00
Quitta	98dfb1fd6e	create ticket works, also admins can create other people's tickets	2013-07-08 09:40:48 +02:00
Quitta	a42443054e	Creation of a ticket (not the content yet though) seems to work	2013-07-06 22:38:57 +02:00
Quitta	9a89c0d90e	woops forgot to add those in last update, also loading all categories from the db works now	2013-07-06 19:12:55 +02:00
Quitta	948794bff6	createticket template done + when registering: create ticket_user + when login make session object ticket_user	2013-07-06 18:27:25 +02:00
Quitta	a9fca71b8d	Added ticket class | added ticket_user class| added ticket_category class. These aren't tested yet, so expect errors and changes! :D	2013-07-06 06:09:47 +02:00
Quitta	2f214d18b8	Add some default categories	2013-07-05 23:00:19 +02:00
Quitta	93469e1130	Added database setup into install	2013-07-05 22:28:31 +02:00
Quitta	1931f0f46f	updated the sync and added some new db tabels in the install	2013-07-05 03:50:43 +02:00
Quitta	add130d21e	Added the DB scheme + png image as reference	2013-07-05 00:51:26 +02:00
Quitta	aae614dd45	Added functionality to update country + gender + added some xss security	2013-07-05 00:37:48 +02:00
Quitta	f3a1410562	Made country select code way more easy to handle by using smarty's foreach loop	2013-07-04 22:05:26 +02:00
Quitta	c3da5bac66	making install dependent on config file for db name	2013-07-04 01:26:55 +02:00
Quitta	c5d063a6eb	error template added, fixed some small bugs	2013-07-03 18:49:23 +02:00
Quitta	e0691ab9f5	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!	2013-07-03 06:03:01 +02:00
Quitta	ebca9d0a48	added a userlist to browse users and edit their settings as admin	2013-07-03 05:57:50 +02:00
Quitta	128529c6c1	Change info works, without whiping the other fiels now! :)	2013-07-03 03:05:01 +02:00
Quitta	2c4505c4c0	Checking filled in data for change_info has to be updated	2013-07-02 16:36:44 +02:00
Quitta	8df8d37ffb	change info page basics	2013-07-02 16:07:55 +02:00
Quitta	f835f4a85f	Change email seems to work, also for admin's :)	2013-07-02 04:42:12 +02:00
Quitta	2a1b8f9dd2	changepassword works	2013-07-02 03:36:49 +02:00
Quitta	a94bb6dbc7	change password is now usable for GM's too by using a GET['id'] param!	2013-07-01 23:29:16 +02:00
Quitta	10213a0530	Settings page layout set!	2013-07-01 18:28:37 +02:00
Quitta	a95960841e	template for changing the settings added, still needs quite some work	2013-06-30 05:53:31 +02:00
Quitta	3aebdc0d40	added flags to inlog/logout etc, + added some base translations	2013-06-29 20:46:38 +02:00
Quitta	6e04a001a7	added initial admin/admin account when sql/install is executed, also added the admin's functionality: libuserlist	2013-06-29 19:05:54 +02:00
Quitta	47a278636b	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	2013-06-29 06:46:10 +02:00
Quitta	beefbe03f8	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	2013-06-29 05:23:38 +02:00
Quitta	193a5843b0	webUsers derived from Users, with www dependent functionality to check if username already in use or email already in use	2013-06-29 05:02:54 +02:00
Quitta	6df401280a	add language flags + js for activating them	2013-06-28 18:10:02 +02:00
Quitta	197457c356	messing around and fixing throwing of exceptions in DBLayer	2013-06-28 06:18:23 +02:00
Quitta	f6511b256f	Language stuff supports cookies now and in case a not specified language is given, then it uses the default	2013-06-27 20:50:32 +02:00
Quitta	f0caa1f5d0	small test to check if ajax works on the pages, it still seems to work :)	2013-06-27 20:18:36 +02:00
Quitta	278dbb23ff	dblayer + refactored the db parts	2013-06-27 18:06:09 +02:00
Quitta	229f76c3e8	Syncing basics, need refactoring though	2013-06-27 04:54:41 +02:00
Quitta	24587c1d6e	show name when logged in in main top bar	2013-06-26 17:43:29 +02:00
Quitta	577d68a6d9	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	2013-06-26 16:35:33 +02:00
Quitta	8735e2f7e6	feedback on registering early version, also added an installer.php in the previous revision, forgot to mention that	2013-06-26 04:03:16 +02:00
Quitta	fc7bab9506	Reworked register	2013-06-26 03:26:25 +02:00
Quitta	ed483da085	Reworked index.php a little, though something is going wrong with my session variables	2013-06-25 21:33:49 +02:00
Quitta	fa7afa87fd	Loging in match searching seems to work :)	2013-06-25 20:57:10 +02:00
Quitta	b0889ebc4b	Register seems to work :) Next step permissions and login	2013-06-20 01:02:27 +02:00
Quitta	6f7cf4c1ed	first attempt to get register up and running	2013-06-19 23:53:53 +02:00
Quitta	0c46da1f62	small fixes of last night, still have to figure out a way to get the mkdir warning dissapear!	2013-06-19 21:05:12 +02:00
Quitta	c95fd0aefd	register refactoring + small bug fixes that went unnoticed before	2013-06-19 06:50:08 +02:00
Botanic	d544921f87	add_user example	2013-06-18 10:48:54 -07:00
Quitta	446569ecb9	show error message + tooltips while registering	2013-06-18 16:27:57 +02:00
Quitta	6e621e1677	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!	2013-06-18 07:22:24 +02:00
Quitta	bcc19a09d4	Changed register form + tried getting messages passed	2013-06-17 21:42:33 +02:00
Quitta	55acd2aab2	Select automatically if it should load with no_visible_elements on or off + minor updates	2013-06-17 16:29:20 +02:00
Botanic	1947120095	fix top menu	2013-06-17 06:57:22 -07:00
Quitta	d7be3a1a78	Trying to intigrate the home template in the inheritance structure of smarty	2013-06-17 15:39:55 +02:00
Botanic	1f590f529d	fixed js issue	2013-06-17 03:08:45 -07:00
Quitta	c502acdeb3	Tour seems to work here, not sure though	2013-06-17 11:03:31 +02:00
Botanic	b7052ff21c	working on help tips	2013-06-17 00:25:04 -07:00
Botanic	93937db2d9	changed default skin to cerulean and constrained proportions in css	2013-06-16 23:28:58 -07:00
Botanic	6581e2393d	changed index.php to correct file and created charisma index for backup	2013-06-16 23:13:38 -07:00
Botanic	473703c19f	cleaned up formatting and added custom.css	2013-06-16 22:57:09 -07:00
Botanic	1d155268d2	changed to default will override with custom.css	2013-06-16 22:46:50 -07:00
Botanic	340b5496ab	updated the index pages with home register and login	2013-06-16 20:11:11 -07:00
Botanic	1cb9529d46	Merge with quitta-gsoc-2013	2013-06-16 00:59:10 -07:00