]> git.mxchange.org Git - friendica.git/log
friendica.git
7 years agoFrio: sitck aside on page scroll
fabrixxm [Sat, 22 Apr 2017 18:36:48 +0000 (20:36 +0200)]
Frio: sitck aside on page scroll

use sticky-kit jquery library to keep aside inside viewport
when user scrolls the page.

7 years agoFrio: Fix aside in mobile view
fabrixxm [Sat, 22 Apr 2017 18:34:52 +0000 (20:34 +0200)]
Frio: Fix aside in mobile view

Aside is fixed to cover page, without the need to scroll back top to see it.

7 years agoMerge pull request #3375 from Quix0r/rewrites/coding-convention-split2-3-2
Hypolite Petovan [Sat, 22 Apr 2017 13:11:18 +0000 (09:11 -0400)]
Merge pull request #3375 from Quix0r/rewrites/coding-convention-split2-3-2

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

7 years agoMerge pull request #3376 from annando/1704-key-length
Hypolite Petovan [Sat, 22 Apr 2017 00:41:45 +0000 (20:41 -0400)]
Merge pull request #3376 from annando/1704-key-length

Issue 3358: The key length should now work on InnoDB and MyISAM

7 years agoMerge pull request #3377 from Alkarex/dfrn-date-format
Michael Vogel [Fri, 21 Apr 2017 22:07:47 +0000 (00:07 +0200)]
Merge pull request #3377 from Alkarex/dfrn-date-format

Fix SQL date format bug in dfrn

7 years agoFix SQL date format bug in dfrn
Alexandre Alapetite [Fri, 21 Apr 2017 22:00:13 +0000 (00:00 +0200)]
Fix SQL date format bug in dfrn

https://github.com/friendica/friendica/issues/3336
https://github.com/friendica/friendica/pull/3338

7 years agoIssue 3358: The key length should now work on InnoDB and MyISAM
Michael [Fri, 21 Apr 2017 21:26:05 +0000 (21:26 +0000)]
Issue 3358: The key length should now work on InnoDB and MyISAM

7 years agoadded spaces + some curly braces + some usage of dbm::is_result()
Roland Haeder [Tue, 4 Apr 2017 17:47:45 +0000 (19:47 +0200)]
added spaces + some curly braces + some usage of dbm::is_result()

Signed-off-by: Roland Haeder <roland@mxchange.org>
7 years agoadded spaces + some curly braces + some usage of dbm::is_result()
Roland Haeder [Tue, 4 Apr 2017 17:47:32 +0000 (19:47 +0200)]
added spaces + some curly braces + some usage of dbm::is_result()

Signed-off-by: Roland Haeder <roland@mxchange.org>
7 years agoMerge pull request #3373 from strk/expire-login-later
Hypolite Petovan [Fri, 21 Apr 2017 16:18:57 +0000 (12:18 -0400)]
Merge pull request #3373 from strk/expire-login-later

Make log-in cookie expiration time configurable

7 years agoFix Config::get call
Sandro Santilli [Fri, 21 Apr 2017 15:36:45 +0000 (17:36 +0200)]
Fix Config::get call

7 years agoAdd default value to documentation for system.auth_cookie_lifetime
Sandro Santilli [Fri, 21 Apr 2017 15:20:28 +0000 (17:20 +0200)]
Add default value to documentation for system.auth_cookie_lifetime

7 years agoAdd auth_cookie_lifetime variable to installation config template
Sandro Santilli [Fri, 21 Apr 2017 15:19:58 +0000 (17:19 +0200)]
Add auth_cookie_lifetime variable to installation config template

7 years agoAdd documentation
Sandro Santilli [Fri, 21 Apr 2017 15:19:11 +0000 (17:19 +0200)]
Add documentation

7 years agoAdd missing semicolon
Sandro Santilli [Fri, 21 Apr 2017 15:13:05 +0000 (17:13 +0200)]
Add missing semicolon

