]> git.mxchange.org Git - friendica.git/log
friendica.git
7 years agoRestores bold text for text dropdown button
Hypolite Petovan [Sun, 26 Mar 2017 01:33:34 +0000 (21:33 -0400)]
Restores bold text for text dropdown button

7 years agoFix superfluous comment box top margin
Hypolite Petovan [Sun, 26 Mar 2017 01:29:13 +0000 (21:29 -0400)]
Fix superfluous comment box top margin

7 years agoFix .btn-link hover/focus color
Hypolite Petovan [Sun, 26 Mar 2017 01:28:53 +0000 (21:28 -0400)]
Fix .btn-link hover/focus color

7 years agoFix indent in search_item.tpl
Hypolite Petovan [Sun, 26 Mar 2017 00:45:03 +0000 (20:45 -0400)]
Fix indent in search_item.tpl

7 years agoVarious fixes
Hypolite Petovan [Sun, 26 Mar 2017 00:43:33 +0000 (20:43 -0400)]
Various fixes

- Removed superfluous CSS rule
- Fixed whitespace
- Restored separators in search_item.tpl

7 years agoMerge branch 'develop' into improvement/frio-action-links-to-buttons
Hypolite Petovan [Sun, 26 Mar 2017 00:27:26 +0000 (20:27 -0400)]
Merge branch 'develop' into improvement/frio-action-links-to-buttons

# Conflicts:
# view/theme/frio/js/filebrowser.js
# view/theme/frio/templates/filebrowser.tpl

7 years agoMerge branch 'develop' of https://github.com/friendica/friendica into develop
Hypolite Petovan [Sun, 26 Mar 2017 00:16:27 +0000 (20:16 -0400)]
Merge branch 'develop' of https://github.com/friendica/friendica into develop

7 years agoMerge pull request #3251 from rabuzarus/20170320_-_fix_fbrowser
Hypolite Petovan [Sat, 25 Mar 2017 20:13:31 +0000 (16:13 -0400)]
Merge pull request #3251 from rabuzarus/20170320_-_fix_fbrowser

Bugfix: fbrowser did insert 2 Pictures instead of only 1

7 years agoRemove the AjaxUpload element when jot modal is closed
rabuzarus [Sat, 25 Mar 2017 20:10:57 +0000 (21:10 +0100)]
Remove the AjaxUpload element when jot modal is closed

