]> git.mxchange.org Git - friendica.git/log
friendica.git
9 years agoMoved the needed include to a better place.
Michael Vogel [Sun, 12 Jul 2015 10:03:39 +0000 (12:03 +0200)]
Moved the needed include to a better place.

9 years agoOnly update communication relevant data. And only update if needed.
Michael Vogel [Sun, 12 Jul 2015 09:46:08 +0000 (11:46 +0200)]
Only update communication relevant data. And only update if needed.

9 years agoSome more test code removed
Michael Vogel [Sun, 12 Jul 2015 09:24:01 +0000 (11:24 +0200)]
Some more test code removed

9 years agoTesting code removed
Michael Vogel [Sun, 12 Jul 2015 09:22:36 +0000 (11:22 +0200)]
Testing code removed

9 years agoSome precaution to avoid overwriting of existing data with blanks
Michael Vogel [Sun, 12 Jul 2015 09:19:40 +0000 (11:19 +0200)]
Some precaution to avoid overwriting of existing data with blanks

9 years agoAutomatically update contact data.
Michael Vogel [Sat, 11 Jul 2015 12:36:04 +0000 (14:36 +0200)]
Automatically update contact data.

9 years agoMerge branch 'master' into develop
Fabrixxm [Mon, 6 Jul 2015 14:56:49 +0000 (16:56 +0200)]
Merge branch 'master' into develop

9 years agoMerge branch '3.4.1'
fabrixxm [Mon, 6 Jul 2015 12:52:23 +0000 (14:52 +0200)]
Merge branch '3.4.1'

9 years agoMerge pull request #1737 from fabrixxm/changelog
Tobias Diekershoff [Mon, 6 Jul 2015 12:36:08 +0000 (14:36 +0200)]
Merge pull request #1737 from fabrixxm/changelog

small updates to CHANGELOG

9 years agosmall updates to CHANGELOG
fabrixxm [Mon, 6 Jul 2015 12:30:52 +0000 (14:30 +0200)]
small updates to CHANGELOG

9 years agoMerge pull request #1736 from fabrixxm/changelog
Michael Vogel [Mon, 6 Jul 2015 12:28:20 +0000 (14:28 +0200)]
Merge pull request #1736 from fabrixxm/changelog

Update Changelog and version

9 years agofix typos in changelog
fabrixxm [Mon, 6 Jul 2015 12:19:21 +0000 (14:19 +0200)]
fix typos in changelog

9 years agoUpdate version
Fabrixxm [Mon, 6 Jul 2015 10:49:43 +0000 (12:49 +0200)]
Update version

9 years agoUpdate CHANGELOG
Fabrixxm [Mon, 6 Jul 2015 10:48:57 +0000 (12:48 +0200)]
Update CHANGELOG

9 years agoMerge pull request #1724 from rabuzarus/theme_uid
Tobias Diekershoff [Sat, 4 Jul 2015 05:14:24 +0000 (07:14 +0200)]
Merge pull request #1724 from rabuzarus/theme_uid

fix mobile-view

9 years agoMerge pull request #1726 from rabuzarus/acl-var
fabrixxm [Thu, 2 Jul 2015 10:13:14 +0000 (12:13 +0200)]
Merge pull request #1726 from rabuzarus/acl-var

fix for #1725

9 years agoinlude jotnets for bookmark acl
rabuzarus [Thu, 2 Jul 2015 10:09:40 +0000 (12:09 +0200)]
inlude jotnets for bookmark acl

9 years agofix toggle mobile/desktop view
rabuzarus [Thu, 2 Jul 2015 00:55:03 +0000 (02:55 +0200)]
fix toggle mobile/desktop view

9 years agofix for mobile-view on system pages
rabuzarus [Thu, 2 Jul 2015 00:15:36 +0000 (02:15 +0200)]
fix for mobile-view on system pages

9 years agofix mobile-view
rabuzarus [Wed, 1 Jul 2015 14:22:08 +0000 (16:22 +0200)]
fix mobile-view

9 years agoMerge pull request #1722 from annando/1506-password-on-install
Tobias Diekershoff [Wed, 1 Jul 2015 05:53:25 +0000 (07:53 +0200)]
Merge pull request #1722 from annando/1506-password-on-install

Ability to enter a password when the first user is created

