]> git.mxchange.org Git - friendica.git/log
friendica.git
9 years agoFurther improvement of the contact menu
Michael Vogel [Sun, 4 Oct 2015 21:41:13 +0000 (23:41 +0200)]
Further improvement of the contact menu

9 years agoShow RedMatrix and use the proxy for the profile pictures
Michael Vogel [Sun, 4 Oct 2015 20:24:58 +0000 (22:24 +0200)]
Show RedMatrix and use the proxy for the profile pictures

9 years agoMerge pull request #1936 from annando/1510-contact-menu
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)

9 years agoThe 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)

9 years agoMerge pull request #1935 from annando/1510-bugfix-repair
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 ...

9 years agoA contact that couldn't be resolved is know known as "UNKNOWN"
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"

9 years agoBugfix: Repairing a contact was more like killing the contact ...
Michael Vogel [Sun, 4 Oct 2015 17:39:55 +0000 (19:39 +0200)]
Bugfix: Repairing a contact was more like killing the contact ...

9 years agoMerge pull request #1934 from annando/1510-better-notification
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

9 years agoMerge pull request #1931 from annando/1510-documentation-htconfig
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

9 years agoAdded explanation how to add a parameter to the .htconfig.pgp
Michael Vogel [Sun, 4 Oct 2015 15:37:08 +0000 (17:37 +0200)]
Added explanation how to add a parameter to the .htconfig.pgp

9 years agoFor safety reasons include the include
Michael Vogel [Sun, 4 Oct 2015 15:20:47 +0000 (17:20 +0200)]
For safety reasons include the include

9 years agoLet the notification look more like the follow dialog
Michael Vogel [Sun, 4 Oct 2015 15:18:58 +0000 (17:18 +0200)]
Let the notification look more like the follow dialog

9 years agoMerge pull request #1933 from annando/1510-follow-more-data
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

9 years agoMerge pull request #1932 from annando/1510-vier-2
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"

9 years agotransfer some stuff from "follow" to the "notifications" to reduce the differences...
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.

9 years agoPreparation for a not found contact.
Michael Vogel [Sun, 4 Oct 2015 12:49:12 +0000 (14:49 +0200)]
Preparation for a not found contact.

9 years agoShow more information when following a new contact
Michael Vogel [Sun, 4 Oct 2015 12:41:39 +0000 (14:41 +0200)]
Show more information when following a new contact

9 years agoBeautyfied code. Link to "follow" on community profiles
Michael Vogel [Sun, 4 Oct 2015 12:40:02 +0000 (14:40 +0200)]
Beautyfied code. Link to "follow" on community profiles

9 years agoSmall optical changes in "vier"
Michael Vogel [Sun, 4 Oct 2015 10:24:00 +0000 (12:24 +0200)]
Small optical changes in "vier"

9 years agoDocumentation of .htconfig.php values
Michael Vogel [Sun, 4 Oct 2015 10:02:44 +0000 (12:02 +0200)]
Documentation of .htconfig.php values

9 years agoMerge pull request #1930 from tobiasd/20151004-de
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

9 years agoDE update to the translation
Tobias Diekershoff [Sun, 4 Oct 2015 07:23:58 +0000 (09:23 +0200)]
DE update to the translation

9 years agoMerge pull request #1928 from annando/issue-1913
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

9 years agoMerge pull request #1927 from annando/issue-1914
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

9 years agoMerge pull request #1926 from annando/1510-permit-crawler
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

9 years agoMerge pull request #1923 from annando/1510-feed-remote-self
Tobias Diekershoff [Sun, 4 Oct 2015 06:51:58 +0000 (08:51 +0200)]
Merge pull request #1923 from annando/1510-feed-remote-self

Bugfix: Remote self hadn't worked anymore since the new feed import

9 years agoMerge pull request #1922 from annando/1510-vier-right-aside
Tobias Diekershoff [Sun, 4 Oct 2015 06:51:36 +0000 (08:51 +0200)]
Merge pull request #1922 from annando/1510-vier-right-aside

"Vier" comes now with the right column from Diabook

