]> git.mxchange.org Git - friendica.git/log
friendica.git
7 years agoMerge pull request #3484 from annando/fix-empty-author
Hypolite Petovan [Tue, 23 May 2017 07:14:41 +0000 (03:14 -0400)]
Merge pull request #3484 from annando/fix-empty-author

Bugfix OStatus: Avoid empty author data

7 years agoMerge pull request #3485 from annando/range-curl
Tobias Diekershoff [Tue, 23 May 2017 06:16:34 +0000 (08:16 +0200)]
Merge pull request #3485 from annando/range-curl

Bugfix ParseUrl: Only fetch a range to avoid memory issues

7 years agoBugfix OStatus: Avoid empty author data
Michael [Tue, 23 May 2017 05:28:51 +0000 (05:28 +0000)]
Bugfix OStatus: Avoid empty author data

7 years agoBugfix ParseUrl: Only fetch a range to avoid memory issues
Michael [Tue, 23 May 2017 05:26:22 +0000 (05:26 +0000)]
Bugfix ParseUrl: Only fetch a range to avoid memory issues

7 years agoMerge pull request #3483 from rabuzarus/20170522_-_frio_event_button_fix
Michael Vogel [Mon, 22 May 2017 15:55:28 +0000 (17:55 +0200)]
Merge pull request #3483 from rabuzarus/20170522_-_frio_event_button_fix

Bugfix: fix frio's event dropdown color

7 years agoBugfix: fix frio's event dropdown color
rabuzarus [Mon, 22 May 2017 12:44:51 +0000 (14:44 +0200)]
Bugfix: fix frio's event dropdown color

7 years agoMerge pull request #3479 from Hypolite/3.5.2rc
Michael Vogel [Sat, 20 May 2017 20:13:37 +0000 (22:13 +0200)]
Merge pull request #3479 from Hypolite/3.5.2rc

Frio: Fix Hubzilla scrollToItem

7 years agoFrio: Fix hubzilla scrollToItem
Hypolite Petovan [Sat, 20 May 2017 17:18:20 +0000 (13:18 -0400)]
Frio: Fix hubzilla scrollToItem

- Removed unnecessary item guid truncation

7 years agoMerge pull request #3478 from tobiasd/20170520-dedocs
Michael Vogel [Sat, 20 May 2017 10:22:54 +0000 (12:22 +0200)]
Merge pull request #3478 from tobiasd/20170520-dedocs

DE documentation

7 years agoremoved some more files from doc/de
Tobias Diekershoff [Sat, 20 May 2017 09:24:28 +0000 (11:24 +0200)]
removed some more files from doc/de

7 years agoremoved de/andfinally from docs
Tobias Diekershoff [Sat, 20 May 2017 09:22:47 +0000 (11:22 +0200)]
removed de/andfinally from docs

7 years agolinks in BBCode docs
Tobias Diekershoff [Sat, 20 May 2017 09:20:31 +0000 (11:20 +0200)]
links in BBCode docs

7 years agolinks in Account Basics
Tobias Diekershoff [Sat, 20 May 2017 09:12:51 +0000 (11:12 +0200)]
links in Account Basics

7 years agoMerge pull request #3477 from beardyunixer/doco-without-making-a-shite-of-it-this...
Hypolite Petovan [Sat, 20 May 2017 01:48:11 +0000 (21:48 -0400)]
Merge pull request #3477 from beardyunixer/doco-without-making-a-shite-of-it-this-time

Update doco

7 years agoSwitch image URL to master branch
Thomas Willingham [Sat, 20 May 2017 01:38:01 +0000 (02:38 +0100)]
Switch image URL to master branch

7 years agoMerge pull request #3476 from rabuzarus/20170519_-_frio_not_experimental
Hypolite Petovan [Sat, 20 May 2017 00:50:01 +0000 (20:50 -0400)]
Merge pull request #3476 from rabuzarus/20170519_-_frio_not_experimental

Frio: remove experimental flag + rise version number to 0.8

7 years agoUpdate doco
Thomas Willingham [Fri, 19 May 2017 20:37:45 +0000 (21:37 +0100)]
Update doco

7 years agoFrio: some correction in grammar/expression - thx Hypolite
rabuzarus [Fri, 19 May 2017 11:32:55 +0000 (13:32 +0200)]
Frio: some correction in grammar/expression - thx Hypolite

