]>
git.mxchange.org Git - friendica.git/log
Fabrixxm [Tue, 30 Jun 2015 06:44:16 +0000 (08:44 +0200)]
update util/messages.po
Fabrixxm [Tue, 30 Jun 2015 06:43:02 +0000 (08:43 +0200)]
Merge branch 'develop' into lang
fabrixxm [Tue, 30 Jun 2015 06:41:07 +0000 (08:41 +0200)]
Merge pull request #1715 from rabuzarus/theme_uid
use local theme settings for visitors
fabrixxm [Tue, 30 Jun 2015 06:37:40 +0000 (08:37 +0200)]
Merge pull request #1714 from annando/1506-mail-link-profile
Show preselected mail receivers
fabrixxm [Tue, 30 Jun 2015 06:36:33 +0000 (08:36 +0200)]
Merge pull request #1713 from annando/1506-ostatus-completion-timeframe
There is now two different checks for the completion of conversations
fabrixxm [Tue, 30 Jun 2015 06:35:33 +0000 (08:35 +0200)]
Merge pull request #1712 from annando/1506-ostatus-guid
OStatus: Use the GUID format for the link to the item
fabrixxm [Tue, 30 Jun 2015 06:27:59 +0000 (08:27 +0200)]
Merge pull request #1716 from annando/1506-no-googlemap
Removed Google Maps
fabrixxm [Tue, 30 Jun 2015 06:27:03 +0000 (08:27 +0200)]
Merge pull request #1717 from annando/1506-ostatus-ignore-delete
OStatus: By using Qvitter, users can delete items.
Michael Vogel [Tue, 30 Jun 2015 06:08:02 +0000 (08:08 +0200)]
OStatus: By using Qvitter, users can delete items. We can't handle that by now, so we ignore it.
Michael Vogel [Tue, 30 Jun 2015 05:42:59 +0000 (07:42 +0200)]
Removed Google Maps
rabuzarus [Mon, 29 Jun 2015 21:03:44 +0000 (23:03 +0200)]
make supported themes compatible with get_theme_uid
Michael Vogel [Mon, 29 Jun 2015 20:54:26 +0000 (22:54 +0200)]
Mail link in profile page
Michael Vogel [Mon, 29 Jun 2015 19:53:59 +0000 (21:53 +0200)]
There is now two different checks for the completion of conversations
Michael Vogel [Mon, 29 Jun 2015 19:49:42 +0000 (21:49 +0200)]
OStatus: Use the GUID format for the link to the item
Fabrixxm [Mon, 29 Jun 2015 13:59:28 +0000 (15:59 +0200)]
update util/messages.po
Fabrixxm [Mon, 29 Jun 2015 13:55:27 +0000 (15:55 +0200)]
Add new option "-s" to run_xgettext. Fix paths.
with this option, current directory is scanned for strings, and message.po is saved in lang/C subdir.
This is usefull when developing new addons outside from friendica tree.
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
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
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
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
rabuzarus [Mon, 29 Jun 2015 11:46:47 +0000 (13:46 +0200)]
deactivate logger in acl_lookup
rabuzarus [Mon, 29 Jun 2015 09:22:29 +0000 (11:22 +0200)]
moved formatBytes() to /include/text.php
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
Michael Vogel [Mon, 29 Jun 2015 06:00:52 +0000 (08:00 +0200)]
Vier: Colors for notifications changed
rabuzarus [Mon, 29 Jun 2015 00:39:08 +0000 (02:39 +0200)]
show maximagesize warning in a human readable format
rabuzarus [Sun, 28 Jun 2015 11:32:03 +0000 (13:32 +0200)]
change profile_url in profile_uid
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
rabuzarus [Sat, 27 Jun 2015 13:23:19 +0000 (15:23 +0200)]
Merge acl-var into develop
Conflicts:
mod/settings.php
rabuzarus [Sat, 27 Jun 2015 13:11:18 +0000 (15:11 +0200)]
restore jotplugins
rabuzarus [Sat, 27 Jun 2015 12:10:43 +0000 (14:10 +0200)]
get the themes settings of foreign profiles
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
rabuzarus [Fri, 26 Jun 2015 16:57:20 +0000 (18:57 +0200)]
move some identity based functions to identity.php
rabuzarus [Fri, 26 Jun 2015 13:44:32 +0000 (15:44 +0200)]
work on supported themes to use new acl
rabuzarus [Fri, 26 Jun 2015 13:13:52 +0000 (15:13 +0200)]
cleanup of some unused code
Michael Vogel [Fri, 26 Jun 2015 11:51:22 +0000 (13:51 +0200)]
Merge pull request #1695 from strk/accepted
Spelling error: "acepted" -> "accepted"
Sandro Santilli [Fri, 26 Jun 2015 10:03:32 +0000 (12:03 +0200)]
Spelling error: "acepted" -> "accepted"
Michael Vogel [Fri, 26 Jun 2015 08:41:11 +0000 (10:41 +0200)]
OStatus: Mentions should work now
Michael Vogel [Fri, 26 Jun 2015 06:45:16 +0000 (08:45 +0200)]
Merge pull request #1692 from fabrixxm/desktopnotifications
Desktop notifications
rabuzarus [Thu, 25 Jun 2015 20:57:26 +0000 (22:57 +0200)]
make notes work
rabuzarus [Thu, 25 Jun 2015 18:29:09 +0000 (20:29 +0200)]
respect hidewall
rabuzarus [Thu, 25 Jun 2015 16:57:42 +0000 (18:57 +0200)]
some more work to get acl data into populate_acl
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
rabuzarus [Thu, 25 Jun 2015 12:21:12 +0000 (14:21 +0200)]
delete $md (event-links) because event ID is used
rabuzarus [Thu, 25 Jun 2015 11:50:48 +0000 (13:50 +0200)]
one whitespace
rabuzarus [Thu, 25 Jun 2015 11:43:41 +0000 (13:43 +0200)]
use colorbox to display upcomming events
rabuzarus [Thu, 25 Jun 2015 10:38:09 +0000 (12:38 +0200)]
acl for events and photos
rabuzarus [Thu, 25 Jun 2015 10:33:05 +0000 (12:33 +0200)]
include jotnets in populate_acl
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
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
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
Michael Vogel [Thu, 25 Jun 2015 05:30:14 +0000 (07:30 +0200)]
Removed test code
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.
Michael Vogel [Wed, 24 Jun 2015 22:47:59 +0000 (00:47 +0200)]
Send a salmon notice whenever an OStatus user is mentioned.
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
Michael Vogel [Wed, 24 Jun 2015 20:51:46 +0000 (22:51 +0200)]
Removed test
Michael Vogel [Wed, 24 Jun 2015 20:31:38 +0000 (22:31 +0200)]
Fixed inReplyTo in conversations
Michael Vogel [Wed, 24 Jun 2015 19:49:51 +0000 (21:49 +0200)]
Vier: Just another thread improvment
Michael Vogel [Wed, 24 Jun 2015 19:05:38 +0000 (21:05 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1506-ostatus-evenbetter
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
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'
Michael Vogel [Wed, 24 Jun 2015 12:21:42 +0000 (14:21 +0200)]
Some test code added
Michael Vogel [Wed, 24 Jun 2015 12:20:08 +0000 (14:20 +0200)]
Improved width for nested comments.
Fabrixxm [Wed, 24 Jun 2015 09:15:35 +0000 (11:15 +0200)]
remove close timeout
Fabrixxm [Wed, 24 Jun 2015 09:04:38 +0000 (11:04 +0200)]
remove debug logs
Fabrixxm [Wed, 24 Jun 2015 08:56:10 +0000 (10:56 +0200)]
fix desktop notification logic, add onclick handler
Fabrixxm [Wed, 24 Jun 2015 08:11:11 +0000 (10:11 +0200)]
move field help text css to global.css
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
Fabrixxm [Wed, 24 Jun 2015 06:23:56 +0000 (08:23 +0200)]
fix spelling
Fabrixxm [Tue, 23 Jun 2015 15:36:26 +0000 (17:36 +0200)]
rino: settings in admin, choose lowest common on notify
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.
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/
Fabrixxm [Tue, 23 Jun 2015 10:34:57 +0000 (12:34 +0200)]
remove localized htconfig templates
Fabrixxm [Tue, 23 Jun 2015 10:32:35 +0000 (12:32 +0200)]
install: load htconfig template from templates/
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.
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
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
Fabrixxm [Tue, 23 Jun 2015 08:52:02 +0000 (10:52 +0200)]
Remove various unused crypto functions
Fabrixxm [Tue, 23 Jun 2015 08:51:29 +0000 (10:51 +0200)]
remove RINO from htconfig.php
Fabrixxm [Tue, 23 Jun 2015 08:39:28 +0000 (10:39 +0200)]
admin: allow deletion of any users but yourself
fix #1625
Fabrixxm [Tue, 23 Jun 2015 08:09:27 +0000 (10:09 +0200)]
Add contact detail to contact drop confirm
fix #1629
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
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
Michael Vogel [Tue, 23 Jun 2015 05:32:14 +0000 (07:32 +0200)]
API: Return the geo coordinates
Michael Vogel [Mon, 22 Jun 2015 21:47:08 +0000 (23:47 +0200)]
Just some more fixing for issue 1642
fabrixxm [Mon, 22 Jun 2015 18:07:19 +0000 (20:07 +0200)]
use fields template in photo edit form
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
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
Michael Vogel [Sun, 21 Jun 2015 20:36:24 +0000 (22:36 +0200)]
OStatus: Support for events and questions
Michael Vogel [Sun, 21 Jun 2015 20:02:44 +0000 (22:02 +0200)]
OStatus: Support for bookmarks
Michael Vogel [Sun, 21 Jun 2015 18:40:39 +0000 (20:40 +0200)]
Vier: Improved threading
fabrixxm [Sun, 21 Jun 2015 09:46:13 +0000 (11:46 +0200)]
Merge pull request #1676 from tobiasd/
20150620 -markdown
markdownification problems
Michael Vogel [Sun, 21 Jun 2015 06:32:03 +0000 (08:32 +0200)]
Changed logging behaviour
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.
Michael Vogel [Sat, 20 Jun 2015 23:36:23 +0000 (01:36 +0200)]
Small restructuring
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)
Michael Vogel [Sat, 20 Jun 2015 15:26:47 +0000 (17:26 +0200)]
Bugfix for repeated items in conversations
Michael Vogel [Sat, 20 Jun 2015 12:41:53 +0000 (14:41 +0200)]
Stuff ...
Michael Vogel [Sat, 20 Jun 2015 12:40:30 +0000 (14:40 +0200)]
Moved all OStatus code in a single file.
Tobias Diekershoff [Sat, 20 Jun 2015 12:27:42 +0000 (14:27 +0200)]
hide some HTML coded chars from markdownification
Tobias Diekershoff [Sat, 20 Jun 2015 10:31:34 +0000 (12:31 +0200)]
<3 causes troubles in D*