]> git.mxchange.org Git - friendica.git/log
friendica.git
9 years agoRemoved Google Maps
Michael Vogel [Tue, 30 Jun 2015 05:42:59 +0000 (07:42 +0200)]
Removed Google Maps

9 years agoMerge pull request #1696 from rabuzarus/acl-var
fabrixxm [Mon, 29 Jun 2015 11:53:37 +0000 (13:53 +0200)]
Merge pull request #1696 from rabuzarus/acl-var

move jotnets to populate_acl

9 years agoMerge pull request #1698 from rabuzarus/identity
fabrixxm [Mon, 29 Jun 2015 11:52:07 +0000 (13:52 +0200)]
Merge pull request #1698 from rabuzarus/identity

move some identity related functions to identity.php

9 years agoMerge pull request #1703 from rabuzarus/readable_bytes
fabrixxm [Mon, 29 Jun 2015 11:50:55 +0000 (13:50 +0200)]
Merge pull request #1703 from rabuzarus/readable_bytes

show maximagesize warning in a human readable format

9 years agoMerge pull request #1710 from rabuzarus/deactivate_log
fabrixxm [Mon, 29 Jun 2015 11:48:42 +0000 (13:48 +0200)]
Merge pull request #1710 from rabuzarus/deactivate_log

deactivate logger in acl_lookup

9 years agodeactivate logger in acl_lookup
rabuzarus [Mon, 29 Jun 2015 11:46:47 +0000 (13:46 +0200)]
deactivate logger in acl_lookup

9 years agomoved formatBytes() to /include/text.php
rabuzarus [Mon, 29 Jun 2015 09:22:29 +0000 (11:22 +0200)]
moved formatBytes() to /include/text.php

9 years agoMerge pull request #1704 from annando/1506-vier-notifications
fabrixxm [Mon, 29 Jun 2015 06:16:35 +0000 (08:16 +0200)]
Merge pull request #1704 from annando/1506-vier-notifications

Vier: Colors for notifications changed

9 years agoVier: Colors for notifications changed
Michael Vogel [Mon, 29 Jun 2015 06:00:52 +0000 (08:00 +0200)]
Vier: Colors for notifications changed

9 years agoshow maximagesize warning in a human readable format
rabuzarus [Mon, 29 Jun 2015 00:39:08 +0000 (02:39 +0200)]
show maximagesize warning in a human readable format

9 years agoMerge pull request #1683 from fabrixxm/issue-1655
Michael Vogel [Sat, 27 Jun 2015 15:39:00 +0000 (17:39 +0200)]
Merge pull request #1683 from fabrixxm/issue-1655

Deprecate RINO1 function, implements RINO2, remove unused crypro functions

9 years agoMerge acl-var into develop
rabuzarus [Sat, 27 Jun 2015 13:23:19 +0000 (15:23 +0200)]
Merge acl-var into develop

Conflicts:
mod/settings.php

9 years agorestore jotplugins
rabuzarus [Sat, 27 Jun 2015 13:11:18 +0000 (15:11 +0200)]
restore jotplugins

9 years agoMerge pull request #1694 from annando/1506-ostatus-mention
Tobias Diekershoff [Sat, 27 Jun 2015 09:12:31 +0000 (11:12 +0200)]
Merge pull request #1694 from annando/1506-ostatus-mention

OStatus: Notifications now work - even if not mentioned in the post

9 years agomove some identity based functions to identity.php
rabuzarus [Fri, 26 Jun 2015 16:57:20 +0000 (18:57 +0200)]
move some identity based functions to identity.php

9 years agowork on supported themes to use new acl
rabuzarus [Fri, 26 Jun 2015 13:44:32 +0000 (15:44 +0200)]
work on supported themes to use new acl

9 years agocleanup of some unused code
rabuzarus [Fri, 26 Jun 2015 13:13:52 +0000 (15:13 +0200)]
cleanup of some unused code

9 years agoMerge pull request #1695 from strk/accepted
Michael Vogel [Fri, 26 Jun 2015 11:51:22 +0000 (13:51 +0200)]
Merge pull request #1695 from strk/accepted

Spelling error: "acepted" -> "accepted"

9 years agoSpelling error: "acepted" -> "accepted"
Sandro Santilli [Fri, 26 Jun 2015 10:03:32 +0000 (12:03 +0200)]
Spelling error: "acepted" -> "accepted"

9 years agoOStatus: Mentions should work now
Michael Vogel [Fri, 26 Jun 2015 08:41:11 +0000 (10:41 +0200)]
OStatus: Mentions should work now

