]> git.mxchange.org Git - friendica.git/log
friendica.git
7 years agoMerge remote-tracking branch 'refs/remotes/origin/develop' into improvement/frio...
Hypolite Petovan [Wed, 22 Mar 2017 11:29:13 +0000 (07:29 -0400)]
Merge remote-tracking branch 'refs/remotes/origin/develop' into improvement/frio-action-links-to-buttons

7 years agoMerge remote-tracking branch 'refs/remotes/friendica/develop' into develop
Hypolite Petovan [Wed, 22 Mar 2017 11:28:22 +0000 (07:28 -0400)]
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop

7 years agoRemove spaces confusing jSmart in contact_template
Hypolite Petovan [Wed, 22 Mar 2017 02:39:29 +0000 (22:39 -0400)]
Remove spaces confusing jSmart in contact_template

- Fix two missing button closing tags

7 years agoMerge pull request #3252 from annando/1703-worker-splitting
Hypolite Petovan [Wed, 22 Mar 2017 00:29:35 +0000 (20:29 -0400)]
Merge pull request #3252 from annando/1703-worker-splitting

The worker processes in cron.php are now split into many small parts

7 years agoLinefeed added
Michael [Tue, 21 Mar 2017 22:06:57 +0000 (22:06 +0000)]
Linefeed added

7 years agoMerge branch 'develop' into 1703-worker-splitting
Michael Vogel [Tue, 21 Mar 2017 16:08:07 +0000 (17:08 +0100)]
Merge branch 'develop' into 1703-worker-splitting

7 years agoMerge pull request #3253 from friendica/revert-3112-rewrites/coding-convention
Hypolite Petovan [Tue, 21 Mar 2017 16:04:19 +0000 (12:04 -0400)]
Merge pull request #3253 from friendica/revert-3112-rewrites/coding-convention

Revert "Coding convention applied - part 1"

7 years agoRevert "Coding convention applied - part 1"
Hypolite Petovan [Tue, 21 Mar 2017 16:02:59 +0000 (12:02 -0400)]
Revert "Coding convention applied - part 1"

7 years agoMerge branch 'develop' into 1703-worker-splitting
Michael Vogel [Tue, 21 Mar 2017 15:38:59 +0000 (16:38 +0100)]
Merge branch 'develop' into 1703-worker-splitting

7 years agoSome standards
Michael [Tue, 21 Mar 2017 15:24:49 +0000 (15:24 +0000)]
Some standards

7 years agoStrange comment removed
Michael [Tue, 21 Mar 2017 15:15:58 +0000 (15:15 +0000)]
Strange comment removed

7 years agoMerge pull request #3112 from Quix0r/rewrites/coding-convention
Hypolite Petovan [Tue, 21 Mar 2017 14:19:53 +0000 (10:19 -0400)]
Merge pull request #3112 from Quix0r/rewrites/coding-convention

Coding convention applied - part 1

7 years agoChanged probing call. Removed dupolicated code.
Michael [Tue, 21 Mar 2017 13:43:53 +0000 (13:43 +0000)]
Changed probing call. Removed dupolicated code.

