]> git.mxchange.org Git - friendica.git/log
friendica.git
8 years agoMerge pull request #2305 from nerdoc/patch-1
Michael Vogel [Tue, 2 Feb 2016 20:07:52 +0000 (21:07 +0100)]
Merge pull request #2305 from nerdoc/patch-1

add simple option for HTTPS in .htaccess

8 years agoreally uncomment the lines.
Christian González [Sun, 31 Jan 2016 15:20:06 +0000 (16:20 +0100)]
really uncomment the lines.

8 years agoadditional blank line
Christian González [Sat, 30 Jan 2016 22:22:40 +0000 (23:22 +0100)]
additional blank line

8 years agoadd simple option for HTTPS in .htaccess
Christian González [Sat, 30 Jan 2016 22:21:03 +0000 (23:21 +0100)]
add simple option for HTTPS in .htaccess

people have it easier to just uncomment 2 lines if they want such an important feature

8 years agoBump version
Fabrixxm [Wed, 20 Jan 2016 10:39:31 +0000 (11:39 +0100)]
Bump version

8 years agoMerge branch 'hotfix_diaspora'
Fabrixxm [Wed, 20 Jan 2016 07:45:42 +0000 (08:45 +0100)]
Merge branch 'hotfix_diaspora'

8 years agoBugfix: Comments weren't relayed anymore to Diaspora due to a Diaspora change
Michael Vogel [Wed, 20 Jan 2016 03:22:07 +0000 (04:22 +0100)]
Bugfix: Comments weren't relayed anymore to Diaspora due to a Diaspora change

8 years agoFriendica 3.4.3
Fabrixxm [Tue, 22 Dec 2015 09:45:43 +0000 (10:45 +0100)]
Friendica 3.4.3

8 years agoMerge branch 'release-3.4.3-rc'
Fabrixxm [Tue, 22 Dec 2015 09:43:57 +0000 (10:43 +0100)]
Merge branch 'release-3.4.3-rc'

8 years agoMerge pull request #2193 from fabrixxm/changelog
Michael Vogel [Tue, 22 Dec 2015 08:52:12 +0000 (09:52 +0100)]
Merge pull request #2193 from fabrixxm/changelog

Update CHANGELOG

8 years agoUpdate CHANGELOG
Fabrixxm [Tue, 22 Dec 2015 08:08:53 +0000 (09:08 +0100)]
Update CHANGELOG

8 years agoMerge pull request #2195 from fabrixxm/last-minute
Michael Vogel [Mon, 21 Dec 2015 21:50:51 +0000 (22:50 +0100)]
Merge pull request #2195 from fabrixxm/last-minute

Last minute

8 years agocall resizeIframe() function until size is stable
Fabrixxm [Mon, 21 Dec 2015 15:41:55 +0000 (16:41 +0100)]
call resizeIframe() function until size is stable

(iframe content finished to load, hopefully)
should remove scrollbars on rich oembeds

8 years agoquattro: style managed unread notification
Fabrixxm [Mon, 21 Dec 2015 15:19:56 +0000 (16:19 +0100)]
quattro: style managed unread notification

8 years agoUpdate CHANGELOG
Fabrixxm [Mon, 21 Dec 2015 14:51:21 +0000 (15:51 +0100)]
Update CHANGELOG

8 years agoMerge pull request #2192 from fabrixxm/quattro-message-aside
Tobias Diekershoff [Mon, 21 Dec 2015 08:57:17 +0000 (09:57 +0100)]
Merge pull request #2192 from fabrixxm/quattro-message-aside

quattro: fix PM aside template

8 years agoquattro: fix PM aside template
Fabrixxm [Mon, 21 Dec 2015 08:43:10 +0000 (09:43 +0100)]
quattro: fix PM aside template

errors was raised with new "show message list in aside" patch

8 years agoMerge pull request #2191 from tobiasd/20151217-fr
Michael Vogel [Sun, 20 Dec 2015 21:17:26 +0000 (22:17 +0100)]
Merge pull request #2191 from tobiasd/20151217-fr

