]>
git.mxchange.org Git - friendica.git/log
rabuzarus [Sun, 25 Oct 2015 15:57:04 +0000 (16:57 +0100)]
Merge develop into manage
Conflicts:
view/global.css
Tobias Diekershoff [Sun, 25 Oct 2015 15:54:24 +0000 (16:54 +0100)]
Merge pull request #1982 from annando/1510-reduced-profile
Profile data are now reduced to only the most important fields
Tobias Diekershoff [Sun, 25 Oct 2015 15:53:17 +0000 (16:53 +0100)]
Merge pull request #1980 from annando/1510-coord-ostatus
OStatus: send the coordinates in an additional field
Tobias Diekershoff [Sun, 25 Oct 2015 15:52:38 +0000 (16:52 +0100)]
Merge pull request #1979 from annando/1510-gnusocial
Statusnet is now GNU Social
Tobias Diekershoff [Sun, 25 Oct 2015 15:52:10 +0000 (16:52 +0100)]
Merge pull request #1978 from annando/1510-bad-servers
Workaround for bad configured servers
Tobias Diekershoff [Sun, 25 Oct 2015 15:51:36 +0000 (16:51 +0100)]
Merge pull request #1983 from annando/1510-ejabberd-auth
Bugfix: Authorization at ejabberd only worked for uid=1
rabuzarus [Sun, 25 Oct 2015 15:49:45 +0000 (16:49 +0100)]
manage-selector: some cleanup and css work
Michael Vogel [Sun, 25 Oct 2015 13:59:39 +0000 (14:59 +0100)]
Merge pull request #1981 from rabuzarus/poke
some work on poke template
rabuzarus [Sun, 25 Oct 2015 13:40:56 +0000 (14:40 +0100)]
poke template: make use of global.css
rabuzarus [Sun, 25 Oct 2015 13:00:08 +0000 (14:00 +0100)]
some inital work to have profile pics on manage page
Michael Vogel [Sun, 25 Oct 2015 09:17:23 +0000 (10:17 +0100)]
Bugfix: Authorization at ejabberd only worked for uid=1
Michael Vogel [Sun, 25 Oct 2015 08:44:12 +0000 (09:44 +0100)]
Merge pull request #1977 from rabuzarus/crepair
move html from crepair.php to template
Michael Vogel [Sun, 25 Oct 2015 08:42:48 +0000 (09:42 +0100)]
Merge pull request #1976 from rabuzarus/tabs-id
tabs have now an ID
Michael Vogel [Sun, 25 Oct 2015 08:15:36 +0000 (09:15 +0100)]
Profile data are now reduced to only the most important fields
Michael Vogel [Sat, 24 Oct 2015 18:44:18 +0000 (20:44 +0200)]
Statusnet is now GNU Social
Michael Vogel [Sat, 24 Oct 2015 18:42:47 +0000 (20:42 +0200)]
OStatus: send the coordinates in an additional field
Michael Vogel [Sat, 24 Oct 2015 18:41:21 +0000 (20:41 +0200)]
Workaround for bad configured servers
rabuzarus [Sat, 24 Oct 2015 17:51:58 +0000 (19:51 +0200)]
some work on poke template
rabuzarus [Sat, 24 Oct 2015 14:01:55 +0000 (16:01 +0200)]
some minor changes in crepair.tpl
rabuzarus [Sat, 24 Oct 2015 13:57:46 +0000 (15:57 +0200)]
move html from crepair.php to template
rabuzarus [Sat, 24 Oct 2015 13:04:27 +0000 (15:04 +0200)]
tabs have now an ID
Tobias Diekershoff [Tue, 20 Oct 2015 05:11:47 +0000 (07:11 +0200)]
Merge pull request #1973 from annando/1510-ejabberd-auth
Support for additional passwords for ejabberd
Michael Vogel [Mon, 19 Oct 2015 17:03:11 +0000 (19:03 +0200)]
Support for additional passwords for ejabberd
Michael Vogel [Mon, 19 Oct 2015 08:10:24 +0000 (10:10 +0200)]
Merge pull request #1971 from tobiasd/
20151019-docs
Updates to the documentations
Tobias Diekershoff [Mon, 19 Oct 2015 05:58:13 +0000 (07:58 +0200)]
Updates to the documentations
Tobias Diekershoff [Sun, 18 Oct 2015 14:08:48 +0000 (16:08 +0200)]
Merge pull request #1968 from annando/1510-directory-configuration
Set the new configuration for the global directory when updating
Michael Vogel [Sat, 17 Oct 2015 13:26:11 +0000 (15:26 +0200)]
Automatically set the new configuration for the global directory when updating.
Tobias Diekershoff [Sat, 17 Oct 2015 10:51:19 +0000 (12:51 +0200)]
Merge pull request #1965 from rabuzarus/event-attendance
fix translation bug for likers
Tobias Diekershoff [Sat, 17 Oct 2015 10:51:09 +0000 (12:51 +0200)]
Merge pull request #1966 from annando/1510-event-guid
Issue 1561: Deleting events (And some other event stuff)
Michael Vogel [Sat, 17 Oct 2015 08:48:13 +0000 (10:48 +0200)]
The datepicker is now localised
Michael Vogel [Sat, 17 Oct 2015 07:41:58 +0000 (09:41 +0200)]
Events on Diaspora now looking okay.
Michael Vogel [Sat, 17 Oct 2015 06:46:45 +0000 (08:46 +0200)]
Changing the acl does not work when editing posts - so it is disabled for events.
Michael Vogel [Sat, 17 Oct 2015 06:29:22 +0000 (08:29 +0200)]
Merge branch '1510-event-guid' of github.com:annando/friendica into 1510-event-guid
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 [Sat, 17 Oct 2015 00:36:16 +0000 (02:36 +0200)]
Avoid wrong birthdays
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
rabuzarus [Wed, 14 Oct 2015 17:48:57 +0000 (19:48 +0200)]
fix translation bug for likers
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
projects / friendica.git / log