]> git.mxchange.org Git - friendica.git/log
friendica.git
9 years agoFix syntax error in include/Emailer.php
fabrixxm [Mon, 29 Dec 2014 15:40:04 +0000 (16:40 +0100)]
Fix syntax error in include/Emailer.php

9 years agoAdds optional parameter 'uid' to Emailer::send()
fabrixxm [Mon, 29 Dec 2014 15:04:51 +0000 (16:04 +0100)]
Adds optional parameter 'uid' to Emailer::send()
that is the user id of the recipient of the mail.
Make enotify pass it to Emailer::send()

9 years agoAdds 'emailer_send_prepare' and 'emailer_send' hooks
Fabio Comuni [Mon, 29 Dec 2014 14:44:30 +0000 (15:44 +0100)]
Adds 'emailer_send_prepare' and 'emailer_send' hooks
Adds relative documentation in doc/Plugins

9 years agoMerge pull request #1264 from tugelbend/develop
Tobias Diekershoff [Sun, 28 Dec 2014 18:29:09 +0000 (19:29 +0100)]
Merge pull request #1264 from tugelbend/develop

Develop

9 years agoMerge pull request #1263 from silke/documentation
Tobias Diekershoff [Sun, 28 Dec 2014 17:14:00 +0000 (18:14 +0100)]
Merge pull request #1263 from silke/documentation

Documentation

9 years agoadded some info on vagrant to the help for devs
Silke Meyer [Sun, 28 Dec 2014 15:58:49 +0000 (16:58 +0100)]
added some info on vagrant to the help for devs

9 years agoadded a getting started file for developers
Silke Meyer [Sun, 28 Dec 2014 15:40:07 +0000 (16:40 +0100)]
added a getting started file for developers

9 years agorenamed general dev documentation to github documentation
Silke Meyer [Sun, 28 Dec 2014 15:39:19 +0000 (16:39 +0100)]
renamed general dev documentation to github documentation

9 years agoupdated help's table of content
Silke Meyer [Sun, 28 Dec 2014 15:38:19 +0000 (16:38 +0100)]
updated help's table of content

9 years agoAdded h-card and functionality for IndieAuth/Web-sign-in
hauke [Sun, 28 Dec 2014 14:48:24 +0000 (15:48 +0100)]
Added h-card and functionality for IndieAuth/Web-sign-in

9 years agoFixed a small typo
Silke Meyer [Sun, 28 Dec 2014 13:50:43 +0000 (14:50 +0100)]
Fixed a small typo

9 years agoMerge branch 'develop' of https://github.com/friendica/friendica into develop
hauke [Sat, 27 Dec 2014 11:50:24 +0000 (12:50 +0100)]
Merge branch 'develop' of https://github.com/friendica/friendica into develop

9 years agoMerge pull request #1259 from rabuzarus/issue_1258
fabrixxm [Fri, 26 Dec 2014 18:52:57 +0000 (19:52 +0100)]
Merge pull request #1259 from rabuzarus/issue_1258

Fix issue #1258 : photo albums are not complely themeable with photo_album.tpl

9 years agorevert last commit f59e574, remove some html code
Rabuzarus [Fri, 26 Dec 2014 13:44:48 +0000 (14:44 +0100)]
revert last commit f59e574, remove some html code

9 years agoremoved Pagination
Rabuzarus [Fri, 26 Dec 2014 11:54:23 +0000 (12:54 +0100)]
removed Pagination

9 years agoMerge branch 'master' into develop
Fabio Comuni [Fri, 26 Dec 2014 10:00:01 +0000 (11:00 +0100)]
Merge branch 'master' into develop

9 years agoUpdate version in boot.php
Fabio Comuni [Fri, 26 Dec 2014 09:46:10 +0000 (10:46 +0100)]
Update version in boot.php

9 years agomerge changelist.txt into CHANGELOG
Fabio Comuni [Fri, 26 Dec 2014 09:44:23 +0000 (10:44 +0100)]
merge changelist.txt into CHANGELOG