9 years agoIssue 1913: Report invalid feed
Michael Vogel [Sat, 3 Oct 2015 22:28:15 +0000 (00:28 +0200)]
Issue 1913: Report invalid feed

9 years agoIssue 1914: A feed was falsely detected as OStatus
Michael Vogel [Sat, 3 Oct 2015 21:57:00 +0000 (23:57 +0200)]
Issue 1914: A feed was falsely detected as OStatus

9 years agoNew template for http status messages
Michael Vogel [Sat, 3 Oct 2015 21:19:09 +0000 (23:19 +0200)]
New template for http status messages

9 years agoNew option to permit crawlers
Michael Vogel [Sat, 3 Oct 2015 21:16:40 +0000 (23:16 +0200)]
New option to permit crawlers

9 years agoMerge pull request #1916 from rabuzarus/geotag
Michael Vogel [Sat, 3 Oct 2015 20:06:28 +0000 (22:06 +0200)]
Merge pull request #1916 from rabuzarus/geotag

port of red matrix geotag feature

9 years agoMerge origin/geotag into geotag
rabuzarus [Sat, 3 Oct 2015 18:41:26 +0000 (20:41 +0200)]
Merge origin/geotag into geotag

9 years agoport of reds geotag feature
rabuzarus [Tue, 29 Sep 2015 22:19:54 +0000 (00:19 +0200)]
port of reds geotag feature

9 years agoBugfix: Remote self worked anymore
Michael Vogel [Sat, 3 Oct 2015 11:58:10 +0000 (13:58 +0200)]
Bugfix: Remote self worked anymore

9 years agoThe right side now contains much stuff from diabook - but completely reworked.
Michael Vogel [Sat, 3 Oct 2015 10:55:55 +0000 (12:55 +0200)]
The right side now contains much stuff from diabook - but completely reworked.

9 years agoVier: Menu at the right side (inspired and copyied from diabook)
Michael Vogel [Thu, 1 Oct 2015 06:19:35 +0000 (08:19 +0200)]
Vier: Menu at the right side (inspired and copyied from diabook)

9 years agoMerge pull request #1919 from tobiasd/20151001-calendar
Michael Vogel [Thu, 1 Oct 2015 06:09:28 +0000 (08:09 +0200)]
Merge pull request #1919 from tobiasd/20151001-calendar

add a header to seperate the beginning of week settings

9 years agoadd a header to seperate the beginning of week settings
Tobias Diekershoff [Thu, 1 Oct 2015 04:19:57 +0000 (06:19 +0200)]
add a header to seperate the beginning of week settings

9 years agoMerge pull request #1918 from annando/1510-events
Tobias Diekershoff [Thu, 1 Oct 2015 04:09:37 +0000 (06:09 +0200)]
Merge pull request #1918 from annando/1510-events

Event improvements

9 years agoRearrange the navigation bar on smaller windows
Michael Vogel [Wed, 30 Sep 2015 19:59:55 +0000 (21:59 +0200)]
Rearrange the navigation bar on smaller windows

9 years agoSetting for the first day of the week
Michael Vogel [Wed, 30 Sep 2015 17:18:13 +0000 (19:18 +0200)]
Setting for the first day of the week

9 years agoThe events moved from the profile to the navigation bar - for supported themes
Michael Vogel [Wed, 30 Sep 2015 16:50:44 +0000 (18:50 +0200)]
The events moved from the profile to the navigation bar - for supported themes

9 years agoMerge geotag into develop
rabuzarus [Wed, 30 Sep 2015 10:37:20 +0000 (12:37 +0200)]
Merge geotag into develop

Conflicts:
mod/photos.php

9 years agoport of reds geotag feature
rabuzarus [Wed, 30 Sep 2015 10:33:57 +0000 (12:33 +0200)]
port of reds geotag feature

9 years agoMerge pull request #1915 from rabuzarus/hide_profilepics
fabrixxm [Wed, 30 Sep 2015 06:57:31 +0000 (08:57 +0200)]
Merge pull request #1915 from rabuzarus/hide_profilepics