7 years agoMerge remote-tracking branch 'refs/remotes/origin/develop' into improvement/frio...
Hypolite Petovan [Sat, 25 Mar 2017 20:09:46 +0000 (16:09 -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 [Sat, 25 Mar 2017 20:09:10 +0000 (16:09 -0400)]
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop

7 years agoMerge pull request #3265 from annando/1703-remove-linefeeds
Hypolite Petovan [Sat, 25 Mar 2017 20:06:53 +0000 (16:06 -0400)]
Merge pull request #3265 from annando/1703-remove-linefeeds

Remove unneeded linefeeds in HTML output

7 years agoMerge pull request #3257 from annando/1703-gcontact
Hypolite Petovan [Sat, 25 Mar 2017 19:35:41 +0000 (15:35 -0400)]
Merge pull request #3257 from annando/1703-gcontact

Improved gcontact handling

7 years agoRemove unneeded linefeeds
Michael [Sat, 25 Mar 2017 19:31:32 +0000 (19:31 +0000)]
Remove unneeded linefeeds

7 years agoRemove the "call by reference"
Michael [Sat, 25 Mar 2017 18:00:56 +0000 (18:00 +0000)]
Remove the "call by reference"

7 years agoUse of exceptions
Michael [Sat, 25 Mar 2017 16:56:04 +0000 (16:56 +0000)]
Use of exceptions

7 years agoMerge pull request #3263 from annando/1601-api-statuses-lookup
Tobias Diekershoff [Sat, 25 Mar 2017 15:26:21 +0000 (16:26 +0100)]
Merge pull request #3263 from annando/1601-api-statuses-lookup

More GNU Social compatibility for the API

7 years agoMerge pull request #3264 from annando/1703-avoid-api-error
Tobias Diekershoff [Sat, 25 Mar 2017 15:25:20 +0000 (16:25 +0100)]
Merge pull request #3264 from annando/1703-avoid-api-error

Avoid API error when calling "/api/friendica/profile/show"

7 years agoAvoid API error when calling "/api/friendica/profile/show"
Michael [Sat, 25 Mar 2017 14:16:21 +0000 (14:16 +0000)]
Avoid API error when calling "/api/friendica/profile/show"

7 years agoOne more API call added
Michael [Sat, 25 Mar 2017 11:31:31 +0000 (11:31 +0000)]
One more API call added

7 years agoMerge remote-tracking branch 'upstream/develop' into 1601-api-statuses-lookup
Michael [Sat, 25 Mar 2017 11:25:47 +0000 (11:25 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1601-api-statuses-lookup

7 years agoMerge pull request #3262 from annando/1703-no-no-utf
Tobias Diekershoff [Sat, 25 Mar 2017 11:01:53 +0000 (12:01 +0100)]
Merge pull request #3262 from annando/1703-no-no-utf

"no_utf" wasn't in use anymore - it is now removed completely

7 years ago"no_utf" wasn't in use anymore - it is now removed completely
Michael [Sat, 25 Mar 2017 10:51:00 +0000 (10:51 +0000)]
"no_utf" wasn't in use anymore - it is now removed completely

7 years agoHypolite is right (not always, but in this case)
Michael [Sat, 25 Mar 2017 10:11:02 +0000 (10:11 +0000)]
Hypolite is right (not always, but in this case)

7 years agoReset the static variable $baseurl
Michael [Sat, 25 Mar 2017 10:07:45 +0000 (10:07 +0000)]
Reset the static variable $baseurl

7 years agoMerge pull request #3259 from Hypolite/issue/#3256
Tobias Diekershoff [Sat, 25 Mar 2017 09:14:43 +0000 (10:14 +0100)]
Merge pull request #3259 from Hypolite/issue/#3256

Upgrade PHP-Markdown + enable hard_wrap

7 years agoMerge pull request #3261 from Hypolite/issue/#3260
Tobias Diekershoff [Sat, 25 Mar 2017 09:13:20 +0000 (10:13 +0100)]
Merge pull request #3261 from Hypolite/issue/#3260

Remove Embedly integration

7 years agoCleanup + Standards for library/markdown.php
Hypolite Petovan [Sat, 25 Mar 2017 06:03:47 +0000 (02:03 -0400)]
Cleanup + Standards for library/markdown.php

7 years agoRemove Embedly integration
Hypolite Petovan [Sat, 25 Mar 2017 05:57:19 +0000 (01:57 -0400)]
Remove Embedly integration

- Remove admin setting input

7 years agoCode cleanup + standards
Hypolite Petovan [Sat, 25 Mar 2017 05:54:16 +0000 (01:54 -0400)]
Code cleanup + standards

7 years agoImprove display feedback on like actions
Hypolite Petovan [Fri, 24 Mar 2017 02:47:56 +0000 (22:47 -0400)]
Improve display feedback on like actions

- Move rotator in sight
- Preventively change display class before next item update

7 years agoMore display fixes
Hypolite Petovan [Fri, 24 Mar 2017 02:45:40 +0000 (22:45 -0400)]
More display fixes

See
https://github.com/friendica/friendica/pull/3204#issuecomment-288908490

7 years agoEnable hard_wrap for Markdown parser to match Diaspora parsing
Hypolite Petovan [Fri, 24 Mar 2017 01:23:00 +0000 (21:23 -0400)]
Enable hard_wrap for Markdown parser to match Diaspora  parsing

7 years agoUpgraded PHP Markdown library to version 1.7.0
Hypolite Petovan [Fri, 24 Mar 2017 01:19:24 +0000 (21:19 -0400)]
Upgraded PHP Markdown library to version 1.7.0

7 years agopoco_last_updated is optimized
Michael [Thu, 23 Mar 2017 22:56:22 +0000 (22:56 +0000)]
poco_last_updated is optimized

7 years agoremoved commented out line
Michael [Thu, 23 Mar 2017 07:36:22 +0000 (07:36 +0000)]
removed commented out line

7 years agoBetter server_url handling
Michael [Thu, 23 Mar 2017 07:34:45 +0000 (07:34 +0000)]
Better server_url handling

7 years agobaseurl should now be set correctly at all the time.
Michael [Thu, 23 Mar 2017 07:10:22 +0000 (07:10 +0000)]
baseurl should now be set correctly at all the time.

7 years agoserver_url was forgotten
Michael [Thu, 23 Mar 2017 06:45:00 +0000 (06:45 +0000)]
server_url was forgotten

7 years ago"poco_check" is now replaced and removed
Michael [Thu, 23 Mar 2017 06:23:23 +0000 (06:23 +0000)]
"poco_check" is now replaced and removed

7 years agoNew function to validate gcontact array data
Michael [Wed, 22 Mar 2017 23:13:32 +0000 (23:13 +0000)]
New function to validate gcontact array data

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 more deprecated "poco_check" calls
Michael [Wed, 22 Mar 2017 07:11:58 +0000 (07:11 +0000)]
Remove more deprecated "poco_check" calls

7 years agoRemove reduncancies
Michael [Wed, 22 Mar 2017 05:26:44 +0000 (05:26 +0000)]
Remove reduncancies

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 agoBugfix: fbrowser did insert 2 Pictures instead of only 1
rabuzarus [Mon, 20 Mar 2017 21:45:24 +0000 (22:45 +0100)]
Bugfix: fbrowser did insert 2 Pictures instead of only 1

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>