9 years agominor change: rel should not be part of the PHP
Rabuzarus [Fri, 26 Dec 2014 02:32:21 +0000 (03:32 +0100)]
minor change: rel should not be part of the PHP

9 years agoinsert new line at the end
Rabuzarus [Thu, 25 Dec 2014 15:31:52 +0000 (16:31 +0100)]
insert new line at the end

9 years agomove some html code from photos.php to photo_album.tpl
Rabuzarus [Thu, 25 Dec 2014 15:20:55 +0000 (16:20 +0100)]
move some html code from photos.php to photo_album.tpl

9 years agoMerge branch 'release-3.3.2'
Fabio Comuni [Wed, 24 Dec 2014 09:17:50 +0000 (10:17 +0100)]
Merge branch 'release-3.3.2'

9 years agoMerge pull request #1256 from annando/issue-1234
tobiasd [Tue, 23 Dec 2014 05:56:36 +0000 (06:56 +0100)]
Merge pull request #1256 from annando/issue-1234

Issue 1234: Add the account name to the notification mails

9 years agoIssue 1234: Add the account name to the notification mails.
Michael Vogel [Mon, 22 Dec 2014 23:55:36 +0000 (00:55 +0100)]
Issue 1234: Add the account name to the notification mails.

9 years agoMerge pull request #1253 from annando/1412-performance-improvement
tobiasd [Sun, 21 Dec 2014 09:19:55 +0000 (10:19 +0100)]
Merge pull request #1253 from annando/1412-performance-improvement

Performance improvements when polling contacts

9 years agoreverted a change that wasn't intended to be published yet/Delete thread was missing...
Michael Vogel [Sun, 21 Dec 2014 01:10:49 +0000 (02:10 +0100)]
reverted a change that wasn't intended to be published yet/Delete thread was missing at Diaspora items.

9 years agoPerformance stuff: Caching for getsiteinfo function, check before running onepoll.php
Michael Vogel [Sun, 21 Dec 2014 01:03:06 +0000 (02:03 +0100)]
Performance stuff: Caching for getsiteinfo function, check before running onepoll.php

9 years agoFix for error in delete function, improved query for community.
Michael Vogel [Sun, 21 Dec 2014 00:59:38 +0000 (01:59 +0100)]
Fix for error in delete function, improved query for community.

