]> git.mxchange.org Git - friendica.git/log
friendica.git
10 years agoDE update to the strings
Tobias Diekershoff [Wed, 8 Apr 2015 10:06:05 +0000 (12:06 +0200)]
DE update to the strings

10 years agoMerge pull request #1499 from tobiasd/20150407_lng
Michael Vogel [Tue, 7 Apr 2015 17:08:30 +0000 (19:08 +0200)]
Merge pull request #1499 from tobiasd/20150407_lng

CS, FR update to the strings

10 years agoMerge pull request #1498 from ddorian1/develop
Michael Vogel [Tue, 7 Apr 2015 13:24:12 +0000 (15:24 +0200)]
Merge pull request #1498 from ddorian1/develop

Fix infinite scrolling with frost-mobile

10 years agofix infinite scrolling with frost-mobile
Johannes Schwab [Tue, 7 Apr 2015 11:26:09 +0000 (13:26 +0200)]
fix infinite scrolling with frost-mobile

10 years agoFR update of the strings
Tobias Diekershoff [Tue, 7 Apr 2015 07:07:04 +0000 (09:07 +0200)]
FR update of the strings

10 years agoCS update to the strings
Tobias Diekershoff [Tue, 7 Apr 2015 07:00:12 +0000 (09:00 +0200)]
CS update to the strings

10 years agoMerge pull request #1497 from tobiasd/20150407_HF_1460
fabrixxm [Tue, 7 Apr 2015 06:07:54 +0000 (08:07 +0200)]
Merge pull request #1497 from tobiasd/20150407_HF_1460

after pull 1460 all notifications got marked read

10 years agoafter pull 1460 all notifications got marked read
Tobias Diekershoff [Tue, 7 Apr 2015 05:47:15 +0000 (07:47 +0200)]
after pull 1460 all notifications got marked read

10 years agoMerge pull request #1486 from annando/1504-like-on-comment
Tobias Diekershoff [Mon, 6 Apr 2015 12:09:53 +0000 (14:09 +0200)]
Merge pull request #1486 from annando/1504-like-on-comment

Liking of "red" comments is now possible

10 years agoLiking of "red" comments is now possible.
Michael Vogel [Mon, 6 Apr 2015 11:22:19 +0000 (13:22 +0200)]
Liking of "red" comments is now possible.

10 years agoMerge pull request #1484 from annando/1504-bugfix-sql-warning
Tobias Diekershoff [Mon, 6 Apr 2015 10:56:03 +0000 (12:56 +0200)]
Merge pull request #1484 from annando/1504-bugfix-sql-warning

Bugfix: Avoid SQL warnings because of empty id list

10 years agoMerge pull request #1485 from annando/1504-diaspora-plink
Tobias Diekershoff [Mon, 6 Apr 2015 10:55:38 +0000 (12:55 +0200)]
Merge pull request #1485 from annando/1504-diaspora-plink

Diaspora: Central "plink" function

10 years agoDiaspora: Central "plink" function
Michael Vogel [Mon, 6 Apr 2015 10:26:31 +0000 (12:26 +0200)]
Diaspora: Central "plink" function

10 years agoAvoid SQL warnings because of empty id list.
Michael Vogel [Mon, 6 Apr 2015 08:12:37 +0000 (10:12 +0200)]
Avoid SQL warnings because of empty id list.

10 years agoMerge pull request #1483 from annando/1504-api-upload-pictures
Tobias Diekershoff [Mon, 6 Apr 2015 05:23:42 +0000 (07:23 +0200)]
Merge pull request #1483 from annando/1504-api-upload-pictures

API: New picture upload function (Enhanced Twidere support)

10 years agoAPI: New picture upload function (Enhanced Twidere support)
Michael Vogel [Mon, 6 Apr 2015 01:19:12 +0000 (03:19 +0200)]
API: New picture upload function (Enhanced Twidere support)

