]> git.mxchange.org Git - friendica.git/log
friendica.git
9 years agoMerge remote-tracking branch 'upstream/develop' into issue-1218
Michael Vogel [Sun, 4 Jan 2015 19:21:49 +0000 (20:21 +0100)]
Merge remote-tracking branch 'upstream/develop' into issue-1218

9 years agoMerge pull request #1279 from annando/1501-wrong-encoding
Tobias Diekershoff [Sun, 4 Jan 2015 17:01:11 +0000 (18:01 +0100)]
Merge pull request #1279 from annando/1501-wrong-encoding

The "scrape" bugfix lead to partly damaged encodings. This is fixed now

9 years agoReplaced $argv and $argc with the $_SERVER array
Michael Vogel [Sun, 4 Jan 2015 12:24:16 +0000 (13:24 +0100)]
Replaced $argv and $argc with the $_SERVER array

9 years agoThe "scrape" bugfix lead to partly damaged encodings. This is fixed now.
Michael Vogel [Sun, 4 Jan 2015 10:56:41 +0000 (11:56 +0100)]
The "scrape" bugfix lead to partly damaged encodings. This is fixed now.

9 years agoMerge pull request #1275 from annando/1501-hashtags-in-attachments
fabrixxm [Sat, 3 Jan 2015 20:32:55 +0000 (21:32 +0100)]
Merge pull request #1275 from annando/1501-hashtags-in-attachments

Titles in attached link description now don't create misformatted text anymore

9 years agoMerge pull request #1277 from annando/1501-bugfix-remote-self
Tobias Diekershoff [Fri, 2 Jan 2015 12:07:14 +0000 (13:07 +0100)]
Merge pull request #1277 from annando/1501-bugfix-remote-self

Items that were stored via "remote-self" hadn't contained a valid avatar

9 years agoMerge pull request #1276 from tobiasd/20150102fr
Michael Vogel [Fri, 2 Jan 2015 12:06:02 +0000 (13:06 +0100)]
Merge pull request #1276 from tobiasd/20150102fr

FR update to the strings

9 years agoItems that were stored via "remote-self" hadn't contained a valid avatar picture.
Michael Vogel [Fri, 2 Jan 2015 11:45:09 +0000 (12:45 +0100)]
Items that were stored via "remote-self" hadn't contained a valid avatar picture.

9 years agoFR update to the strings
Tobias Diekershoff [Fri, 2 Jan 2015 07:26:08 +0000 (08:26 +0100)]
FR update to the strings

9 years agoLitte typo ...
Michael Vogel [Fri, 2 Jan 2015 06:50:21 +0000 (07:50 +0100)]
Litte typo ...

9 years agoHashtags in attached link description now don't create misformatted text anymore.
Michael Vogel [Fri, 2 Jan 2015 00:43:31 +0000 (01:43 +0100)]
Hashtags in attached link description now don't create misformatted text anymore.

9 years agoSee issue 1218: generate $argv and $argc from $_SERVER if it wasn't defined.
Michael Vogel [Thu, 1 Jan 2015 23:01:17 +0000 (00:01 +0100)]
See issue 1218: generate $argv and $argc from $_SERVER if it wasn't defined.

9 years agoMerge pull request #1273 from annando/issue-920
Tobias Diekershoff [Thu, 1 Jan 2015 20:47:48 +0000 (21:47 +0100)]
Merge pull request #1273 from annando/issue-920

Using a better placeholder. See issue 920

9 years agoUsing a better placeholder. Could solve this issue: https://github.com/friendica...
Michael Vogel [Thu, 1 Jan 2015 20:19:07 +0000 (21:19 +0100)]
Using a better placeholder. Could solve this issue: https://github.com/friendica/friendica/issues/920

9 years agoMerge pull request #1271 from fabrixxm/api/favorites
Tobias Diekershoff [Thu, 1 Jan 2015 18:06:59 +0000 (19:06 +0100)]
Merge pull request #1271 from fabrixxm/api/favorites

api: favorite create/destroy update also thread table

9 years agoMerge pull request #1272 from annando/1412-api-attachments
Tobias Diekershoff [Thu, 1 Jan 2015 18:06:24 +0000 (19:06 +0100)]
Merge pull request #1272 from annando/1412-api-attachments

API: Support for attachments

9 years agoAPI: Support for attachments
Michael Vogel [Thu, 1 Jan 2015 17:31:50 +0000 (18:31 +0100)]
API: Support for attachments

