]>
git.mxchange.org Git - friendica.git/log
Michael Vogel [Tue, 22 Dec 2015 10:25:37 +0000 (11:25 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1512-ostatus-comment
Conflicts:
include/ostatus.php
Fabrixxm [Tue, 22 Dec 2015 09:52:00 +0000 (10:52 +0100)]
Friendica 3.5-dev
Fabrixxm [Tue, 22 Dec 2015 09:50:52 +0000 (10:50 +0100)]
Merge branch 'master' into develop
Fabrixxm [Tue, 22 Dec 2015 09:45:43 +0000 (10:45 +0100)]
Friendica 3.4.3
Fabrixxm [Tue, 22 Dec 2015 09:43:57 +0000 (10:43 +0100)]
Merge branch 'release-3.4.3-rc'
Michael Vogel [Tue, 22 Dec 2015 08:52:12 +0000 (09:52 +0100)]
Merge pull request #2193 from fabrixxm/changelog
Update CHANGELOG
Fabrixxm [Tue, 22 Dec 2015 08:08:53 +0000 (09:08 +0100)]
Update CHANGELOG
Michael Vogel [Mon, 21 Dec 2015 21:50:51 +0000 (22:50 +0100)]
Merge pull request #2195 from fabrixxm/last-minute
Last minute
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
Fabrixxm [Mon, 21 Dec 2015 15:19:56 +0000 (16:19 +0100)]
quattro: style managed unread notification
Fabrixxm [Mon, 21 Dec 2015 14:51:21 +0000 (15:51 +0100)]
Update CHANGELOG
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
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
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
Michael Vogel [Sun, 20 Dec 2015 09:44:03 +0000 (10:44 +0100)]
Code clean up.
Tobias Diekershoff [Thu, 17 Dec 2015 07:27:02 +0000 (08:27 +0100)]
FR: update to the translation
Michael Vogel [Wed, 16 Dec 2015 09:47:26 +0000 (10:47 +0100)]
Don't generate a guid shorter than 13 characters
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.
Michael Vogel [Tue, 15 Dec 2015 23:14:53 +0000 (00:14 +0100)]
Bugfix for the maximum load check in worker.
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.
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
rabuzarus [Tue, 15 Dec 2015 14:13:46 +0000 (15:13 +0100)]
vier: fix missing icons
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
rabuzarus [Tue, 15 Dec 2015 13:31:24 +0000 (14:31 +0100)]
add pager to common friends and allfriends
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
Michael Vogel [Mon, 14 Dec 2015 23:16:40 +0000 (00:16 +0100)]
Merge pull request #2157 from gerhard6380/patch-1
Update api.md
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
Michael Vogel [Mon, 14 Dec 2015 22:53:35 +0000 (23:53 +0100)]
Bugfix: The bbcode conversion of the profile was inconsistent
Michael Vogel [Mon, 14 Dec 2015 22:02:49 +0000 (23:02 +0100)]
The "about" in feed has to be rendered as HTML
gerhard6380 [Mon, 14 Dec 2015 21:53:12 +0000 (22:53 +0100)]
Update api.md
Michael Vogel [Mon, 14 Dec 2015 21:39:52 +0000 (22:39 +0100)]
Rearrangements
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
Tobias Diekershoff [Mon, 14 Dec 2015 15:56:40 +0000 (16:56 +0100)]
IT update to the strings
Tobias Diekershoff [Mon, 14 Dec 2015 15:30:28 +0000 (16:30 +0100)]
FR update to the strings
Tobias Diekershoff [Mon, 14 Dec 2015 15:27:00 +0000 (16:27 +0100)]
DE update to the strings
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
rabuzarus [Mon, 14 Dec 2015 13:12:56 +0000 (14:12 +0100)]
fix account_type
fabrixxm [Mon, 14 Dec 2015 07:30:10 +0000 (08:30 +0100)]
Merge pull request #2179 from tobiasd/
20151214-messages
regenerated messages.po and small changes to run_xgettext
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
Tobias Diekershoff [Mon, 14 Dec 2015 06:51:27 +0000 (07:51 +0100)]
regenerated messages.po file, excluding addons-extra stuff
Tobias Diekershoff [Mon, 14 Dec 2015 06:51:11 +0000 (07:51 +0100)]
exclude addons-extra directory from the translation as well
Michael Vogel [Sun, 13 Dec 2015 23:42:36 +0000 (00:42 +0100)]
Only optical stuff
Michael Vogel [Sun, 13 Dec 2015 23:39:20 +0000 (00:39 +0100)]
Completely reworked delivery process.
Michael Vogel [Sun, 13 Dec 2015 13:10:18 +0000 (14:10 +0100)]
OStatus: Make sure that mentions are always accepted
Michael Vogel [Sun, 13 Dec 2015 11:15:45 +0000 (12:15 +0100)]
Code cleanup and first steps for a better comment distribition with DFRN and OStatus
Michael Vogel [Sun, 13 Dec 2015 11:12:32 +0000 (12:12 +0100)]
Maybe this solves the slapper problems ...
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
Michael Vogel [Sun, 13 Dec 2015 08:43:47 +0000 (09:43 +0100)]
Bugfix: Warning because of undefined constant
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
fabrixxm [Sun, 13 Dec 2015 08:20:03 +0000 (09:20 +0100)]
Merge pull request #2175 from tobiasd/
20151213-message
regenerated messages.po
Tobias Diekershoff [Sun, 13 Dec 2015 07:55:17 +0000 (08:55 +0100)]
regenerated messages.po
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
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 ...
Tobias Diekershoff [Sun, 13 Dec 2015 07:09:53 +0000 (08:09 +0100)]
resized icons to 16px
Michael Vogel [Sat, 12 Dec 2015 16:55:57 +0000 (17:55 +0100)]
Bugfix: The subscribe process took the own contact by random ...
Michael Vogel [Sat, 12 Dec 2015 16:46:24 +0000 (17:46 +0100)]
There is now a fragmentation level for the table optimisation
Michael Vogel [Sat, 12 Dec 2015 16:41:25 +0000 (17:41 +0100)]
Code cleaning, real changes will follow
Michael Vogel [Sat, 12 Dec 2015 09:41:42 +0000 (10:41 +0100)]
Some more work to make reshares work.
Tobias Diekershoff [Sat, 12 Dec 2015 05:23:54 +0000 (06:23 +0100)]
added event icons from frost-mobile to frost
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
rabuzarus [Sat, 12 Dec 2015 00:27:31 +0000 (01:27 +0100)]
fix directory search
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
fabrixxm [Fri, 11 Dec 2015 18:38:00 +0000 (19:38 +0100)]
missing frost-mobile event icons
fabrixxm [Fri, 11 Dec 2015 11:37:26 +0000 (12:37 +0100)]
Merge pull request #2156 from gerhard6380/develop
new API calls for managing contact groups
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
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."
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
Tobias Diekershoff [Fri, 11 Dec 2015 07:04:35 +0000 (08:04 +0100)]
regenerated credits.txt
Tobias Diekershoff [Fri, 11 Dec 2015 07:03:09 +0000 (08:03 +0100)]
FR update to the strings THX Perig
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."
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
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
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
Michael Vogel [Thu, 10 Dec 2015 17:16:16 +0000 (18:16 +0100)]
Support for real repeated messages
rabuzarus [Thu, 10 Dec 2015 12:30:11 +0000 (13:30 +0100)]
vier: fix little misspelling
Michael Vogel [Thu, 10 Dec 2015 00:10:54 +0000 (01:10 +0100)]
OStatus: Basic support for groups, new function to detect reshared items
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
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
Michael Vogel [Tue, 8 Dec 2015 18:53:01 +0000 (19:53 +0100)]
Avoid problems with wrong configured server variables
Michael Vogel [Tue, 8 Dec 2015 18:41:27 +0000 (19:41 +0100)]
Do a linebreak before the output of rendertime
Johannes Schwab [Mon, 7 Dec 2015 23:10:12 +0000 (00:10 +0100)]
fix path for photo and proxy
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)
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)
Michael Vogel [Mon, 7 Dec 2015 22:35:33 +0000 (23:35 +0100)]
Always include the direct parent in the mentions
fabrixxm [Mon, 7 Dec 2015 22:24:55 +0000 (23:24 +0100)]
Update FRIENDICA_VERSION
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
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
Michael Vogel [Mon, 7 Dec 2015 22:06:28 +0000 (23:06 +0100)]
OStatus: Deactivated The resharing until it is tested completely.
gerhard6380 [Mon, 7 Dec 2015 21:42:43 +0000 (22:42 +0100)]
Update api.md
changed from api/users/group_* to api/friendica/group_*
root [Mon, 7 Dec 2015 21:18:55 +0000 (22:18 +0100)]
change api/user/group_* to api/friendica/group_*
gerhard6380 [Mon, 7 Dec 2015 21:07:20 +0000 (22:07 +0100)]
Update api.md
add documentation for new API calls for Managing groups
Michael Vogel [Mon, 7 Dec 2015 20:52:42 +0000 (21:52 +0100)]
OStatus: Send even Friendica comments to OStatus
Michael Vogel [Mon, 7 Dec 2015 20:45:33 +0000 (21:45 +0100)]
Vier: The line-height seems to make problems with windows
Gerhard Seeber [Mon, 7 Dec 2015 18:37:14 +0000 (19:37 +0100)]
new API calls for managing contact groups
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
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
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)
Michael Vogel [Sun, 6 Dec 2015 21:01:20 +0000 (22:01 +0100)]
Issue 1924: New configuration value for permitting crawler access
Michael Vogel [Sun, 6 Dec 2015 19:05:57 +0000 (20:05 +0100)]
Bugfix for pull request #2147 (Fix for issue #2122)
Michael Vogel [Sun, 6 Dec 2015 19:04:33 +0000 (20:04 +0100)]
Some better logging
projects / friendica.git / log