7 years agoUse Config::get
Sandro Santilli [Fri, 21 Apr 2017 15:09:06 +0000 (17:09 +0200)]
Use Config::get

7 years agoAllow specifying cookie lifetime via config variable
Sandro Santilli [Fri, 21 Apr 2017 14:15:39 +0000 (16:15 +0200)]
Allow specifying cookie lifetime via config variable

Tweak $a->config['system']['auth_cookie_lifetime']

7 years agoExpire log-in cookie in 90 days rather than 7
Sandro Santilli [Fri, 21 Apr 2017 13:13:34 +0000 (15:13 +0200)]
Expire log-in cookie in 90 days rather than 7

7 years agoMerge pull request #3369 from Quix0r/rewrites/coding-convention-split2-2-2
Hypolite Petovan [Thu, 20 Apr 2017 22:28:16 +0000 (18:28 -0400)]
Merge pull request #3369 from Quix0r/rewrites/coding-convention-split2-2-2

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

7 years agofixed parser error
Roland Häder [Thu, 20 Apr 2017 20:59:43 +0000 (22:59 +0200)]
fixed parser error

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoadded spaces + some curly braces + some usage of dbm::is_result()
Roland Haeder [Tue, 4 Apr 2017 17:47:32 +0000 (19:47 +0200)]
added spaces + some curly braces + some usage of dbm::is_result()

Signed-off-by: Roland Haeder <roland@mxchange.org>
7 years agoMerge pull request #3371 from Alkarex/photos_any_value
Hypolite Petovan [Thu, 20 Apr 2017 19:26:31 +0000 (15:26 -0400)]
Merge pull request #3371 from Alkarex/photos_any_value

mod photos compatibility only_full_group_by

7 years agomod photos compatibility only_full_group_by
Alexandre Alapetite [Thu, 20 Apr 2017 19:23:45 +0000 (21:23 +0200)]
mod photos compatibility only_full_group_by

Related to https://github.com/friendica/friendica/pull/3323

7 years agoMerge pull request #3367 from annando/1704-mastodon
Hypolite Petovan [Thu, 20 Apr 2017 06:12:41 +0000 (02:12 -0400)]
Merge pull request #3367 from annando/1704-mastodon

Reworked OStatus communication part to better support Mastodon.

7 years agoMerge pull request #3368 from tobiasd/develop
Michael Vogel [Thu, 20 Apr 2017 06:12:01 +0000 (08:12 +0200)]
Merge pull request #3368 from tobiasd/develop

regen credits

7 years agoMerge pull request #3366 from annando/issue-3358
Hypolite Petovan [Thu, 20 Apr 2017 06:03:30 +0000 (02:03 -0400)]
Merge pull request #3366 from annando/issue-3358

Issue 3358; Avoid key length problems when changing collation

7 years agoregen credits
Tobias Diekershoff [Thu, 20 Apr 2017 05:59:54 +0000 (07:59 +0200)]
regen credits