10 years agoMerge pull request #1480 from annando/1504-diaspora-enhancement
Tobias Diekershoff [Sun, 5 Apr 2015 19:24:21 +0000 (21:24 +0200)]
Merge pull request #1480 from annando/1504-diaspora-enhancement

Diaspora uses this to fetch single public items

10 years agoMerge pull request #1481 from annando/1504-new-share-function
Tobias Diekershoff [Sun, 5 Apr 2015 19:21:14 +0000 (21:21 +0200)]
Merge pull request #1481 from annando/1504-new-share-function

New central function for the "share" header

10 years agoRemoved test logger
Michael Vogel [Sun, 5 Apr 2015 19:06:32 +0000 (21:06 +0200)]
Removed test logger

10 years agoDiaspora uses this to fetch single public items.
Michael Vogel [Sun, 5 Apr 2015 18:50:15 +0000 (20:50 +0200)]
Diaspora uses this to fetch single public items.

10 years agoNew function for building the "share" header
Michael Vogel [Sun, 5 Apr 2015 18:43:06 +0000 (20:43 +0200)]
New function for building the "share" header

10 years agoMerge pull request #1477 from dc5ala/master
Tobias Diekershoff [Sun, 5 Apr 2015 12:51:48 +0000 (14:51 +0200)]
Merge pull request #1477 from dc5ala/master

Just a few typos fixed I've seen

10 years agofixes a few typos
André Lohan [Sun, 5 Apr 2015 11:20:15 +0000 (13:20 +0200)]
fixes a few typos

10 years agoMerge pull request #1460 from FlxAlbroscheit/develop
Tobias Diekershoff [Sun, 5 Apr 2015 09:37:05 +0000 (11:37 +0200)]
Merge pull request #1460 from FlxAlbroscheit/develop

Issue 1163: Feature allowing desktop-notifications

10 years agoMerge branch 'release/3.4' into develop
fabrixxm [Sun, 5 Apr 2015 09:07:22 +0000 (11:07 +0200)]
Merge branch 'release/3.4' into develop

10 years agoMerge branch 'release/3.4'
fabrixxm [Sun, 5 Apr 2015 09:05:30 +0000 (11:05 +0200)]
Merge branch 'release/3.4'

10 years agoMerge pull request #1476 from fabrixxm/changelog
Michael Vogel [Sun, 5 Apr 2015 08:38:49 +0000 (10:38 +0200)]
Merge pull request #1476 from fabrixxm/changelog

update CHANGELOG

10 years agoupdate CHANGELOG
fabrixxm [Sun, 5 Apr 2015 08:30:57 +0000 (10:30 +0200)]
update CHANGELOG

10 years agoMerge pull request #1474 from fabrixxm/silke-helptext
fabrixxm [Sun, 5 Apr 2015 08:23:19 +0000 (10:23 +0200)]
Merge pull request #1474 from fabrixxm/silke-helptext

Connection approval help text, issue #1349, based on pull request #1463

10 years agodifferent help text for different network
fabrixxm [Sat, 4 Apr 2015 16:02:26 +0000 (18:02 +0200)]
different help text for different network

10 years agoMerge branch 'helptext' of https://github.com/silke/friendica into silke-helptext
fabrixxm [Sat, 4 Apr 2015 15:42:23 +0000 (17:42 +0200)]
Merge branch 'helptext' of https://github.com/silke/friendica into silke-helptext

10 years agoMerge pull request #1473 from tobiasd/20150403doc
Michael Vogel [Fri, 3 Apr 2015 20:10:33 +0000 (22:10 +0200)]
Merge pull request #1473 from tobiasd/20150403doc

small updates to the developer intro doc

10 years agosmall changes to the developer intro doc
Tobias Diekershoff [Fri, 3 Apr 2015 17:47:14 +0000 (19:47 +0200)]
small changes to the developer intro doc

10 years agoMerge pull request #1472 from annando/issue-1063
fabrixxm [Fri, 3 Apr 2015 13:07:56 +0000 (15:07 +0200)]
Merge pull request #1472 from annando/issue-1063