FR: update to the translation

8 years agoFR: update to the translation
Tobias Diekershoff [Thu, 17 Dec 2015 07:27:02 +0000 (08:27 +0100)]
FR: update to the translation

8 years agoMerge pull request #2190 from annando/1512-getload
Tobias Diekershoff [Wed, 16 Dec 2015 05:21:17 +0000 (06:21 +0100)]
Merge pull request #2190 from annando/1512-getload

Sometimes the function "sys_getloadavg" doesn't return an array.

8 years agoBugfix for the maximum load check in worker.
Michael Vogel [Tue, 15 Dec 2015 23:14:53 +0000 (00:14 +0100)]
Bugfix for the maximum load check in worker.

8 years agoSometimes the function "sys_getloadavg" doesn't return an array. This is a workaround.
Michael Vogel [Tue, 15 Dec 2015 22:26:58 +0000 (23:26 +0100)]
Sometimes the function "sys_getloadavg" doesn't return an array. This is a workaround.

8 years agoMerge pull request #2189 from rabuzarus/1512_vier_images
Michael Vogel [Tue, 15 Dec 2015 14:47:09 +0000 (15:47 +0100)]
Merge pull request #2189 from rabuzarus/1512_vier_images

vier: fix missing icons

8 years agovier: fix missing icons
rabuzarus [Tue, 15 Dec 2015 14:13:46 +0000 (15:13 +0100)]
vier: fix missing icons

8 years agoMerge pull request #2188 from rabuzarus/1512_allfriends_pager
Michael Vogel [Tue, 15 Dec 2015 13:53:06 +0000 (14:53 +0100)]
Merge pull request #2188 from rabuzarus/1512_allfriends_pager

add pager to common friends and allfriends

8 years agoadd pager to common friends and allfriends
rabuzarus [Tue, 15 Dec 2015 13:31:24 +0000 (14:31 +0100)]
add pager to common friends and allfriends

8 years agoMerge pull request #2186 from annando/1512-profile-bbcode
Tobias Diekershoff [Tue, 15 Dec 2015 07:09:41 +0000 (08:09 +0100)]
Merge pull request #2186 from annando/1512-profile-bbcode

Bugfix: The bbcode conversion of the profile was inconsistent

8 years agoJust one more place where we had forgotten to use the bbcode function for the about...
Michael Vogel [Mon, 14 Dec 2015 23:11:19 +0000 (00:11 +0100)]
Just one more place where we had forgotten to use the bbcode function for the about text

8 years agoBugfix: The bbcode conversion of the profile was inconsistent
Michael Vogel [Mon, 14 Dec 2015 22:53:35 +0000 (23:53 +0100)]
Bugfix: The bbcode conversion of the profile was inconsistent

8 years agoThe "about" in feed has to be rendered as HTML
Michael Vogel [Mon, 14 Dec 2015 22:02:49 +0000 (23:02 +0100)]
The "about" in feed has to be rendered as HTML

8 years agoMerge pull request #2185 from tobiasd/20151214-translations
fabrixxm [Mon, 14 Dec 2015 16:04:02 +0000 (17:04 +0100)]
Merge pull request #2185 from tobiasd/20151214-translations

update to translation for DE, FR; IT

8 years agoIT update to the strings
Tobias Diekershoff [Mon, 14 Dec 2015 15:56:40 +0000 (16:56 +0100)]
IT update to the strings

8 years agoFR update to the strings
Tobias Diekershoff [Mon, 14 Dec 2015 15:30:28 +0000 (16:30 +0100)]
FR update to the strings

8 years agoDE update to the strings
Tobias Diekershoff [Mon, 14 Dec 2015 15:27:00 +0000 (16:27 +0100)]
DE update to the strings