7 years agoMerge remote-tracking branch 'upstream/develop' into 1704-mastodon
Michael [Thu, 20 Apr 2017 05:44:31 +0000 (05:44 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1704-mastodon

Conflicts:
include/bbcode.php

7 years agoIssue 3358; Avoid key length problems when changing collation
Michael [Thu, 20 Apr 2017 05:24:08 +0000 (05:24 +0000)]
Issue 3358; Avoid key length problems when changing collation

7 years agoSome standards
Michael [Thu, 20 Apr 2017 05:17:00 +0000 (05:17 +0000)]
Some standards

7 years agoMerge pull request #3365 from Hypolite/issue/remove-wrong-profile-link-for-contacts
Michael Vogel [Thu, 20 Apr 2017 03:38:38 +0000 (05:38 +0200)]
Merge pull request #3365 from Hypolite/issue/remove-wrong-profile-link-for-contacts

Remove vcard Edit link pointing to profiles for contacts

7 years agoRemove debug
Hypolite Petovan [Thu, 20 Apr 2017 03:31:38 +0000 (23:31 -0400)]
Remove debug

7 years agoMerge pull request #3326 from Alkarex/utf8mb4
Michael Vogel [Thu, 20 Apr 2017 03:28:16 +0000 (05:28 +0200)]
Merge pull request #3326 from Alkarex/utf8mb4

Default to utf8mb4

7 years agoRemove vcard Edit link pointing to profiles for contacts
Hypolite Petovan [Thu, 20 Apr 2017 01:58:33 +0000 (21:58 -0400)]
Remove vcard Edit link pointing to profiles for contacts

7 years agoMerge pull request #3287 from Quix0r/rewrites/coding-convention-split2-1-2
Hypolite Petovan [Thu, 20 Apr 2017 00:39:07 +0000 (20:39 -0400)]
Merge pull request #3287 from Quix0r/rewrites/coding-convention-split2-1-2

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

7 years agoMerge pull request #3364 from Rudloff/feature/external-links
rabuzarus [Wed, 19 Apr 2017 23:37:28 +0000 (01:37 +0200)]
Merge pull request #3364 from Rudloff/feature/external-links

In standalone mode, open links to source in a new tab (fixes #3359)

7 years agoMake standalone tweaks work with infinite scrolling
Pierre Rudloff [Wed, 19 Apr 2017 21:51:18 +0000 (23:51 +0200)]
Make standalone tweaks work with infinite scrolling

7 years agoReworked OStatus communication part to better support Mastodon.
Michael [Wed, 19 Apr 2017 21:37:00 +0000 (21:37 +0000)]
Reworked OStatus communication part to better support Mastodon.

7 years agoIn standalone mode, open links to source in a new tab (fixes #3359)
Pierre Rudloff [Wed, 19 Apr 2017 21:24:43 +0000 (23:24 +0200)]
In standalone mode, open links to source in a new tab (fixes #3359)

7 years agoadded curly braces
Roland Häder [Wed, 19 Apr 2017 21:07:59 +0000 (23:07 +0200)]
added curly braces

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoMerge branch 'develop' into rewrites/coding-convention-split2-1-2
Roland Häder [Wed, 19 Apr 2017 21:06:01 +0000 (23:06 +0200)]
Merge branch 'develop' into rewrites/coding-convention-split2-1-2

7 years agoadded braces, opps
Roland Häder [Wed, 19 Apr 2017 21:03:44 +0000 (23:03 +0200)]
added braces, opps

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoMerge pull request #3363 from sesom42/develop
Hypolite Petovan [Wed, 19 Apr 2017 19:45:38 +0000 (15:45 -0400)]
Merge pull request #3363 from sesom42/develop

displays the correct profile for contacts that have set the default profile

7 years agoDelete frio dynamic.php
Alexandre Alapetite [Wed, 19 Apr 2017 19:44:13 +0000 (21:44 +0200)]
Delete frio dynamic.php

https://github.com/friendica/friendica/pull/3326#discussion_r112116929

7 years agodisplays the correct profile for contacts that have set the default profile
Jens Tautenhahn [Wed, 19 Apr 2017 19:25:25 +0000 (20:25 +0100)]
displays the correct profile for contacts that have set the default profile

7 years agoMerge pull request #3361 from Hypolite/issue/#3053
Michael Vogel [Wed, 19 Apr 2017 17:00:42 +0000 (19:00 +0200)]
Merge pull request #3361 from Hypolite/issue/#3053

Change default directory URL

7 years agoChange default directory URL
Hypolite Petovan [Wed, 19 Apr 2017 16:27:51 +0000 (12:27 -0400)]
Change default directory URL

7 years agoMerge pull request #3355 from Hypolite/issue/fix-language-guess
Michael Vogel [Wed, 19 Apr 2017 14:24:30 +0000 (16:24 +0200)]
Merge pull request #3355 from Hypolite/issue/fix-language-guess

Skip lang file search if lang=en

7 years agoStandards
Hypolite Petovan [Wed, 19 Apr 2017 14:14:43 +0000 (10:14 -0400)]
Standards

7 years agoMerge pull request #3357 from Hypolite/issue/fix-frio-comment-box
rabuzarus [Wed, 19 Apr 2017 12:14:35 +0000 (14:14 +0200)]
Merge pull request #3357 from Hypolite/issue/fix-frio-comment-box

Fix Issues with frio comment box

7 years agoAdd explicit parentheses in condition
Hypolite Petovan [Wed, 19 Apr 2017 11:05:48 +0000 (07:05 -0400)]
Add explicit parentheses in condition

7 years agoMerge pull request #3356 from Hypolite/issue/fix-notifications-display
Michael Vogel [Wed, 19 Apr 2017 05:10:31 +0000 (07:10 +0200)]
Merge pull request #3356 from Hypolite/issue/fix-notifications-display

Remove extra htmlentities in notifications

7 years agoAdd autosize call for all external textarea value changes
Hypolite Petovan [Wed, 19 Apr 2017 02:04:23 +0000 (22:04 -0400)]
Add autosize call for all external textarea value changes

7 years agoPrevent comment UI from closing when using BBCode buttons with empty textarea
Hypolite Petovan [Wed, 19 Apr 2017 02:03:49 +0000 (22:03 -0400)]
Prevent comment UI from closing when using BBCode buttons with empty textarea

7 years agoRemove extra htmlentities in notifications
Hypolite Petovan [Tue, 18 Apr 2017 23:34:46 +0000 (19:34 -0400)]
Remove extra htmlentities in notifications

7 years agoSkip lang file search if lang=en
Hypolite Petovan [Tue, 18 Apr 2017 23:21:26 +0000 (19:21 -0400)]
Skip lang file search if lang=en

7 years agoMerge pull request #3354 from annando/issue-3157
Hypolite Petovan [Tue, 18 Apr 2017 20:31:15 +0000 (16:31 -0400)]
Merge pull request #3354 from annando/issue-3157

Issue 3157: No fulltext anymore

7 years agoMerge pull request #3353 from annando/1704-empty-contacts
Hypolite Petovan [Tue, 18 Apr 2017 20:20:33 +0000 (16:20 -0400)]
Merge pull request #3353 from annando/1704-empty-contacts

Handle the case when the given contact url or address is empty

7 years agoIssue 3157: No fulltext anymore
Michael [Tue, 18 Apr 2017 20:09:05 +0000 (20:09 +0000)]
Issue 3157: No fulltext anymore

7 years agoRevert unneeded changes in third-party libraries
Alexandre Alapetite [Tue, 18 Apr 2017 19:21:29 +0000 (21:21 +0200)]
Revert unneeded changes in third-party libraries

https://github.com/friendica/friendica/pull/3326#discussion_r112039526
https://github.com/friendica/friendica/pull/3326#discussion_r112039589

7 years agoHandle the case when the given contact url or address is empty
Michael [Tue, 18 Apr 2017 18:50:01 +0000 (18:50 +0000)]
Handle the case when the given contact url or address is empty

7 years agoMerge pull request #3352 from annando/issue-3351
Hypolite Petovan [Tue, 18 Apr 2017 17:48:47 +0000 (13:48 -0400)]
Merge pull request #3352 from annando/issue-3351

Issue 3351: Check if resource was created

7 years agoIssue 3351: Check if resource was created
Michael [Tue, 18 Apr 2017 17:17:15 +0000 (17:17 +0000)]
Issue 3351: Check if resource was created

7 years agoMerge pull request #3350 from annando/1704-resubmit-directory
Hypolite Petovan [Tue, 18 Apr 2017 04:03:22 +0000 (00:03 -0400)]
Merge pull request #3350 from annando/1704-resubmit-directory

Resubmit all profiles on directory change

7 years agoResubmit all profiles on directory change
Michael [Mon, 17 Apr 2017 21:39:11 +0000 (21:39 +0000)]
Resubmit all profiles on directory change

7 years agoMerge pull request #3349 from annando/1704-api-owner
Hypolite Petovan [Mon, 17 Apr 2017 17:00:58 +0000 (13:00 -0400)]
Merge pull request #3349 from annando/1704-api-owner

API: The "friendica-owner" has only to be different from the user on starting posts

7 years agoAPI: The "friendica-owner" has only to be different from the user on starting posts
Michael [Mon, 17 Apr 2017 14:38:13 +0000 (14:38 +0000)]
API: The "friendica-owner" has only to be different from the user on starting posts

7 years agoMerge pull request #3348 from Alkarex/SQL-messages-AS
Hypolite Petovan [Mon, 17 Apr 2017 13:03:20 +0000 (09:03 -0400)]
Merge pull request #3348 from Alkarex/SQL-messages-AS

SQL AS for messages

7 years agoSQL AS for messages
Alexandre Alapetite [Mon, 17 Apr 2017 13:01:05 +0000 (15:01 +0200)]
SQL AS for messages

Fix bug introduced in https://github.com/friendica/friendica/pull/3323

7 years agoMerge pull request #3333 from Rudloff/feature/theme-color
rabuzarus [Mon, 17 Apr 2017 11:51:37 +0000 (13:51 +0200)]
Merge pull request #3333 from Rudloff/feature/theme-color

theme-color meta

7 years agoUpdated theme-color code
Pierre Rudloff [Mon, 17 Apr 2017 11:38:55 +0000 (13:38 +0200)]
Updated theme-color code

Add comment explaining what the code does
Remove unused include
Code standards

7 years agoMerge pull request #3344 from tobiasd/20170412-doc
Michael Vogel [Mon, 17 Apr 2017 06:11:18 +0000 (08:11 +0200)]
Merge pull request #3344 from tobiasd/20170412-doc

some words about the workers

7 years agoHam
Tobias Diekershoff [Mon, 17 Apr 2017 05:33:12 +0000 (07:33 +0200)]
Ham

7 years agoMerge branch 'develop' into utf8mb4
Alexandre Alapetite [Sun, 16 Apr 2017 20:08:48 +0000 (22:08 +0200)]
Merge branch 'develop' into utf8mb4

7 years agoMerge pull request #3321 from Alkarex/MySQL5.7
Hypolite Petovan [Sun, 16 Apr 2017 20:03:13 +0000 (16:03 -0400)]
Merge pull request #3321 from Alkarex/MySQL5.7

Fix for MySQL 5.7+ NO_ZERO_DATE

7 years agoMerge pull request #3345 from annando/1704-db-update-error
Hypolite Petovan [Sun, 16 Apr 2017 20:03:06 +0000 (16:03 -0400)]
Merge pull request #3345 from annando/1704-db-update-error

Print out database error messages

7 years agoDefault UTF8MB4 for CREATE DATABASE
Alexandre Alapetite [Sun, 16 Apr 2017 14:04:38 +0000 (16:04 +0200)]
Default UTF8MB4 for CREATE DATABASE

7 years agoMore replaces UTF8 to UTF8MB4
Alexandre Alapetite [Sun, 16 Apr 2017 13:53:48 +0000 (15:53 +0200)]
More replaces UTF8 to UTF8MB4

7 years agoDoxygen header added
Michael [Sun, 16 Apr 2017 13:37:42 +0000 (13:37 +0000)]
Doxygen header added

7 years agoMore general date test for dob
Alexandre Alapetite [Sun, 16 Apr 2017 13:36:01 +0000 (15:36 +0200)]
More general date test for dob

7 years agoBump version to 1219
Alexandre Alapetite [Sun, 16 Apr 2017 13:23:57 +0000 (15:23 +0200)]
Bump version to 1219

https://github.com/friendica/friendica/pull/3321#pullrequestreview-32528437

7 years agoPrint out database error messages
Michael [Sun, 16 Apr 2017 13:21:49 +0000 (13:21 +0000)]
Print out database error messages

7 years agoMerge branch 'develop' into MySQL5.7
Alexandre Alapetite [Sun, 16 Apr 2017 13:16:58 +0000 (15:16 +0200)]
Merge branch 'develop' into MySQL5.7

7 years agotypos
Tobias Diekershoff [Sun, 16 Apr 2017 11:59:52 +0000 (13:59 +0200)]
typos

7 years agoremote_self paragraph was missing in DE
Tobias Diekershoff [Sun, 16 Apr 2017 11:54:12 +0000 (13:54 +0200)]
remote_self paragraph was missing in DE

7 years agoWorker auf Deutsch
Tobias Diekershoff [Sun, 16 Apr 2017 11:47:57 +0000 (13:47 +0200)]
Worker auf Deutsch

7 years agosome EN doc about the worker
Tobias Diekershoff [Thu, 13 Apr 2017 05:52:38 +0000 (07:52 +0200)]
some EN doc about the worker

7 years agoMerge pull request #3343 from annando/1704-mastodon
Tobias Diekershoff [Sun, 16 Apr 2017 08:23:07 +0000 (10:23 +0200)]
Merge pull request #3343 from annando/1704-mastodon

Discover Mastodon servers

7 years agoDiscover Mastodon servers
Michael [Sun, 16 Apr 2017 07:46:04 +0000 (07:46 +0000)]
Discover Mastodon servers

7 years agoMerge pull request #3323 from Alkarex/ostatus-only_full_group_by
Hypolite Petovan [Sat, 15 Apr 2017 22:32:50 +0000 (18:32 -0400)]
Merge pull request #3323 from Alkarex/ostatus-only_full_group_by

Fix MySQL bugs related to only_full_group_by

7 years agoForgotten AS in mod/admin patch
Alexandre Alapetite [Sat, 15 Apr 2017 21:48:02 +0000 (23:48 +0200)]
Forgotten AS in mod/admin patch

7 years agoANY_VALUE in mod/admin
Alexandre Alapetite [Sat, 15 Apr 2017 21:42:10 +0000 (23:42 +0200)]
ANY_VALUE in mod/admin

The query was not standard, not deterministic, and was not doing what
its description says. The patch makes it more standard and a bit more
deterministic. The returned protocol type is still undeterministic.

7 years agoMove any_value_fallback() to dba class
Alexandre Alapetite [Sat, 15 Apr 2017 15:31:32 +0000 (17:31 +0200)]
Move any_value_fallback() to dba class

https://github.com/friendica/friendica/pull/3323#discussion_r111666245

7 years agoDocument any_value_fallback()
Alexandre Alapetite [Sat, 15 Apr 2017 12:39:41 +0000 (14:39 +0200)]
Document any_value_fallback()

https://github.com/friendica/friendica/pull/3323#discussion_r111663767

7 years agoUse server_info to fallback from ANY_VALUE if needed
Alexandre Alapetite [Sat, 15 Apr 2017 10:40:32 +0000 (12:40 +0200)]
Use server_info to fallback from ANY_VALUE if needed

7 years agoMerge pull request #3341 from annando/issue-3326
Hypolite Petovan [Sat, 15 Apr 2017 05:58:18 +0000 (01:58 -0400)]
Merge pull request #3341 from annando/issue-3326

Always use utf8mb4 from now on

7 years agoMerge develop
Alexandre Alapetite [Fri, 14 Apr 2017 23:03:21 +0000 (01:03 +0200)]
Merge develop

7 years agoSQL typo mod/message
Alexandre Alapetite [Fri, 14 Apr 2017 22:45:30 +0000 (00:45 +0200)]
SQL typo mod/message

Mistake in previous commit

7 years agoMySQL ANY_VALUE with fallback to MIN
Alexandre Alapetite [Fri, 14 Apr 2017 22:42:44 +0000 (00:42 +0200)]
MySQL ANY_VALUE with fallback to MIN

https://github.com/friendica/friendica/issues/3322

7 years agoDatabase version updated
Michael [Fri, 14 Apr 2017 22:34:01 +0000 (22:34 +0000)]
Database version updated