9 years agoAdded help text
Michael Vogel [Tue, 30 Jun 2015 22:41:04 +0000 (00:41 +0200)]
Added help text

9 years agoAbility to enter a password when the first user is created
Michael Vogel [Tue, 30 Jun 2015 21:37:31 +0000 (23:37 +0200)]
Ability to enter a password when the first user is created

9 years agoMerge pull request #1721 from rabuzarus/settings_translate
Tobias Diekershoff [Tue, 30 Jun 2015 18:19:43 +0000 (20:19 +0200)]
Merge pull request #1721 from rabuzarus/settings_translate

system settings is now a variable in settings_display.tpl

9 years agosystem settings is now a variable in settings_display.tpl
rabuzarus [Tue, 30 Jun 2015 12:51:14 +0000 (14:51 +0200)]
system settings is now a variable in settings_display.tpl

9 years agoMerge pull request #1719 from tobiasd/20150630-de
fabrixxm [Tue, 30 Jun 2015 08:01:26 +0000 (10:01 +0200)]
Merge pull request #1719 from tobiasd/20150630-de

update translations for DE and IT

9 years agoDE update to the strings
Tobias Diekershoff [Tue, 30 Jun 2015 07:45:05 +0000 (09:45 +0200)]
DE update to the strings

9 years agoIT update to the strings
Tobias Diekershoff [Tue, 30 Jun 2015 07:44:53 +0000 (09:44 +0200)]
IT update to the strings

9 years agoMerge pull request #1711 from fabrixxm/lang
fabrixxm [Tue, 30 Jun 2015 06:44:49 +0000 (08:44 +0200)]
Merge pull request #1711 from fabrixxm/lang

Update messages.po

9 years agoupdate util/messages.po
Fabrixxm [Tue, 30 Jun 2015 06:44:16 +0000 (08:44 +0200)]
update util/messages.po

9 years agoMerge branch 'develop' into lang
Fabrixxm [Tue, 30 Jun 2015 06:43:02 +0000 (08:43 +0200)]
Merge branch 'develop' into lang

9 years agoMerge pull request #1715 from rabuzarus/theme_uid
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

9 years agoMerge pull request #1714 from annando/1506-mail-link-profile
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

9 years agoMerge pull request #1713 from annando/1506-ostatus-completion-timeframe
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

9 years agoMerge pull request #1712 from annando/1506-ostatus-guid
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

9 years agoMerge pull request #1716 from annando/1506-no-googlemap
fabrixxm [Tue, 30 Jun 2015 06:27:59 +0000 (08:27 +0200)]
Merge pull request #1716 from annando/1506-no-googlemap

Removed Google Maps

9 years agoMerge pull request #1717 from annando/1506-ostatus-ignore-delete
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.

9 years agoOStatus: By using Qvitter, users can delete items. We can't handle that by now, so...
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.

9 years agoRemoved Google Maps
Michael Vogel [Tue, 30 Jun 2015 05:42:59 +0000 (07:42 +0200)]
Removed Google Maps

9 years agomake supported themes compatible with get_theme_uid
rabuzarus [Mon, 29 Jun 2015 21:03:44 +0000 (23:03 +0200)]
make supported themes compatible with get_theme_uid

9 years agoMail link in profile page
Michael Vogel [Mon, 29 Jun 2015 20:54:26 +0000 (22:54 +0200)]
Mail link in profile page

9 years agoThere is now two different checks for the completion of conversations
Michael Vogel [Mon, 29 Jun 2015 19:53:59 +0000 (21:53 +0200)]
There is now two different checks for the completion of conversations

9 years agoOStatus: Use the GUID format for the link to the item
Michael Vogel [Mon, 29 Jun 2015 19:49:42 +0000 (21:49 +0200)]
OStatus: Use the GUID format for the link to the item

9 years agoupdate util/messages.po
Fabrixxm [Mon, 29 Jun 2015 13:59:28 +0000 (15:59 +0200)]
update util/messages.po

9 years agoAdd new option "-s" to run_xgettext. Fix paths.
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.

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 agochange profile_url in profile_uid
rabuzarus [Sun, 28 Jun 2015 11:32:03 +0000 (13:32 +0200)]
change profile_url in profile_uid

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 agoget the themes settings of foreign profiles
rabuzarus [Sat, 27 Jun 2015 12:10:43 +0000 (14:10 +0200)]
get the themes settings of foreign profiles

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/