]>
git.mxchange.org Git - friendica.git/log
Fabrixxm [Tue, 24 Feb 2015 08:09:02 +0000 (09:09 +0100)]
Merge branch 'master' into develop
Fabrixxm [Tue, 24 Feb 2015 08:03:21 +0000 (09:03 +0100)]
Merge branch 'release-3.3.3'
Fabrixxm [Tue, 24 Feb 2015 08:00:37 +0000 (09:00 +0100)]
Friendica 3.3.3
See CHANGELOG
Michael Vogel [Mon, 23 Feb 2015 20:09:44 +0000 (21:09 +0100)]
Merge pull request #1414 from ddorian1/release-3.3.3
fix validate_email()
Johannes Schwab [Mon, 23 Feb 2015 11:20:05 +0000 (12:20 +0100)]
fix validate_email
fabrixxm [Mon, 23 Feb 2015 07:51:31 +0000 (08:51 +0100)]
Merge pull request #1412 from annando/1502-vier-plus-default
"plus" is now the default style at "vier" for new installations
fabrixxm [Mon, 23 Feb 2015 07:51:02 +0000 (08:51 +0100)]
Merge pull request #1356 from silke/develop
Added help text as requested in #1349.
fabrixxm [Mon, 23 Feb 2015 07:49:34 +0000 (08:49 +0100)]
Merge pull request #1413 from annando/1502-more-contact-options
Show the profile visibility only for Friendica contacts
Michael Vogel [Sat, 21 Feb 2015 19:03:02 +0000 (20:03 +0100)]
Show the profile visibility only for Friendica contacts.
Michael Vogel [Sat, 21 Feb 2015 08:44:13 +0000 (09:44 +0100)]
"plus" is now the default style at "vier" for new installations
Tobias Diekershoff [Sat, 21 Feb 2015 07:21:40 +0000 (08:21 +0100)]
Merge pull request #1411 from annando/1502-contact-management
Only show the options that fit to the current network
Michael Vogel [Fri, 20 Feb 2015 22:56:41 +0000 (23:56 +0100)]
Only show the relation on native networks.
Michael Vogel [Fri, 20 Feb 2015 22:33:21 +0000 (23:33 +0100)]
Bugfix: If "all" is selected then no contacts were shown.
Michael Vogel [Fri, 20 Feb 2015 22:12:04 +0000 (23:12 +0100)]
Only show the options that fit to the current network.
Tobias Diekershoff [Fri, 20 Feb 2015 06:49:58 +0000 (07:49 +0100)]
Merge pull request #1410 from annando/1502-poller-issues
Solving poller issues
Michael Vogel [Thu, 19 Feb 2015 22:02:55 +0000 (23:02 +0100)]
Merge pull request #1408 from tobiasd/issue885
decreasing bubble display time in themes from 10s to 5s
Michael Vogel [Thu, 19 Feb 2015 21:38:02 +0000 (22:38 +0100)]
Beautified the poller logging
Michael Vogel [Thu, 19 Feb 2015 21:30:16 +0000 (22:30 +0100)]
Restructured and simplified the poller check
Michael Vogel [Thu, 19 Feb 2015 21:04:05 +0000 (22:04 +0100)]
The poller now always respects the priority setting for feeds.
Michael Vogel [Thu, 19 Feb 2015 20:36:29 +0000 (21:36 +0100)]
More logging for the poller. Changed the query for the contacts to reduce the amount of contacts
Tobias Diekershoff [Thu, 19 Feb 2015 20:24:09 +0000 (21:24 +0100)]
decreasing bubble display time in themes from 10s to 5s
Tobias Diekershoff [Thu, 19 Feb 2015 09:54:33 +0000 (10:54 +0100)]
Merge pull request #1407 from annando/1502-poller
The poller can now be called even inside the "include" directory
Michael Vogel [Thu, 19 Feb 2015 09:45:46 +0000 (10:45 +0100)]
Do the directory change only when it is needed.
Michael Vogel [Thu, 19 Feb 2015 09:26:49 +0000 (10:26 +0100)]
The poller can now be called even inside the "include" directory.
Tobias Diekershoff [Thu, 19 Feb 2015 08:27:12 +0000 (09:27 +0100)]
Merge pull request #1406 from annando/1502-scrape-last-item
scrape/noscrape now contains the date the profile was last updated
Tobias Diekershoff [Thu, 19 Feb 2015 08:25:41 +0000 (09:25 +0100)]
Merge pull request #1403 from annando/issue-1228
Issue 1228: Pictures aren't sent via API in comments.
Michael Vogel [Wed, 18 Feb 2015 22:40:46 +0000 (23:40 +0100)]
scrape/noscrape now contains the date the profile was last updated or the last message was sent.
Fabrixxm [Wed, 18 Feb 2015 07:37:40 +0000 (08:37 +0100)]
Merge branch 'release-3.3.3' into develop
fabrixxm [Tue, 17 Feb 2015 20:21:38 +0000 (21:21 +0100)]
Merge pull request #1400 from annando/1502-contacts-in-scrape
"contacts" field in scrape/noscrape
fabrixxm [Tue, 17 Feb 2015 20:19:39 +0000 (21:19 +0100)]
Merge pull request #1402 from annando/release-3.3.3
Bugfix: See issue 1338
Michael Vogel [Tue, 17 Feb 2015 19:43:11 +0000 (20:43 +0100)]
Issue 1228: Pictures aren't sent via API in comments.
Michael Vogel [Tue, 17 Feb 2015 18:48:02 +0000 (19:48 +0100)]
Bugfix: See issue 1338
Michael Vogel [Tue, 17 Feb 2015 18:27:13 +0000 (19:27 +0100)]
Removed Statusnet from the counting of contacts for scrape/noscrape
Michael Vogel [Tue, 17 Feb 2015 18:18:17 +0000 (19:18 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1502-contacts-in-scrape
Tobias Diekershoff [Tue, 17 Feb 2015 16:42:53 +0000 (17:42 +0100)]
Merge pull request #1399 from annando/1502-profile-link-avatar-picture
link to the profile behind the avatar picture on the display page
Michael Vogel [Tue, 17 Feb 2015 16:33:28 +0000 (17:33 +0100)]
There is now a link to the profile behind the avatar picture on the display page
Tobias Diekershoff [Tue, 17 Feb 2015 06:43:42 +0000 (07:43 +0100)]
Merge pull request #1397 from annando/release-3.3.3
Bugfix: Friendica contacts were detected as Diaspora contacts. (Poco)
Tobias Diekershoff [Tue, 17 Feb 2015 06:43:09 +0000 (07:43 +0100)]
Merge pull request #1396 from annando/1502-poco-generation-counter
Improved probe_url, new generation counter for poco
Michael Vogel [Tue, 17 Feb 2015 06:34:04 +0000 (07:34 +0100)]
Bugfix: Friendica contacts were detected as Diaspora contacts. (Poco)
Michael Vogel [Mon, 16 Feb 2015 21:30:46 +0000 (22:30 +0100)]
Just some more code beautification
Michael Vogel [Mon, 16 Feb 2015 21:28:24 +0000 (22:28 +0100)]
Just removing unused codelines
Michael Vogel [Mon, 16 Feb 2015 21:11:51 +0000 (22:11 +0100)]
Improved probe_url, fixed wrong network detection.
Tobias Diekershoff [Mon, 16 Feb 2015 08:56:00 +0000 (09:56 +0100)]
Merge pull request #1395 from fabrixxm/escape_input_values
Escape values to input fields (and some 'title' and 'alt')
Fabrixxm [Mon, 16 Feb 2015 08:30:12 +0000 (09:30 +0100)]
Escape values to input fields (and some 'title' and 'alt')
Michael Vogel [Sun, 15 Feb 2015 09:54:41 +0000 (10:54 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1502-poco-generation-counter
Michael Vogel [Sun, 15 Feb 2015 09:52:45 +0000 (10:52 +0100)]
The global contacts now contain a "generation" value that defines how we know this contact
Tobias Diekershoff [Sat, 14 Feb 2015 14:40:35 +0000 (15:40 +0100)]
Merge pull request #1393 from annando/1502-cleaned-item-storage-code
Additional check for notifications
Michael Vogel [Fri, 13 Feb 2015 07:33:27 +0000 (08:33 +0100)]
Merge pull request #1392 from ddorian1/scrolling
Improved infinite scrolling
Michael Vogel [Fri, 13 Feb 2015 07:09:27 +0000 (08:09 +0100)]
Improved logging with receiving mails
Johannes Schwab [Fri, 13 Feb 2015 00:21:57 +0000 (01:21 +0100)]
fix infinite scrolling with frost
Johannes Schwab [Thu, 5 Feb 2015 10:29:14 +0000 (11:29 +0100)]
improved infinite scrollling
Tobias Diekershoff [Thu, 12 Feb 2015 07:08:26 +0000 (08:08 +0100)]
Merge pull request #1390 from tobiasd/20150212cszh
CS, ZH-CN: update to the strings
Tobias Diekershoff [Thu, 12 Feb 2015 06:59:21 +0000 (07:59 +0100)]
CS, ZH-CN: update to the strings
Michael Vogel [Wed, 11 Feb 2015 06:19:48 +0000 (07:19 +0100)]
The "share a post" notification is now sent based upon mentions as well.
Michael Vogel [Wed, 11 Feb 2015 06:07:31 +0000 (07:07 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1502-cleaned-item-storage-code
Michael Vogel [Wed, 11 Feb 2015 06:02:10 +0000 (07:02 +0100)]
Merge pull request #1387 from mexon/mat/mergerequest
Close cURL object earlier in fetch_url
Matthew Exon [Sun, 14 Sep 2014 03:00:33 +0000 (05:00 +0200)]
Close cURL handle before recursing, so that cookie file is flushed
Fabrixxm [Tue, 10 Feb 2015 15:04:22 +0000 (16:04 +0100)]
Merge branch 'release-3.3.3' into develop
Fabrixxm [Tue, 10 Feb 2015 10:00:02 +0000 (11:00 +0100)]
Merge branch 'mexon-mat/mergerequest' into develop
Fabrixxm [Tue, 10 Feb 2015 09:57:26 +0000 (10:57 +0100)]
Merge branch 'mat/mergerequest' of https://github.com/mexon/friendica into mexon-mat/mergerequest
fabrixxm [Tue, 10 Feb 2015 07:31:55 +0000 (08:31 +0100)]
Merge pull request #1385 from mexon/mat/caseheaders
Accept lowercase location header
Michael Vogel [Tue, 10 Feb 2015 07:22:21 +0000 (08:22 +0100)]
Relocated the cache code.
Tobias Diekershoff [Tue, 10 Feb 2015 06:49:09 +0000 (07:49 +0100)]
Merge pull request #1386 from tobiasd/20150210zh
ZH-CN update to the strings
Tobias Diekershoff [Tue, 10 Feb 2015 06:47:26 +0000 (07:47 +0100)]
ZH-CN update to the strings
Matthew Exon [Tue, 10 Feb 2015 03:14:08 +0000 (03:14 +0000)]
Accept lowercase location header
Michael Vogel [Mon, 9 Feb 2015 22:04:18 +0000 (23:04 +0100)]
Removed cache code, since it was superfluous.
Michael Vogel [Mon, 9 Feb 2015 20:52:08 +0000 (21:52 +0100)]
Rearranged code in item storage.
Michael Vogel [Mon, 9 Feb 2015 20:45:17 +0000 (21:45 +0100)]
Take the UID from another place.
Tobias Diekershoff [Mon, 9 Feb 2015 18:59:02 +0000 (19:59 +0100)]
Merge pull request #1383 from tobiasd/20150209csit
CS, IT: update to the strings
Tobias Diekershoff [Mon, 9 Feb 2015 18:53:35 +0000 (19:53 +0100)]
CS, IT: update to the strings
Tobias Diekershoff [Mon, 9 Feb 2015 12:25:50 +0000 (13:25 +0100)]
Merge pull request #1382 from fabrixxm/localize-activity-poke
Fix localization of poke activity + update IT strings
Fabrixxm [Mon, 9 Feb 2015 10:55:14 +0000 (11:55 +0100)]
update IT strings
Fabrixxm [Mon, 9 Feb 2015 10:54:50 +0000 (11:54 +0100)]
fix translation of poke activity body
Tobias Diekershoff [Mon, 9 Feb 2015 10:38:20 +0000 (11:38 +0100)]
Merge pull request #1380 from fabrixxm/plain-text-mail-option
Emailer: fix text-only email
Matthew Exon [Tue, 3 Feb 2015 01:30:03 +0000 (02:30 +0100)]
Support feeds without XML headers
Tobias Diekershoff [Mon, 9 Feb 2015 10:21:17 +0000 (11:21 +0100)]
Merge pull request #1379 from tobiasd/
20150209de
DE update to the strings
Fabrixxm [Mon, 9 Feb 2015 10:21:10 +0000 (11:21 +0100)]
Emailer: fix text-only email
Tobias Diekershoff [Mon, 9 Feb 2015 10:19:56 +0000 (11:19 +0100)]
DE update to the strings
Michael Vogel [Mon, 9 Feb 2015 09:16:48 +0000 (10:16 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1502-contacts-in-scrape
Tobias Diekershoff [Mon, 9 Feb 2015 08:02:55 +0000 (09:02 +0100)]
Merge pull request #1378 from tobiasd/20150209newstrings
regenerated master strings
Tobias Diekershoff [Mon, 9 Feb 2015 07:58:22 +0000 (08:58 +0100)]
regenerated master strings
Tobias Diekershoff [Mon, 9 Feb 2015 07:45:48 +0000 (08:45 +0100)]
Merge pull request #1377 from tobiasd/20150209cs
CS update to the strings
Tobias Diekershoff [Mon, 9 Feb 2015 07:44:06 +0000 (08:44 +0100)]
Merge pull request #1376 from annando/1502-central-item-storage
Moved several configuration values to the admin page
Michael Vogel [Mon, 9 Feb 2015 07:25:12 +0000 (08:25 +0100)]
Bugfix: The value for "global community" wasn't read.
Tobias Diekershoff [Mon, 9 Feb 2015 06:57:03 +0000 (07:57 +0100)]
CS update to the strings
Michael Vogel [Sun, 8 Feb 2015 22:50:45 +0000 (23:50 +0100)]
Enhanced SQL query so that the search is faster.
Michael Vogel [Sun, 8 Feb 2015 22:35:29 +0000 (23:35 +0100)]
Scrape now contains the number of contacts as well.
Michael Vogel [Sun, 8 Feb 2015 20:27:57 +0000 (21:27 +0100)]
Merge pull request #1371 from fabrixxm/release-3.3.3
Update CHANGELOG
Michael Vogel [Sun, 8 Feb 2015 20:03:04 +0000 (21:03 +0100)]
Just a little bit more code clean up.
Michael Vogel [Sun, 8 Feb 2015 19:55:48 +0000 (20:55 +0100)]
Just cleaning up the code.
fabrixxm [Sun, 8 Feb 2015 19:53:30 +0000 (20:53 +0100)]
Update CHANGELOG
fix spelling
Michael Vogel [Sun, 8 Feb 2015 19:35:40 +0000 (20:35 +0100)]
Moved several settings from .htconfig.php to the admin settings page.
Michael Vogel [Sun, 8 Feb 2015 15:03:23 +0000 (16:03 +0100)]
Added thread update for central item storage in the update procedure.
Michael Vogel [Sun, 8 Feb 2015 14:59:22 +0000 (15:59 +0100)]
Searching for items now always searches public entries from the central item storage with uid=0.
Tobias Diekershoff [Sun, 8 Feb 2015 12:37:26 +0000 (13:37 +0100)]
Merge pull request #1375 from annando/1502-altpager-default
"altpager" is now the standard value and can be disabled.
Michael Vogel [Sun, 8 Feb 2015 12:26:28 +0000 (13:26 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1502-altpager-default
Conflicts:
mod/admin.php
Tobias Diekershoff [Sun, 8 Feb 2015 11:48:13 +0000 (12:48 +0100)]
Merge pull request #1374 from annando/1502-noscrape-always-active
Noscrape is now enabled all the time
Tobias Diekershoff [Sun, 8 Feb 2015 11:47:46 +0000 (12:47 +0100)]
Merge pull request #1373 from annando/1502-bugfix-admin-aside
Bad HTML in the admin side menu for webfinger and probe
Michael Vogel [Sun, 8 Feb 2015 11:32:03 +0000 (12:32 +0100)]
Merge pull request #1372 from tobiasd/20150207fr
FR update for the strings
Michael Vogel [Sun, 8 Feb 2015 11:12:19 +0000 (12:12 +0100)]
Bad HTML in the admin side menu for webfinger and probe
projects / friendica.git / log