8 years agoMerge pull request #2183 from rabuzarus/1412_profile_addr_fix
fabrixxm [Mon, 14 Dec 2015 14:21:14 +0000 (15:21 +0100)]
Merge pull request #2183 from rabuzarus/1412_profile_addr_fix

fix displaying forum in hcard

8 years agofix account_type
rabuzarus [Mon, 14 Dec 2015 13:12:56 +0000 (14:12 +0100)]
fix account_type

8 years agoMerge pull request #2178 from annando/1512-slapper-400
Tobias Diekershoff [Mon, 14 Dec 2015 06:57:44 +0000 (07:57 +0100)]
Merge pull request #2178 from annando/1512-slapper-400

OStatus: Make sure that mentions are always accepted

8 years agoOStatus: Make sure that mentions are always accepted
Michael Vogel [Sun, 13 Dec 2015 13:10:18 +0000 (14:10 +0100)]
OStatus: Make sure that mentions are always accepted

8 years agoMerge pull request #2176 from annando/1512-warning
Tobias Diekershoff [Sun, 13 Dec 2015 09:22:13 +0000 (10:22 +0100)]
Merge pull request #2176 from annando/1512-warning

Bugfix: Notice because of undefined constant

8 years agoBugfix: Warning because of undefined constant
Michael Vogel [Sun, 13 Dec 2015 08:43:47 +0000 (09:43 +0100)]
Bugfix: Warning because of undefined constant

8 years agoMerge pull request #2172 from tobiasd/20151212-frosticons
fabrixxm [Sun, 13 Dec 2015 08:21:03 +0000 (09:21 +0100)]
Merge pull request #2172 from tobiasd/20151212-frosticons

added event icons from frost-mobile to frost

8 years agoMerge pull request #2173 from annando/1512-optimize-fragmentation
Tobias Diekershoff [Sun, 13 Dec 2015 07:32:03 +0000 (08:32 +0100)]
Merge pull request #2173 from annando/1512-optimize-fragmentation

There is now a fragmentation level for the table optimization

8 years agoMerge pull request #2174 from annando/1512-ostatus-subscribe
Tobias Diekershoff [Sun, 13 Dec 2015 07:30:43 +0000 (08:30 +0100)]
Merge pull request #2174 from annando/1512-ostatus-subscribe

Bugfix: OStatus subscription worked by random until now ...

8 years agoresized icons to 16px
Tobias Diekershoff [Sun, 13 Dec 2015 07:09:53 +0000 (08:09 +0100)]
resized icons to 16px

8 years agoBugfix: The subscribe process took the own contact by random ...
Michael Vogel [Sat, 12 Dec 2015 16:55:57 +0000 (17:55 +0100)]
Bugfix: The subscribe process took the own contact by random ...

8 years agoThere is now a fragmentation level for the table optimisation
Michael Vogel [Sat, 12 Dec 2015 16:46:24 +0000 (17:46 +0100)]
There is now a fragmentation level for the table optimisation

8 years agoCode cleaning, real changes will follow
Michael Vogel [Sat, 12 Dec 2015 16:41:25 +0000 (17:41 +0100)]
Code cleaning, real changes will follow

8 years agoadded event icons from frost-mobile to frost
Tobias Diekershoff [Sat, 12 Dec 2015 05:23:54 +0000 (06:23 +0100)]
added event icons from frost-mobile to frost

8 years agoMerge pull request #2171 from rabuzarus/1212_directory_fix
Tobias Diekershoff [Sat, 12 Dec 2015 04:56:27 +0000 (05:56 +0100)]
Merge pull request #2171 from rabuzarus/1212_directory_fix

fix directory search

8 years agofix directory search
rabuzarus [Sat, 12 Dec 2015 00:27:31 +0000 (01:27 +0100)]
fix directory search

8 years agoMerge pull request #2170 from fabrixxm/issue_1953
Tobias Diekershoff [Fri, 11 Dec 2015 18:45:09 +0000 (19:45 +0100)]
Merge pull request #2170 from fabrixxm/issue_1953