9 years agoMerge pull request #1692 from fabrixxm/desktopnotifications
Michael Vogel [Fri, 26 Jun 2015 06:45:16 +0000 (08:45 +0200)]
Merge pull request #1692 from fabrixxm/desktopnotifications

Desktop notifications

9 years agomake notes work
rabuzarus [Thu, 25 Jun 2015 20:57:26 +0000 (22:57 +0200)]
make notes work

9 years agorespect hidewall
rabuzarus [Thu, 25 Jun 2015 18:29:09 +0000 (20:29 +0200)]
respect hidewall

9 years agosome more work to get acl data into populate_acl
rabuzarus [Thu, 25 Jun 2015 16:57:42 +0000 (18:57 +0200)]
some more work to get acl data into populate_acl

9 years agoMerge pull request #1693 from rabuzarus/events-reminder
fabrixxm [Thu, 25 Jun 2015 13:06:55 +0000 (15:06 +0200)]
Merge pull request #1693 from rabuzarus/events-reminder

use title in events-reminder

9 years agodelete $md (event-links) because event ID is used
rabuzarus [Thu, 25 Jun 2015 12:21:12 +0000 (14:21 +0200)]
delete $md (event-links) because event ID is used

9 years agoone whitespace
rabuzarus [Thu, 25 Jun 2015 11:50:48 +0000 (13:50 +0200)]
one whitespace

9 years agouse colorbox to display upcomming events
rabuzarus [Thu, 25 Jun 2015 11:43:41 +0000 (13:43 +0200)]
use colorbox to display upcomming events

9 years agoacl for events and photos
rabuzarus [Thu, 25 Jun 2015 10:38:09 +0000 (12:38 +0200)]
acl for events and photos

9 years agoinclude jotnets in populate_acl
rabuzarus [Thu, 25 Jun 2015 10:33:05 +0000 (12:33 +0200)]
include jotnets in populate_acl

9 years agoMerge pull request #1690 from annando/1506-vier-again
fabrixxm [Thu, 25 Jun 2015 08:03:19 +0000 (10:03 +0200)]
Merge pull request #1690 from annando/1506-vier-again

Vier: Just another thread improvment

9 years agorework mod/ping and desktop notification logic
Fabrixxm [Thu, 25 Jun 2015 08:02:26 +0000 (10:02 +0200)]
rework mod/ping and desktop notification logic

`mod/ping.php` returns all notifications ordered by date
mixing system notifications, private messages, intros, registrations
remove 'notify_full' mode
remove `&arr;` from unseen notes, 'seen' attrib now is "1" or "0"
new note attribute 'timestamp'
desktop notification logic use timestamp to check which notification show to the user
notification html template use timestamp to show full date to user in tooltip
`relative_date()` don't append full date on dates older than 24 hours

9 years agoMerge pull request #1691 from annando/1506-ostatus-evenbetter
fabrixxm [Thu, 25 Jun 2015 06:38:47 +0000 (08:38 +0200)]
Merge pull request #1691 from annando/1506-ostatus-evenbetter

OStatus: Bugfix in threading, answers to OStatus messages in Friendica posts

9 years agoRemoved test code
Michael Vogel [Thu, 25 Jun 2015 05:30:14 +0000 (07:30 +0200)]
Removed test code

9 years agoPuSH now supports answers to OStatus messages inside of Friendica threads as well.
Michael Vogel [Thu, 25 Jun 2015 05:18:02 +0000 (07:18 +0200)]
PuSH now supports answers to OStatus messages inside of Friendica threads as well.

9 years agoSend a salmon notice whenever an OStatus user is mentioned.
Michael Vogel [Wed, 24 Jun 2015 22:47:59 +0000 (00:47 +0200)]
Send a salmon notice whenever an OStatus user is mentioned.

9 years agoMerge pull request #1687 from annando/1506-location-api
Tobias Diekershoff [Wed, 24 Jun 2015 22:00:01 +0000 (00:00 +0200)]
Merge pull request #1687 from annando/1506-location-api

API: Return the geo coordinates

9 years agoRemoved test
Michael Vogel [Wed, 24 Jun 2015 20:51:46 +0000 (22:51 +0200)]
Removed test

9 years agoFixed inReplyTo in conversations
Michael Vogel [Wed, 24 Jun 2015 20:31:38 +0000 (22:31 +0200)]
Fixed inReplyTo in conversations

9 years agoVier: Just another thread improvment
Michael Vogel [Wed, 24 Jun 2015 19:49:51 +0000 (21:49 +0200)]
Vier: Just another thread improvment

