]>
git.mxchange.org Git - friendica.git/log
Michael Vogel [Sat, 17 Oct 2015 06:27:33 +0000 (08:27 +0200)]
Editing an item with an event is now opeing the event edit form.
Michael Vogel [Fri, 16 Oct 2015 23:25:25 +0000 (01:25 +0200)]
Delete event when the item is deleted
Michael Vogel [Fri, 16 Oct 2015 22:58:22 +0000 (00:58 +0200)]
Store the event when a summary or a description is set
Michael Vogel [Fri, 16 Oct 2015 21:50:34 +0000 (23:50 +0200)]
Unsure to store the guid with new events
Tobias Diekershoff [Wed, 14 Oct 2015 16:11:36 +0000 (18:11 +0200)]
Merge pull request #1964 from rebeka-catalina/FAQignoreDescr
FaQignoreDescr
rebeka-catalina [Wed, 14 Oct 2015 15:48:26 +0000 (17:48 +0200)]
Clarified description of ignore
Tobias Diekershoff [Wed, 14 Oct 2015 06:49:02 +0000 (08:49 +0200)]
Merge pull request #1963 from annando/1510-feed-warning
Avoid a warning when a feed contains no items.
Michael Vogel [Wed, 14 Oct 2015 06:10:06 +0000 (08:10 +0200)]
Avoid a warning when a feed contains no items.
Tobias Diekershoff [Wed, 14 Oct 2015 04:42:50 +0000 (06:42 +0200)]
Merge pull request #1962 from annando/1510-attend-vier
Vier: Some small changes in the template for events
Michael Vogel [Tue, 13 Oct 2015 19:42:01 +0000 (21:42 +0200)]
Merge pull request #1961 from tobiasd/
20151013-typo
typo in markdown syntax
Michael Vogel [Tue, 13 Oct 2015 18:15:01 +0000 (20:15 +0200)]
Vier: Some small changes in the template for events
Tobias Diekershoff [Tue, 13 Oct 2015 16:22:45 +0000 (18:22 +0200)]
typo in markdown syntax
Tobias Diekershoff [Tue, 13 Oct 2015 15:37:01 +0000 (17:37 +0200)]
Merge pull request #1960 from tobiasd/
20151013-deA
DE: update to the strings
Tobias Diekershoff [Tue, 13 Oct 2015 15:35:08 +0000 (17:35 +0200)]
DE: update to the strings
Tobias Diekershoff [Tue, 13 Oct 2015 15:09:39 +0000 (17:09 +0200)]
Merge pull request #1959 from tobiasd/
20151013-de
DE: translation of the attend strings THX to Abrax
Tobias Diekershoff [Tue, 13 Oct 2015 15:06:35 +0000 (17:06 +0200)]
DE: translation of the attend strings THX to Abrax
Tobias Diekershoff [Mon, 12 Oct 2015 19:17:03 +0000 (21:17 +0200)]
Merge pull request #1958 from fabrixxm/event_firstday
default value for firstDay in events page
Tobias Diekershoff [Mon, 12 Oct 2015 19:16:40 +0000 (21:16 +0200)]
Merge pull request #1957 from fabrixxm/duepuntozeroattend
attend functionality for duepuntozero
fabrixxm [Mon, 12 Oct 2015 18:23:09 +0000 (20:23 +0200)]
default value for firstDay in events page
fabrixxm [Mon, 12 Oct 2015 18:09:33 +0000 (20:09 +0200)]
attend functionality for duepuntozero
fabrixxm [Mon, 12 Oct 2015 17:05:57 +0000 (19:05 +0200)]
Merge pull request #1954 from tobiasd/
20151012-messages
regeneration of the messages.po file for attendance translation
fabrixxm [Mon, 12 Oct 2015 17:04:51 +0000 (19:04 +0200)]
Merge pull request #1956 from tobiasd/
20151012-de
DE Update to the translation, thx Abrax
fabrixxm [Mon, 12 Oct 2015 17:03:30 +0000 (19:03 +0200)]
Merge pull request #1955 from tobiasd/
20151012-quattroattend
attend functionality for quattro theme (part of #1953)
Tobias Diekershoff [Mon, 12 Oct 2015 16:08:11 +0000 (18:08 +0200)]
DE Update to the translation, thx Abrax
Tobias Diekershoff [Mon, 12 Oct 2015 13:58:34 +0000 (15:58 +0200)]
cleanup forgotten lines
Tobias Diekershoff [Mon, 12 Oct 2015 13:34:18 +0000 (15:34 +0200)]
attend functionality for quattro theme (part of #1953)
Tobias Diekershoff [Mon, 12 Oct 2015 13:15:39 +0000 (15:15 +0200)]
regeneration of the messages.po file for attendance translation
Tobias Diekershoff [Mon, 12 Oct 2015 13:10:03 +0000 (15:10 +0200)]
Merge pull request #1929 from rabuzarus/event-attendance
port of reds event attendance feature
Tobias Diekershoff [Mon, 12 Oct 2015 06:18:11 +0000 (08:18 +0200)]
Merge pull request #1952 from annando/1510-ifttt
Vier: Support for the new IFTTT addon
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 21:36:23 +0000 (23:36 +0200)]
Vier: Support for the new IFTTT addon.
rabuzarus [Sun, 11 Oct 2015 18:00:54 +0000 (20:00 +0200)]
this got lost by merge
rabuzarus [Sun, 11 Oct 2015 17:39:55 +0000 (19:39 +0200)]
Merge develop-new into event-attendance-new
Conflicts:
include/conversation.php
rabuzarus [Sun, 11 Oct 2015 17:28:54 +0000 (19:28 +0200)]
Merge event-attendance into develop
Conflicts:
include/conversation.php
rabuzarus [Sun, 11 Oct 2015 16:20:06 +0000 (18:20 +0200)]
correct a little mistake (delivery.php was not commited)
rabuzarus [Sun, 11 Oct 2015 13:34:56 +0000 (15:34 +0200)]
correct a little mistake (ACTIVITY_LIKE is supported)
rabuzarus [Sun, 11 Oct 2015 11:07:19 +0000 (13:07 +0200)]
don't send attendance activities to diaspora (unsupported)
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.
rabuzarus [Fri, 9 Oct 2015 12:20:01 +0000 (14:20 +0200)]
update attendance state on profile wall
rabuzarus [Fri, 9 Oct 2015 11:46:08 +0000 (13:46 +0200)]
attendance update in network stream
Michael Vogel [Fri, 9 Oct 2015 05:39:38 +0000 (07:39 +0200)]
Contact names with ">" and "<" are a problem ...
rabuzarus [Thu, 8 Oct 2015 20:23:09 +0000 (22:23 +0200)]
translate attendance with localize_item()
rabuzarus [Thu, 8 Oct 2015 18:26:11 +0000 (20:26 +0200)]
small bugfix in like.php
rabuzarus [Thu, 8 Oct 2015 16:35:33 +0000 (18:35 +0200)]
treat attendance as like activity
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
projects / friendica.git / log