missing frost-mobile event icons

8 years agomissing frost-mobile event icons
fabrixxm [Fri, 11 Dec 2015 18:38:00 +0000 (19:38 +0100)]
missing frost-mobile event icons

8 years agoMerge pull request #2169 from tobiasd/20151211-FR
Michael Vogel [Fri, 11 Dec 2015 10:23:49 +0000 (11:23 +0100)]
Merge pull request #2169 from tobiasd/20151211-FR

update to the French translation

8 years agoMerge pull request #2168 from annando/1512-contact-posts
Tobias Diekershoff [Fri, 11 Dec 2015 07:11:16 +0000 (08:11 +0100)]
Merge pull request #2168 from annando/1512-contact-posts

Bugfix: Posts weren't always shown for feeds that start with "www."

8 years agoMerge pull request #2167 from annando/1512-profile-aside
Tobias Diekershoff [Fri, 11 Dec 2015 07:10:23 +0000 (08:10 +0100)]
Merge pull request #2167 from annando/1512-profile-aside

Sometimes there wasn't a linebreak before the address in the profile

8 years agoregenerated credits.txt
Tobias Diekershoff [Fri, 11 Dec 2015 07:04:35 +0000 (08:04 +0100)]
regenerated credits.txt

8 years agoFR update to the strings THX Perig
Tobias Diekershoff [Fri, 11 Dec 2015 07:03:09 +0000 (08:03 +0100)]
FR update to the strings THX Perig

8 years agoBugfix: Posts weren't always shown for feeds that start with "www."
Michael Vogel [Thu, 10 Dec 2015 21:47:58 +0000 (22:47 +0100)]
Bugfix: Posts weren't always shown for feeds that start with "www."

8 years agoSometimes there wasn't a linebreak before the address in the profile
Michael Vogel [Thu, 10 Dec 2015 20:39:44 +0000 (21:39 +0100)]
Sometimes there wasn't a linebreak before the address in the profile

8 years agoMerge pull request #2161 from ddorian1/release-3.4.3-rc
Michael Vogel [Thu, 10 Dec 2015 20:20:37 +0000 (21:20 +0100)]
Merge pull request #2161 from ddorian1/release-3.4.3-rc

fix path for photo and proxy

8 years agoMerge pull request #2166 from rabuzarus/1012_vier-forum
Michael Vogel [Thu, 10 Dec 2015 20:19:16 +0000 (21:19 +0100)]
Merge pull request #2166 from rabuzarus/1012_vier-forum

vier: fix little misspelling

8 years agovier: fix little misspelling
rabuzarus [Thu, 10 Dec 2015 12:30:11 +0000 (13:30 +0100)]
vier: fix little misspelling

8 years agoMerge pull request #2164 from annando/1512-basepath-2
fabrixxm [Wed, 9 Dec 2015 18:17:48 +0000 (19:17 +0100)]
Merge pull request #2164 from annando/1512-basepath-2

Avoid problems with wrong configured server variables

8 years agoMerge pull request #2163 from annando/1512-rendertime-css
Tobias Diekershoff [Tue, 8 Dec 2015 20:05:05 +0000 (21:05 +0100)]
Merge pull request #2163 from annando/1512-rendertime-css

Do a linebreak before the output of rendertime

8 years agoAvoid problems with wrong configured server variables
Michael Vogel [Tue, 8 Dec 2015 18:53:01 +0000 (19:53 +0100)]
Avoid problems with wrong configured server variables

8 years agoDo a linebreak before the output of rendertime
Michael Vogel [Tue, 8 Dec 2015 18:41:27 +0000 (19:41 +0100)]
Do a linebreak before the output of rendertime

8 years agofix path for photo and proxy
Johannes Schwab [Mon, 7 Dec 2015 23:10:12 +0000 (00:10 +0100)]
fix path for photo and proxy

8 years agoMerge pull request #2162 from annando/1512-basepath
fabrixxm [Tue, 8 Dec 2015 08:08:48 +0000 (09:08 +0100)]
Merge pull request #2162 from annando/1512-basepath