The unseen marker is now set according to the api output

10 years agoThe unseen marker is now set according to the query that is used for the home timeline.
Michael Vogel [Fri, 3 Apr 2015 12:58:42 +0000 (14:58 +0200)]
The unseen marker is now set according to the query that is used for the home timeline.

10 years agoMerge pull request #1471 from annando/markdown-shared-posts
fabrixxm [Fri, 3 Apr 2015 11:56:27 +0000 (13:56 +0200)]
Merge pull request #1471 from annando/markdown-shared-posts

Diaspora/Libertree: problems with repeated posts

10 years agoReshared posts weren't always recognized as such.
Michael Vogel [Fri, 3 Apr 2015 11:06:19 +0000 (13:06 +0200)]
Reshared posts weren't always recognized as such.

10 years agoThe conversion of Repeated posts to markdown had a problem with a missing linefeed...
Michael Vogel [Fri, 3 Apr 2015 10:37:29 +0000 (12:37 +0200)]
The conversion of Repeated posts to markdown had a problem with a missing linefeed before the quote.

10 years agoMerge pull request #1469 from fabrixxm/changelog
Michael Vogel [Thu, 2 Apr 2015 21:14:40 +0000 (23:14 +0200)]
Merge pull request #1469 from fabrixxm/changelog

Update codename and CHANGELOG

10 years agoUpdate CHANGELOG
fabrixxm [Thu, 2 Apr 2015 20:18:59 +0000 (22:18 +0200)]
Update CHANGELOG

10 years agoMerge pull request #1468 from tobiasd/20150402lng
fabrixxm [Thu, 2 Apr 2015 20:17:35 +0000 (22:17 +0200)]
Merge pull request #1468 from tobiasd/20150402lng

DE update to the strings

10 years agoMerge pull request #1467 from annando/issue-1306
fabrixxm [Thu, 2 Apr 2015 20:17:12 +0000 (22:17 +0200)]
Merge pull request #1467 from annando/issue-1306

Events from the past aren't shown anymore (hopefully)

10 years agoUpdate codename and CHANGELOG
fabrixxm [Thu, 2 Apr 2015 20:05:52 +0000 (22:05 +0200)]
Update codename and CHANGELOG

10 years agoDE update to the strings
Tobias Diekershoff [Thu, 2 Apr 2015 19:34:59 +0000 (21:34 +0200)]
DE update to the strings

10 years agoDE update to the strings
Tobias Diekershoff [Thu, 2 Apr 2015 16:23:27 +0000 (18:23 +0200)]
DE update to the strings

10 years agoNow past events aren't shown at any circumstance.
Michael Vogel [Wed, 1 Apr 2015 21:11:18 +0000 (23:11 +0200)]
Now past events aren't shown at any circumstance.

10 years agoEvents from the past aren't shown anymore (hopefully)
Michael Vogel [Wed, 1 Apr 2015 20:25:53 +0000 (22:25 +0200)]
Events from the past aren't shown anymore (hopefully)

10 years agoImproved help text, issue 1349.
Silke Meyer [Wed, 1 Apr 2015 08:10:00 +0000 (10:10 +0200)]
Improved help text, issue 1349.

10 years agoMerge pull request #1461 from fabrixxm/issue-1459
Michael Vogel [Wed, 1 Apr 2015 05:52:20 +0000 (07:52 +0200)]
Merge pull request #1461 from fabrixxm/issue-1459

Block settings page for unauthorized users

10 years agoBlock settings page for unauthorized users
fabrixxm [Tue, 31 Mar 2015 08:24:23 +0000 (10:24 +0200)]
Block settings page for unauthorized users

fixes issue #1459

10 years agoMerge pull request #1456 from tobiasd/20150330lng
fabrixxm [Tue, 31 Mar 2015 08:16:59 +0000 (10:16 +0200)]
Merge pull request #1456 from tobiasd/20150330lng

updating the core translation

