clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • 6edc52f78f Convert received "edited" timestamp to UTC before comparing to what's in the database, and don't overwrite with older items. Matthew Exon 2013-03-20 09:00:12 +08:00
  • 00aab4039d Merge https://github.com/friendica/friendica into pull friendica 2013-03-19 03:31:37 -07:00
  • 17cb682ed0 rm addon.old friendica 2013-03-19 03:30:50 -07:00
  • 39cc7f4565 use _Enable Debugging_ instead of only _Debugging_ in the interface Tobias Diekershoff 2013-03-19 07:01:34 +01:00
  • 1a49c841d8 Merge pull request #649 from mexon/redirect_fix fermionic 2013-03-18 18:06:41 -07:00
  • 133ef9155d don't allow deleted accounts to appear on "manage" page friendica 2013-03-18 17:31:21 -07:00
  • 108f2e1b81 Merge https://github.com/friendica/friendica into pull friendica 2013-03-18 16:41:56 -07:00
  • 1ff37ca4c1 double encode any text that is destined for meta fields. friendica 2013-03-18 16:40:33 -07:00
  • 887a5e5987 Merge pull request #650 from fermionic/20130316-network-infinite-redirect fermionic 2013-03-16 09:12:35 -07:00
  • 03f2fa5119 prevent infinite redirect on network page for non-existant group Zach Prezkuta 2013-03-16 10:11:32 -06:00
  • 111495423c Imported mails were deleted the second time the poller ran - when moving or deleting of mails was activated. Michael Vogel 2013-03-14 23:15:15 +01:00
  • c53bdfb163 Restore redirect functionality removed by change 452ff19d Matthew Exon 2013-03-14 13:50:45 +08:00
  • bb3e8ad785 modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php pixelroot 2013-03-12 10:06:19 +01:00
  • a65ae04bcc modified: view/theme/smoothly/style.css pixelroot 2013-03-11 19:59:49 +01:00
  • a2adc03636 deleted: view/theme/smoothly/login.tpl deleted: view/theme/smoothly/smarty3/login.tpl modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php pixelroot 2013-03-11 19:19:33 +01:00
  • 3399b1ccf6 Merge pull request #648 from mexon/mailstream-prerequisites fermionic 2013-03-10 15:34:54 -07:00
  • 91a6a1cb25 Merge pull request #646 from annando/master fermionic 2013-03-10 15:24:27 -07:00
  • 720a44bb0b The post_remote_end hook was being called with an escaped version of the item, not very useful. This change moves the hook to the end of item_store and gets all data fresh from the database. Matthew Exon 2013-03-08 03:08:47 +01:00
  • 4df162d929 Explicitly list protocols that are allowed, rather than using their initials. Also, add cid, which I need for my mailstream plugin to work. Matthew Exon 2013-03-08 08:38:25 +01:00
  • e200040c5b Merge remote-tracking branch 'upstream/master' Michael Vogel 2013-03-07 20:20:12 +01:00
  • 5d3613c8bc Vier: The change from blue to black in links is now faded as well. Michael Vogel 2013-03-07 19:34:54 +01:00
  • ce7217c8f6 Merge pull request #647 from fabrixxm/issue-552 fabrixxm 2013-03-07 05:21:36 -08:00
  • a92ef6f0fe remove authentication from api help/test. fix issue 552. identi.ca don't ask for auth on help/test. Fabrixxm 2013-03-07 08:16:53 -05:00
  • c40c61c106 OStatus conversations: Fixed a bug when a message hadn't got an id. vier: Some more changes to make the side menu static. In the index.php I did a small change to make friendica compatible with the android client for diaspora. Michael Vogel 2013-03-06 23:23:04 +01:00
  • 3bf560f22f Merge pull request #643 from annando/master tobiasd 2013-03-05 22:06:39 -08:00
  • b94bd93b0b Merge pull request #645 from tobiasd/master tobiasd 2013-03-04 19:17:10 -08:00
  • 86eec2e0fa Twitter API 1.1 Tobias Diekershoff 2013-03-05 03:48:29 +01:00
  • 1b74e3ff10 Merge pull request #644 from fermionic/20130303-no-embedding-private-images-option fermionic 2013-03-04 15:57:57 -08:00
  • 277c47732b fix disable embedding option description Zach Prezkuta 2013-03-04 16:55:07 -07:00
  • 86e19dda22 Vier: Some more changes to the theme. Added a switch to suppress displaying of the tags. Michael Vogel 2013-03-05 00:46:11 +01:00
  • 8bb6b51967 Vier: Some more transition effects Michael Vogel 2013-03-04 21:11:31 +01:00
  • 421d484839 Merge remote-tracking branch 'upstream/master' Michael Vogel 2013-03-04 00:05:17 +01:00
  • 478a079665 Vier: Further changes: profile border is rounded. Michael Vogel 2013-03-04 00:04:06 +01:00
  • 8e1d253568 OStatus conversation: now the creation date of the item is store with the conversation vier: The link color and the color of the top bar is changed. Michael Vogel 2013-03-03 23:44:50 +01:00
  • 631085462e Merge pull request #642 from oohlaf/master friendica 2013-03-03 14:38:17 -08:00
  • 77f4a36d90 Ignore invalid tokens when scraping an URL Olaf Conradi 2013-03-03 21:41:27 +01:00
  • 1c55b0b359 Merge pull request #639 from annando/master friendica 2013-03-03 12:07:52 -08:00
  • ee70e02d0d Merge pull request #640 from fermionic/20130303-no-embedding-private-images-option friendica 2013-03-03 12:07:35 -08:00
  • 2c1729e7a8 Merge pull request #641 from oohlaf/master friendica 2013-03-03 12:06:10 -08:00
  • aa7aa59def Fix SQL error for missing AND operator Olaf Conradi 2013-03-03 20:44:52 +01:00
  • 00888a73bb OStatus conversation: Prevent posting loops Michael Vogel 2013-03-03 17:58:35 +01:00
  • 0187283709 allow admin to prevent private image embedding on hub Zach Prezkuta 2013-03-03 09:44:41 -07:00
  • ee263aec55 Merge pull request #636 from fabrixxm/installer/checkphpcli fermionic 2013-03-03 07:51:51 -08:00
  • ef39edd845 Merge pull request #638 from tobiasd/issue_197 fermionic 2013-03-03 07:48:51 -08:00
  • 05597b564d Merge remote-tracking branch 'upstream/master' Michael Vogel 2013-03-03 16:30:18 +01:00
  • 4e68a6b3e0 typo Tobias Diekershoff 2013-03-03 12:02:45 +01:00
  • 0b925899d4 put edited meta info in item object to give theme developers the chance to display this in a fancy way Tobias Diekershoff 2013-03-03 11:47:01 +01:00
  • 583e82aeb5 Merge https://github.com/friendica/friendica into pull friendica 2013-03-02 15:47:23 -08:00
  • f07df4f667 merge friendica 2013-03-02 15:46:54 -08:00
  • 59c03edbc9 fix util/config friendica 2013-03-02 15:44:00 -08:00
  • 2866f62c88 Suppoorting Open Graph and Dublin Core when displaying single item Following link shorteners in parse_url Michael Vogel 2013-03-02 14:46:06 +01:00
  • 7e7e88d4ad Add sample lighttpd config, from the mailing list. Thomas Willingham 2013-03-01 19:55:33 +00:00
  • 40f61f7841 Merge pull request #637 from fabrixxm/lang/it fabrixxm 2013-03-01 08:29:02 -08:00
  • 1524c15ba5 update IT strings Fabrixxm 2013-03-01 11:27:43 -05:00
  • c54b61cf81 DE: update to the strings Tobias Diekershoff 2013-03-01 16:24:58 +01:00
  • 4791e5b245 install: add check for php-cli Check won't pass if $php -v won't return "(cli)" Fabrixxm 2013-03-01 04:43:04 -05:00
  • 78cc56309b Merge pull request #633 from tobiasd/admin-info-themes fermionic 2013-02-28 17:00:56 -08:00
  • 570f67187d Merge pull request #635 from fabrixxm/addonlangs fabrixxm 2013-02-28 07:16:18 -08:00
  • 3d3aebeda1 fix bug in run_xgettext, update messages.po Fabrixxm 2013-02-28 10:14:40 -05:00
  • a84e9196fb ZH-CN: update to the strings Tobias Diekershoff 2013-02-28 08:59:06 +01:00
  • 56b8118485 PL: update to the strings Tobias Diekershoff 2013-02-28 08:55:38 +01:00
  • cd478ecdca exp account info in decaf-mobile Tobias Diekershoff 2013-02-28 08:10:05 +01:00
  • 42a054c667 exp account info in frost-mobile Tobias Diekershoff 2013-02-28 08:07:41 +01:00
  • 209ebd4e74 exp account info in frost Tobias Diekershoff 2013-02-28 08:03:34 +01:00
  • 36959cfc4b exp accounts info in diabook Tobias Diekershoff 2013-02-28 08:01:37 +01:00
  • 079c638403 Merge pull request #631 from fabrixxm/addonlangs friendica 2013-02-27 16:53:08 -08:00
  • 90a596339d Merge pull request #632 from beardy-unixer/master friendica 2013-02-27 16:51:56 -08:00
  • f5d15a7ff8 Add support for members-only addons Thomas Willingham 2013-02-28 00:29:06 +00:00
  • d302bd070c add check for false returned by query in load_translation_table Fabrixxm 2013-02-27 10:16:05 -05:00
  • 7b01e735ae move load_traslation_table after db setup Fabrixxm 2013-02-27 10:15:09 -05:00
  • 5214eb2bda update util/messages.po Fabrixxm 2013-02-27 09:44:05 -05:00
  • a1746a9fd2 run_xgettext: check for dir before run xgettext Fabrixxm 2013-02-27 09:42:20 -05:00
  • 057110e08b update strings, add plural select function definition check Fabrixxm 2013-02-27 09:36:25 -05:00
  • e1c24377ee new file: view/theme/smoothly/images/larrow.gif new file: view/theme/smoothly/images/rarrow.gif pixelroot 2013-02-27 14:27:41 +01:00
  • 43e88508c9 modified: view/theme/smoothly/login.tpl modified: view/theme/smoothly/smarty3/login.tpl modified: view/theme/smoothly/smarty3/wall_thread.tpl modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php modified: view/theme/smoothly/wall_thread.tpl pixelroot 2013-02-27 14:27:06 +01:00
  • 9d99a531b9 update translation utils: po2php: add "if function_exists" around plural select function run_xgettext: add option to extract strings from addon folder Fabrixxm 2013-02-27 08:25:03 -05:00
  • cd8346694b load_translation_table: load translation strings from enabled plugins Fabrixxm 2013-02-27 08:23:00 -05:00
  • 3ea5d6591d Merge pull request #630 from mexon/bbcode-regex-fix friendica 2013-02-27 01:55:59 -08:00
  • 63be0062b6 For very large posts (~18k) with lots of markup, these regexes were causing enough backtracking for php to run out of memory, silently generating an empty entry. This tightens up the regexes so they do less backtracking. Matthew Exon 2013-02-27 07:34:40 +08:00
  • 0433263866 Merge https://github.com/friendica/friendica into pull friendica 2013-02-26 17:33:47 -08:00
  • 5205a374ee block injection vector friendica 2013-02-26 17:33:18 -08:00
  • 52614bd72b Merge pull request #629 from tobiasd/admin-info fabrixxm 2013-02-25 05:04:58 -08:00
  • f97c81c178 kill some newlines Tobias Diekershoff 2013-02-25 13:05:30 +01:00
  • 7186331a89 Admin panel: show if an account has expired Tobias Diekershoff 2013-02-25 13:02:17 +01:00
  • 6100ae98a2 Merge branch 'master' of https://github.com/friendica/friendica Tobias Diekershoff 2013-02-24 18:19:55 +01:00
  • cf677a3003 Merge pull request #628 from fermionic/20130223-limit-body-size-on-email-imports fermionic 2013-02-24 07:13:21 -08:00
  • c35feb27f2 community: Only show top postings, no comments parse_url: Follow location in "meta"-header Michael Vogel 2013-02-24 12:54:53 +01:00
  • ab81be3bb1 Merge branch 'master' of https://github.com/friendica/friendica Tobias Diekershoff 2013-02-24 12:31:25 +01:00
  • 521ccc38c6 Merge pull request #625 from tobiasd/master tobiasd 2013-02-23 23:27:21 -08:00
  • 69776fc54e Merge pull request #627 from fermionic/20130223-quattro-vier-smarty-updates tobiasd 2013-02-23 23:26:48 -08:00
  • c83b82ee2b Merge pull request #626 from fermionic/20130223-disable-content-in-notifications tobiasd 2013-02-23 23:25:49 -08:00
  • c0d1caa47d Merge branch 'master' of https://github.com/friendica/friendica Tobias Diekershoff 2013-02-23 19:57:31 +01:00
  • 023752ae46 DE: update to the strings Tobias Diekershoff 2013-02-23 19:56:21 +01:00
  • fcab22b80f run limit_body_size on imported emails, which don't go through consume_feed Zach Prezkuta 2013-02-23 10:06:59 -07:00
  • 047cf0d342 some smarty templates needed updating Zach Prezkuta 2013-02-23 09:36:00 -07:00
  • 3843f821b2 better description Zach Prezkuta 2013-02-23 09:33:29 -07:00
  • 4db50a3ecb admin option to disable post content in email notifications for the site Zach Prezkuta 2013-02-23 09:31:34 -07:00
  • c2b49f2588 make sure conv_as->items is an array or don't proceed Tobias Diekershoff 2013-02-23 12:42:55 +01:00
  • c35b21eb18 Merge branch 'master' of https://github.com/friendica/friendica Tobias Diekershoff 2013-02-23 08:25:12 +01:00
  • 6e21534f23 Merge https://github.com/friendica/friendica into pull friendica 2013-02-22 17:12:14 -08:00