]>
git.mxchange.org Git - friendica.git/log
Michael Vogel [Mon, 12 Oct 2015 05:50:40 +0000 (07:50 +0200)]
Merge pull request #1943 from tobiasd/
20151007-adminname
personalise emails send from the server
Michael Vogel [Sun, 11 Oct 2015 10:01:46 +0000 (12:01 +0200)]
Merge pull request #1951 from tobiasd/
20151011-messagespo
regenerated messages.po file
Tobias Diekershoff [Sun, 11 Oct 2015 08:38:05 +0000 (10:38 +0200)]
regenerated messages.po file
Tobias Diekershoff [Sun, 11 Oct 2015 06:53:15 +0000 (08:53 +0200)]
Merge pull request #1950 from annando/1510-contact-menu
Some improvements to the contact menus
Michael Vogel [Sun, 11 Oct 2015 03:11:46 +0000 (05:11 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1510-contact-menu
Conflicts:
include/conversation.php
Tobias Diekershoff [Sat, 10 Oct 2015 16:50:20 +0000 (18:50 +0200)]
Merge pull request #1947 from annando/1510-diaspora-follower
Reworked contact relations between Diaspora and Friendica
Tobias Diekershoff [Sat, 10 Oct 2015 16:48:20 +0000 (18:48 +0200)]
Merge pull request #1948 from annando/1510-more-escaping
Handling contact names with > and <
Tobias Diekershoff [Sat, 10 Oct 2015 16:47:02 +0000 (18:47 +0200)]
Merge pull request #1949 from annando/1510-feed-duplicates
Bugfix: Feeds weren't imported if a post with the same URI existed.
Michael Vogel [Sat, 10 Oct 2015 14:23:20 +0000 (16:23 +0200)]
Improved contact menu
Michael Vogel [Sat, 10 Oct 2015 12:26:07 +0000 (14:26 +0200)]
Bugfix: Feeds weren't imported if a post with the same URI existed.
Michael Vogel [Sat, 10 Oct 2015 09:06:18 +0000 (11:06 +0200)]
Reworked contact relations between Friendica and Diaspora
Michael Vogel [Sat, 10 Oct 2015 02:56:40 +0000 (04:56 +0200)]
Bugfix: Unidirectional Diaspora connect request have to be followers - not sharers
Michael Vogel [Fri, 9 Oct 2015 21:27:00 +0000 (23:27 +0200)]
acl lookup now works fine as well.
Michael Vogel [Fri, 9 Oct 2015 05:39:38 +0000 (07:39 +0200)]
Contact names with ">" and "<" are a problem ...
Tobias Diekershoff [Thu, 8 Oct 2015 06:03:42 +0000 (08:03 +0200)]
Merge pull request #1944 from annando/1510-proxy-picture-size
Picture size and bugfix for contact names with "<" and ">"
Michael Vogel [Wed, 7 Oct 2015 22:25:55 +0000 (00:25 +0200)]
Bugfix: The contact names had to be escaped
Tobias Diekershoff [Wed, 7 Oct 2015 07:38:47 +0000 (09:38 +0200)]
added some lines to the htconfig config variables
fabrixxm [Wed, 7 Oct 2015 06:37:50 +0000 (08:37 +0200)]
Merge pull request #1942 from tobiasd/
20151007-IT
IT: update to the strings
Michael Vogel [Wed, 7 Oct 2015 06:25:10 +0000 (08:25 +0200)]
Added resize possibility to proxy function
Tobias Diekershoff [Wed, 7 Oct 2015 04:22:15 +0000 (06:22 +0200)]
personalise emails send from the server
Tobias Diekershoff [Wed, 7 Oct 2015 04:20:54 +0000 (06:20 +0200)]
IT: update to the strings
Tobias Diekershoff [Tue, 6 Oct 2015 17:02:41 +0000 (19:02 +0200)]
Merge pull request #1941 from annando/1510-diaspora-privacy
Reworked contact data fetching on "display" page, bugfix in notifications
Michael Vogel [Tue, 6 Oct 2015 16:31:08 +0000 (18:31 +0200)]
Reworked fetching of contact data on "display" page
Michael Vogel [Tue, 6 Oct 2015 05:41:09 +0000 (07:41 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1510-diaspora-privacy
Michael Vogel [Tue, 6 Oct 2015 04:56:31 +0000 (06:56 +0200)]
Hide some profile data if not connected.
Tobias Diekershoff [Tue, 6 Oct 2015 04:43:20 +0000 (06:43 +0200)]
Merge pull request #1940 from annando/1510-proxy-problems
Bugfix: The proxy function had problems with embedded pictures
Michael Vogel [Mon, 5 Oct 2015 20:25:14 +0000 (22:25 +0200)]
Removed "proxy_parse_html" since it is now done in the bbcode function.
Michael Vogel [Mon, 5 Oct 2015 20:19:34 +0000 (22:19 +0200)]
The proxy function sometimes kills embedded pictures ...
Tobias Diekershoff [Mon, 5 Oct 2015 17:14:42 +0000 (19:14 +0200)]
Merge pull request #1939 from annando/issue-1938
Vier: Error when calling the admin settings of "vier" when "vier" is not activated
Michael Vogel [Mon, 5 Oct 2015 15:38:57 +0000 (17:38 +0200)]
Vier: Avoid an error when calling the admin settings of "vier" when "vier" is not activated.
Tobias Diekershoff [Mon, 5 Oct 2015 13:15:52 +0000 (15:15 +0200)]
Merge pull request #1937 from annando/1510-follow-notifications
Show RedMatrix and use the proxy for the profile pictures
Michael Vogel [Mon, 5 Oct 2015 06:08:59 +0000 (08:08 +0200)]
Added the contact menu to the search as well.
Michael Vogel [Sun, 4 Oct 2015 22:19:58 +0000 (00:19 +0200)]
Rearranged the contact menu so that it fits the menu at the conversations.
Michael Vogel [Sun, 4 Oct 2015 22:14:39 +0000 (00:14 +0200)]
Remove all menu entries on the contact list that are empty
Michael Vogel [Sun, 4 Oct 2015 21:41:13 +0000 (23:41 +0200)]
Further improvement of the contact menu
Michael Vogel [Sun, 4 Oct 2015 20:24:58 +0000 (22:24 +0200)]
Show RedMatrix and use the proxy for the profile pictures
Tobias Diekershoff [Sun, 4 Oct 2015 19:30:35 +0000 (21:30 +0200)]
Merge pull request #1936 from annando/1510-contact-menu
The contact menu is now improved (for example a "Follow" link)
Michael Vogel [Sun, 4 Oct 2015 19:17:28 +0000 (21:17 +0200)]
The contact menu is now improved (for example a "Follow" link)
Tobias Diekershoff [Sun, 4 Oct 2015 18:10:38 +0000 (20:10 +0200)]
Merge pull request #1935 from annando/1510-bugfix-repair
Bugfix: Repairing a contact was more like killing the contact ...
Michael Vogel [Sun, 4 Oct 2015 17:48:29 +0000 (19:48 +0200)]
A contact that couldn't be resolved is know known as "UNKNOWN"
Michael Vogel [Sun, 4 Oct 2015 17:39:55 +0000 (19:39 +0200)]
Bugfix: Repairing a contact was more like killing the contact ...
Tobias Diekershoff [Sun, 4 Oct 2015 15:49:02 +0000 (17:49 +0200)]
Merge pull request #1934 from annando/1510-better-notification
Let the notification look more like the follow dialog
Tobias Diekershoff [Sun, 4 Oct 2015 15:46:50 +0000 (17:46 +0200)]
Merge pull request #1931 from annando/1510-documentation-htconfig
Documentation of .htconfig.php values
Michael Vogel [Sun, 4 Oct 2015 15:37:08 +0000 (17:37 +0200)]
Added explanation how to add a parameter to the .htconfig.pgp
Michael Vogel [Sun, 4 Oct 2015 15:20:47 +0000 (17:20 +0200)]
For safety reasons include the include
Michael Vogel [Sun, 4 Oct 2015 15:18:58 +0000 (17:18 +0200)]
Let the notification look more like the follow dialog
Tobias Diekershoff [Sun, 4 Oct 2015 15:02:27 +0000 (17:02 +0200)]
Merge pull request #1933 from annando/1510-follow-more-data
Show more information when following a new contact
Tobias Diekershoff [Sun, 4 Oct 2015 15:01:25 +0000 (17:01 +0200)]
Merge pull request #1932 from annando/1510-vier-2
Small optical changes in "vier"
Michael Vogel [Sun, 4 Oct 2015 13:55:24 +0000 (15:55 +0200)]
transfer some stuff from "follow" to the "notifications" to reduce the differences in the two dialogues.
Michael Vogel [Sun, 4 Oct 2015 12:49:12 +0000 (14:49 +0200)]
Preparation for a not found contact.
Michael Vogel [Sun, 4 Oct 2015 12:41:39 +0000 (14:41 +0200)]
Show more information when following a new contact
Michael Vogel [Sun, 4 Oct 2015 12:40:02 +0000 (14:40 +0200)]
Beautyfied code. Link to "follow" on community profiles
Michael Vogel [Sun, 4 Oct 2015 10:24:00 +0000 (12:24 +0200)]
Small optical changes in "vier"
Michael Vogel [Sun, 4 Oct 2015 10:02:44 +0000 (12:02 +0200)]
Documentation of .htconfig.php values
Michael Vogel [Sun, 4 Oct 2015 08:25:40 +0000 (10:25 +0200)]
Merge pull request #1930 from tobiasd/
20151004-de
DE update to the translation
Tobias Diekershoff [Sun, 4 Oct 2015 07:23:58 +0000 (09:23 +0200)]
DE update to the translation
Tobias Diekershoff [Sun, 4 Oct 2015 06:54:59 +0000 (08:54 +0200)]
Merge pull request #1928 from annando/issue-1913
Issue 1913: Report invalid feed
Tobias Diekershoff [Sun, 4 Oct 2015 06:54:01 +0000 (08:54 +0200)]
Merge pull request #1927 from annando/issue-1914
Issue 1914: A feed was falsely detected as OStatus
Tobias Diekershoff [Sun, 4 Oct 2015 06:53:32 +0000 (08:53 +0200)]
Merge pull request #1926 from annando/1510-permit-crawler
New option to permit crawlers
Tobias Diekershoff [Sun, 4 Oct 2015 06:51:58 +0000 (08:51 +0200)]
Merge pull request #1923 from annando/1510-feed-remote-self
Bugfix: Remote self hadn't worked anymore since the new feed import
Tobias Diekershoff [Sun, 4 Oct 2015 06:51:36 +0000 (08:51 +0200)]
Merge pull request #1922 from annando/1510-vier-right-aside
"Vier" comes now with the right column from Diabook
Michael Vogel [Sat, 3 Oct 2015 22:28:15 +0000 (00:28 +0200)]
Issue 1913: Report invalid feed
Michael Vogel [Sat, 3 Oct 2015 21:57:00 +0000 (23:57 +0200)]
Issue 1914: A feed was falsely detected as OStatus
Michael Vogel [Sat, 3 Oct 2015 21:19:09 +0000 (23:19 +0200)]
New template for http status messages
Michael Vogel [Sat, 3 Oct 2015 21:16:40 +0000 (23:16 +0200)]
New option to permit crawlers
Michael Vogel [Sat, 3 Oct 2015 20:06:28 +0000 (22:06 +0200)]
Merge pull request #1916 from rabuzarus/geotag
port of red matrix geotag feature
rabuzarus [Sat, 3 Oct 2015 18:41:26 +0000 (20:41 +0200)]
Merge origin/geotag into geotag
rabuzarus [Tue, 29 Sep 2015 22:19:54 +0000 (00:19 +0200)]
port of reds geotag feature
Michael Vogel [Sat, 3 Oct 2015 11:58:10 +0000 (13:58 +0200)]
Bugfix: Remote self worked anymore
Michael Vogel [Sat, 3 Oct 2015 10:55:55 +0000 (12:55 +0200)]
The right side now contains much stuff from diabook - but completely reworked.
Michael Vogel [Thu, 1 Oct 2015 06:19:35 +0000 (08:19 +0200)]
Vier: Menu at the right side (inspired and copyied from diabook)
Michael Vogel [Thu, 1 Oct 2015 06:09:28 +0000 (08:09 +0200)]
Merge pull request #1919 from tobiasd/
20151001-calendar
add a header to seperate the beginning of week settings
Tobias Diekershoff [Thu, 1 Oct 2015 04:19:57 +0000 (06:19 +0200)]
add a header to seperate the beginning of week settings
Tobias Diekershoff [Thu, 1 Oct 2015 04:09:37 +0000 (06:09 +0200)]
Merge pull request #1918 from annando/1510-events
Event improvements
Michael Vogel [Wed, 30 Sep 2015 19:59:55 +0000 (21:59 +0200)]
Rearrange the navigation bar on smaller windows
Michael Vogel [Wed, 30 Sep 2015 17:18:13 +0000 (19:18 +0200)]
Setting for the first day of the week
Michael Vogel [Wed, 30 Sep 2015 16:50:44 +0000 (18:50 +0200)]
The events moved from the profile to the navigation bar - for supported themes
rabuzarus [Wed, 30 Sep 2015 10:37:20 +0000 (12:37 +0200)]
Merge geotag into develop
Conflicts:
mod/photos.php
rabuzarus [Wed, 30 Sep 2015 10:33:57 +0000 (12:33 +0200)]
port of reds geotag feature
fabrixxm [Wed, 30 Sep 2015 06:57:31 +0000 (08:57 +0200)]
Merge pull request #1915 from rabuzarus/hide_profilepics
don't show profile photos in albums to others than owner or remote
fabrixxm [Wed, 30 Sep 2015 06:56:54 +0000 (08:56 +0200)]
Merge pull request #1912 from annando/1509-worker
New way of background processing
fabrixxm [Wed, 30 Sep 2015 06:46:57 +0000 (08:46 +0200)]
Merge pull request #1911 from annando/1509-i18n-events
Localisation of the event page
fabrixxm [Wed, 30 Sep 2015 06:46:08 +0000 (08:46 +0200)]
Merge pull request #1910 from annando/1509-new-feed-import
New feed import functionality
rabuzarus [Tue, 29 Sep 2015 22:19:54 +0000 (00:19 +0200)]
port of reds geotag feature
rabuzarus [Tue, 29 Sep 2015 17:44:26 +0000 (19:44 +0200)]
don't show profile photos in albums to others than the owner or remote user
Michael Vogel [Tue, 29 Sep 2015 08:35:50 +0000 (10:35 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1509-i18n-events
Michael Vogel [Tue, 29 Sep 2015 08:27:04 +0000 (10:27 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1509-new-feed-import
Michael Vogel [Tue, 29 Sep 2015 08:25:59 +0000 (10:25 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1509-worker
Fabrixxm [Tue, 29 Sep 2015 08:00:13 +0000 (10:00 +0200)]
Merge branch 'master' back into develop
Fabrixxm [Tue, 29 Sep 2015 07:58:16 +0000 (09:58 +0200)]
Merge branch '3.4.2'
Michael Vogel [Tue, 29 Sep 2015 07:56:59 +0000 (09:56 +0200)]
Merge pull request #1909 from fabrixxm/changelog-3.4.2
3.4.2: update changelog and version
Fabrixxm [Tue, 29 Sep 2015 07:25:59 +0000 (09:25 +0200)]
Bump Friendica version
Fabrixxm [Tue, 29 Sep 2015 07:25:36 +0000 (09:25 +0200)]
Update CHANGELOG
Michael Vogel [Tue, 29 Sep 2015 04:15:26 +0000 (06:15 +0200)]
Reduction of double executions - hopefully
Michael Vogel [Mon, 28 Sep 2015 20:32:56 +0000 (22:32 +0200)]
Logging message added
Michael Vogel [Mon, 28 Sep 2015 19:58:58 +0000 (21:58 +0200)]
Prevent double execution
Michael Vogel [Mon, 28 Sep 2015 17:14:07 +0000 (19:14 +0200)]
Magical mathematics to reduce the number of workers
Michael Vogel [Mon, 28 Sep 2015 05:54:28 +0000 (07:54 +0200)]
Load depending number of worker queues.
Michael Vogel [Sun, 27 Sep 2015 12:02:05 +0000 (14:02 +0200)]
New functionality to import feeds. Now with support of every used feed format (RSS, RDF, Atom)
Michael Vogel [Sun, 27 Sep 2015 12:00:15 +0000 (14:00 +0200)]
Internationalisation of events/Move events to the navigation bar
projects / friendica.git / log