9 years agoMerge remote-tracking branch 'upstream/develop' into 1412-api-attachments
Michael Vogel [Thu, 1 Jan 2015 13:53:13 +0000 (14:53 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1412-api-attachments

9 years agoMerge pull request #1254 from annando/1409-shadow-items
fabrixxm [Wed, 31 Dec 2014 17:13:58 +0000 (18:13 +0100)]
Merge pull request #1254 from annando/1409-shadow-items

Global Community

9 years agoapi: favorite create/destroy update also thread table
fabrixxm [Wed, 31 Dec 2014 17:08:11 +0000 (18:08 +0100)]
api: favorite create/destroy update also thread table

9 years agoSupport for attachments in the API (for better AndStatus support)
Michael Vogel [Wed, 31 Dec 2014 16:01:55 +0000 (17:01 +0100)]
Support for attachments in the API (for better AndStatus support)

9 years agoMerge remote-tracking branch 'upstream/develop' into 1412-api-attachments
Michael Vogel [Wed, 31 Dec 2014 14:45:51 +0000 (15:45 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1412-api-attachments

9 years agoAdd the file size to the photo data array
Michael Vogel [Wed, 31 Dec 2014 14:44:32 +0000 (15:44 +0100)]
Add the file size to the photo data array

9 years agoMerge pull request #1270 from tobiasd/20141231
fabrixxm [Wed, 31 Dec 2014 12:36:54 +0000 (13:36 +0100)]
Merge pull request #1270 from tobiasd/20141231

FR IT update for the strings

9 years agoMerge pull request #1269 from fabrixxm/api/favorites
Tobias Diekershoff [Wed, 31 Dec 2014 11:43:40 +0000 (12:43 +0100)]
Merge pull request #1269 from fabrixxm/api/favorites

api: add support to star/unstar items

9 years agoFR IT update to the strings
Tobias Diekershoff [Wed, 31 Dec 2014 11:41:00 +0000 (12:41 +0100)]
FR IT update to the strings

9 years agoapi: add support to star/unstar items
fabrixxm [Wed, 31 Dec 2014 11:34:32 +0000 (12:34 +0100)]
api: add support to star/unstar items

9 years agoFR update to the strings
Tobias Diekershoff [Tue, 30 Dec 2014 08:04:35 +0000 (09:04 +0100)]
FR update to the strings

9 years agoMerge pull request #1267 from fabrixxm/feature-hook-emailer_send
Tobias Diekershoff [Mon, 29 Dec 2014 16:41:50 +0000 (17:41 +0100)]
Merge pull request #1267 from fabrixxm/feature-hook-emailer_send

Fix syntax error in include/Emailer.php

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 agoMerge pull request #1266 from fabrixxm/feature-hook-emailer_send
Tobias Diekershoff [Mon, 29 Dec 2014 15:22:56 +0000 (16:22 +0100)]
Merge pull request #1266 from fabrixxm/feature-hook-emailer_send

Adds 'emailer_send_prepare' and 'emailer_send' hooks

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 agoMerge remote-tracking branch 'upstream/develop' into 1409-shadow-items
Michael Vogel [Fri, 26 Dec 2014 17:07:37 +0000 (18:07 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1409-shadow-items

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 remote-tracking branch 'upstream/develop' into 1409-shadow-items
Michael Vogel [Tue, 23 Dec 2014 06:41:47 +0000 (07:41 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1409-shadow-items

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 agoFeeds are never public so the posts can never be duplicated.
Michael Vogel [Mon, 22 Dec 2014 06:32:04 +0000 (07:32 +0100)]
Feeds are never public so the posts can never be duplicated.

9 years agoAdditional check if the duplicated entry isn't from a hidden or blocked contact.
Michael Vogel [Sun, 21 Dec 2014 22:47:19 +0000 (23:47 +0100)]
Additional check if the duplicated entry isn't from a hidden or blocked contact.

9 years agoUpdate function for creating the shadow entries.
Michael Vogel [Sun, 21 Dec 2014 20:19:37 +0000 (21:19 +0100)]
Update function for creating the shadow entries.

9 years agoredone the changes I accidentally overwrote ... Me and GIT will never be in love ...
Michael Vogel [Sun, 21 Dec 2014 10:02:31 +0000 (11:02 +0100)]
redone the changes I accidentally overwrote ... Me and GIT will never be in love ...

9 years agoMerge remote-tracking branch 'upstream/develop' into 1409-shadow-items
Michael Vogel [Sun, 21 Dec 2014 09:59:56 +0000 (10:59 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1409-shadow-items

9 years agoApplied a change to the community query that was already done in another branch.
Michael Vogel [Sun, 21 Dec 2014 09:55:15 +0000 (10:55 +0100)]
Applied a change to the community query that was already done in another branch.

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.