374 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
friendica	d7d0d54c54	Merge pull request #25 from beardy-unixer/029b2d0531b8e5bbd38c69a2e9d570e06b76b003 ... The missing smileys	2012-03-19 18:41:29 -07:00
Thomas	c4a374fa58	clean up	2012-03-19 23:57:47 +00:00
Thomas	029b2d0531	Merge remote-tracking branch 'upstream/master'	2012-03-19 23:56:21 +00:00
Thomas	9e438d288d	Beard, Shaka, headbang, and whitebeard that somehow didn't get commited	2012-03-19 23:54:13 +00:00
friendica	02decaaf44	fix missing packages	2012-03-19 16:02:12 -07:00
friendica	8029e35d44	package updates	2012-03-19 15:58:10 -07:00
friendica	91a1306d7e	Merge pull request #24 from beardy-unixer/master ... More smileys	2012-03-19 15:57:01 -07:00
Thomas	1c2d3aee9b	Merge remote-tracking branch 'upstream/master'	2012-03-19 22:34:27 +00:00
friendica	5d81b4a0ae	Merge pull request #23 from CatoTH/master ... Bugfix: deactivating Real-Time Updates when updating the plugin	2012-03-19 15:26:38 -07:00
Tobias Hößl	437325c5c8	This deactivated the plugin not only when uninstalling it, but also when updating it	2012-03-19 21:20:51 +00:00
Tobias Hößl	834845a6c2	Merge branch 'master' of git://github.com/friendica/friendica-addons	2012-03-19 21:10:54 +00:00
Thomas	fcc73edffa	Music smileys	2012-03-19 21:04:36 +00:00
Thomas	7af1cb4e90	misc new smileys	2012-03-19 21:00:26 +00:00
Thomas	ac5a591b7e	Laughing smileys	2012-03-19 20:51:08 +00:00
Thomas	fae69870d2	Banana smiley - may need to be removed if I can't verify licence	2012-03-19 17:35:44 +00:00
Thomas	e7b992e118	respect smileys	2012-03-19 17:29:46 +00:00
friendica	57ff121647	Merge branch 'apull'	2012-03-19 05:47:30 -07:00
friendica	be363e0ad4	add frown plugin	2012-03-19 05:46:09 -07:00
Fabio Comuni	c92861618b	Merge remote-tracking branch 'friendica/master'	2012-03-19 12:28:41 +01:00
Simon	365757a2ce	Merge pull request #22 from beardy-unixer/master ... Loads more smileys and a couple of typo-fixes	2012-03-18 21:35:12 -07:00
Thomas	8a5e770a8c	Fixed typo	2012-03-19 04:06:41 +00:00
Thomas	2d03d285e4	Fixed stuff	2012-03-19 03:35:28 +00:00
Thomas	760abc1593	Merge remote-tracking branch 'upstream/master'	2012-03-19 03:34:54 +00:00
Thomas	0bc7e1302d	Happy smileys	2012-03-19 03:32:34 +00:00
Thomas	c39003b224	Fixed typos per Fabian Dost bug report	2012-03-19 03:25:37 +00:00
Thomas	530dacc123	More irritating smileys to make everybody cross	2012-03-19 03:19:23 +00:00
Thomas	bad9d035fe	Fantasy smileys. Alas, not the fantasty where nobody uses smileys.	2012-03-19 03:14:02 +00:00
Thomas	69fc5a53da	Suitable punishments for anyone who actually uses any of these smilies.	2012-03-19 03:07:41 +00:00
Thomas	a0a630eeaf	Tired smileys	2012-03-19 02:55:23 +00:00
Thomas	9a0daeb205	actual smileys	2012-03-19 02:49:17 +00:00
Thomas	9ac0113c08	Stupid love smileys	2012-03-19 02:47:18 +00:00
Thomas	4910970823	More retarded smileys	2012-03-19 02:42:14 +00:00
friendica	0be5a02c9c	bug: used uid for allow_gid instead of contact id	2012-03-18 18:51:52 -07:00
friendica	20ab0c68af	not yet linked adult_smiles	2012-03-18 18:00:28 -07:00
friendica	c397089f9d	pkg update	2012-03-18 17:59:17 -07:00
friendica	dd46179855	Merge pull request #21 from beardy-unixer/master ... New plugin - smiley pack	2012-03-18 17:56:16 -07:00
Simon	71ad01ee5b	Merge pull request #20 from tonybaldwin/master ... added comments and link to documentation for irc	2012-03-18 15:18:50 -07:00
Thomas	0d19b9efed	deleted: smiley_pack/smiley_pack.php~	2012-03-18 22:05:37 +00:00
Thomas	97334a59c6	First set of smilies for smiley_pack	2012-03-18 22:04:53 +00:00
Tony Baldwin	403022498d	added comments and link to documentation to irc.php	2012-03-18 12:10:55 -04:00
Simon	e8562283af	Merge pull request #19 from tonybaldwin/master ... added insanejournal	2012-03-18 06:56:14 -07:00
Tony Baldwin	1f50a42135	minor	2012-03-18 09:50:50 -04:00
Tony Baldwin	28a7fb2680	replaces missing semi-colon...	2012-03-18 09:47:39 -04:00
Tony Baldwin	cf6f514fe9	minor alteration	2012-03-18 09:37:46 -04:00
Tobias Hößl	519edd184b	Delete the app_access_token once the addon is uninstalled. And some more error handling	2012-03-18 10:59:01 +00:00
Tony Baldwin	b1fb01437f	another attempt ... having difficulties perhaps resolved?	2012-03-17 19:17:07 -04:00
Tony Baldwin	3d38180d8f	corrections, minor alterations	2012-03-17 18:34:25 -04:00
Tony Baldwin	f26c87aaea	minor alterations, mostly to ijpost	2012-03-17 17:53:53 -04:00
Tony Baldwin	06e04aca2f	added Cat's tag stuff to ijpost	2012-03-17 17:30:21 -04:00
Tony Baldwin	f75d96e5bc	Merge remote branch 'upstream/master'	2012-03-17 17:16:57 -04:00