10 years agoMerge pull request #1458 from annando/issue-1038
Tobias Diekershoff [Tue, 31 Mar 2015 05:35:12 +0000 (07:35 +0200)]
Merge pull request #1458 from annando/issue-1038

Issue 1038:  Send update to directory when account is removed

10 years agoFeature for desktop-notifications
FlxAlbroscheit [Tue, 31 Mar 2015 00:11:46 +0000 (02:11 +0200)]
Feature for desktop-notifications

10 years agoFeature for desktop-notifications
FlxAlbroscheit [Tue, 31 Mar 2015 00:10:36 +0000 (02:10 +0200)]
Feature for desktop-notifications

10 years agoFeature for desktop-notifications
FlxAlbroscheit [Tue, 31 Mar 2015 00:06:07 +0000 (02:06 +0200)]
Feature for desktop-notifications

see issue #1163

10 years agoIssue 1038: Send update to directory when account is removed.
Michael Vogel [Mon, 30 Mar 2015 20:22:11 +0000 (22:22 +0200)]
Issue 1038:  Send update to directory when account is removed.

10 years agoupdating the core translation
Tobias Diekershoff [Mon, 30 Mar 2015 07:21:01 +0000 (09:21 +0200)]
updating the core translation

10 years agoMerge pull request #1455 from pztrn/master
Tobias Diekershoff [Sun, 29 Mar 2015 14:05:57 +0000 (16:05 +0200)]
Merge pull request #1455 from pztrn/master

Do not attempt to create itemcache directory if it already exist.

10 years agoTypo
Stanislav N. [Sun, 29 Mar 2015 12:01:51 +0000 (17:01 +0500)]
Typo

10 years agoDo not try to create itemcache directory if it already exist.
Stanislav N. [Sun, 29 Mar 2015 11:56:26 +0000 (16:56 +0500)]
Do not try to create itemcache directory if it already exist.

On FreeBSD, with more-or-less default PHP configuration, when mkdir() is called on already existing directory - it will produce a warning, that could flood all over cron mail. To prevent that flooding a directory existing should be checked.

10 years agoMerge pull request #1453 from annando/ddos-with-gprobe
Tobias Diekershoff [Sat, 28 Mar 2015 08:12:24 +0000 (09:12 +0100)]
Merge pull request #1453 from annando/ddos-with-gprobe

Prevention for DDoS attach through gprobe

10 years agoSome more logging added for the DDoS prevention
Michael Vogel [Sat, 28 Mar 2015 07:49:24 +0000 (08:49 +0100)]
Some more logging added for the DDoS prevention

10 years agoPreventing a DDoS with the zrl parameter.
Michael Vogel [Sat, 28 Mar 2015 07:29:01 +0000 (08:29 +0100)]
Preventing a DDoS with the zrl parameter.

10 years agoMerge pull request #1450 from StefOfficiel/patch-2
Tobias Diekershoff [Fri, 27 Mar 2015 06:21:15 +0000 (07:21 +0100)]
Merge pull request #1450 from StefOfficiel/patch-2

Update jquery.js

10 years agoUpdate jquery.js
StefOfficiel [Thu, 26 Mar 2015 22:55:32 +0000 (23:55 +0100)]
Update jquery.js

Update jQuery 1.11.1 to 1.11.2 in good branch

10 years agoMerge pull request #1449 from fabrixxm/issue-1370
Michael Vogel [Wed, 25 Mar 2015 21:02:50 +0000 (22:02 +0100)]
Merge pull request #1449 from fabrixxm/issue-1370

Create `database.sql` from `include\dbstructure.php`

10 years agoMerge pull request #1448 from annando/issue1432
fabrixxm [Wed, 25 Mar 2015 10:13:50 +0000 (11:13 +0100)]
Merge pull request #1448 from annando/issue1432

Removed the special detection for facebook and app.net

10 years agofix SQL generation, update database.sql
fabrixxm [Wed, 25 Mar 2015 09:03:17 +0000 (10:03 +0100)]
fix SQL generation, update database.sql

