Commit graph

  • 70cf5ae3c7 Merge remote-tracking branch 'friendika-master/master' Fabio Comuni 2011-02-15 14:19:54 +01:00
  • 473786d3a0 Merge branch 'chriscase-master' Friendika 2011-02-15 03:45:40 -08:00
  • 0d853433eb fixed error which was causing multiple line breaks, added comments to better document what is occuring, cleaned up code, removed unnecessary parameters from templating step Chris Case 2011-02-15 03:31:20 -08:00
  • dd8bbe8202 change \"html\" with \"bb code\" in tinyMce icons Fabio Comuni 2011-02-15 12:23:47 +01:00
  • 69be5b64e0 Merge branch 'tobiasd-master' Friendika 2011-02-15 03:17:18 -08:00
  • f856493555 add permalink field to item table Friendika 2011-02-15 03:13:38 -08:00
  • 1b14f67a86 bug #0000006, local sparkle links visible in "like" items when remote viewing Friendika 2011-02-15 02:30:01 -08:00
  • 7a6174298b deleted the translated file of comment_item.tpl Tobias Diekershoff 2011-02-15 10:56:07 +01:00
  • 397643a066 masked the / in the config strings to fix problems with the strings.php Tobias Diekershoff 2011-02-15 10:03:05 +01:00
  • afdfc725b8 some translations into German Tobias Diekershoff 2011-02-15 09:49:38 +01:00
  • 0e7b09b41c bug #0000002, strip HTML from pasted text in prv messages Friendika 2011-02-14 21:33:17 -08:00
  • 1dea6a2d71 wrong return url for ajax comments on display and photos pages Friendika 2011-02-14 20:21:28 -08:00
  • 7b26500510 Merge remote branch 'upstream/master' Chris Case 2011-02-14 11:50:08 -08:00
  • 42eb6dd723 fixed a bbcode issue with rich text html messages, fixed some issues with plain text. Chris Case 2011-02-14 05:44:27 -08:00
  • fe1a37074a Merge branch 'chriscase-master' Friendika 2011-02-14 05:06:16 -08:00
  • 94e0c3c970 fixed the charset on the html version of the message, overlooked this in the last commit, now uses utf-8 in the meta tag Chris Case 2011-02-14 04:54:44 -08:00
  • b87ddbd58a Merge branch 'ajaxcomms' Friendika 2011-02-14 04:46:49 -08:00
  • df20990753 ajax comments Friendika 2011-02-14 04:43:49 -08:00
  • 39dd36176b ajax comments Friendika 2011-02-14 04:43:19 -08:00
  • 5eebb373e5 revamped private message templates, added multipart messages with text and html versions, updated de, en, fr and it. Translated the french version of the private message template. Chris Case 2011-02-14 03:59:54 -08:00
  • f37caa0999 try this again Friendika 2011-02-14 02:59:22 -08:00
  • ce8c6dfaf7 just in time for valentines day - heart smiley <3 Friendika 2011-02-13 17:24:42 -08:00
  • f98ba371cf updated private message notification to use HTML, still need the foreign language message notifications updated Chris Case 2011-02-13 14:55:48 -08:00
  • e32cda6542 app not defined Friendika 2011-02-13 13:35:08 -08:00
  • 2d542e0f98 receiving comment notifications for conversations we aren't "involved" in Friendika 2011-02-12 22:29:32 -08:00
  • 91190de0f0 fb addon only working from one site - more debug + simplify permission toggle Friendika 2011-02-12 19:24:19 -08:00
  • 53dff2204b Merge branch 'friendika-master' fabrixxm 2011-02-12 18:31:13 +01:00
  • 89cbd17c72 more fb debug msgs Friendika 2011-02-12 05:07:24 -08:00
  • ee46a028d6 more test ajax comments Friendika 2011-02-12 03:42:57 -08:00
  • 3d9845f4a4 preliminary ajax comment setups Friendika 2011-02-12 03:14:59 -08:00
  • 4081ebe6c5 correct color and indent on wall-wall comments Friendika 2011-02-12 02:07:16 -08:00
  • 7d0de6dfb7 trim excessive space around message body (though we still need 20px padding to accomodate scrollbars) Friendika 2011-02-12 01:51:29 -08:00
  • f79c215293 give all comment input form elements id's Friendika 2011-02-12 01:37:21 -08:00
  • 8937ba86a2 set default size for profile photo to improve render appearance/speed Chris Case 2011-02-11 18:52:30 -08:00
  • b98b5645e6 fixed a typo in the profile photo wrapper div id Chris Case 2011-02-11 18:46:54 -08:00
  • 6745f07817 set size of contact images to improve rendering Chris Case 2011-02-11 18:26:07 -08:00
  • 5e02519a13 disable network toggles when ACL's are entered Friendika 2011-02-11 04:32:38 -08:00
  • 61a3c93593 reinstate send slaps but only at top level (and followup) Friendika 2011-02-11 03:18:51 -08:00
  • 0bfe63e7d8 reinstate send slaps but only at the top level (and followup) Friendika 2011-02-11 03:17:16 -08:00
  • c16e86add8 toggles "post to facebook, post to twitter", etc. Friendika 2011-02-11 02:35:19 -08:00
  • 40574589e2 fb connecter - document installation Friendika 2011-02-10 23:10:50 -08:00
  • fc5a3cac14 post to FB is working Friendika 2011-02-10 21:25:24 -08:00
  • bd4e7249a3 more work on facebook addon Friendika 2011-02-10 18:01:38 -08:00
  • f217a557b8 allow plugins to become cmd modules Friendika 2011-02-10 16:17:21 -08:00
  • 6da603fbb5 typo in schema Friendika 2011-02-10 13:21:17 -08:00
  • 09e07f0daa typo in schema Friendika 2011-02-10 13:19:17 -08:00
  • e2d6e986bc don't send empty tweets through to twitter/statusnet Friendika 2011-02-10 04:22:04 -08:00
  • a18bb816cd entirely possible media/links were the only thing posted - don't forward empty message to twitter/SN Friendika 2011-02-10 03:51:42 -08:00
  • 2e78ed00f6 general purpose callback landing page - e.g. for facebook plugin Friendika 2011-02-10 00:32:09 -08:00
  • 40777b132b log ignored pubsub deliveries Friendika 2011-02-09 19:56:40 -08:00
  • de2c9531db post permission hooks Friendika 2011-02-09 19:39:49 -08:00
  • 05c52ae81d preserve newlines inside <pre> tags when importing feeds Friendika 2011-02-09 17:51:05 -08:00
  • 971b16ea4a Accept pretty much bloody anything inside a [url] tag as a legal URL. Friendika 2011-02-09 16:55:31 -08:00
  • 1d12a2be69 string update Friendika 2011-02-09 00:53:51 -08:00
  • 9afbb74bf4 Merge branch 'tobiasd-master' Friendika 2011-02-09 00:48:07 -08:00
  • 89da23c30e spaces for the string extractor, check no parent Tobias Diekershoff 2011-02-09 09:40:56 +01:00
  • ca826c7ff2 images were left behind in theme rename Friendika 2011-02-08 23:24:19 -08:00
  • 5899ae9017 Support bbcode size tag - I may regret this... Friendika 2011-02-08 21:26:28 -08:00
  • 6b8bbef6c7 suppress parse warnings Friendika 2011-02-08 20:55:34 -08:00
  • f70a0b0282 more graceful handling of some statusnet followups Friendika 2011-02-08 18:44:30 -08:00
  • 766c4778cb modify tag handling and replies to stnet Friendika 2011-02-08 15:08:07 -08:00
  • a05b2b4cc7 Merge branch 'tobiasd-master' Friendika 2011-02-08 13:30:24 -08:00
  • b8629a0318 added README files for the piwik, twitter and statusnet addon Tobias Diekershoff 2011-02-08 19:04:39 +01:00
  • 26dfb73f48 Merge branch 'friendika-master' fabrixxm 2011-02-08 18:13:41 +01:00
  • ca1b8a267d post to StatusNet addon for Friendika Tobias Diekershoff 2011-02-08 15:17:41 +01:00
  • 2a093c5c8b added link to Redmine of addon author Tobias Diekershoff 2011-02-08 14:39:59 +01:00
  • 89a33a651e deletion of OAuth stuff works now, removed ToDo note Tobias Diekershoff 2011-02-08 14:38:51 +01:00
  • 9a1e5aaf09 tweaks to reworked remote deletion, which also fixes some comment box oddities Friendika 2011-02-08 05:08:10 -08:00
  • d8cd693f11 rework remote deletion Friendika 2011-02-08 04:25:27 -08:00
  • 98db8bc015 Merge branch 'master' of git://github.com/friendika/friendika Tobias Diekershoff 2011-02-08 13:00:53 +01:00
  • d280184b87 fix del_pconfig Friendika 2011-02-08 02:45:55 -08:00
  • e06cd399b7 close tag on favicon link missing Friendika 2011-02-07 23:28:41 -08:00
  • d37ee1b399 at least one server is giving CURL a second set of headers (and it isn't a 100 continue which we've already accounted for) Friendika 2011-02-07 23:20:38 -08:00
  • 9f5d3000c7 don't change photo visibility if only album name was changed Friendika 2011-02-07 21:16:39 -08:00
  • 18c5d1ff90 feed cleanup Friendika 2011-02-07 17:06:04 -08:00
  • 7dd56fa14c one less paren Friendika 2011-02-06 23:06:50 -08:00
  • 118f1d7e0a don't show logout link on 'home' link if remote_user Friendika 2011-02-06 23:04:10 -08:00
  • fbb635462a Merge github.com:tobiasd/friendika Tobias Diekershoff 2011-02-07 08:03:29 +01:00
  • 0d9ed48738 functionise birthday Friendika 2011-02-06 22:41:07 -08:00
  • b96d6c015b fix contact photo updates - a result of baseurl being wrong for cmdline processes Friendika 2011-02-06 19:15:20 -08:00
  • 147d7f3bbf theme name cleanup - rename default to loozah, provide sane fallbacks and change system primary theme. Provide indication on contact edit page of last update success/failure - can be extended later to show actual timestamp of last successful update. Friendika 2011-02-06 15:50:50 -08:00
  • 8e988341d0 Merge branch 'fabrixxm-master' Friendika 2011-02-06 13:27:52 -08:00
  • 3f97344560 Merge branch 'master' of https://github.com/fabrixxm/friendika into fabrixxm-master Friendika 2011-02-06 13:27:37 -08:00
  • 97b608db38 Merge branch 'friendika-master' fabrixxm 2011-02-06 21:27:24 +01:00
  • 64be33a3ff fixed missing close parenthesis fabrixxm 2011-02-06 21:24:41 +01:00
  • 695e084956 deleted another item from the Twitter addon ToDo list Tobias Diekershoff 2011-02-06 18:18:54 +01:00
  • a175027fc1 deleted an item from the ToDo list Tobias Diekershoff 2011-02-06 17:37:04 +01:00
  • fd6116296e Post to Twitter plugin Tobias Diekershoff 2011-02-06 17:27:16 +01:00
  • 339a92fe1b added Slinky library by Beau Lebens for shortening the post url Tobias Diekershoff 2011-02-06 17:22:15 +01:00
  • ac3f3a6e9f kill orphans Friendika 2011-02-06 02:33:02 -08:00
  • 073f3720ac Merge branch 'tobiasd-master' Friendika 2011-02-06 02:21:45 -08:00
  • 4e63b0acb9 ensure that jot_plugins inherit '$visitor' correctly Friendika 2011-02-06 01:08:12 -08:00
  • 09af200bcc german choose existing pic for the avatar Tobias Diekershoff 2011-02-06 08:51:10 +01:00
  • dd3f21b98a Merge branch 'master' of git://github.com/friendika/friendika Tobias Diekershoff 2011-02-06 08:48:07 +01:00
  • d322bb4613 Merge branch 'fabrixxm-master' Friendika 2011-02-05 13:06:20 -08:00
  • 8a55168d4f Merge branch 'ph2pr' of https://github.com/fabrixxm/friendika into fabrixxm-master Friendika 2011-02-05 13:05:57 -08:00
  • c26463b65b Merge branch 'omigeot-master' Friendika 2011-02-05 13:01:28 -08:00
  • c4ddee005e Merge branch 'master' of https://github.com/omigeot/friendika into omigeot-master Friendika 2011-02-05 12:59:04 -08:00
  • 4e913d59ea Fixed some typo (prevented Friendika to load with french locale) olivierm 2011-02-05 15:19:28 +01:00
  • 0c83fb4d80 Merge branch 'master' of git://github.com/friendika/friendika Tobias Diekershoff 2011-02-05 09:19:03 +01:00