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

Commit Graph

  • 4a1105ede6 scrape/noscrape now contains the date the profile was last updated or the last message was sent. Michael Vogel 2015-02-18 23:40:46 +01:00
  • b7a50a24c7 Merge branch 'release-3.3.3' into develop Fabrixxm 2015-02-18 08:37:40 +01:00
  • 7d7096f489 Merge pull request #1400 from annando/1502-contacts-in-scrape fabrixxm 2015-02-17 21:21:38 +01:00
  • 66e075ff95 Merge pull request #1402 from annando/release-3.3.3 fabrixxm 2015-02-17 21:19:39 +01:00
  • 2f79e98cda Issue 1228: Pictures aren't sent via API in comments. Michael Vogel 2015-02-17 20:43:11 +01:00
  • 4b7ff42a89 Bugfix: See issue 1338 Michael Vogel 2015-02-17 19:48:02 +01:00
  • 219932f692 Removed Statusnet from the counting of contacts for scrape/noscrape Michael Vogel 2015-02-17 19:27:13 +01:00
  • a26d04574d Merge remote-tracking branch 'upstream/develop' into 1502-contacts-in-scrape Michael Vogel 2015-02-17 19:18:17 +01:00
  • fff7a070f9 Merge pull request #1399 from annando/1502-profile-link-avatar-picture Tobias Diekershoff 2015-02-17 17:42:53 +01:00
  • 52de6c11b1 There is now a link to the profile behind the avatar picture on the display page Michael Vogel 2015-02-17 17:33:28 +01:00
  • 03d779971a Merge pull request #1397 from annando/release-3.3.3 Tobias Diekershoff 2015-02-17 07:43:42 +01:00
  • 94bbc5605b Merge pull request #1396 from annando/1502-poco-generation-counter Tobias Diekershoff 2015-02-17 07:43:09 +01:00
  • d9f222b330 Bugfix: Friendica contacts were detected as Diaspora contacts. (Poco) Michael Vogel 2015-02-17 07:34:04 +01:00
  • 2e1acf7611 Just some more code beautification Michael Vogel 2015-02-16 22:30:46 +01:00
  • 9d920033e8 Just removing unused codelines Michael Vogel 2015-02-16 22:28:24 +01:00
  • 8b1b886797 Improved probe_url, fixed wrong network detection. Michael Vogel 2015-02-16 22:11:51 +01:00
  • b86b6e8e77 Merge pull request #1395 from fabrixxm/escape_input_values Tobias Diekershoff 2015-02-16 09:56:00 +01:00
  • 9d3fb417c2 Escape values to input fields (and some 'title' and 'alt') Fabrixxm 2015-02-16 09:30:12 +01:00
  • 2dafc9eac1 Merge remote-tracking branch 'upstream/develop' into 1502-poco-generation-counter Michael Vogel 2015-02-15 10:54:41 +01:00
  • d1d794f1ab The global contacts now contain a "generation" value that defines how we know this contact Michael Vogel 2015-02-15 10:52:45 +01:00
  • d39612ac25 Merge pull request #1393 from annando/1502-cleaned-item-storage-code Tobias Diekershoff 2015-02-14 15:40:35 +01:00
  • cb88269581 Merge pull request #1392 from ddorian1/scrolling Michael Vogel 2015-02-13 08:33:27 +01:00
  • 75797c61f2 Improved logging with receiving mails Michael Vogel 2015-02-13 08:09:27 +01:00
  • 9f4523dc9a fix infinite scrolling with frost Johannes Schwab 2015-02-13 01:21:57 +01:00
  • 12d7ca9b84 improved infinite scrollling Johannes Schwab 2015-02-05 11:29:14 +01:00
  • 18a297805c Merge pull request #1390 from tobiasd/20150212cszh Tobias Diekershoff 2015-02-12 08:08:26 +01:00
  • e3b6770ad4 CS, ZH-CN: update to the strings Tobias Diekershoff 2015-02-12 07:59:21 +01:00
  • 3c8fc863a8 The "share a post" notification is now sent based upon mentions as well. Michael Vogel 2015-02-11 07:19:48 +01:00
  • 9287a0521a Merge remote-tracking branch 'upstream/develop' into 1502-cleaned-item-storage-code Michael Vogel 2015-02-11 07:07:31 +01:00
  • ce8f965e11 Merge pull request #1387 from mexon/mat/mergerequest Michael Vogel 2015-02-11 07:02:10 +01:00
  • 2bb8b77123 Close cURL handle before recursing, so that cookie file is flushed Matthew Exon 2014-09-14 05:00:33 +02:00
  • 135869fd1c Merge branch 'release-3.3.3' into develop Fabrixxm 2015-02-10 16:04:22 +01:00
  • 4d17b2e9e8 Merge branch 'mexon-mat/mergerequest' into develop Fabrixxm 2015-02-10 11:00:02 +01:00
  • 87f9258834 Merge branch 'mat/mergerequest' of https://github.com/mexon/friendica into mexon-mat/mergerequest Fabrixxm 2015-02-10 10:57:26 +01:00
  • d4e93ee9b4 Merge pull request #1385 from mexon/mat/caseheaders fabrixxm 2015-02-10 08:31:55 +01:00
  • 1a75503b1c Relocated the cache code. Michael Vogel 2015-02-10 08:22:21 +01:00
  • 6e3a236cfc Merge pull request #1386 from tobiasd/20150210zh Tobias Diekershoff 2015-02-10 07:49:09 +01:00
  • 400e11fd9f ZH-CN update to the strings Tobias Diekershoff 2015-02-10 07:47:26 +01:00
  • d12b929c96 Accept lowercase location header Matthew Exon 2015-02-10 03:14:08 +00:00
  • 2dc5f1aefc Removed cache code, since it was superfluous. Michael Vogel 2015-02-09 23:04:18 +01:00
  • 091c3e75ca Rearranged code in item storage. Michael Vogel 2015-02-09 21:52:08 +01:00
  • 05319083c6 Take the UID from another place. Michael Vogel 2015-02-09 21:45:17 +01:00
  • fe43f87bda Merge pull request #1383 from tobiasd/20150209csit Tobias Diekershoff 2015-02-09 19:59:02 +01:00
  • 4e4702fb8b CS, IT: update to the strings Tobias Diekershoff 2015-02-09 19:53:35 +01:00
  • e051da8203 Merge pull request #1382 from fabrixxm/localize-activity-poke Tobias Diekershoff 2015-02-09 13:25:50 +01:00
  • f4f0f2bbc7 update IT strings Fabrixxm 2015-02-09 11:55:14 +01:00
  • 5d19b21298 fix translation of poke activity body Fabrixxm 2015-02-09 11:54:50 +01:00
  • b383e53927 Merge pull request #1380 from fabrixxm/plain-text-mail-option Tobias Diekershoff 2015-02-09 11:38:20 +01:00
  • 1c31dca5d6 Support feeds without XML headers Matthew Exon 2015-02-03 02:30:03 +01:00
  • c0c429eb41 Merge pull request #1379 from tobiasd/20150209de Tobias Diekershoff 2015-02-09 11:21:17 +01:00
  • ff41cc24bd Emailer: fix text-only email Fabrixxm 2015-02-09 11:21:10 +01:00
  • 93cb464d79 DE update to the strings Tobias Diekershoff 2015-02-09 11:19:56 +01:00
  • 21c63e8b65 Merge remote-tracking branch 'upstream/develop' into 1502-contacts-in-scrape Michael Vogel 2015-02-09 10:16:48 +01:00
  • 88b86bf6f6 Merge pull request #1378 from tobiasd/20150209newstrings Tobias Diekershoff 2015-02-09 09:02:55 +01:00
  • e8155a6df0 regenerated master strings Tobias Diekershoff 2015-02-09 08:58:22 +01:00
  • 18cfb5e726 Merge pull request #1377 from tobiasd/20150209cs Tobias Diekershoff 2015-02-09 08:45:48 +01:00
  • 5e51a125a7 Merge pull request #1376 from annando/1502-central-item-storage Tobias Diekershoff 2015-02-09 08:44:06 +01:00
  • e7b2c5dbf3 Bugfix: The value for "global community" wasn't read. Michael Vogel 2015-02-09 08:25:12 +01:00
  • 898d4b2a62 CS update to the strings Tobias Diekershoff 2015-02-09 07:57:03 +01:00
  • c0411ae25a Enhanced SQL query so that the search is faster. Michael Vogel 2015-02-08 23:50:45 +01:00
  • 842ac46857 Scrape now contains the number of contacts as well. Michael Vogel 2015-02-08 23:35:29 +01:00
  • 6f78a4dcf2 Merge pull request #1371 from fabrixxm/release-3.3.3 Michael Vogel 2015-02-08 21:27:57 +01:00
  • 136626c199 Just a little bit more code clean up. Michael Vogel 2015-02-08 21:03:04 +01:00
  • 2a02e1cb9c Just cleaning up the code. Michael Vogel 2015-02-08 20:55:48 +01:00
  • 456b6b17c0 Update CHANGELOG fix spelling fabrixxm 2015-02-08 20:53:30 +01:00
  • 7e9ae24511 Moved several settings from .htconfig.php to the admin settings page. Michael Vogel 2015-02-08 20:35:40 +01:00
  • 10c7ab76a2 Added thread update for central item storage in the update procedure. Michael Vogel 2015-02-08 16:03:23 +01:00
  • a97d4383a1 Searching for items now always searches public entries from the central item storage with uid=0. Michael Vogel 2015-02-08 15:59:22 +01:00
  • 7d2da9be02 Merge pull request #1375 from annando/1502-altpager-default Tobias Diekershoff 2015-02-08 13:37:26 +01:00
  • 8871591a98 Merge remote-tracking branch 'upstream/develop' into 1502-altpager-default Michael Vogel 2015-02-08 13:26:28 +01:00
  • b4dc344f9c Merge pull request #1374 from annando/1502-noscrape-always-active Tobias Diekershoff 2015-02-08 12:48:13 +01:00
  • 1418d6bc27 Merge pull request #1373 from annando/1502-bugfix-admin-aside Tobias Diekershoff 2015-02-08 12:47:46 +01:00
  • 65e4dc93d5 Merge pull request #1372 from tobiasd/20150207fr Michael Vogel 2015-02-08 12:32:03 +01:00
  • 1781fbff13 Bad HTML in the admin side menu for webfinger and probe Michael Vogel 2015-02-08 12:12:19 +01:00
  • f931eba7f2 Noscrape is now enabled all the time. Michael Vogel 2015-02-08 12:07:35 +01:00
  • 1d48ab0191 "altpager" is now the standard value and can be disabled. Depending upon the user reactions we can disable it in an upcoming version. Michael Vogel 2015-02-08 11:54:42 +01:00
  • cea445de2e FR update for the strings Tobias Diekershoff 2015-02-08 10:44:47 +01:00
  • fb6521cca2 Update CHANGELOG fabrixxm 2015-02-07 15:50:16 +01:00
  • f620834d97 Merge branch 'release-3.3.3' into develop fabrixxm 2015-02-07 12:57:12 +01:00
  • dea2e66cdf Merge pull request #1369 from annando/1502-title-in-diaspora-bookmarklet Tobias Diekershoff 2015-02-06 22:03:54 +01:00
  • 1f346e7c1f Merge pull request #1368 from annando/1502-contact-correction Tobias Diekershoff 2015-02-06 22:03:00 +01:00
  • 89f260eb6c The title in the bookmarklet had several asterisk in the title. This had no use for friendica. Michael Vogel 2015-02-06 21:10:49 +01:00
  • d87ab3cd97 Correct the contact data if it was changed although the system don't thinks so. Michael Vogel 2015-02-06 21:02:33 +01:00
  • df6188f2c7 Merge pull request #1366 from ddorian1/release-3.3.3 fabrixxm 2015-02-06 17:38:55 +01:00
  • 1114ae4c81 fix urls for pager Johannes Schwab 2015-02-06 16:56:09 +01:00
  • aa720eb277 Merge pull request #1357 from annando/1502-html-poco-2 fabrixxm 2015-02-05 11:21:23 +01:00
  • 4be63b0a82 Merge pull request #1360 from tobiasd/20150205lng Tobias Diekershoff 2015-02-05 11:09:00 +01:00
  • 5aba3abfc1 CS DE FR: update to the strings Tobias Diekershoff 2015-02-05 11:06:23 +01:00
  • be40d9d265 Merge pull request #1359 from annando/1502-more-detailled-location Tobias Diekershoff 2015-02-05 08:31:15 +01:00
  • f3b8950ab1 Merge pull request #1358 from annando/1502-relocate-set-nurl Tobias Diekershoff 2015-02-04 20:39:31 +01:00
  • 9641436996 The relocate message hadn't changed the "nurl" value. Michael Vogel 2015-02-04 20:22:05 +01:00
  • 742a6dcf6e Due to some git problems, just the same stuff again (html to bbcode conversation in poco) Michael Vogel 2015-02-04 19:49:43 +01:00
  • cdd3089444 Help text sounded too complicated Silke Meyer 2015-02-04 16:43:31 +01:00
  • 6bccf0be79 Added help text as requested in #1349. Silke Meyer 2015-02-04 16:13:07 +01:00
  • 60eae0b2bc Merge pull request #1355 from tobiasd/20150204_fr Tobias Diekershoff 2015-02-04 11:55:26 +01:00
  • 485432e734 FR: some more updates to the strings Tobias Diekershoff 2015-02-04 11:54:13 +01:00
  • 0f4decf74e Merge pull request #1354 from tobiasd/20150204_defr Tobias Diekershoff 2015-02-04 11:42:39 +01:00
  • 14dec94d33 DE FR: update to the strings Tobias Diekershoff 2015-02-04 11:41:06 +01:00
  • 49eadbdad9 Merge pull request #1353 from tobiasd/20150205_typo Tobias Diekershoff 2015-02-04 11:39:20 +01:00
  • 8a55e20143 regenerated master message.po Tobias Diekershoff 2015-02-04 11:38:34 +01:00