7 years agoMerge pull request #3475 from annando/bugfix-profile-change
Hypolite Petovan [Fri, 19 May 2017 11:28:56 +0000 (07:28 -0400)]
Merge pull request #3475 from annando/bugfix-profile-change

Bugfix: Timeout problems when saving profile settings

7 years agoFrio: a word was missing in the README
rabuzarus [Fri, 19 May 2017 11:18:27 +0000 (13:18 +0200)]
Frio: a word was missing in the README

7 years agoFrio: remove experimental flag + rise version number to 0.8
rabuzarus [Fri, 19 May 2017 11:11:30 +0000 (13:11 +0200)]
Frio: remove experimental flag + rise version number to 0.8

7 years agoBugfix: Timeout problems when saving profile settings
Michael [Fri, 19 May 2017 06:01:13 +0000 (06:01 +0000)]
Bugfix: Timeout problems when saving profile settings

7 years agoMerge pull request #3474 from annando/bugfix-mail
Hypolite Petovan [Wed, 17 May 2017 19:58:17 +0000 (15:58 -0400)]
Merge pull request #3474 from annando/bugfix-mail

Bugfix Diaspora: We exited with the wrong return values

7 years agoMerge remote-tracking branch 'upstream/3.5.2rc' into bugfix-mail
Michael [Wed, 17 May 2017 19:56:38 +0000 (19:56 +0000)]
Merge remote-tracking branch 'upstream/3.5.2rc' into bugfix-mail

7 years agoBugfix Diaspora: We exited with the wrong return values and the guid for messages...
Michael [Wed, 17 May 2017 19:25:30 +0000 (19:25 +0000)]
Bugfix Diaspora: We exited with the wrong return values and the guid for messages was too short

7 years agoMerge pull request #3471 from annando/issue-3309
Hypolite Petovan [Wed, 17 May 2017 16:42:34 +0000 (12:42 -0400)]
Merge pull request #3471 from annando/issue-3309

Issue 3309: Avatar update should work now

7 years agoMerge pull request #3472 from rabuzarus/feature/frio/fixedaside2
Tobias Diekershoff [Wed, 17 May 2017 09:27:37 +0000 (11:27 +0200)]
Merge pull request #3472 from rabuzarus/feature/frio/fixedaside2

Frio: better UX for aside bar

7 years agoIt is better this way
Michael [Wed, 17 May 2017 06:07:55 +0000 (06:07 +0000)]
It is better this way

7 years agoUse the contact picture instead of the profile picture
Michael [Wed, 17 May 2017 06:00:20 +0000 (06:00 +0000)]
Use the contact picture instead of the profile picture

7 years agoIssue 3309: Avatar update should work now
Michael [Tue, 16 May 2017 21:21:54 +0000 (21:21 +0000)]
Issue 3309: Avatar update should work now

7 years agoMerge pull request #3470 from rabuzarus/201705016_-_fix_doxyfile
Hypolite Petovan [Tue, 16 May 2017 15:51:39 +0000 (11:51 -0400)]
Merge pull request #3470 from rabuzarus/201705016_-_fix_doxyfile

Update Doxyfile (add src folder)

7 years agoUpdate Doxyfile (add src folder)
rabuzarus [Tue, 16 May 2017 15:36:19 +0000 (17:36 +0200)]
Update Doxyfile (add src folder)

7 years agoMerge pull request #3465 from annando/bugfix-dba-1
Hypolite Petovan [Tue, 16 May 2017 06:05:16 +0000 (02:05 -0400)]
Merge pull request #3465 from annando/bugfix-dba-1

Bugfix: dba::num_rows hadn't checked the object variable

7 years agoSpelling
Michael [Tue, 16 May 2017 06:00:01 +0000 (06:00 +0000)]
Spelling

7 years agoMerge pull request #3468 from tobiasd/20170516-IT
Hypolite Petovan [Tue, 16 May 2017 05:46:55 +0000 (01:46 -0400)]
Merge pull request #3468 from tobiasd/20170516-IT

IT translations THX fabrixxm

7 years agoIT translations THX fabrixxm
Tobias Diekershoff [Tue, 16 May 2017 05:39:38 +0000 (07:39 +0200)]
IT translations THX fabrixxm

7 years agoMerge pull request #3464 from beardyunixer/nginx
Michael Vogel [Tue, 16 May 2017 04:26:54 +0000 (06:26 +0200)]
Merge pull request #3464 from beardyunixer/nginx

Nginx

7 years agoRequested changes
Thomas Willingham [Mon, 15 May 2017 23:22:17 +0000 (00:22 +0100)]
Requested changes