don't show profile photos in albums to others than owner or remote

9 years agoMerge pull request #1912 from annando/1509-worker
fabrixxm [Wed, 30 Sep 2015 06:56:54 +0000 (08:56 +0200)]
Merge pull request #1912 from annando/1509-worker

New way of background processing

9 years agoMerge pull request #1911 from annando/1509-i18n-events
fabrixxm [Wed, 30 Sep 2015 06:46:57 +0000 (08:46 +0200)]
Merge pull request #1911 from annando/1509-i18n-events

Localisation of the event page

9 years agoMerge pull request #1910 from annando/1509-new-feed-import
fabrixxm [Wed, 30 Sep 2015 06:46:08 +0000 (08:46 +0200)]
Merge pull request #1910 from annando/1509-new-feed-import

New feed import functionality

9 years agoport of reds geotag feature
rabuzarus [Tue, 29 Sep 2015 22:19:54 +0000 (00:19 +0200)]
port of reds geotag feature

9 years agodon't show profile photos in albums to others than the owner or remote user
rabuzarus [Tue, 29 Sep 2015 17:44:26 +0000 (19:44 +0200)]
don't show profile photos in albums to others than the owner or remote user

9 years agoMerge remote-tracking branch 'upstream/develop' into 1509-i18n-events
Michael Vogel [Tue, 29 Sep 2015 08:35:50 +0000 (10:35 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1509-i18n-events

9 years agoMerge remote-tracking branch 'upstream/develop' into 1509-new-feed-import
Michael Vogel [Tue, 29 Sep 2015 08:27:04 +0000 (10:27 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1509-new-feed-import

9 years agoMerge remote-tracking branch 'upstream/develop' into 1509-worker
Michael Vogel [Tue, 29 Sep 2015 08:25:59 +0000 (10:25 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1509-worker

9 years agoMerge branch 'master' back into develop
Fabrixxm [Tue, 29 Sep 2015 08:00:13 +0000 (10:00 +0200)]
Merge branch 'master' back into develop

9 years agoMerge branch '3.4.2'
Fabrixxm [Tue, 29 Sep 2015 07:58:16 +0000 (09:58 +0200)]
Merge branch '3.4.2'

9 years agoMerge pull request #1909 from fabrixxm/changelog-3.4.2
Michael Vogel [Tue, 29 Sep 2015 07:56:59 +0000 (09:56 +0200)]
Merge pull request #1909 from fabrixxm/changelog-3.4.2

3.4.2: update changelog and version

9 years agoBump Friendica version
Fabrixxm [Tue, 29 Sep 2015 07:25:59 +0000 (09:25 +0200)]
Bump Friendica version

9 years agoUpdate CHANGELOG
Fabrixxm [Tue, 29 Sep 2015 07:25:36 +0000 (09:25 +0200)]
Update CHANGELOG

9 years agoReduction of double executions - hopefully
Michael Vogel [Tue, 29 Sep 2015 04:15:26 +0000 (06:15 +0200)]
Reduction of double executions - hopefully

9 years agoLogging message added
Michael Vogel [Mon, 28 Sep 2015 20:32:56 +0000 (22:32 +0200)]
Logging message added

9 years agoPrevent double execution
Michael Vogel [Mon, 28 Sep 2015 19:58:58 +0000 (21:58 +0200)]
Prevent double execution

9 years agoMagical mathematics to reduce the number of workers
Michael Vogel [Mon, 28 Sep 2015 17:14:07 +0000 (19:14 +0200)]
Magical mathematics to reduce the number of workers

9 years agoLoad depending number of worker queues.
Michael Vogel [Mon, 28 Sep 2015 05:54:28 +0000 (07:54 +0200)]
Load depending number of worker queues.

9 years agoNew functionality to import feeds. Now with support of every used feed format (RSS...
Michael Vogel [Sun, 27 Sep 2015 12:02:05 +0000 (14:02 +0200)]
New functionality to import feeds. Now with support of every used feed format (RSS, RDF, Atom)

9 years agoInternationalisation of events/Move events to the navigation bar
Michael Vogel [Sun, 27 Sep 2015 12:00:15 +0000 (14:00 +0200)]
Internationalisation of events/Move events to the navigation bar

9 years agoLoad depending number of workers
Michael Vogel [Sun, 27 Sep 2015 11:56:20 +0000 (13:56 +0200)]
Load depending number of workers

9 years agoMerge pull request #1901 from tobiasd/20150924-pl
fabrixxm [Fri, 25 Sep 2015 16:25:13 +0000 (18:25 +0200)]
Merge pull request #1901 from tobiasd/20150924-pl

PL update to the strings

9 years agoMerge pull request #1903 from annando/1509-bbcode-notifications
fabrixxm [Fri, 25 Sep 2015 16:24:48 +0000 (18:24 +0200)]
Merge pull request #1903 from annando/1509-bbcode-notifications

The "about" field in the introductions should be send through bbcode

9 years agoBugfix: The "about" field in the introductions should be send through bbcode
Michael Vogel [Fri, 25 Sep 2015 15:47:37 +0000 (17:47 +0200)]
Bugfix: The "about" field in the introductions should be send through bbcode

9 years agoMute warnings in pidfile/Quit poller after an hour.
Michael Vogel [Fri, 25 Sep 2015 15:38:56 +0000 (17:38 +0200)]
Mute warnings in pidfile/Quit poller after an hour.

9 years agoPL update to the strings
Tobias Diekershoff [Thu, 24 Sep 2015 20:09:39 +0000 (22:09 +0200)]
PL update to the strings

9 years agoMerge pull request #1899 from strk/postopt-lang
fabrixxm [Wed, 23 Sep 2015 09:41:15 +0000 (11:41 +0200)]
Merge pull request #1899 from strk/postopt-lang

Remove duplicated calls to language detection

9 years agoUse ampersend to separate postopts, and explicit test for empty string
Sandro Santilli [Wed, 23 Sep 2015 09:39:36 +0000 (11:39 +0200)]
Use ampersend to separate postopts, and explicit test for empty string

9 years agoUse x() function to check for array containement (I think)
Sandro Santilli [Wed, 23 Sep 2015 09:11:12 +0000 (11:11 +0200)]
Use x() function to check for array containement (I think)

this is response to @fabrixxxm comment

9 years agoRemove duplicated calls to language detection
Sandro Santilli [Wed, 23 Sep 2015 08:47:34 +0000 (10:47 +0200)]
Remove duplicated calls to language detection

Also avoids overriding existing "lang" specification in an item

9 years agoDo a load check during execution of the queue.
Michael Vogel [Wed, 23 Sep 2015 06:56:48 +0000 (08:56 +0200)]
Do a load check during execution of the queue.

9 years agoMerge pull request #1897 from annando/3.4.2
Tobias Diekershoff [Wed, 23 Sep 2015 04:20:49 +0000 (06:20 +0200)]
Merge pull request #1897 from annando/3.4.2

Bugfix: Following mail accounts is now possible again

9 years agoBugfix: Following mail accounts is now possible again
Michael Vogel [Tue, 22 Sep 2015 20:31:22 +0000 (22:31 +0200)]
Bugfix: Following mail accounts is now possible again

9 years agoMerge pull request #1895 from fabrixxm/rino2-mcrypt
Tobias Diekershoff [Tue, 22 Sep 2015 11:15:01 +0000 (13:15 +0200)]
Merge pull request #1895 from fabrixxm/rino2-mcrypt

Adds checks for mcrypt module for RINO2

9 years agoupdate messages.po
Fabrixxm [Tue, 22 Sep 2015 07:59:12 +0000 (09:59 +0200)]
update messages.po

9 years agoAdds checks for mcrypt module for RINO2
Fabrixxm [Tue, 22 Sep 2015 07:50:24 +0000 (09:50 +0200)]
Adds checks for mcrypt module for RINO2

- check for module on install
- check for module when RINO2 is enabled in admin
- check for module when RINO2 is used in communications

9 years agoMerge pull request #1894 from annando/1509-diaspora-federation
Tobias Diekershoff [Sat, 19 Sep 2015 13:51:25 +0000 (15:51 +0200)]
Merge pull request #1894 from annando/1509-diaspora-federation

Some changes to stay compatible to Diaspora

9 years agoSome changes to stay compatible to Diaspora
Michael Vogel [Sat, 19 Sep 2015 12:00:33 +0000 (14:00 +0200)]
Some changes to stay compatible to Diaspora

9 years agoMerge pull request #1893 from annando/1509-lockpath
Tobias Diekershoff [Sat, 19 Sep 2015 11:53:13 +0000 (13:53 +0200)]
Merge pull request #1893 from annando/1509-lockpath

Avoiding errors when checking for the lockpath

9 years agoAvoiding errors when checking for the lockpath
Michael Vogel [Sat, 19 Sep 2015 09:30:19 +0000 (11:30 +0200)]
Avoiding errors when checking for the lockpath

9 years agoMerge pull request #1892 from annando/1509-vier-attachements
Tobias Diekershoff [Fri, 18 Sep 2015 19:11:57 +0000 (21:11 +0200)]
Merge pull request #1892 from annando/1509-vier-attachements

Now attachments of the type "application" are displayed as well.

9 years agoNow attachments of the type "application" are displayed as well.
Michael Vogel [Fri, 18 Sep 2015 19:09:31 +0000 (21:09 +0200)]
Now attachments of the type "application" are displayed as well.

9 years agoMerge pull request #1888 from fabrixxm/changelog-3.4.2
Michael Vogel [Thu, 17 Sep 2015 19:53:23 +0000 (21:53 +0200)]
Merge pull request #1888 from fabrixxm/changelog-3.4.2

Update changelog

9 years agoMerge pull request #1891 from tobiasd/20150917-de
Tobias Diekershoff [Thu, 17 Sep 2015 12:25:34 +0000 (14:25 +0200)]
Merge pull request #1891 from tobiasd/20150917-de

DE update to the strings

9 years agoDE update to the strings
Tobias Diekershoff [Thu, 17 Sep 2015 12:24:07 +0000 (14:24 +0200)]
DE update to the strings

9 years agoFix CHANGELOG
fabrixxm [Wed, 16 Sep 2015 14:59:14 +0000 (16:59 +0200)]
Fix CHANGELOG

9 years agoMerge pull request #1890 from annando/1509-directory
Tobias Diekershoff [Tue, 15 Sep 2015 20:48:34 +0000 (22:48 +0200)]
Merge pull request #1890 from annando/1509-directory

There is now only one central parameter for the global directory.

9 years agoThere is now only one central parameter for the global directory.
Michael Vogel [Tue, 15 Sep 2015 20:29:02 +0000 (22:29 +0200)]
There is now only one central parameter for the global directory.

9 years agoMerge pull request #1889 from annando/1509-diaspora-images
Tobias Diekershoff [Tue, 15 Sep 2015 04:21:19 +0000 (06:21 +0200)]
Merge pull request #1889 from annando/1509-diaspora-images

Bugfix: Picture import from Diaspora often failed

9 years agoPicture import from Diaspora often failed
Michael Vogel [Mon, 14 Sep 2015 21:14:21 +0000 (23:14 +0200)]
Picture import from Diaspora often failed

9 years agoFix CHANGELOG
fabrixxm [Mon, 14 Sep 2015 15:31:13 +0000 (17:31 +0200)]
Fix CHANGELOG

9 years agoUpdate CHANGELOG
Fabrixxm [Mon, 14 Sep 2015 13:22:41 +0000 (15:22 +0200)]
Update CHANGELOG

9 years agoChecking includes for valid paths
Michael Vogel [Sun, 13 Sep 2015 16:47:10 +0000 (18:47 +0200)]
Checking includes for valid paths

9 years agoWith the new queue we don't need "delivery_batch_count" anymore
Michael Vogel [Sun, 13 Sep 2015 06:08:13 +0000 (08:08 +0200)]
With the new queue we don't need "delivery_batch_count" anymore