Add an additional way to fetch the basepath (See pull request 2161)

8 years agoAdd an additional way to fetch the basepath (See pull request 2161)
Michael Vogel [Tue, 8 Dec 2015 07:17:29 +0000 (08:17 +0100)]
Add an additional way to fetch the basepath (See pull request 2161)

8 years agoUpdate FRIENDICA_VERSION
fabrixxm [Mon, 7 Dec 2015 22:24:55 +0000 (23:24 +0100)]
Update FRIENDICA_VERSION

8 years agoMerge pull request #2159 from annando/1512-worker-processes
fabrixxm [Mon, 7 Dec 2015 22:20:02 +0000 (23:20 +0100)]
Merge pull request #2159 from annando/1512-worker-processes

Better control for the number of workers

8 years agoMerge pull request #2158 from annando/1512-vier-fonts
fabrixxm [Mon, 7 Dec 2015 22:06:50 +0000 (23:06 +0100)]
Merge pull request #2158 from annando/1512-vier-fonts

Vier: The line-height seems to make problems with windows

8 years agoVier: The line-height seems to make problems with windows
Michael Vogel [Mon, 7 Dec 2015 20:45:33 +0000 (21:45 +0100)]
Vier: The line-height seems to make problems with windows

8 years agoMerge pull request #2151 from annando/1512-misconfigured-friendica
Tobias Diekershoff [Mon, 7 Dec 2015 05:37:37 +0000 (06:37 +0100)]
Merge pull request #2151 from annando/1512-misconfigured-friendica

Workaround for misconfigured Friendica servers with probe_url

8 years agoMerge pull request #2153 from annando/issue-1924
Tobias Diekershoff [Mon, 7 Dec 2015 05:32:01 +0000 (06:32 +0100)]
Merge pull request #2153 from annando/issue-1924

Issue 1924: New configuration value for permitting crawler access

8 years agoMerge pull request #2152 from annando/bugfix-socgraph
Tobias Diekershoff [Mon, 7 Dec 2015 05:29:38 +0000 (06:29 +0100)]
Merge pull request #2152 from annando/bugfix-socgraph

Bugfix for pull request #2147 (Fix for issue #2122)

8 years agoIssue 1924: New configuration value for permitting crawler access
Michael Vogel [Sun, 6 Dec 2015 21:01:20 +0000 (22:01 +0100)]
Issue 1924: New configuration value for permitting crawler access

8 years agoBugfix for pull request #2147 (Fix for issue #2122)
Michael Vogel [Sun, 6 Dec 2015 19:05:57 +0000 (20:05 +0100)]
Bugfix for pull request #2147 (Fix for issue #2122)

8 years agoSome better logging
Michael Vogel [Sun, 6 Dec 2015 19:04:33 +0000 (20:04 +0100)]
Some better logging

8 years agoCode beautification
Michael Vogel [Sun, 6 Dec 2015 17:57:23 +0000 (18:57 +0100)]
Code beautification

8 years agoWorkaround for misconfigured Friendica servers
Michael Vogel [Sun, 6 Dec 2015 17:52:19 +0000 (18:52 +0100)]
Workaround for misconfigured Friendica servers

8 years agoMove the process check at the beginning of the script
Michael Vogel [Sun, 6 Dec 2015 15:40:31 +0000 (16:40 +0100)]
Move the process check at the beginning of the script

8 years agoDouble check for maximum number of workers
Michael Vogel [Sun, 6 Dec 2015 15:28:28 +0000 (16:28 +0100)]
Double check for maximum number of workers

8 years agoMerge pull request #2150 from annando/1512-probe-url-caching
Tobias Diekershoff [Sun, 6 Dec 2015 11:22:43 +0000 (12:22 +0100)]
Merge pull request #2150 from annando/1512-probe-url-caching

probe_url: Only cache successful results