10 years agoCreate `database.sql` from `include\dbstructure.php`
fabrixxm [Wed, 25 Mar 2015 08:47:59 +0000 (09:47 +0100)]
Create `database.sql` from `include\dbstructure.php`
add two commands to `dbstructure.php` when called from cli:
'update' updates the database schema
'dumpsql' dump database sql to stdout

10 years agoRemoved the special detection for facebook and app.net since both provide RSS feeds.
Michael Vogel [Tue, 24 Mar 2015 22:08:46 +0000 (23:08 +0100)]
Removed the special detection for facebook and app.net since both provide RSS feeds.

10 years agoMerge pull request #1442 from fabrixxm/issue-1362
Michael Vogel [Tue, 24 Mar 2015 11:34:31 +0000 (12:34 +0100)]
Merge pull request #1442 from fabrixxm/issue-1362

Add scheme if missing to url inserted by user in 'insert link' jot button

10 years agoMerge pull request #1444 from fabrixxm/issue-1341
Michael Vogel [Mon, 23 Mar 2015 14:19:35 +0000 (15:19 +0100)]
Merge pull request #1444 from fabrixxm/issue-1341

fix paginate url

10 years agoMerge pull request #1446 from annando/issue-905
fabrixxm [Mon, 23 Mar 2015 11:06:46 +0000 (12:06 +0100)]
Merge pull request #1446 from annando/issue-905

Diaspora: The signature of likes are checked now correctly

10 years agoMerge pull request #1443 from fabrixxm/issue-1437
Michael Vogel [Mon, 23 Mar 2015 05:21:25 +0000 (06:21 +0100)]
Merge pull request #1443 from fabrixxm/issue-1437

Use correct class name to send post to email recipients. Fix #1437

10 years agoMerge pull request #1445 from fabrixxm/issue-1041
Michael Vogel [Sun, 22 Mar 2015 21:22:49 +0000 (22:22 +0100)]
Merge pull request #1445 from fabrixxm/issue-1041

ignore tags inside code block

10 years agoDiaspora: The signature of likes are checked now correctly.
Michael Vogel [Sun, 22 Mar 2015 20:53:13 +0000 (21:53 +0100)]
Diaspora: The signature of likes are checked now correctly.
 enter the commit message for your changes. Lines starting

10 years agoignore tags inside code block
fabrixxm [Sun, 22 Mar 2015 16:12:51 +0000 (17:12 +0100)]
ignore tags inside code block
should fix issue #1041

10 years agofix paginate url
fabrixxm [Sun, 22 Mar 2015 15:38:05 +0000 (16:38 +0100)]
fix paginate url
pagination url wasn't alway stripping 'page' parameter from url
related to issue #1341

10 years agoVersion bump, 3.4.0
Beanow [Sun, 22 Mar 2015 14:25:31 +0000 (15:25 +0100)]
Version bump, 3.4.0

10 years agoMerge branch 'develop' of github.com:friendica/friendica into develop
Beanow [Sun, 22 Mar 2015 14:13:30 +0000 (15:13 +0100)]
Merge branch 'develop' of github.com:friendica/friendica into develop

10 years agoFix blank reponse if no siteinfo are fetched
fabrixxm [Sun, 22 Mar 2015 10:03:46 +0000 (11:03 +0100)]
Fix blank reponse if no siteinfo are fetched

10 years agoAdd scheme if missing to url inserted by user in 'insert link' jot
fabrixxm [Sun, 22 Mar 2015 09:53:24 +0000 (10:53 +0100)]
Add scheme if missing to url inserted by user in 'insert link' jot
button

10 years agoMerge branch 'develop' of github.com:friendica/friendica into develop
fabrixxm [Sun, 22 Mar 2015 09:21:57 +0000 (10:21 +0100)]
Merge branch 'develop' of github.com:friendica/friendica into develop

10 years agoMerge branch 'release-3.4' into develop
Beanow [Sun, 22 Mar 2015 09:19:35 +0000 (10:19 +0100)]
Merge branch 'release-3.4' into develop