7 years agoMerge pull request #3467 from annando/1705-dm-api
Hypolite Petovan [Mon, 15 May 2017 23:00:41 +0000 (19:00 -0400)]
Merge pull request #3467 from annando/1705-dm-api

API: Direct Messages via the API now work again.

7 years agodba: Beautification is now a separate function
Michael [Mon, 15 May 2017 21:06:17 +0000 (21:06 +0000)]
dba: Beautification is now a separate function

7 years agoAPI: Direct Messages via the API now work again.
Michael [Mon, 15 May 2017 20:11:33 +0000 (20:11 +0000)]
API: Direct Messages via the API now work again.

7 years agoBugfix: dba::num_rows hadn't checked the object variable
Michael [Mon, 15 May 2017 15:17:38 +0000 (15:17 +0000)]
Bugfix: dba::num_rows hadn't checked the object variable

7 years agored > Friendica
Thomas Willingham [Mon, 15 May 2017 09:39:39 +0000 (10:39 +0100)]
red > Friendica

7 years agoUpdate nginx
Thomas Willingham [Mon, 15 May 2017 09:36:56 +0000 (10:36 +0100)]
Update nginx

7 years agoMerge pull request #3463 from friendica/develop
Michael Vogel [Sun, 14 May 2017 19:08:08 +0000 (21:08 +0200)]
Merge pull request #3463 from friendica/develop

Update 3.5.2rc with latest develop

7 years agoMerge pull request #3462 from annando/bugfix-dba
Hypolite Petovan [Sun, 14 May 2017 18:40:19 +0000 (14:40 -0400)]
Merge pull request #3462 from annando/bugfix-dba

Bugfix: The commit in dba::delete was never executed

7 years agoset version to 3.5.2rc
Tobias Diekershoff [Sun, 14 May 2017 07:16:55 +0000 (09:16 +0200)]
set version to 3.5.2rc

7 years agoBugfix: The commit in dba::delete was never executed
Michael [Sun, 14 May 2017 07:01:38 +0000 (07:01 +0000)]
Bugfix: The commit in dba::delete was never executed

7 years agoMerge pull request #3461 from annando/1705-some-more-dba
Hypolite Petovan [Sat, 13 May 2017 04:22:01 +0000 (00:22 -0400)]
Merge pull request #3461 from annando/1705-some-more-dba

DBA: poller / SQL errors / dbclean

