]> git.mxchange.org Git - friendica.git/log
friendica.git
7 years agofrio: hilight selectet item in generic_links_widget.tpl
fabrixxm [Thu, 27 Apr 2017 17:34:01 +0000 (19:34 +0200)]
frio: hilight selectet item in generic_links_widget.tpl

Add a custom generic_links_widget.tpl.
The class ".selected" is add to `li` instead of `a`,
hilighting current item, e.g. in user settings aside.

7 years agoMerge pull request #3393 from Shnoulle/develop_feature3334
Tobias Diekershoff [Thu, 27 Apr 2017 05:23:01 +0000 (07:23 +0200)]
Merge pull request #3393 from Shnoulle/develop_feature3334

Simple robots.txt for server 404 log

7 years agoMerge pull request #3392 from Hypolite/issue/#3387
Tobias Diekershoff [Thu, 27 Apr 2017 05:22:45 +0000 (07:22 +0200)]
Merge pull request #3392 from Hypolite/issue/#3387

Enforce the domain blocklist

7 years agoAdd documentation about the new admin page
Hypolite Petovan [Thu, 27 Apr 2017 02:22:01 +0000 (22:22 -0400)]
Add documentation about the new admin page

7 years agoUse Config::get instead of get_config
Hypolite Petovan [Thu, 27 Apr 2017 02:08:47 +0000 (22:08 -0400)]
Use Config::get instead of get_config

7 years agoCoding standards : doxygen + tab + single quote
Denis Chenu [Wed, 26 Apr 2017 15:26:13 +0000 (17:26 +0200)]
Coding standards : doxygen + tab + single quote

7 years agoDoxygen standard
Denis Chenu [Wed, 26 Apr 2017 15:09:10 +0000 (17:09 +0200)]
Doxygen standard

7 years agoCoding standards part and bad empty Disallow
Denis Chenu [Wed, 26 Apr 2017 15:07:24 +0000 (17:07 +0200)]
Coding standards part and bad empty Disallow
- Unsure PHP_EOL is the best here : PHP_EOL are not the same on *nux and win, it's not for server , but for browser
- _content vs _init : seems not really a web content ?

7 years agoSimple robots.txt for server 404 log
Denis Chenu [Wed, 26 Apr 2017 13:39:35 +0000 (15:39 +0200)]
Simple robots.txt for server 404 log

7 years agoRenamed check_domain_blocklist to blocked_url
Hypolite Petovan [Wed, 26 Apr 2017 04:23:01 +0000 (00:23 -0400)]
Renamed check_domain_blocklist to blocked_url

- Remove debug

7 years agoAdd check_blocklist to z_fetch_url and post_url
Hypolite Petovan [Wed, 26 Apr 2017 02:59:11 +0000 (22:59 -0400)]
Add check_blocklist to z_fetch_url and post_url

- Standard compliance

7 years agoAdded check_domain_blocklist
Hypolite Petovan [Wed, 26 Apr 2017 02:45:56 +0000 (22:45 -0400)]
Added check_domain_blocklist

7 years agoRefactor "URL" to "domain" for blocklist
Hypolite Petovan [Wed, 26 Apr 2017 02:45:42 +0000 (22:45 -0400)]
Refactor "URL" to "domain" for blocklist

- Add slash trimming to domain
- Reformatted mod/friendica

7 years agoMerge pull request #3388 from tobiasd/20170424-blocklistadminpanel
Hypolite Petovan [Wed, 26 Apr 2017 01:23:20 +0000 (21:23 -0400)]
Merge pull request #3388 from tobiasd/20170424-blocklistadminpanel

blocklist front end for the admin panel

7 years agoMerge pull request #3389 from annando/1704-db-query
Hypolite Petovan [Tue, 25 Apr 2017 17:02:43 +0000 (13:02 -0400)]
Merge pull request #3389 from annando/1704-db-query

New database functions

7 years agostandards
Tobias Diekershoff [Tue, 25 Apr 2017 16:57:50 +0000 (18:57 +0200)]
standards

7 years agoAdded class description
Michael [Tue, 25 Apr 2017 16:05:26 +0000 (16:05 +0000)]
Added class description

7 years agoBetter debugging
Michael [Tue, 25 Apr 2017 05:20:34 +0000 (05:20 +0000)]
Better debugging

7 years agoSmall corrections
Michael [Tue, 25 Apr 2017 05:11:04 +0000 (05:11 +0000)]
Small corrections

7 years agoMerge pull request #3374 from rabuzarus/20170407_-_group_edit
Hypolite Petovan [Mon, 24 Apr 2017 23:50:46 +0000 (19:50 -0400)]
Merge pull request #3374 from rabuzarus/20170407_-_group_edit

Frio: provide own group template + some restructuring in group.php

7 years agoWe weren't able to test mysqlnd, so better remove the code
Michael [Mon, 24 Apr 2017 21:51:47 +0000 (21:51 +0000)]
We weren't able to test mysqlnd, so better remove the code

7 years agodocstrings for the admin panel functions
Tobias Diekershoff [Mon, 24 Apr 2017 21:47:05 +0000 (23:47 +0200)]
docstrings for the admin panel functions

7 years agoadded subpage for blocklist management to the admin panel
Tobias Diekershoff [Mon, 24 Apr 2017 21:45:05 +0000 (23:45 +0200)]
added subpage for blocklist management to the admin panel

7 years agoadded template for the blocklist editor in the admin panel
Tobias Diekershoff [Mon, 24 Apr 2017 21:44:27 +0000 (23:44 +0200)]
added template for the blocklist editor in the admin panel

