Commit graph

  • beffd91100 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-03-29 00:10:38 -0400
  • 74fdd56ced Merge pull request #31 from annando/master friendica 2012-03-28 15:09:18 -0700
  • df8163fe0d Another proposal for notifications after FB-Connection-Invalidation Tobias Hößl 2012-03-28 19:23:32 +0000
  • 1fce805ee9 Merge commit 'upstream/master' Michael Vogel 2012-03-28 19:53:07 +0200
  • 64a429ed31 Merge pull request #30 from fabrixxm/master friendica 2012-03-28 05:14:53 -0700
  • 5adb4ef803 viewsrc: show message source in a fancybox via ajax Fabio Comuni 2012-03-28 11:44:04 +0200
  • b7bb933fa8 Merge pull request #29 from beardy-unixer/master friendica 2012-03-27 21:41:02 -0700
  • 47449e6238 Fixed typo in smiley name. Thomas Willingham 2012-03-28 04:27:00 +0100
  • 73ec380c7c Merge remote-tracking branch 'upstream/master' Thomas Willingham 2012-03-28 04:26:46 +0100
  • 4df92de9eb Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-03-27 00:55:43 -0400
  • fb9bb64689 package updates friendica 2012-03-26 14:57:09 -0700
  • 008055c861 Merge pull request #28 from CatoTH/master Simon 2012-03-26 11:34:27 -0700
  • 1adc9433a5 Send a notification to the user if his/her FB-Connections became invalid (usualle after changing the FB-Password) Tobias Hößl 2012-03-26 13:08:22 +0000
  • 0f87f3400f Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-03-25 01:06:15 -0400
  • 09f36c856a Merge pull request #27 from beardy-unixer/78a1f3277f72b15221c224262019a849b4c1edec Simon 2012-03-24 22:05:38 -0700
  • 3a57b092d2 Merge branch 'master' of github.com:beardy-unixer/friendica-addons Thomas Willingham 2012-03-25 00:13:13 +0000
  • b388a8e2a2 deleted: .gitignore On second thoughts, better leave that to Mike since I don't really know what I'm doing Thomas Willingham 2012-03-25 00:10:22 +0000
  • 83670ac5bd Update .gitignore Thomas Willingham 2012-03-25 00:09:19 +0000
  • 4a4bf31fae Merge remote-tracking branch 'upstream/master' Thomas Willingham 2012-03-25 00:02:16 +0000
  • 78a1f3277f Few more smileys Thomas Willingham 2012-03-25 00:00:37 +0000
  • 4f925a9e4a tweaks to page plugin friendica 2012-03-24 03:29:17 -0700
  • 1a2c142a9e Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-03-23 10:40:40 -0400
  • 2a193c4f09 updated page plugin friendica 2012-03-23 01:44:24 -0700
  • 580bc49308 "page" addon - higher performance version of "pages" addon friendica 2012-03-23 01:18:45 -0700
  • 16bdb3c9b3 update pkg friendica 2012-03-22 18:28:05 -0700
  • b1d2020db5 deleted: smiley_pack/.smiley_pack.php.kate-swp Thomas 2012-03-22 21:15:54 +0000
  • 85b05aa980 modified: .gitignore Commented out bits that don't seem relevant to friendica-addons. Somebody should do this properly, but I'm not confident. Thomas 2012-03-22 21:09:32 +0000
  • 72e8ad0f94 Merge remote-tracking branch 'upstream/master' Thomas 2012-03-22 20:56:09 +0000
  • 78427f5457 new file: .gitignore .gitignore file Thomas 2012-03-22 20:54:32 +0000
  • 184e2b776b a few new smilieys, plus case-insensitivty for a couple of core smileys Thomas 2012-03-22 20:53:03 +0000
  • 40d779af57 Facebook: detecting of images when exporting Michael Vogel 2012-03-21 10:07:29 +0100
  • 6abe6b0a65 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-03-20 21:41:53 -0400
  • e4aa572a25 Merge pull request #26 from beardy-unixer/master Simon 2012-03-20 18:41:08 -0700
  • 9ee713776e updated default profile photo friendica 2012-03-20 15:44:53 -0700
  • 772686b171 Merge remote-tracking branch 'upstream/master' Thomas 2012-03-20 16:40:05 +0000
  • 31611d4a2c modified: smiley_pack/smiley_pack.php Thomas 2012-03-20 16:39:17 +0000
  • a649c1966d Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-03-20 03:20:10 -0400
  • b8dd62d229 cleanup shaka emoticon friendica 2012-03-19 19:34:29 -0700
  • d7d0d54c54 Merge pull request #25 from beardy-unixer/029b2d0531b8e5bbd38c69a2e9d570e06b76b003 friendica 2012-03-19 18:41:29 -0700
  • c4a374fa58 clean up Thomas 2012-03-19 23:57:47 +0000
  • 029b2d0531 Merge remote-tracking branch 'upstream/master' Thomas 2012-03-19 23:56:21 +0000
  • 9e438d288d Beard, Shaka, headbang, and whitebeard that somehow didn't get commited Thomas 2012-03-19 23:54:13 +0000
  • 02decaaf44 fix missing packages friendica 2012-03-19 16:02:12 -0700
  • 8029e35d44 package updates friendica 2012-03-19 15:58:10 -0700
  • 91a1306d7e Merge pull request #24 from beardy-unixer/master friendica 2012-03-19 15:57:01 -0700
  • 1c2d3aee9b Merge remote-tracking branch 'upstream/master' Thomas 2012-03-19 22:34:27 +0000
  • 5d81b4a0ae Merge pull request #23 from CatoTH/master friendica 2012-03-19 15:26:38 -0700
  • 437325c5c8 This deactivated the plugin not only when uninstalling it, but also when updating it Tobias Hößl 2012-03-19 21:20:51 +0000
  • 834845a6c2 Merge branch 'master' of git://github.com/friendica/friendica-addons Tobias Hößl 2012-03-19 21:10:54 +0000
  • fcc73edffa Music smileys Thomas 2012-03-19 21:04:36 +0000
  • 7af1cb4e90 misc new smileys Thomas 2012-03-19 21:00:26 +0000
  • ac5a591b7e Laughing smileys Thomas 2012-03-19 20:51:08 +0000
  • fae69870d2 Banana smiley - may need to be removed if I can't verify licence Thomas 2012-03-19 17:35:44 +0000
  • e7b992e118 respect smileys Thomas 2012-03-19 17:29:46 +0000
  • 57ff121647 Merge branch 'apull' friendica 2012-03-19 05:47:30 -0700
  • be363e0ad4 add frown plugin friendica 2012-03-19 05:46:09 -0700
  • c92861618b Merge remote-tracking branch 'friendica/master' Fabio Comuni 2012-03-19 12:28:41 +0100
  • a21d2b4a78 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-03-19 00:35:55 -0400
  • 365757a2ce Merge pull request #22 from beardy-unixer/master Simon 2012-03-18 21:35:12 -0700
  • 8a5e770a8c Fixed typo Thomas 2012-03-19 04:06:41 +0000
  • 2d03d285e4 Fixed stuff Thomas 2012-03-19 03:35:28 +0000
  • 760abc1593 Merge remote-tracking branch 'upstream/master' Thomas 2012-03-19 03:34:54 +0000
  • 0bc7e1302d Happy smileys Thomas 2012-03-19 03:32:34 +0000
  • c39003b224 Fixed typos per Fabian Dost bug report Thomas 2012-03-19 03:25:37 +0000
  • 530dacc123 More irritating smileys to make everybody cross Thomas 2012-03-19 03:19:23 +0000
  • bad9d035fe Fantasy smileys. Alas, not the fantasty where nobody uses smileys. Thomas 2012-03-19 03:14:02 +0000
  • 69fc5a53da Suitable punishments for anyone who actually uses any of these smilies. Thomas 2012-03-19 03:07:41 +0000
  • a0a630eeaf Tired smileys Thomas 2012-03-19 02:55:23 +0000
  • 9a0daeb205 actual smileys Thomas 2012-03-19 02:49:17 +0000
  • 9ac0113c08 Stupid love smileys Thomas 2012-03-19 02:47:18 +0000
  • 4910970823 More retarded smileys Thomas 2012-03-19 02:42:14 +0000
  • 0be5a02c9c bug: used uid for allow_gid instead of contact id friendica 2012-03-18 18:51:52 -0700
  • 141bac1714 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-03-18 21:17:42 -0400
  • 20ab0c68af not yet linked adult_smiles friendica 2012-03-18 18:00:28 -0700
  • c397089f9d pkg update friendica 2012-03-18 17:59:17 -0700
  • dd46179855 Merge pull request #21 from beardy-unixer/master friendica 2012-03-18 17:56:16 -0700
  • d9786544f4 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-03-18 18:30:44 -0400
  • 71ad01ee5b Merge pull request #20 from tonybaldwin/master Simon 2012-03-18 15:18:50 -0700
  • 0d19b9efed deleted: smiley_pack/smiley_pack.php~ Thomas 2012-03-18 22:05:37 +0000
  • 97334a59c6 First set of smilies for smiley_pack Thomas 2012-03-18 22:04:53 +0000
  • 403022498d added comments and link to documentation to irc.php Tony Baldwin 2012-03-18 12:10:55 -0400
  • ce21d9375a Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-03-18 12:00:57 -0400
  • e8562283af Merge pull request #19 from tonybaldwin/master Simon 2012-03-18 06:56:14 -0700
  • 1f50a42135 minor Tony Baldwin 2012-03-18 09:50:50 -0400
  • 28a7fb2680 replaces missing semi-colon... Tony Baldwin 2012-03-18 09:47:39 -0400
  • cf6f514fe9 minor alteration Tony Baldwin 2012-03-18 09:37:46 -0400
  • 519edd184b Delete the app_access_token once the addon is uninstalled. And some more error handling Tobias Hößl 2012-03-18 10:59:01 +0000
  • b1fb01437f another attempt having difficulties perhaps resolved? Tony Baldwin 2012-03-17 19:17:07 -0400
  • 3d38180d8f corrections, minor alterations Tony Baldwin 2012-03-17 18:34:25 -0400
  • f26c87aaea minor alterations, mostly to ijpost Tony Baldwin 2012-03-17 17:53:53 -0400
  • 06e04aca2f added Cat's tag stuff to ijpost Tony Baldwin 2012-03-17 17:30:21 -0400
  • f75d96e5bc Merge remote branch 'upstream/master' Tony Baldwin 2012-03-17 17:16:57 -0400
  • 6696cc4cd1 minor adjustment to ijpost.php Tony Baldwin 2012-03-17 16:49:40 -0400
  • 7949cf3f53 cleaned up where "lj" was included in dwpost.css changed my profile url to the current, free-haven profile, in all plugins to which I have contributed added insanejournal.com plugin, ijpost other minor cleanup of details, where a plugin was copied and modified but incorrect details were left. Tony Baldwin 2012-03-17 16:40:17 -0400
  • 60db7fb8d0 Pages: Moved under Networks Michael Vogel 2012-03-17 13:44:13 +0100
  • 619c758263 Show more: Changed "Show More" to "show more" Michael Vogel 2012-03-17 11:09:21 +0100
  • 3503adb8cc facebook comment notifications friendica 2012-03-17 01:21:38 -0700
  • 50a1a15c49 Merge pull request #18 from annando/master friendica 2012-03-15 15:29:33 -0700
  • 61edc9ff5e Pages: Some minor improvements (I guess) :) Michael Vogel 2012-03-15 21:15:40 +0100
  • 96d8df11f7 Merge commit 'upstream/master' Michael Vogel 2012-03-15 21:12:25 +0100