7 years agoMerge remote-tracking branch 'upstream/develop' into 1705-some-more-dba
Michael [Sat, 13 May 2017 04:13:07 +0000 (04:13 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1705-some-more-dba

Conflicts:
include/uimport.php

7 years agoJust some more dba::delete
Michael [Sat, 13 May 2017 04:04:17 +0000 (04:04 +0000)]
Just some more dba::delete

7 years agoMerge pull request #3381 from Quix0r/rewrites/coding-convention-split2-4-2
Hypolite Petovan [Sat, 13 May 2017 01:40:30 +0000 (21:40 -0400)]
Merge pull request #3381 from Quix0r/rewrites/coding-convention-split2-4-2

Coding convention applied split 2-4-2 (of 2-14-2)

7 years agofixed parser error, need parentheses
Roland Häder [Fri, 12 May 2017 19:02:58 +0000 (21:02 +0200)]
fixed parser error, need parentheses

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agodba is now used for writing the workerqueue as well
Michael [Fri, 12 May 2017 16:25:44 +0000 (16:25 +0000)]
dba is now used for writing the workerqueue as well

7 years agoMerge remote-tracking branch 'upstream/develop' into 1705-some-more-dba
Michael [Fri, 12 May 2017 16:12:00 +0000 (16:12 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1705-some-more-dba

7 years agodba functions in poller / avoiding SQL errors in conversation / dbclean is better
Michael [Fri, 12 May 2017 16:09:25 +0000 (16:09 +0000)]
dba functions in poller / avoiding SQL errors in conversation / dbclean is better

7 years agoMerge pull request #3460 from annando/1705-dbclean
Hypolite Petovan [Fri, 12 May 2017 15:45:27 +0000 (11:45 -0400)]
Merge pull request #3460 from annando/1705-dbclean

dbclean is now using the new database functions

7 years agoAnd another one
Michael [Fri, 12 May 2017 06:55:04 +0000 (06:55 +0000)]
And another one

7 years agoSome more cleaner delete
Michael [Fri, 12 May 2017 06:30:45 +0000 (06:30 +0000)]
Some more cleaner delete

7 years agoThis item removal is much more cleaner
Michael [Fri, 12 May 2017 06:17:48 +0000 (06:17 +0000)]
This item removal is much more cleaner

7 years agoMerge pull request #3459 from Hypolite/improvement/class-autoloading-use
Michael Vogel [Fri, 12 May 2017 04:46:52 +0000 (06:46 +0200)]
Merge pull request #3459 from Hypolite/improvement/class-autoloading-use

Use `use` instead of `\`

7 years agoRemoved code from the pre worker era.
Michael [Fri, 12 May 2017 04:33:52 +0000 (04:33 +0000)]
Removed code from the pre worker era.

7 years agoImproved usage of `use` in dba_pdo
Hypolite Petovan [Fri, 12 May 2017 03:05:49 +0000 (23:05 -0400)]
Improved usage of `use` in dba_pdo

7 years agoRemoved useless usage of `use`
Hypolite Petovan [Fri, 12 May 2017 03:01:49 +0000 (23:01 -0400)]
Removed useless usage of `use`

7 years agoNow it should work
Michael [Thu, 11 May 2017 20:19:43 +0000 (20:19 +0000)]
Now it should work

7 years agodbclean is now using the new database functions / new functions for commit, rollback...
Michael [Thu, 11 May 2017 20:13:45 +0000 (20:13 +0000)]
dbclean is now using the new database functions / new functions for commit, rollback and transaction

7 years agoUse `use` instead of `\`
Hypolite Petovan [Thu, 11 May 2017 15:53:04 +0000 (11:53 -0400)]
Use `use` instead of `\`

7 years agoMerge branch 'develop' of github.com:friendica/friendica into rewrites/coding-convent...
Roland Häder [Thu, 11 May 2017 12:54:26 +0000 (14:54 +0200)]
Merge branch 'develop' of github.com:friendica/friendica into rewrites/coding-convention-split2-4-2

Fixed some stuff:
- converted some files from DOS to Uni* (CRLF -> LF)
- removed trailing white-spaces

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoFrio: recalculate sticky aside on click only on a tags
fabrixxm [Tue, 9 May 2017 12:53:56 +0000 (14:53 +0200)]
Frio: recalculate sticky aside on click only on a tags

This to prevent input elements in aside to lose focus after the
recalculation.

7 years agoMerge pull request #3458 from Hypolite/bug/missing-require-poco
Michael Vogel [Tue, 9 May 2017 04:56:32 +0000 (06:56 +0200)]
Merge pull request #3458 from Hypolite/bug/missing-require-poco

Missing require for poco_serverlist

7 years agoImprove refactoring
Hypolite Petovan [Tue, 9 May 2017 03:03:52 +0000 (23:03 -0400)]
Improve refactoring

- Rename $contacts to $users where meaningful
- Use Config::get instead of get_config
- Move requires for lazy inclusion

7 years agoAdd missing require for poco_serverlist
Hypolite Petovan [Tue, 9 May 2017 01:55:19 +0000 (21:55 -0400)]
Add missing require for poco_serverlist

7 years agoFix standards + refactored variables with meaningful names
Hypolite Petovan [Tue, 9 May 2017 01:55:04 +0000 (21:55 -0400)]
Fix standards + refactored variables with meaningful names

7 years agoMerge pull request #3456 from annando/1704-mastodon-html
Hypolite Petovan [Mon, 8 May 2017 20:54:45 +0000 (16:54 -0400)]
Merge pull request #3456 from annando/1704-mastodon-html

HTML for OStatus posts look better (in Mastodon and GNU Social)

7 years agoMerge pull request #3457 from annando/1705-probe
rabuzarus [Mon, 8 May 2017 20:28:42 +0000 (22:28 +0200)]
Merge pull request #3457 from annando/1705-probe

Small bugfix for PR 3454

7 years agoSmall bugfix for PR 3454
Michael [Mon, 8 May 2017 20:01:18 +0000 (20:01 +0000)]
Small bugfix for PR 3454

7 years agoThis should make posts fine on GNU Social as well
Michael [Mon, 8 May 2017 19:11:47 +0000 (19:11 +0000)]
This should make posts fine on GNU Social as well

7 years agoMerge pull request #3455 from rabuzarus/20170508_-_fix_frio_register_tooltip
Hypolite Petovan [Mon, 8 May 2017 18:13:03 +0000 (14:13 -0400)]
Merge pull request #3455 from rabuzarus/20170508_-_fix_frio_register_tooltip

Bugfix: frio - make register tooltip work

7 years agoShared links create now a better HTML
Michael [Mon, 8 May 2017 18:11:37 +0000 (18:11 +0000)]
Shared links create now a better HTML

7 years agoBugfix: frio - make register tooltip work
rabuzarus [Mon, 8 May 2017 17:39:06 +0000 (19:39 +0200)]
Bugfix: frio - make register tooltip work

7 years agoAdded documentation
Michael [Mon, 8 May 2017 17:29:46 +0000 (17:29 +0000)]
Added documentation

7 years agoMerge pull request #3454 from rabuzarus/20170508_-_camelCase
Hypolite Petovan [Mon, 8 May 2017 17:26:16 +0000 (13:26 -0400)]
Merge pull request #3454 from rabuzarus/20170508_-_camelCase

Bugfix: correct uninitialized variables

7 years agoremove use of PConfig Class from Probe class because we don't use it here
rabuzarus [Mon, 8 May 2017 17:04:01 +0000 (19:04 +0200)]
remove use of PConfig Class from Probe class because we don't use it here

7 years agoBugfix: correct uninitialized variables
rabuzarus [Mon, 8 May 2017 17:02:34 +0000 (19:02 +0200)]
Bugfix: correct uninitialized variables

7 years agoMerge pull request #3453 from rabuzarus/20170508_-_camelCase
Hypolite Petovan [Mon, 8 May 2017 16:42:42 +0000 (12:42 -0400)]
Merge pull request #3453 from rabuzarus/20170508_-_camelCase

Probe.php:  some work for standardization

7 years agoadd some spaces for better readability
rabuzarus [Mon, 8 May 2017 16:28:30 +0000 (18:28 +0200)]
add some spaces for better readability

7 years agorename some variables for comprehensibility
rabuzarus [Mon, 8 May 2017 16:07:06 +0000 (18:07 +0200)]
rename some variables for comprehensibility

7 years agoimprove readability
rabuzarus [Mon, 8 May 2017 15:36:04 +0000 (17:36 +0200)]
improve readability

7 years agoapply coding standard
rabuzarus [Mon, 8 May 2017 15:06:57 +0000 (17:06 +0200)]
apply coding standard

7 years agoEven better?
Michael [Mon, 8 May 2017 14:31:37 +0000 (14:31 +0000)]
Even better?

7 years agorename methods of the Probe class to camelCase
rabuzarus [Mon, 8 May 2017 14:19:10 +0000 (16:19 +0200)]
rename methods of the Probe class to camelCase

7 years agoShould work now ...
Michael [Mon, 8 May 2017 14:02:32 +0000 (14:02 +0000)]
Should work now ...

7 years agofrio mobile: disable page scroll when aside is shown
fabrixxm [Mon, 8 May 2017 13:14:31 +0000 (15:14 +0200)]
frio mobile: disable page scroll when aside is shown

7 years agoMore URL can be styled
Michael [Mon, 8 May 2017 12:35:44 +0000 (12:35 +0000)]
More URL can be styled

7 years agoBetter design for links in Mastodon posts
Michael [Mon, 8 May 2017 12:18:30 +0000 (12:18 +0000)]
Better design for links in Mastodon posts

7 years agoMerge pull request #3451 from annando/issue-basepath-writable
Tobias Diekershoff [Mon, 8 May 2017 06:29:51 +0000 (08:29 +0200)]
Merge pull request #3451 from annando/issue-basepath-writable

Don't check if basepath is writeable / convert App.php to unix newlines

7 years agoDon't check if basepath is writable / convert App.php to unix newlines
Michael [Mon, 8 May 2017 06:11:38 +0000 (06:11 +0000)]
Don't check if basepath is writable / convert App.php to unix newlines

7 years agoMerge pull request #3418 from gerhard6380/develop
Tobias Diekershoff [Mon, 8 May 2017 04:56:24 +0000 (06:56 +0200)]
Merge pull request #3418 from gerhard6380/develop

New API calls for photo management

7 years agoMerge pull request #3450 from annando/1705-more-classes
Hypolite Petovan [Sun, 7 May 2017 22:35:21 +0000 (18:35 -0400)]
Merge pull request #3450 from annando/1705-more-classes

And even more global classes ...

7 years agoAnd even more global classes ...
Michael [Sun, 7 May 2017 22:21:12 +0000 (22:21 +0000)]
And even more global classes ...