7 years agoadd the contents from the blocklist to the /friendica page
Tobias Diekershoff [Mon, 24 Apr 2017 21:43:39 +0000 (23:43 +0200)]
add the contents from the blocklist to the /friendica page

7 years agoFree results
Michael [Mon, 24 Apr 2017 21:36:04 +0000 (21:36 +0000)]
Free results

7 years agoLittle spelling problem
Michael [Mon, 24 Apr 2017 21:23:00 +0000 (21:23 +0000)]
Little spelling problem

7 years agoReplace spaces by tabs
Michael [Mon, 24 Apr 2017 21:20:24 +0000 (21:20 +0000)]
Replace spaces by tabs

7 years agoCode cleanup
Michael [Mon, 24 Apr 2017 21:18:30 +0000 (21:18 +0000)]
Code cleanup

7 years agoRemoved old functions
Michael [Mon, 24 Apr 2017 21:02:51 +0000 (21:02 +0000)]
Removed old functions

7 years agoNew function to calculate rows
Michael [Mon, 24 Apr 2017 20:32:35 +0000 (20:32 +0000)]
New function to calculate rows

7 years agoNew function to check for the existance of data
Michael [Mon, 24 Apr 2017 19:23:49 +0000 (19:23 +0000)]
New function to check for the existance of data

7 years agoÖrgs
Michael [Mon, 24 Apr 2017 06:28:57 +0000 (06:28 +0000)]
Örgs

7 years agoRestored privates variables
Michael [Mon, 24 Apr 2017 06:27:59 +0000 (06:27 +0000)]
Restored privates variables

7 years agoRearranged lines
Michael [Mon, 24 Apr 2017 06:26:49 +0000 (06:26 +0000)]
Rearranged lines

7 years agoLost lines are back
Michael [Mon, 24 Apr 2017 06:24:03 +0000 (06:24 +0000)]
Lost lines are back

7 years agoNew function skeleton for execution of queries
Michael [Mon, 24 Apr 2017 06:13:42 +0000 (06:13 +0000)]
New function skeleton for execution of queries

7 years agoMerge pull request #3386 from rabuzarus/20170422_-_Stream_content_update_2
Hypolite Petovan [Mon, 24 Apr 2017 01:43:27 +0000 (21:43 -0400)]
Merge pull request #3386 from rabuzarus/20170422_-_Stream_content_update_2

improve profile page (wall) update for non logged in users and remote users

7 years agoWe now can work with prepared statements
Michael [Sun, 23 Apr 2017 23:15:38 +0000 (23:15 +0000)]
We now can work with prepared statements

7 years agofall back to unseen items if no timestamp is available
rabuzarus [Sun, 23 Apr 2017 14:22:53 +0000 (16:22 +0200)]
fall back to unseen items if no timestamp is available

7 years agoadd a visual indicator (fade) on group membership change
rabuzarus [Sun, 23 Apr 2017 13:26:26 +0000 (15:26 +0200)]
add a visual indicator (fade) on group membership change

7 years agoadd $contact.change_member to the js template. At the present time we don't make...
rabuzarus [Sun, 23 Apr 2017 12:58:23 +0000 (14:58 +0200)]
add $contact.change_member to the js template. At the present time we don't make use of it, but the js smarty template should be the same as the php smarty template

7 years agoMerge pull request #3384 from strk/openid-register
Hypolite Petovan [Sun, 23 Apr 2017 12:55:51 +0000 (08:55 -0400)]
Merge pull request #3384 from strk/openid-register

Fix OpenID registration, and improve its robustness

7 years agofix smarty PHP warnings
rabuzarus [Sun, 23 Apr 2017 12:51:41 +0000 (14:51 +0200)]
fix smarty PHP warnings

7 years agoUrlencode query parameters
Sandro Santilli [Sun, 23 Apr 2017 11:48:46 +0000 (13:48 +0200)]
Urlencode query parameters

7 years agoAdd missing query string introducing character
Sandro Santilli [Sun, 23 Apr 2017 11:48:05 +0000 (13:48 +0200)]
Add missing query string introducing character

Fixes #3383

7 years agoMerge pull request #3382 from annando/1704-myisam
Hypolite Petovan [Sun, 23 Apr 2017 00:55:06 +0000 (20:55 -0400)]
Merge pull request #3382 from annando/1704-myisam

Command in dbstructure.php to convert all tables from MyISAM to InnoDB

7 years agoCall it "toinnodb"
Michael [Sat, 22 Apr 2017 21:55:16 +0000 (21:55 +0000)]
Call it "toinnodb"

7 years agoNew command in dbstructure.php to convert all tables from MyISAM to InnoDB
Michael [Sat, 22 Apr 2017 21:36:01 +0000 (21:36 +0000)]
New command in dbstructure.php to convert all tables from MyISAM to InnoDB

7 years agofixed typo
rabuzarus [Sat, 22 Apr 2017 20:10:43 +0000 (22:10 +0200)]
fixed typo

7 years agoimprove profile update for non logged in ussers and remote users
rabuzarus [Sat, 22 Apr 2017 20:08:05 +0000 (22:08 +0200)]
improve profile update for non logged in ussers and remote users

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 agoRemove unused function
rabuzarus [Fri, 21 Apr 2017 14:13:16 +0000 (16:13 +0200)]
Remove unused function

7 years agoMerge develop into 20170407_-_group_edit
rabuzarus [Fri, 21 Apr 2017 14:09:48 +0000 (16:09 +0200)]
Merge develop into 20170407_-_group_edit

Conflicts:
mod/group.php

7 years agosome restructuring in groups.php + Frio: provide own group template
rabuzarus [Fri, 21 Apr 2017 14:04:29 +0000 (16:04 +0200)]
some restructuring in groups.php + Frio: provide own group template

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