8 years agoprobe_url: Only cache successful results
Michael Vogel [Sun, 6 Dec 2015 11:15:31 +0000 (12:15 +0100)]
probe_url: Only cache successful results

8 years agoMerge pull request #2149 from annando/issue-1921
Tobias Diekershoff [Sun, 6 Dec 2015 06:31:13 +0000 (07:31 +0100)]
Merge pull request #2149 from annando/issue-1921

Issue 1921: Disable the auto update

8 years agoMerge pull request #2148 from annando/issue-1871
Tobias Diekershoff [Sun, 6 Dec 2015 05:43:30 +0000 (06:43 +0100)]
Merge pull request #2148 from annando/issue-1871

Issue 1871: Show an information if a group is empty

8 years agoMerge pull request #2147 from annando/issue-2122
Tobias Diekershoff [Sun, 6 Dec 2015 05:42:45 +0000 (06:42 +0100)]
Merge pull request #2147 from annando/issue-2122

Issue 2122: Make sure to always return the correct number of entries

8 years agoIssue 1921: Disable the auto update
Michael Vogel [Sat, 5 Dec 2015 23:18:59 +0000 (00:18 +0100)]
Issue 1921: Disable the auto update

8 years agoIssue 1871: Show an information if a group is empty
Michael Vogel [Sat, 5 Dec 2015 22:29:42 +0000 (23:29 +0100)]
Issue 1871: Show an information if a group is empty

8 years agoIssue 2122: Make sure to always return the correct number of entries
Michael Vogel [Sat, 5 Dec 2015 22:05:48 +0000 (23:05 +0100)]
Issue 2122: Make sure to always return the correct number of entries

8 years agoMerge pull request #2146 from annando/1512-ostatus-picture-posts
Tobias Diekershoff [Sat, 5 Dec 2015 05:47:31 +0000 (06:47 +0100)]
Merge pull request #2146 from annando/1512-ostatus-picture-posts

Enhancements to picture posts to OStatus

8 years agoMerge pull request #2145 from tobiasd/20151204-sv
fabrixxm [Fri, 4 Dec 2015 22:32:37 +0000 (23:32 +0100)]
Merge pull request #2145 from tobiasd/20151204-sv

SV messages.po regenerated from strings.php

8 years agoSV messages.po regenerated from strings.php
Tobias Diekershoff [Fri, 4 Dec 2015 20:31:33 +0000 (21:31 +0100)]
SV messages.po regenerated from strings.php

8 years agoMerge pull request #2144 from fabrixxm/quattro
Tobias Diekershoff [Fri, 4 Dec 2015 19:52:58 +0000 (20:52 +0100)]
Merge pull request #2144 from fabrixxm/quattro

Work on Quattro

8 years ago modified: include/dbstructure.php removed uneeded break; It causes errors with...
root [Fri, 4 Dec 2015 19:49:09 +0000 (19:49 +0000)]
modified:   include/dbstructure.php removed uneeded break; It causes errors with php 7.0.

8 years agoquattro: some love to events pages
fabrixxm [Fri, 4 Dec 2015 19:43:35 +0000 (20:43 +0100)]
quattro: some love to events pages

8 years agoMerge pull request #2142 from fabrixxm/issue_1920
Tobias Diekershoff [Fri, 4 Dec 2015 19:29:01 +0000 (20:29 +0100)]
Merge pull request #2142 from fabrixxm/issue_1920

Fix contact popup with tinyMCE

8 years agoMerge pull request #2140 from fabrixxm/issue_2046
Tobias Diekershoff [Fri, 4 Dec 2015 19:25:33 +0000 (20:25 +0100)]
Merge pull request #2140 from fabrixxm/issue_2046

Rewrite util/php2po.php

8 years agoQuattro: Rss icon for atom feed link in profile
fabrixxm [Fri, 4 Dec 2015 18:57:19 +0000 (19:57 +0100)]
Quattro: Rss icon for atom feed link in profile