9 years agoMerge remote-tracking branch 'upstream/develop' into 1506-ostatus-evenbetter
Michael Vogel [Wed, 24 Jun 2015 19:05:38 +0000 (21:05 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1506-ostatus-evenbetter

9 years agoMerge pull request #1686 from annando/1506-vier-threading-2
Tobias Diekershoff [Wed, 24 Jun 2015 14:27:53 +0000 (16:27 +0200)]
Merge pull request #1686 from annando/1506-vier-threading-2

Improved width for nested comments

9 years agonotifications order, unseen css class
Fabrixxm [Wed, 24 Jun 2015 14:10:06 +0000 (16:10 +0200)]
notifications order, unseen css class

ping return notfications ordered by notification id
notifications list get seen/unseen class from ping xml
global.css define 'notify-unseen'

9 years agoSome test code added
Michael Vogel [Wed, 24 Jun 2015 12:21:42 +0000 (14:21 +0200)]
Some test code added

9 years agoImproved width for nested comments.
Michael Vogel [Wed, 24 Jun 2015 12:20:08 +0000 (14:20 +0200)]
Improved width for nested comments.

9 years agoremove close timeout
Fabrixxm [Wed, 24 Jun 2015 09:15:35 +0000 (11:15 +0200)]
remove close timeout

9 years agoremove debug logs
Fabrixxm [Wed, 24 Jun 2015 09:04:38 +0000 (11:04 +0200)]
remove debug logs

9 years agofix desktop notification logic, add onclick handler
Fabrixxm [Wed, 24 Jun 2015 08:56:10 +0000 (10:56 +0200)]
fix desktop notification logic, add onclick handler

9 years agomove field help text css to global.css
Fabrixxm [Wed, 24 Jun 2015 08:11:11 +0000 (10:11 +0200)]
move field help text css to global.css

9 years agoFix desktop notification
Fabrixxm [Wed, 24 Jun 2015 07:49:53 +0000 (09:49 +0200)]
Fix desktop notification

use on/off field for enable/disable desktop notification
show only new notifications after enable
use localstorage to save enabled/disalbed and last notification id
hide settings on browsers without desktop notification

9 years agofix spelling
Fabrixxm [Wed, 24 Jun 2015 06:23:56 +0000 (08:23 +0200)]
fix spelling

9 years agorino: settings in admin, choose lowest common on notify
Fabrixxm [Tue, 23 Jun 2015 15:36:26 +0000 (17:36 +0200)]
rino: settings in admin, choose lowest common on notify

9 years agoRINO 2 based on php-encryption
Fabrixxm [Tue, 23 Jun 2015 14:13:09 +0000 (16:13 +0200)]
RINO 2 based on php-encryption

reenable RINO 1 functions, add a deprecation note.
use by default RINO 2 , with crypto from php-encryption
fallback to RINO 1 for old nodes.

9 years agoMerge pull request #1684 from fabrixxm/install
Michael Vogel [Tue, 23 Jun 2015 12:19:30 +0000 (14:19 +0200)]
Merge pull request #1684 from fabrixxm/install

Install: load htconfig template from view/templates/

9 years agoremove localized htconfig templates
Fabrixxm [Tue, 23 Jun 2015 10:34:57 +0000 (12:34 +0200)]
remove localized htconfig templates

9 years agoinstall: load htconfig template from templates/
Fabrixxm [Tue, 23 Jun 2015 10:32:35 +0000 (12:32 +0200)]
install: load htconfig template from templates/

9 years agoDisable RINO
Fabrixxm [Tue, 23 Jun 2015 09:05:03 +0000 (11:05 +0200)]
Disable RINO

Comment out functions for RINO crypt and disable RINO request and response.

9 years agoMerge pull request #1682 from fabrixxm/issue-1625
Tobias Diekershoff [Tue, 23 Jun 2015 09:05:16 +0000 (11:05 +0200)]
Merge pull request #1682 from fabrixxm/issue-1625

admin: allow deletion of any users but yourself

9 years agoMerge pull request #1681 from fabrixxm/issue-1629
Tobias Diekershoff [Tue, 23 Jun 2015 09:04:26 +0000 (11:04 +0200)]
Merge pull request #1681 from fabrixxm/issue-1629

Add contact detail to contact drop confirm

9 years agoRemove various unused crypto functions
Fabrixxm [Tue, 23 Jun 2015 08:52:02 +0000 (10:52 +0200)]
Remove various unused crypto functions

9 years agoremove RINO from htconfig.php
Fabrixxm [Tue, 23 Jun 2015 08:51:29 +0000 (10:51 +0200)]
remove RINO from htconfig.php

9 years agoadmin: allow deletion of any users but yourself
Fabrixxm [Tue, 23 Jun 2015 08:39:28 +0000 (10:39 +0200)]
admin: allow deletion of any users but yourself

fix #1625

9 years agoAdd contact detail to contact drop confirm
Fabrixxm [Tue, 23 Jun 2015 08:09:27 +0000 (10:09 +0200)]
Add contact detail to contact drop confirm
fix #1629

9 years agoMerge pull request #1679 from fabrixxm/smallfixestothemes
Tobias Diekershoff [Tue, 23 Jun 2015 07:12:25 +0000 (09:12 +0200)]
Merge pull request #1679 from fabrixxm/smallfixestothemes

use fields template in photo edit form

9 years agoMerge pull request #1680 from annando/issue-1642-again
fabrixxm [Tue, 23 Jun 2015 07:09:29 +0000 (09:09 +0200)]
Merge pull request #1680 from annando/issue-1642-again

Just some more fixing for issue 1642

9 years agoAPI: Return the geo coordinates
Michael Vogel [Tue, 23 Jun 2015 05:32:14 +0000 (07:32 +0200)]
API: Return the geo coordinates

9 years agoJust some more fixing for issue 1642
Michael Vogel [Mon, 22 Jun 2015 21:47:08 +0000 (23:47 +0200)]
Just some more fixing for issue 1642

9 years agouse fields template in photo edit form
fabrixxm [Mon, 22 Jun 2015 18:07:19 +0000 (20:07 +0200)]
use fields template in photo edit form

9 years agoMerge pull request #1678 from annando/1506-ostatus-completion
Tobias Diekershoff [Mon, 22 Jun 2015 05:59:40 +0000 (07:59 +0200)]
Merge pull request #1678 from annando/1506-ostatus-completion

OStatus: Still some room for improvements

9 years agoMerge pull request #1677 from annando/1506-vier-threads
Tobias Diekershoff [Mon, 22 Jun 2015 05:55:39 +0000 (07:55 +0200)]
Merge pull request #1677 from annando/1506-vier-threads

Vier: Improved threading

9 years agoOStatus: Support for events and questions
Michael Vogel [Sun, 21 Jun 2015 20:36:24 +0000 (22:36 +0200)]
OStatus: Support for events and questions

9 years agoOStatus: Support for bookmarks
Michael Vogel [Sun, 21 Jun 2015 20:02:44 +0000 (22:02 +0200)]
OStatus: Support for bookmarks

9 years agoVier: Improved threading
Michael Vogel [Sun, 21 Jun 2015 18:40:39 +0000 (20:40 +0200)]
Vier: Improved threading

9 years agoMerge pull request #1676 from tobiasd/20150620-markdown
fabrixxm [Sun, 21 Jun 2015 09:46:13 +0000 (11:46 +0200)]
Merge pull request #1676 from tobiasd/20150620-markdown

markdownification problems

9 years agoChanged logging behaviour
Michael Vogel [Sun, 21 Jun 2015 06:32:03 +0000 (08:32 +0200)]
Changed logging behaviour

9 years agoACL: Don't show OStatus contacts in ACL, since you cannot send private messages to...
Michael Vogel [Sat, 20 Jun 2015 23:37:09 +0000 (01:37 +0200)]
ACL: Don't show OStatus contacts in ACL, since you cannot send private messages to them.

9 years agoSmall restructuring
Michael Vogel [Sat, 20 Jun 2015 23:36:23 +0000 (01:36 +0200)]
Small restructuring

9 years agoDisplay: Look for the network name when fetching the contact (important because of...
Michael Vogel [Sat, 20 Jun 2015 23:34:57 +0000 (01:34 +0200)]
Display: Look for the network name when fetching the contact (important because of the statusnet connector)

9 years agoBugfix for repeated items in conversations
Michael Vogel [Sat, 20 Jun 2015 15:26:47 +0000 (17:26 +0200)]
Bugfix for repeated items in conversations

9 years agoStuff ...
Michael Vogel [Sat, 20 Jun 2015 12:41:53 +0000 (14:41 +0200)]
Stuff ...

9 years agoMoved all OStatus code in a single file.
Michael Vogel [Sat, 20 Jun 2015 12:40:30 +0000 (14:40 +0200)]
Moved all OStatus code in a single file.

9 years agohide some HTML coded chars from markdownification
Tobias Diekershoff [Sat, 20 Jun 2015 12:27:42 +0000 (14:27 +0200)]
hide some HTML coded chars from markdownification

9 years ago<3 causes troubles in D*
Tobias Diekershoff [Sat, 20 Jun 2015 10:31:34 +0000 (12:31 +0200)]
<3 causes troubles in D*

9 years agoCode cleanup
Michael Vogel [Sat, 20 Jun 2015 07:15:19 +0000 (09:15 +0200)]
Code cleanup

9 years agoThe OStatus completion is now called before the original item is stored.
Michael Vogel [Sat, 20 Jun 2015 06:44:29 +0000 (08:44 +0200)]
The OStatus completion is now called before the original item is stored.

9 years agoMerge pull request #1674 from fraengii/patch-2
Tobias Diekershoff [Wed, 17 Jun 2015 08:52:11 +0000 (10:52 +0200)]
Merge pull request #1674 from fraengii/patch-2

Update Quick-Start-groupsandpages.md

9 years agoUpdate Quick-Start-groupsandpages.md
Frank Dieckmann [Wed, 17 Jun 2015 08:48:23 +0000 (10:48 +0200)]
Update Quick-Start-groupsandpages.md

Changed the style in line 12. I think it is better now.

9 years agoMerge pull request #1673 from fraengii/patch-1
Tobias Diekershoff [Wed, 17 Jun 2015 08:39:41 +0000 (10:39 +0200)]
Merge pull request #1673 from fraengii/patch-1

Update Connectors.md

9 years agoUpdate Connectors.md
Frank Dieckmann [Wed, 17 Jun 2015 08:32:50 +0000 (10:32 +0200)]
Update Connectors.md

Changed '<domain_des_friendica-servers>/friendica' to '&lt;domain_des_friendica-servers&gt;/friendica'

9 years agoMerge pull request #1672 from tobiasd/20150614-frank
fabrixxm [Mon, 15 Jun 2015 12:00:18 +0000 (14:00 +0200)]
Merge pull request #1672 from tobiasd/20150614-frank

resolving merge issues with DE doc merging

9 years agoMerge pull request #1670 from annando/setup-rewrite-check
Tobias Diekershoff [Mon, 15 Jun 2015 11:25:54 +0000 (13:25 +0200)]
Merge pull request #1670 from annando/setup-rewrite-check

The installation prozess has a problem with self signed certificates

9 years agoMerge pull request #1671 from annando/issue-1642-b
Tobias Diekershoff [Mon, 15 Jun 2015 11:25:26 +0000 (13:25 +0200)]
Merge pull request #1671 from annando/issue-1642-b

This is working fix for issue 1642

9 years agoBOSH server for Jappixmini addon
Tobias Diekershoff [Mon, 15 Jun 2015 11:19:02 +0000 (13:19 +0200)]
BOSH server for Jappixmini addon

9 years agohint in the docs to start from develop
Tobias Diekershoff [Mon, 15 Jun 2015 11:18:32 +0000 (13:18 +0200)]
hint in the docs to start from develop

9 years agoMerge remote-tracking branch 'frank/2015-06-12-fraengii-doc.de-linguistic_style'...
Tobias Diekershoff [Mon, 15 Jun 2015 11:07:36 +0000 (13:07 +0200)]
Merge remote-tracking branch 'frank/2015-06-12-fraengii-doc.de-linguistic_style' into 20150614-frank

9 years agoThis is working fix for issue 1642
Michael Vogel [Sun, 14 Jun 2015 23:20:04 +0000 (01:20 +0200)]
This is working fix for issue 1642

9 years agoMerge remote-tracking branch 'upstream/develop' into setup-rewrite-check
Michael Vogel [Sun, 14 Jun 2015 22:55:05 +0000 (00:55 +0200)]
Merge remote-tracking branch 'upstream/develop' into setup-rewrite-check

9 years agoMerge pull request #1668 from annando/issue-1642
fabrixxm [Sun, 14 Jun 2015 13:58:52 +0000 (15:58 +0200)]
Merge pull request #1668 from annando/issue-1642

Better detection for the mobile client to avoid "{0}" in notifications

9 years agoMerge pull request #1669 from annando/1506-ostatus-v3
fabrixxm [Sun, 14 Jun 2015 13:52:10 +0000 (15:52 +0200)]
Merge pull request #1669 from annando/1506-ostatus-v3

Yet another OStatus improvement

9 years agoMerge pull request #1667 from annando/1506-remote-subscribe
fabrixxm [Sun, 14 Jun 2015 13:49:03 +0000 (15:49 +0200)]
Merge pull request #1667 from annando/1506-remote-subscribe

Remote subscribe from a GNU Social site is now possible