7 years agoMerge remote-tracking branch 'upstream/develop' into 1703-worker-splitting
Michael [Tue, 21 Mar 2017 07:59:14 +0000 (07:59 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1703-worker-splitting

7 years agoWorker processes are split into many more separate tasks
Michael [Tue, 21 Mar 2017 07:57:09 +0000 (07:57 +0000)]
Worker processes are split into many more separate tasks

7 years agoMerge pull request #3246 from annando/1701-poco
Tobias Diekershoff [Tue, 21 Mar 2017 06:27:10 +0000 (07:27 +0100)]
Merge pull request #3246 from annando/1701-poco

Split poco discovery in smaller function calls

7 years agoMerge remote-tracking branch 'upstream/develop' into rewrites/coding-convention
Roland Haeder [Mon, 20 Mar 2017 19:51:32 +0000 (20:51 +0100)]
Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention

Signed-off-by: Roland Haeder <roland@mxchange.org>
7 years agoMerge branch 'develop' into improvement/frio-action-links-to-buttons
Hypolite Petovan [Mon, 20 Mar 2017 18:43:37 +0000 (14:43 -0400)]
Merge branch 'develop' into improvement/frio-action-links-to-buttons

7 years agoMerge pull request #3241 from rabuzarus/20170316_-_fix_event_edit
Hypolite Petovan [Mon, 20 Mar 2017 17:18:18 +0000 (13:18 -0400)]
Merge pull request #3241 from rabuzarus/20170316_-_fix_event_edit

add dop event & fix event edit

7 years agoadd missed NULL_DATE
rabuzarus [Mon, 20 Mar 2017 16:19:24 +0000 (17:19 +0100)]
add missed NULL_DATE

7 years agoMerge origin/20170316_-_fix_event_edit into 20170316_-_fix_event_edit
rabuzarus [Mon, 20 Mar 2017 16:16:39 +0000 (17:16 +0100)]
Merge origin/20170316_-_fix_event_edit into 20170316_-_fix_event_edit

Conflicts:
mod/events.php

7 years agoadd NULL_DATE & coding standard work
rabuzarus [Mon, 20 Mar 2017 15:59:21 +0000 (16:59 +0100)]
add NULL_DATE & coding standard work

7 years agoMerge develop into 20170316_-_fix_event_edit
rabuzarus [Mon, 20 Mar 2017 15:46:36 +0000 (16:46 +0100)]
Merge develop into 20170316_-_fix_event_edit

Conflicts:
mod/events.php

7 years agoMerge branch 'develop' into 20170316_-_fix_event_edit
Hypolite Petovan [Mon, 20 Mar 2017 15:08:07 +0000 (11:08 -0400)]
Merge branch 'develop' into 20170316_-_fix_event_edit

7 years agoMerge pull request #3250 from tobiasd/20170320-msg
Michael Vogel [Mon, 20 Mar 2017 07:40:37 +0000 (08:40 +0100)]
Merge pull request #3250 from tobiasd/20170320-msg

regenerated master messages.po file

7 years agoregenerated master messages.po file
Tobias Diekershoff [Mon, 20 Mar 2017 07:27:10 +0000 (08:27 +0100)]
regenerated master messages.po file

7 years agoMerge pull request #3247 from annando/issue-3242-b
Tobias Diekershoff [Mon, 20 Mar 2017 06:20:23 +0000 (07:20 +0100)]
Merge pull request #3247 from annando/issue-3242-b

If the maintenance reason is a url, then redirect to this address

7 years agoTest code removed
Michael [Mon, 20 Mar 2017 04:37:59 +0000 (04:37 +0000)]
Test code removed

7 years agoEnhanced explanation
Michael [Mon, 20 Mar 2017 04:37:13 +0000 (04:37 +0000)]
Enhanced explanation

7 years agoMerge remote-tracking branch 'refs/remotes/origin/develop' into improvement/frio...
Hypolite Petovan [Mon, 20 Mar 2017 01:12:20 +0000 (21:12 -0400)]
Merge remote-tracking branch 'refs/remotes/origin/develop' into improvement/frio-action-links-to-buttons

7 years agoMerge remote-tracking branch 'refs/remotes/friendica/develop' into develop
Hypolite Petovan [Mon, 20 Mar 2017 01:10:41 +0000 (21:10 -0400)]
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop

7 years agoMerge pull request #3249 from annando/bugfix-dbstructure
Hypolite Petovan [Mon, 20 Mar 2017 01:00:55 +0000 (21:00 -0400)]
Merge pull request #3249 from annando/bugfix-dbstructure

Bugfix for issue 3242 - forgotten "use"

7 years agoBugfix for issue 3242 - forgotten "use"
Michael [Sun, 19 Mar 2017 22:58:35 +0000 (22:58 +0000)]
Bugfix for issue 3242 - forgotten "use"

7 years agoStandards and just some more poco slitting
Michael [Sun, 19 Mar 2017 21:32:11 +0000 (21:32 +0000)]
Standards and just some more poco slitting

7 years agoIf the maintenance reason is a url, then redirect to this address
Michael [Sun, 19 Mar 2017 19:03:09 +0000 (19:03 +0000)]
If the maintenance reason is a url, then redirect to this address

7 years agoAdded documention
Michael [Sun, 19 Mar 2017 18:24:49 +0000 (18:24 +0000)]
Added documention

7 years agoSplit the POCO discovery process in several small processes
Michael [Sun, 19 Mar 2017 17:43:59 +0000 (17:43 +0000)]
Split the POCO discovery process in several small processes

7 years agoMerge remote-tracking branch 'upstream/develop' into 1701-poco
Michael [Sun, 19 Mar 2017 15:36:41 +0000 (15:36 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1701-poco

Conflicts:
include/socgraph.php

7 years agoMerge pull request #3245 from annando/issue-3242
Hypolite Petovan [Sun, 19 Mar 2017 15:06:25 +0000 (11:06 -0400)]
Merge pull request #3245 from annando/issue-3242

Issue 3242: Define a maintenance reason

7 years agoMerge pull request #3243 from annando/1702-null-date
Hypolite Petovan [Sun, 19 Mar 2017 15:03:32 +0000 (11:03 -0400)]
Merge pull request #3243 from annando/1702-null-date

Datetime compatibility to MySQL restored

7 years agoStandards, like always
Michael [Sun, 19 Mar 2017 14:57:36 +0000 (14:57 +0000)]
Standards, like always

7 years agoSome more standards
Michael [Sun, 19 Mar 2017 14:43:24 +0000 (14:43 +0000)]
Some more standards

7 years agoIssue 3242: Define a maintenance reason
Michael [Sun, 19 Mar 2017 13:24:07 +0000 (13:24 +0000)]
Issue 3242: Define a maintenance reason

7 years agoMerge remote-tracking branch 'upstream/develop' into 1702-null-date
Michael [Sun, 19 Mar 2017 08:06:02 +0000 (08:06 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1702-null-date

7 years agoStandards, what else?
Michael [Sun, 19 Mar 2017 08:04:04 +0000 (08:04 +0000)]
Standards, what else?

7 years agoYou shoudln't use a text variable like an array.
Michael [Sat, 18 Mar 2017 23:32:59 +0000 (23:32 +0000)]
You shoudln't use a text variable like an array.

7 years agoadded spaces according to coding-convention
Roland Haeder [Sun, 19 Mar 2017 00:04:30 +0000 (01:04 +0100)]
added spaces according to coding-convention

Signed-off-by: Roland Haeder <roland@mxchange.org>
7 years agoold-lost update way, no need for TODO around.
Roland Haeder [Sun, 19 Mar 2017 00:03:14 +0000 (01:03 +0100)]
old-lost update way, no need for TODO around.

Signed-off-by: Roland Haeder <roland@mxchange.org>
7 years agoremoved MyISAM ...
Roland Haeder [Sun, 19 Mar 2017 00:02:01 +0000 (01:02 +0100)]
removed MyISAM ...

Signed-off-by: Roland Haeder <roland@mxchange.org>
7 years agoadded logger ...
Roland Haeder [Sun, 19 Mar 2017 00:00:35 +0000 (01:00 +0100)]
added logger ...

Signed-off-by: Roland Haeder <roland@mxchange.org>
7 years agoadded spaces around + curly braces ...
Roland Haeder [Sat, 18 Mar 2017 23:58:46 +0000 (00:58 +0100)]
added spaces around + curly braces ...

Signed-off-by: Roland Haeder <roland@mxchange.org>
7 years agobetter log here ...
Roland Haeder [Sat, 18 Mar 2017 23:56:58 +0000 (00:56 +0100)]
better log here ...

Signed-off-by: Roland Haeder <roland@mxchange.org>
7 years agoContinued:
Roland Häder [Tue, 7 Feb 2017 08:36:16 +0000 (09:36 +0100)]
Continued:
- added curly braces
- added TODO
- removed TODO (no change needed, is fine)

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agodon't quit silently, at least a TODO is now around
Roland Häder [Tue, 7 Feb 2017 08:06:33 +0000 (09:06 +0100)]
don't quit silently, at least a TODO is now around

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoMissed a 't', thanks to @annando
Roland Häder [Tue, 7 Feb 2017 08:05:19 +0000 (09:05 +0100)]
Missed a 't', thanks to @annando

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agomore spaces + some curly spaces added
Roland Häder [Thu, 26 Jan 2017 15:07:30 +0000 (16:07 +0100)]
more spaces + some curly spaces added

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoadded spaces + some curly braces
Roland Häder [Thu, 26 Jan 2017 15:01:56 +0000 (16:01 +0100)]
added spaces + some curly braces

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoadded spaces + some curly braces + some usage of dbm::is_result()
Roland Häder [Thu, 26 Jan 2017 14:23:30 +0000 (15:23 +0100)]
added spaces + some curly braces + some usage of dbm::is_result()

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoContinued:
Roland Häder [Thu, 26 Jan 2017 09:01:15 +0000 (10:01 +0100)]
Continued:
- added missing spaces/curly braces
- some more usage of dbm::is_result()
- 2 oppsite if() statements can be mored to else
- added more TODOs for type-hinting

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoContinued:
Roland Häder [Thu, 26 Jan 2017 08:38:52 +0000 (09:38 +0100)]
Continued:
- added missing space/curly braces
- added TODOs for later adding a lot type-hints, without these (and they are
  long time around in PHP) anything can be handled over to the method/function.

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoOpps ...
Roland Häder [Wed, 25 Jan 2017 15:02:02 +0000 (16:02 +0100)]
Opps ...

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoadded more curly braces + a bit more usage of dbm::is_result()
Roland Häder [Wed, 25 Jan 2017 14:59:27 +0000 (15:59 +0100)]
added more curly braces + a bit more usage of dbm::is_result()

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoadded more spaces/curly braces
Roland Häder [Tue, 24 Jan 2017 16:55:31 +0000 (17:55 +0100)]
added more spaces/curly braces

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agounified most db upgrades:
Roland Häder [Mon, 23 Jan 2017 09:14:48 +0000 (10:14 +0100)]
unified most db upgrades:
- common way is to check on result ($r mostly) of db upgrade
- on success, return UPDATE_SUCCESS
- on failure, return UPDATE_FAILED

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoadded curly braces + removed more useless intval() calls on file_exists()
Roland Häder [Tue, 31 Jan 2017 07:57:16 +0000 (08:57 +0100)]
added curly braces + removed more useless intval() calls on file_exists()

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agofixed chmod
Roland Häder [Fri, 27 Jan 2017 15:53:38 +0000 (16:53 +0100)]
fixed chmod

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoContinued a bit:
Roland Häder [Fri, 27 Jan 2017 10:58:40 +0000 (11:58 +0100)]
Continued a bit:
- converted some else if to elseif (only PHP)
- converted some space -> tab (intending)

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoMerge pull request #3244 from annando/bugfix-text
rabuzarus [Sat, 18 Mar 2017 23:51:57 +0000 (00:51 +0100)]
Merge pull request #3244 from annando/bugfix-text

You shouldn't use a text variable like an array.

7 years agoadded spaces (coding convention)
Roland Häder [Fri, 27 Jan 2017 10:53:56 +0000 (11:53 +0100)]
added spaces (coding convention)

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agomore spaces + some curly spaces added
Roland Häder [Thu, 26 Jan 2017 15:07:30 +0000 (16:07 +0100)]
more spaces + some curly spaces added

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoadded spaces + some curly braces
Roland Häder [Thu, 26 Jan 2017 15:01:56 +0000 (16:01 +0100)]
added spaces + some curly braces

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoadded spaces + some curly braces + some usage of dbm::is_result()
Roland Häder [Thu, 26 Jan 2017 14:23:30 +0000 (15:23 +0100)]
added spaces + some curly braces + some usage of dbm::is_result()

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agocurly braces + spaces added
Roland Häder [Thu, 26 Jan 2017 13:44:46 +0000 (14:44 +0100)]
curly braces + spaces added

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoadded missing spaces/curly braces
Roland Häder [Thu, 26 Jan 2017 13:28:43 +0000 (14:28 +0100)]
added missing spaces/curly braces

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoaddec curly braces
Roland Häder [Thu, 26 Jan 2017 09:13:53 +0000 (10:13 +0100)]
addec curly braces

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoadded more curly braces + spaces
Roland Häder [Thu, 26 Jan 2017 09:12:54 +0000 (10:12 +0100)]
added more curly braces + spaces

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agospaces -> tab + added spaces
Roland Häder [Thu, 26 Jan 2017 09:09:54 +0000 (10:09 +0100)]
spaces -> tab + added spaces

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agofixed curly brace (opps)
Roland Häder [Thu, 26 Jan 2017 09:07:12 +0000 (10:07 +0100)]
fixed curly brace (opps)

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoadded more curly braces + fixed one
Roland Häder [Thu, 26 Jan 2017 09:04:37 +0000 (10:04 +0100)]
added more curly braces + fixed one

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoContinued:
Roland Häder [Thu, 26 Jan 2017 09:01:15 +0000 (10:01 +0100)]
Continued:
- added missing spaces/curly braces
- some more usage of dbm::is_result()
- 2 oppsite if() statements can be mored to else
- added more TODOs for type-hinting

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoContinued:
Roland Häder [Thu, 26 Jan 2017 08:38:52 +0000 (09:38 +0100)]
Continued:
- added missing space/curly braces
- added TODOs for later adding a lot type-hints, without these (and they are
  long time around in PHP) anything can be handled over to the method/function.

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoOpps ...
Roland Häder [Wed, 25 Jan 2017 15:02:02 +0000 (16:02 +0100)]
Opps ...

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoadded more curly braces + a bit more usage of dbm::is_result()
Roland Häder [Wed, 25 Jan 2017 14:59:27 +0000 (15:59 +0100)]
added more curly braces + a bit more usage of dbm::is_result()

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoeven more added
Roland Häder [Tue, 24 Jan 2017 16:57:45 +0000 (17:57 +0100)]
even more added

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoadded more spaces/curly braces
Roland Häder [Tue, 24 Jan 2017 16:55:31 +0000 (17:55 +0100)]
added more spaces/curly braces

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoadded missing curly braces
Roland Häder [Tue, 24 Jan 2017 16:50:49 +0000 (17:50 +0100)]
added missing curly braces

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agomore curly braces added + dbm::is_result()
Roland Häder [Mon, 23 Jan 2017 09:49:08 +0000 (10:49 +0100)]
more curly braces added + dbm::is_result()

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agomore coding convention applied
Roland Häder [Mon, 23 Jan 2017 09:27:05 +0000 (10:27 +0100)]
more coding convention applied

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agounified most db upgrades:
Roland Häder [Mon, 23 Jan 2017 09:14:48 +0000 (10:14 +0100)]
unified most db upgrades:
- common way is to check on result ($r mostly) of db upgrade
- on success, return UPDATE_SUCCESS
- on failure, return UPDATE_FAILED

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agomore coding convention applied:
Roland Häder [Mon, 23 Jan 2017 08:50:25 +0000 (09:50 +0100)]
more coding convention applied:
- added curly braces
- added spaces where needed
- $r only needs to be tested with dbm::is_result()
- made SQL keywords all uper-case

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoapplied coding convention:
Roland Häder [Mon, 23 Jan 2017 08:44:53 +0000 (09:44 +0100)]
applied coding convention:
- replaced space -> tab (code indenting)
- added curly braces
- used dbm::is_result() if $r is no result (may happen)

Signed-off-by: Roland Häder <roland@mxchange.org>
7 years agoYou shoudln't use a text variable like an array.
Michael [Sat, 18 Mar 2017 23:32:59 +0000 (23:32 +0000)]
You shoudln't use a text variable like an array.

7 years agoSome standards
Michael [Sat, 18 Mar 2017 12:13:43 +0000 (12:13 +0000)]
Some standards

7 years agoFrom now on we are using 0001-01-01 as lowest date
Michael [Sat, 18 Mar 2017 11:42:54 +0000 (11:42 +0000)]
From now on we are using 0001-01-01 as lowest date

7 years agoSome more unneeded changes reverted
Michael [Sat, 18 Mar 2017 08:54:25 +0000 (08:54 +0000)]
Some more unneeded changes reverted

7 years ago"dob" is not a date field, so the changes are reverted
Michael [Sat, 18 Mar 2017 08:50:27 +0000 (08:50 +0000)]
"dob" is not a date field, so the changes are reverted

7 years agoMerge remote-tracking branch 'upstream/develop' into 1702-null-date
Michael [Sat, 18 Mar 2017 08:31:43 +0000 (08:31 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1702-null-date

7 years agoMerge pull request #3228 from annando/1702-detect-server
Tobias Diekershoff [Sat, 18 Mar 2017 08:10:03 +0000 (09:10 +0100)]
Merge pull request #3228 from annando/1702-detect-server

Server type detection is improved

7 years agomore standards work
rabuzarus [Sat, 18 Mar 2017 03:41:54 +0000 (04:41 +0100)]
more standards work

7 years agoFix frio style.css indentation
Hypolite Petovan [Sat, 18 Mar 2017 00:46:31 +0000 (20:46 -0400)]
Fix frio style.css indentation