heluecht/friendica-addons
1
0
Fork 0
forked from friendica/friendica-addons
Code Issues Pull requests Packages Projects Releases Wiki Activity
303 commits 3 branches 35 tags 87 MiB
Commit graph

303 commits

This branch
This branch
All branches
Author SHA1 Message Date
Simon L'nu 0f87f3400f Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  Few more smileys
  tweaks to page plugin
  deleted:    smiley_pack/.smiley_pack.php.kate-swp
  modified:   .gitignore Commented out bits that don't seem relevant to friendica-addons.  Somebody should do this properly, but I'm not confident.
  new file:   .gitignore .gitignore file
  a few new smilieys, plus case-insensitivty for a couple of core smileys

* master:
 2012-03-25 01:06:15 -04:00
Simon 09f36c856a Merge pull request #27 from beardy-unixer/78a1f3277f72b15221c224262019a849b4c1edec 
Update to smiley pack
 2012-03-24 22:05:38 -07:00
Thomas Willingham 78a1f3277f Few more smileys 2012-03-25 00:00:37 +00:00
friendica 4f925a9e4a tweaks to page plugin 2012-03-24 03:29:17 -07:00
Simon L'nu 1a2c142a9e Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  updated page plugin
  "page" addon - higher performance version of "pages" addon
  update pkg

* master:
 2012-03-23 10:40:40 -04:00
friendica 2a193c4f09 updated page plugin 2012-03-23 01:44:24 -07:00
friendica 580bc49308 "page" addon - higher performance version of "pages" addon 2012-03-23 01:18:45 -07:00
friendica 16bdb3c9b3 update pkg 2012-03-22 18:28:05 -07:00
Thomas b1d2020db5 deleted: smiley_pack/.smiley_pack.php.kate-swp 2012-03-22 21:15:54 +00:00
Thomas 85b05aa980 modified: .gitignore 
Commented out bits that don't seem relevant to friendica-addons.  Somebody should do this properly, but I'm not confident.
 2012-03-22 21:09:32 +00:00
Thomas 72e8ad0f94 Merge remote-tracking branch 'upstream/master' 2012-03-22 20:56:09 +00:00
Thomas 78427f5457 new file: .gitignore 
.gitignore file
 2012-03-22 20:54:32 +00:00
Thomas 184e2b776b a few new smilieys, plus case-insensitivty for a couple of core smileys 2012-03-22 20:53:03 +00:00
Simon L'nu 6abe6b0a65 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  updated default profile photo
  modified:   smiley_pack/smiley_pack.php
  clean up

* master:
 2012-03-20 21:41:53 -04:00
Simon e4aa572a25 Merge pull request #26 from beardy-unixer/master 
Fixed regex problems
 2012-03-20 18:41:08 -07:00
friendica 9ee713776e updated default profile photo 2012-03-20 15:44:53 -07:00
Thomas 772686b171 Merge remote-tracking branch 'upstream/master' 2012-03-20 16:40:05 +00:00
Thomas 31611d4a2c modified: smiley_pack/smiley_pack.php 
Fixed regex problems
 2012-03-20 16:39:17 +00:00
Simon L'nu a649c1966d Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  cleanup shaka emoticon
  Beard, Shaka, headbang, and whitebeard that somehow didn't get commited
  fix missing packages
  package updates
  This deactivated the plugin not only when uninstalling it, but also when updating it
  Music smileys
  misc new smileys
  Laughing smileys
  Banana smiley - may need to be removed if I can't verify licence
  respect smileys
  add frown plugin
  Delete the app_access_token once the addon is uninstalled. And some more error handling

* master:
 2012-03-20 03:20:10 -04:00
friendica b8dd62d229 cleanup shaka emoticon 2012-03-19 19:34:29 -07:00
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
Simon L'nu a21d2b4a78 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  Fixed typo
  Fixed stuff
  Happy smileys
  Fixed typos per Fabian Dost bug report
  More irritating smileys to make everybody cross
  Fantasy smileys.  Alas, not the fantasty where nobody uses smileys.
  Suitable punishments for anyone who actually uses any of these smilies.
  Tired smileys
  actual smileys
  Stupid love smileys
  More retarded smileys
  bug: used uid for allow_gid instead of contact id

* master:
 2012-03-19 00:35:55 -04: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