9 years agoMerge remote-tracking branch 'upstream/develop' into 1409-shadow-items
Michael Vogel [Sat, 20 Dec 2014 08:37:33 +0000 (09:37 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1409-shadow-items

9 years agoMerge pull request #1250 from annando/1412-preview-picture-from-feed-enclosure
tobiasd [Wed, 17 Dec 2014 21:21:14 +0000 (22:21 +0100)]
Merge pull request #1250 from annando/1412-preview-picture-from-feed-enclosure

Generate preview pictures from enclosed data from feeds

9 years agoGenerate preview pictures from enclosed data from feeds.
Michael Vogel [Wed, 17 Dec 2014 20:57:38 +0000 (21:57 +0100)]
Generate preview pictures from enclosed data from feeds.

9 years agoMerge pull request #1248 from kououken/patch-1
fabrixxm [Tue, 16 Dec 2014 11:25:10 +0000 (12:25 +0100)]
Merge pull request #1248 from kououken/patch-1

Changed typo in install.md

9 years agoChanged typo(?) in install.md
Daniel Dupriest [Tue, 16 Dec 2014 11:23:48 +0000 (20:23 +0900)]
Changed typo(?) in install.md

I think you mean to say 'chmod' here to change permissions on smarty3 without changing ownership.

9 years agoMerge pull request #1247 from annando/issue-1191-youtube
tobiasd [Sun, 14 Dec 2014 12:15:13 +0000 (13:15 +0100)]
Merge pull request #1247 from annando/issue-1191-youtube

Fix for issue 1191 - Embedded Youtube video isn't playing when SSL is active

9 years agoFix for issue 1191 - Embedded Youtube video isn't playing when SSL is active
Michael Vogel [Sun, 14 Dec 2014 11:47:16 +0000 (12:47 +0100)]
Fix for issue 1191 - Embedded Youtube video isn't playing when SSL is active

9 years agoMerge pull request #1243 from tobiasd/20141212
tobiasd [Sun, 14 Dec 2014 06:56:18 +0000 (07:56 +0100)]
Merge pull request #1243 from tobiasd/20141212

RO and FR: update to the core strings

9 years agoMerge pull request #1246 from annando/1412-vier-new-style
tobiasd [Sun, 14 Dec 2014 06:55:50 +0000 (07:55 +0100)]
Merge pull request #1246 from annando/1412-vier-new-style

New style for "vier"

9 years agoMerge pull request #1245 from annando/1412-horizontal-ruler-libertree
tobiasd [Sun, 14 Dec 2014 06:55:26 +0000 (07:55 +0100)]
Merge pull request #1245 from annando/1412-horizontal-ruler-libertree

empty line before horizontal ruler

9 years agoVier: New style "dark"
Michael Vogel [Sat, 13 Dec 2014 22:13:34 +0000 (23:13 +0100)]
Vier: New style "dark"

9 years agoWhen converting bbcode for Libertree then an empty line has to be before a honrizonta...
Michael Vogel [Sat, 13 Dec 2014 22:07:15 +0000 (23:07 +0100)]
When converting bbcode for Libertree then an empty line has to be before a honrizontal ruler.

9 years agoMerge pull request #1244 from annando/1412-hidewall-clarification
tobiasd [Sat, 13 Dec 2014 07:06:42 +0000 (08:06 +0100)]
Merge pull request #1244 from annando/1412-hidewall-clarification

Clarification for the hidewall property

9 years agoClarification for the hidewall property.
Michael Vogel [Fri, 12 Dec 2014 22:03:23 +0000 (23:03 +0100)]
Clarification for the hidewall property.

9 years agoRO and FR: update to the core strings
Tobias Diekershoff [Fri, 12 Dec 2014 18:01:08 +0000 (19:01 +0100)]
RO and FR: update to the core strings

9 years agoUpdate CHANGELOG
fabrixxm [Wed, 10 Dec 2014 12:41:36 +0000 (13:41 +0100)]
Update CHANGELOG

9 years agoMerge branch 'develop' into release-3.3.2
fabrixxm [Wed, 10 Dec 2014 12:33:44 +0000 (13:33 +0100)]
Merge branch 'develop' into release-3.3.2

9 years agoMerge pull request #1242 from annando/1412-stale-gprobe
tobiasd [Wed, 10 Dec 2014 05:16:35 +0000 (06:16 +0100)]
Merge pull request #1242 from annando/1412-stale-gprobe

Bugfix for stale gprobe.php

9 years agoMoving the clean up code to a central place.
Michael Vogel [Mon, 8 Dec 2014 21:37:49 +0000 (22:37 +0100)]
Moving the clean up code to a central place.

9 years agoCleanup the HTML before parsing it.
Michael Vogel [Mon, 8 Dec 2014 13:26:44 +0000 (14:26 +0100)]
Cleanup the HTML before parsing it.

9 years agoLogging to analyse the stale gprobe processes
Michael Vogel [Mon, 8 Dec 2014 10:02:03 +0000 (11:02 +0100)]
Logging to analyse the stale gprobe processes

9 years agoMerge pull request #1236 from annando/1412-make-preview-picture-smaller
tobiasd [Sun, 7 Dec 2014 09:43:32 +0000 (10:43 +0100)]
Merge pull request #1236 from annando/1412-make-preview-picture-smaller

When a post contains a picture then a picture in the added information is displayed only as a small preview picture

9 years agoMerge pull request #1235 from annando/1412-some-more-tracker-removed
tobiasd [Sun, 7 Dec 2014 09:42:42 +0000 (10:42 +0100)]
Merge pull request #1235 from annando/1412-some-more-tracker-removed

1412 some more tracker removed

9 years agoMerge pull request #1237 from annando/1412-added-hashtags-for-diaspora
tobiasd [Sun, 7 Dec 2014 09:42:00 +0000 (10:42 +0100)]
Merge pull request #1237 from annando/1412-added-hashtags-for-diaspora

When exporting shared posts to diaspora now removed hashtags will be added again

9 years agoMerge pull request #1238 from annando/1412-prevent-span-problem
tobiasd [Sun, 7 Dec 2014 09:41:14 +0000 (10:41 +0100)]
Merge pull request #1238 from annando/1412-prevent-span-problem

1412 prevent span problem

9 years agoMerge pull request #1239 from annando/1412-prevent-parsing-problems
tobiasd [Sun, 7 Dec 2014 09:39:28 +0000 (10:39 +0100)]
Merge pull request #1239 from annando/1412-prevent-parsing-problems

1412 prevent parsing problems

9 years agoMerge pull request #1240 from silke/breathe
Michael Vogel [Sat, 6 Dec 2014 19:22:45 +0000 (20:22 +0100)]
Merge pull request #1240 from silke/breathe

Use a sans-serif font-family in breathe

9 years agoUse a sans-serif font-family in breathe
Silke Meyer [Sat, 6 Dec 2014 19:05:30 +0000 (20:05 +0100)]
Use a sans-serif font-family in breathe

9 years agoMerge remote-tracking branch 'upstream/develop' into 1409-shadow-items
Michael Vogel [Mon, 1 Dec 2014 22:32:23 +0000 (23:32 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1409-shadow-items

9 years agoWhen selecting forums there was an added "span" html element.
Michael Vogel [Mon, 1 Dec 2014 21:56:41 +0000 (22:56 +0100)]
When selecting forums there was an added "span" html element.

9 years agoIn "parse_url" now links with [ or ] are replaced with shortened versions to avoid...
Michael Vogel [Mon, 1 Dec 2014 21:54:01 +0000 (22:54 +0100)]
In "parse_url" now links with [ or ] are replaced with shortened versions to avoid parsing problems.

9 years agoSome more typical tracking parameter is removed
Michael Vogel [Mon, 1 Dec 2014 21:52:51 +0000 (22:52 +0100)]
Some more typical tracking parameter is removed

9 years agoIf a link contains BBCode stuff, make a short link out of this to avoid parsing problems
Michael Vogel [Mon, 1 Dec 2014 21:51:41 +0000 (22:51 +0100)]
If a link contains BBCode stuff, make a short link out of this to avoid parsing problems

9 years agoWhen a post contains a picture then a picture in the added information is displayed...
Michael Vogel [Mon, 1 Dec 2014 21:49:35 +0000 (22:49 +0100)]
When a post contains a picture then a picture in the added information is displayed only as a small preview picture.

9 years agoWhen exporting shared posts to diaspora now removed hashtags will be added again.
Michael Vogel [Mon, 1 Dec 2014 21:45:13 +0000 (22:45 +0100)]
When exporting shared posts to diaspora now removed hashtags will be added again.

9 years agoMerge pull request #1227 from annando/1411-api-throttling
tobiasd [Sat, 22 Nov 2014 06:38:06 +0000 (07:38 +0100)]
Merge pull request #1227 from annando/1411-api-throttling

API: Possibility of throttling when posting limit is reached

9 years agoMerge branch 'develop' of github.com:annando/friendica into 1409-shadow-items
Michael Vogel [Tue, 18 Nov 2014 23:19:30 +0000 (00:19 +0100)]
Merge branch 'develop' of github.com:annando/friendica into 1409-shadow-items

9 years agoAPI: Possibilty of throttling when posting limit is reached
Michael Vogel [Tue, 18 Nov 2014 22:55:45 +0000 (23:55 +0100)]
API: Possibilty of throttling when posting limit is reached

9 years agoUpdage CHANGELOG
fabrixxm [Sun, 16 Nov 2014 12:47:35 +0000 (13:47 +0100)]
Updage CHANGELOG

9 years agoMerge pull request #1226 from annando/1411-bugfix-dfrn-notify
fabrixxm [Sun, 16 Nov 2014 12:14:45 +0000 (13:14 +0100)]
Merge pull request #1226 from annando/1411-bugfix-dfrn-notify

Urgent Bugfix: Error when delivering Friendica content

9 years agoBugfix: There was a SQL error when trying to deliver friendica posts because of a...
Michael Vogel [Sat, 15 Nov 2014 18:21:54 +0000 (19:21 +0100)]
Bugfix: There was a SQL error when trying to deliver friendica posts because of a parameter mismatch

10 years agoMerge pull request #1225 from tobiasd/20141113a
fabrixxm [Thu, 13 Nov 2014 07:41:07 +0000 (08:41 +0100)]
Merge pull request #1225 from tobiasd/20141113a

applying the removal of that host from the German /help as well

10 years agoapplying the removal of that host from the German /help as well
Tobias Diekershoff [Thu, 13 Nov 2014 07:28:49 +0000 (08:28 +0100)]
applying the removal of that host from the German /help as well

10 years agoMerge pull request #1224 from beardy-unixer/development
tobiasd [Tue, 11 Nov 2014 07:30:55 +0000 (08:30 +0100)]
Merge pull request #1224 from beardy-unixer/development

Move a hub that's no longer a Friendica hub from the doco.  This is

10 years agoMove a hub that's no longer a Friendica hub from the doco. This is
Thomas Willingham [Tue, 11 Nov 2014 00:43:04 +0000 (00:43 +0000)]
Move a hub that's no longer a Friendica hub from the doco.  This is
also listed in the German entries.  I left it there for somebody
German to fix because it can't be easily removed.

10 years agoMerge pull request #1223 from fabrixxm/issue/1222
Michael Vogel [Mon, 10 Nov 2014 15:01:13 +0000 (16:01 +0100)]
Merge pull request #1223 from fabrixxm/issue/1222

Issue/1222

10 years agofix #1222
Fabrixxm [Mon, 10 Nov 2014 14:37:52 +0000 (15:37 +0100)]
fix #1222

10 years agosmall indentation fix
Fabrixxm [Mon, 10 Nov 2014 14:07:35 +0000 (15:07 +0100)]
small indentation fix

10 years agoMerge pull request #1221 from annando/1411-default-value-type
fabrixxm [Mon, 10 Nov 2014 08:57:42 +0000 (09:57 +0100)]
Merge pull request #1221 from annando/1411-default-value-type

Fix: "not null" fields were not set

10 years agoSetting default values for all database fields.
Michael Vogel [Sun, 9 Nov 2014 12:29:27 +0000 (13:29 +0100)]
Setting default values for all database fields.

10 years agoMerge pull request #1219 from annando/1411-hostname
tobiasd [Sun, 9 Nov 2014 08:18:17 +0000 (09:18 +0100)]
Merge pull request #1219 from annando/1411-hostname

It is now possible to define the hostname from the admin page.

10 years agoSome more values that need to be set to avoid SQL warnings.
Michael Vogel [Sun, 9 Nov 2014 00:13:07 +0000 (01:13 +0100)]
Some more values that need to be set to avoid SQL warnings.

10 years agoFix for issue "Field 'type' doesn't have a default value" in the challenge table.
Michael Vogel [Sat, 8 Nov 2014 19:52:15 +0000 (20:52 +0100)]
Fix for issue "Field 'type' doesn't have a default value" in the challenge table.

10 years agoIt is now possible to define the hostname from the admin page. This should definetely...
Michael Vogel [Fri, 7 Nov 2014 23:07:21 +0000 (00:07 +0100)]
It is now possible to define the hostname from the admin page. This should definetely end the problem that the hostname couldn't be detected unter certain conditions.

10 years agoMerge branch 'master' into develop
fabrixxm [Thu, 6 Nov 2014 19:53:49 +0000 (20:53 +0100)]
Merge branch 'master' into develop

10 years agoMerge branch 'release-3.3.1'
fabrixxm [Thu, 6 Nov 2014 19:43:38 +0000 (20:43 +0100)]
Merge branch 'release-3.3.1'

10 years agoBump version to 3.3.1. Add CHANGELOG file
fabrixxm [Thu, 6 Nov 2014 19:31:27 +0000 (20:31 +0100)]
Bump version to 3.3.1. Add CHANGELOG file

10 years agoMerge pull request #1217 from annando/1411-newlines-beyand-attachments
fabrixxm [Mon, 3 Nov 2014 13:18:25 +0000 (14:18 +0100)]
Merge pull request #1217 from annando/1411-newlines-beyand-attachments

Suppress newlines beneath attachments

10 years agoMerge pull request #1216 from cpfeiffer/TinyMCE-resizable
Michael Vogel [Mon, 3 Nov 2014 00:00:05 +0000 (01:00 +0100)]
Merge pull request #1216 from cpfeiffer/TinyMCE-resizable

Make TinyMCE editors resizable

10 years agoFurther improvement for newlines after attachments
Michael Vogel [Sun, 2 Nov 2014 17:39:23 +0000 (18:39 +0100)]
Further improvement for newlines after attachments

10 years agoBBCode: Newlines under attachments are now removed
Michael Vogel [Sun, 2 Nov 2014 16:35:49 +0000 (17:35 +0100)]
BBCode: Newlines under attachments are now removed

10 years agoMake TinyMCE editors resizable
Carsten Pfeiffer [Sat, 1 Nov 2014 21:18:42 +0000 (22:18 +0100)]
Make TinyMCE editors resizable

10 years agoMerge branch 'develop' into release-3.3.1
Fabrixxm [Fri, 31 Oct 2014 13:50:46 +0000 (14:50 +0100)]
Merge branch 'develop' into release-3.3.1

10 years agoMerge pull request #1213 from annando/1410-keyword-blacklist
fabrixxm [Fri, 31 Oct 2014 13:40:27 +0000 (14:40 +0100)]
Merge pull request #1213 from annando/1410-keyword-blacklist

Blacklist for generating hashtags from keywords

10 years agoRemoved some more special characters from hashtags
Michael Vogel [Thu, 30 Oct 2014 10:33:33 +0000 (11:33 +0100)]
Removed some more special characters from hashtags

10 years agofetch further information: it is now possible to define a blacklist for keywords...
Michael Vogel [Wed, 29 Oct 2014 23:24:23 +0000 (00:24 +0100)]
fetch further information: it is now possible to define a blacklist for keywords for "fetch further information"

10 years agoMerge pull request #1212 from annando/1410-remote-self
tobiasd [Wed, 29 Oct 2014 14:06:21 +0000 (15:06 +0100)]
Merge pull request #1212 from annando/1410-remote-self

Remote-Self is now working for Friendica and Diaspora contacts as well

10 years agoRemote-self: It does only make sense to check for duplicates from friendica
Michael Vogel [Wed, 29 Oct 2014 07:24:05 +0000 (08:24 +0100)]
Remote-self: It does only make sense to check for duplicates from friendica

10 years agoRemote self is now working for diaspora contacts as well.
Michael Vogel [Wed, 29 Oct 2014 00:42:43 +0000 (01:42 +0100)]
Remote self is now working for diaspora contacts as well.

10 years agoAdditional check for repeated posts
Michael Vogel [Wed, 29 Oct 2014 00:31:29 +0000 (01:31 +0100)]
Additional check for repeated posts

10 years agoremote-self: Moved the code in a single function and cleaned it up.
Michael Vogel [Wed, 29 Oct 2014 00:05:09 +0000 (01:05 +0100)]
remote-self: Moved the code in a single function and cleaned it up.

10 years agoLet remote-self posts appear as own posts - for test reasons
Michael Vogel [Tue, 28 Oct 2014 21:10:58 +0000 (22:10 +0100)]
Let remote-self posts appear as own posts - for test reasons