10 years agoUse correct class name to send post to email recipients. Fix #1437
fabrixxm [Sun, 22 Mar 2015 09:12:16 +0000 (10:12 +0100)]
Use correct class name to send post to email recipients. Fix #1437

10 years agobugfix #1307
hauke [Thu, 19 Mar 2015 21:04:41 +0000 (22:04 +0100)]
bugfix #1307

10 years agoMerge pull request #1433 from tugelbend/develop
fabrixxm [Sun, 22 Mar 2015 08:55:45 +0000 (09:55 +0100)]
Merge pull request #1433 from tugelbend/develop

bugfix #1307

10 years agoMerge pull request #1436 from annando/1503-global-copy-comments
fabrixxm [Sun, 22 Mar 2015 08:49:49 +0000 (09:49 +0100)]
Merge pull request #1436 from annando/1503-global-copy-comments

The global copy now copies comments as well

10 years agoThe global copy now copies comments as well. This is important for the search.
Michael Vogel [Sat, 21 Mar 2015 19:23:47 +0000 (20:23 +0100)]
The global copy now copies comments as well. This is important for the search.

10 years agoMerge pull request #1435 from FlxAlbroscheit/develop
fabrixxm [Fri, 20 Mar 2015 14:13:17 +0000 (15:13 +0100)]
Merge pull request #1435 from FlxAlbroscheit/develop

Access a contact directly from the contact-manager-page [UPDATED]

10 years agoAccess a contact directly from the contact-manager-page
FlxAlbroscheit [Fri, 20 Mar 2015 14:10:55 +0000 (15:10 +0100)]
Access a contact directly from the contact-manager-page

Improved my former commit (see: https://github.com/friendica/friendica/pull/1428)

10 years agobugfix #1307
hauke [Thu, 19 Mar 2015 21:04:41 +0000 (22:04 +0100)]
bugfix #1307

10 years agoMerge pull request #1431 from thorsten23/develop
Tobias Diekershoff [Sat, 14 Mar 2015 19:42:33 +0000 (20:42 +0100)]
Merge pull request #1431 from thorsten23/develop

Replaced 'q' by 'pagename' so that the basestring is encoded right. The ...

10 years agoReplaced 'q' by 'pagename' so that the basestring is encoded right. The correct bases...
thorsten23 [Sat, 14 Mar 2015 18:55:36 +0000 (19:55 +0100)]
Replaced 'q' by 'pagename' so that the basestring is encoded right. The correct basestring is needed to create the right signature in the OAuth authentication process.

10 years agoMerge pull request #1426 from annando/1503-term-search
Tobias Diekershoff [Thu, 12 Mar 2015 06:15:05 +0000 (07:15 +0100)]
Merge pull request #1426 from annando/1503-term-search

The index for the term search is now massively improved

10 years agoMerge pull request #1424 from annando/1503-better-guid
Tobias Diekershoff [Thu, 12 Mar 2015 06:14:36 +0000 (07:14 +0100)]
Merge pull request #1424 from annando/1503-better-guid

Reworked guid function

10 years agoMerge pull request #1428 from FlxAlbroscheit/develop
Tobias Diekershoff [Thu, 12 Mar 2015 06:13:31 +0000 (07:13 +0100)]
Merge pull request #1428 from FlxAlbroscheit/develop

Access a contact directly from the contact-manager-page

10 years agoGive access to contact's profile-URL
FlxAlbroscheit [Tue, 10 Mar 2015 21:47:38 +0000 (22:47 +0100)]
Give access to contact's profile-URL

10 years agoGive access to contact's profile-URL
FlxAlbroscheit [Tue, 10 Mar 2015 21:44:57 +0000 (22:44 +0100)]
Give access to contact's profile-URL

10 years agoThe index changed, so the database version must be increased as well.
Michael Vogel [Tue, 10 Mar 2015 06:58:49 +0000 (07:58 +0100)]
The index changed, so the database version must be increased as well.