]> git.mxchange.org Git - friendica.git/log
friendica.git
7 years agoMerge branch 'develop' into improvement/frio-action-links-to-buttons
Hypolite Petovan [Tue, 14 Mar 2017 14:45:17 +0000 (10:45 -0400)]
Merge branch 'develop' into improvement/frio-action-links-to-buttons

# Conflicts:
# view/theme/frio/templates/search_item.tpl
# view/theme/frio/templates/wall_thread.tpl

7 years agoMerge remote-tracking branch 'refs/remotes/friendica/develop' into develop
Hypolite Petovan [Tue, 14 Mar 2017 14:30:04 +0000 (10:30 -0400)]
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop

7 years agoMerge pull request #3232 from Hypolite/issue/#3194-2
rabuzarus [Tue, 14 Mar 2017 12:04:47 +0000 (13:04 +0100)]
Merge pull request #3232 from Hypolite/issue/#3194-2

frio: Revert guid truncation for scrollToItem() and improve dropItem()

7 years agoMerge remote-tracking branch 'friendica/develop' into develop
Hypolite Petovan [Tue, 14 Mar 2017 11:58:37 +0000 (07:58 -0400)]
Merge remote-tracking branch 'friendica/develop' into develop

7 years agoMerge pull request #3224 from annando/1702-no-old_pager
fabrixxm [Tue, 14 Mar 2017 09:29:03 +0000 (10:29 +0100)]
Merge pull request #3224 from annando/1702-no-old_pager

The old pager is now removed

7 years agoMerge pull request #3200 from Hypolite/issue/#3195
Michael Vogel [Tue, 14 Mar 2017 05:05:42 +0000 (06:05 +0100)]
Merge pull request #3200 from Hypolite/issue/#3195

Improve pagination on frio

7 years agoMerge pull request #3213 from Hypolite/issue/#2792-2
Michael Vogel [Mon, 13 Mar 2017 17:35:32 +0000 (18:35 +0100)]
Merge pull request #3213 from Hypolite/issue/#2792-2

Like behavior fix/improvements

7 years agoImprove dropItem() functionality
Hypolite Petovan [Mon, 13 Mar 2017 16:12:13 +0000 (12:12 -0400)]
Improve dropItem() functionality

- Drop the obsolete `#` char
- Add error case when deleting item
- Add item drop support to search items
- Add doc

7 years agoFix scrollToItem breaking dropItem functionality
Hypolite Petovan [Mon, 13 Mar 2017 16:10:03 +0000 (12:10 -0400)]
Fix scrollToItem breaking dropItem functionality

- Add doc
- Refactor function by removing double jQuery wrapping

7 years agoMerge remote-tracking branch 'friendica/develop' into develop
Hypolite Petovan [Mon, 13 Mar 2017 15:53:34 +0000 (11:53 -0400)]
Merge remote-tracking branch 'friendica/develop' into develop

7 years agoMerge pull request #3202 from Hypolite/issue/#3107
rabuzarus [Mon, 13 Mar 2017 13:17:37 +0000 (14:17 +0100)]
Merge pull request #3202 from Hypolite/issue/#3107

Delete frio obsolete Colors.php library

7 years agoMerge pull request #3223 from annando/1702-no-language
Tobias Diekershoff [Mon, 13 Mar 2017 07:26:43 +0000 (08:26 +0100)]
Merge pull request #3223 from annando/1702-no-language

The language string isn't displayed anymore

7 years agoMerge pull request #3225 from annando/1702-no_old_share
Tobias Diekershoff [Mon, 13 Mar 2017 06:52:38 +0000 (07:52 +0100)]
Merge pull request #3225 from annando/1702-no_old_share

The old share option is removed

7 years agomore spaces
Michael [Mon, 13 Mar 2017 05:57:37 +0000 (05:57 +0000)]
more spaces

7 years agoStandard stuff
Michael [Mon, 13 Mar 2017 00:09:32 +0000 (00:09 +0000)]
Standard stuff

7 years agoMerge remote-tracking branch 'upstream/develop' into 1702-no_old_share
Michael [Sun, 12 Mar 2017 20:52:48 +0000 (20:52 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1702-no_old_share

7 years agoMerge remote-tracking branch 'upstream/develop' into 1702-no-old_pager
Michael [Sun, 12 Mar 2017 20:52:14 +0000 (20:52 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1702-no-old_pager

Conflicts:
mod/profile.php

7 years agoMerge remote-tracking branch 'upstream/develop' into 1702-no-language
Michael [Sun, 12 Mar 2017 20:50:20 +0000 (20:50 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1702-no-language

7 years agoMerge remote-tracking branch 'refs/remotes/friendica/develop' into develop
Hypolite Petovan [Sun, 12 Mar 2017 15:19:37 +0000 (11:19 -0400)]
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop

7 years agoMerge pull request #3133 from mexon/mat/cidfix
Tobias Diekershoff [Sun, 12 Mar 2017 14:44:22 +0000 (15:44 +0100)]
Merge pull request #3133 from mexon/mat/cidfix

Allow cid URLs for images

7 years agoMerge pull request #3214 from Hypolite/get_contact-rewrite
Tobias Diekershoff [Sun, 12 Mar 2017 14:42:17 +0000 (15:42 +0100)]
Merge pull request #3214 from Hypolite/get_contact-rewrite

Reformatted get_contact()

7 years agoMerge pull request #3216 from annando/1701-performance
Tobias Diekershoff [Sun, 12 Mar 2017 14:40:56 +0000 (15:40 +0100)]
Merge pull request #3216 from annando/1701-performance

Better network handling, improved structure

7 years agoMerge pull request #3222 from Hypolite/issue/#3220
Tobias Diekershoff [Sun, 12 Mar 2017 14:35:42 +0000 (15:35 +0100)]
Merge pull request #3222 from Hypolite/issue/#3220

Diaspora: Normalize line endings instead of adding <br> before Markdown()

7 years agomark the develop version in the version string
Tobias Diekershoff [Sun, 12 Mar 2017 13:40:08 +0000 (14:40 +0100)]
mark the develop version in the version string

7 years agoMerge branch 'master' into develop
Tobias Diekershoff [Sun, 12 Mar 2017 13:39:09 +0000 (14:39 +0100)]
Merge branch 'master' into develop

7 years agoFriendica Version 3.5.1
Tobias Diekershoff [Sun, 12 Mar 2017 13:38:01 +0000 (14:38 +0100)]
Friendica Version 3.5.1

7 years agoNormalize line endings instead of adding <br> before Markdown()
Hypolite Petovan [Sun, 12 Mar 2017 07:55:22 +0000 (03:55 -0400)]
Normalize line endings instead of adding <br> before Markdown()

7 years agoMerge remote-tracking branch 'refs/remotes/friendica/develop' into develop
Hypolite Petovan [Fri, 10 Mar 2017 02:11:14 +0000 (21:11 -0500)]
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop

7 years agoMerge pull request #3208 from Hypolite/issue/#3194
fabrixxm [Thu, 9 Mar 2017 08:37:21 +0000 (09:37 +0100)]
Merge pull request #3208 from Hypolite/issue/#3194

Strip @hubzilla.server part from guid for autoscrolling purpuses

7 years agoMake Hypolite happy
Michael [Wed, 8 Mar 2017 18:03:41 +0000 (18:03 +0000)]
Make Hypolite happy

7 years agoAdd pump.io network to probing supported networks
Hypolite Petovan [Tue, 7 Mar 2017 21:43:22 +0000 (16:43 -0500)]
Add pump.io network to probing supported networks

- Remove useless condition

7 years agoFix behavior regression
Hypolite Petovan [Tue, 7 Mar 2017 21:28:15 +0000 (16:28 -0500)]
Fix behavior regression

Reverted quitting get_contact if Probe::uri didn’t yield an url for
“nick@server.tld” form.

7 years agoMerge remote-tracking branch 'upstream/develop' into 1701-performance
Michael [Tue, 7 Mar 2017 21:24:20 +0000 (21:24 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1701-performance

7 years agoSwitch nurl and addr lookups
Hypolite Petovan [Mon, 6 Mar 2017 21:26:04 +0000 (16:26 -0500)]
Switch nurl and addr lookups

- nurl lookup is more frequent than addr lookup, saves queries

7 years agoSplit slow catch-all query into three fast queries
Hypolite Petovan [Mon, 6 Mar 2017 21:19:12 +0000 (16:19 -0500)]
Split slow catch-all query into three fast queries

Thanks @annando for the tip.

7 years agoUse Probe::uri instead of probe_url()
Hypolite Petovan [Mon, 6 Mar 2017 11:01:08 +0000 (06:01 -0500)]
Use Probe::uri instead of probe_url()

- Moved file inclusion to enable lazy loading

7 years agoReformatted get_contact()
Hypolite Petovan [Mon, 6 Mar 2017 10:37:01 +0000 (05:37 -0500)]
Reformatted get_contact()

- Resolved one `@todo` (the catch-all contact query)
- Improved code readability by naming variables
- Code standards compliance

7 years agoRewriting of do_like()
Hypolite Petovan [Mon, 6 Mar 2017 10:28:01 +0000 (05:28 -0500)]
Rewriting of do_like()

- Fix behavior where event actions had to be performed twice to switch
from one to another
- Simplify the contact data retrieval
- Make sure contact-id, owner-id and author-id are correctly set

7 years agoFix response "self" assigment
Hypolite Petovan [Mon, 6 Mar 2017 10:07:17 +0000 (05:07 -0500)]
Fix response "self" assigment

- Switch from unreliable `uid` matching to `author-id` using
public_contact()

7 years agoAdd public_contact() function
Hypolite Petovan [Mon, 6 Mar 2017 10:06:05 +0000 (05:06 -0500)]
Add public_contact() function

- Add function to retrieve the public contact id (uid = 0) of the
current logged-in user

7 years agoMerge pull request #3212 from annando/followup2-profile
Tobias Diekershoff [Sun, 5 Mar 2017 12:29:48 +0000 (13:29 +0100)]
Merge pull request #3212 from annando/followup2-profile

Second followup for profile issue

7 years agoMerge pull request #3211 from tobiasd/3.5.1rc
Michael Vogel [Sun, 5 Mar 2017 12:09:28 +0000 (13:09 +0100)]
Merge pull request #3211 from tobiasd/3.5.1rc

DE translation and one solved issue for the CHANGELOG

7 years agoissue solved
Tobias Diekershoff [Sun, 5 Mar 2017 11:41:02 +0000 (12:41 +0100)]
issue solved

7 years agoDE translations
Tobias Diekershoff [Sun, 5 Mar 2017 11:40:31 +0000 (12:40 +0100)]
DE translations

7 years agoSecond followup for profile issue
Michael [Sun, 5 Mar 2017 11:07:10 +0000 (11:07 +0000)]
Second followup for profile issue

7 years agoMerge pull request #3209 from annando/followup-3196
Tobias Diekershoff [Sat, 4 Mar 2017 08:41:00 +0000 (09:41 +0100)]
Merge pull request #3209 from annando/followup-3196

Follow up for issue 3196: We need an index hint for performance issues

7 years agoFollow up for issue 3196: We need an index hint for performance issues
Michael [Sat, 4 Mar 2017 08:25:47 +0000 (08:25 +0000)]
Follow up for issue 3196: We need an index hint for performance issues

7 years agoStrip @hubzilla.server part from guid for autoscrolling purpuses
Hypolite Petovan [Sat, 4 Mar 2017 02:45:36 +0000 (21:45 -0500)]
Strip @hubzilla.server part from guid for autoscrolling purpuses

7 years agoMerge pull request #3205 from tobiasd/20170226-issue3187
Michael Vogel [Fri, 3 Mar 2017 20:36:37 +0000 (21:36 +0100)]
Merge pull request #3205 from tobiasd/20170226-issue3187

Bugfix issue 3187

7 years agotag change
Tobias Diekershoff [Fri, 3 Mar 2017 16:18:09 +0000 (17:18 +0100)]
tag change

7 years agoregenerated master messages.po file
Tobias Diekershoff [Fri, 3 Mar 2017 09:31:10 +0000 (10:31 +0100)]
regenerated master messages.po file

7 years agobetter wording and placeholder for name
Tobias Diekershoff [Fri, 3 Mar 2017 09:28:29 +0000 (10:28 +0100)]
better wording and placeholder for name

7 years agoTurn actions links into buttons (nav, search)
Hypolite Petovan [Fri, 3 Mar 2017 06:19:49 +0000 (01:19 -0500)]
Turn actions links into buttons (nav, search)

- Mirrored the changes from wall_thread to search_item
- Replaced a navbar link with a button with according CSS

7 years agoTurn action links into buttons
Hypolite Petovan [Fri, 3 Mar 2017 06:00:52 +0000 (01:00 -0500)]
Turn action links into buttons

- Turns <a role="button"> into <button type="button"> for responses and
dropdown menu in wall_thread.tpl
- Removes extraneous decorations
- Updates dropdown style to prevent hover shenanigans
- Add theme color to active "btn-default" buttons
- Add margin top to comment box that was stuck to the action buttons

7 years agoDelete frio obsolete Colors.php library
Hypolite Petovan [Fri, 3 Mar 2017 00:00:22 +0000 (19:00 -0500)]
Delete frio obsolete Colors.php library

7 years agoImprove readability
Hypolite Petovan [Thu, 2 Mar 2017 16:30:41 +0000 (11:30 -0500)]
Improve readability

- Move CSS block above the temporary block
- Add template description

7 years agoMerge pull request #3201 from tobiasd/20170302-changelog
Michael Vogel [Thu, 2 Mar 2017 09:16:14 +0000 (10:16 +0100)]
Merge pull request #3201 from tobiasd/20170302-changelog

issues solved

7 years agoissues solved
Tobias Diekershoff [Thu, 2 Mar 2017 08:05:24 +0000 (09:05 +0100)]
issues solved

7 years agoMerge pull request #3199 from annando/issue-3196
Tobias Diekershoff [Thu, 2 Mar 2017 06:29:45 +0000 (07:29 +0100)]
Merge pull request #3199 from annando/issue-3196

Bugfix Issue 3196: Not all forum posts weren't shown

7 years agoAdded index for performance issues
Michael [Thu, 2 Mar 2017 05:46:44 +0000 (05:46 +0000)]
Added index for performance issues

7 years agoImprove pagination on frio theme
Hypolite Petovan [Thu, 2 Mar 2017 04:41:54 +0000 (23:41 -0500)]
Improve pagination on frio theme

- Add pager class discrimination
- Change links order to first / prev / 1 / ... / 10 / next / last
- Enable dynamic pagination coloring
- Prevent click on disabled links

7 years agoBackward compatibility for theme other than frio
Hypolite Petovan [Thu, 2 Mar 2017 04:40:34 +0000 (23:40 -0500)]
Backward compatibility for theme other than frio

- Add .pager .disabled CSS rule

7 years agoUpdate paginate_data()
Hypolite Petovan [Thu, 2 Mar 2017 04:26:49 +0000 (23:26 -0500)]
Update paginate_data()

- Formatting: Normalize quotes, spaces, braces
- Add "disabled" CSS class to links previously ommitted
- Add "previous" and "next" CSS classes to minimal pager links
- Add main pager CSS class depending on type

7 years agoFix default paginate.tpl
Hypolite Petovan [Thu, 2 Mar 2017 04:23:14 +0000 (23:23 -0500)]
Fix default paginate.tpl

Adding missing curly braces

7 years agoIssue 3196: Not all forum posts weren't shown
Michael [Wed, 1 Mar 2017 21:47:10 +0000 (21:47 +0000)]
Issue 3196: Not all forum posts weren't shown

7 years agoMerge pull request #3193 from tobiasd/20170228-CHANGELOG
Michael Vogel [Tue, 28 Feb 2017 08:30:35 +0000 (09:30 +0100)]
Merge pull request #3193 from tobiasd/20170228-CHANGELOG

this line is superfluous by now

7 years agothis line is superfluous by now
Tobias Diekershoff [Tue, 28 Feb 2017 07:21:33 +0000 (08:21 +0100)]
this line is superfluous by now

7 years agoMerge pull request #3192 from annando/gstools-isnt-anymore
Tobias Diekershoff [Tue, 28 Feb 2017 06:35:04 +0000 (07:35 +0100)]
Merge pull request #3192 from annando/gstools-isnt-anymore

The service at gstools.org doesn't exist anymore.

7 years agoThe service at gstools.org doesn't exist anymore.
Michael [Tue, 28 Feb 2017 06:26:50 +0000 (06:26 +0000)]
The service at gstools.org doesn't exist anymore.

7 years agoLanguage data won't be displayed anymore (it was experimental stuff)
Michael [Mon, 27 Feb 2017 23:59:05 +0000 (23:59 +0000)]
Language data won't be displayed anymore (it was experimental stuff)

7 years agoThe old pager is removed
Michael [Mon, 27 Feb 2017 21:46:37 +0000 (21:46 +0000)]
The old pager is removed

7 years ago"old_share" is removed
Michael [Mon, 27 Feb 2017 21:26:37 +0000 (21:26 +0000)]
"old_share" is removed

7 years agochange Fan/Admirer to Subscriber
Tobias Diekershoff [Sun, 26 Feb 2017 15:47:11 +0000 (16:47 +0100)]
change Fan/Admirer to Subscriber

7 years agoMerge pull request #3190 from annando/bugfix-dbstructure
Tobias Diekershoff [Sun, 26 Feb 2017 09:05:02 +0000 (10:05 +0100)]
Merge pull request #3190 from annando/bugfix-dbstructure

Bugfix: "ALTER IGNORE" was missing on structure and index alteration

7 years agoBugfix: "ALTER IGNORE" was missing on structure and index change
Michael [Sun, 26 Feb 2017 08:36:05 +0000 (08:36 +0000)]
Bugfix: "ALTER IGNORE" was missing on structure and index change

7 years agoMerge pull request #3188 from annando/bugfix-fetch_url
Tobias Diekershoff [Sun, 26 Feb 2017 03:19:22 +0000 (04:19 +0100)]
Merge pull request #3188 from annando/bugfix-fetch_url

Bugfix: the curl option CURLOPT_SSL_VERIFYHOST is problematic

7 years agoBugfix: the curl option CURLOPT_SSL_VERIFYHOST is problematic
Michael [Sat, 25 Feb 2017 13:59:24 +0000 (13:59 +0000)]
Bugfix: the curl option CURLOPT_SSL_VERIFYHOST is problematic

7 years agoMerge pull request #3186 from tobiasd/20170224-changelog
Michael Vogel [Fri, 24 Feb 2017 23:17:10 +0000 (00:17 +0100)]
Merge pull request #3186 from tobiasd/20170224-changelog

small update for the CHANGELOG

7 years agoissues closed
Tobias Diekershoff [Fri, 24 Feb 2017 18:41:07 +0000 (19:41 +0100)]
issues closed

7 years agoMerge pull request #3185 from annando/3.5.1rc
Tobias Diekershoff [Fri, 24 Feb 2017 18:29:37 +0000 (19:29 +0100)]
Merge pull request #3185 from annando/3.5.1rc

New version string for RC

7 years agoNew version string for RC
Michael [Fri, 24 Feb 2017 15:02:16 +0000 (15:02 +0000)]
New version string for RC

7 years agoMerge pull request #3184 from tobiasd/20170224-doc
Michael Vogel [Fri, 24 Feb 2017 07:50:30 +0000 (08:50 +0100)]
Merge pull request #3184 from tobiasd/20170224-doc

coding standard for the docs

7 years agocoding standard for the docs
Tobias Diekershoff [Fri, 24 Feb 2017 07:37:36 +0000 (08:37 +0100)]
coding standard for the docs

7 years agoMerge pull request #2841 from Hypolite/issue/#2103-alt
Michael Vogel [Fri, 24 Feb 2017 06:46:29 +0000 (07:46 +0100)]
Merge pull request #2841 from Hypolite/issue/#2103-alt

Issue/#2103 alt - define coding standards for Friendica

7 years agoMerge pull request #2916 from tobiasd/20160925-changes
Michael Vogel [Fri, 24 Feb 2017 06:46:07 +0000 (07:46 +0100)]
Merge pull request #2916 from tobiasd/20160925-changes

updateing credits and CHANGELOG

7 years agoMerge pull request #3182 from annando/bugfix-sql-date
Tobias Diekershoff [Fri, 24 Feb 2017 05:28:32 +0000 (06:28 +0100)]
Merge pull request #3182 from annando/bugfix-sql-date

Bugfix for badly formatted date time string

7 years agoFor 3.5.1 use "0000-00-00 00:00:00" as lowest datetime value
Michael [Thu, 23 Feb 2017 07:21:47 +0000 (07:21 +0000)]
For 3.5.1 use "0000-00-00 00:00:00" as lowest datetime value

7 years agoDefine the lowest possible datetime string as "0001-01-01 00:00:00"
Michael [Thu, 23 Feb 2017 07:09:55 +0000 (07:09 +0000)]
Define the lowest possible datetime string as "0001-01-01 00:00:00"

7 years agoMerge remote-tracking branch 'upstream/develop' into 1701-performance
Michael [Thu, 23 Feb 2017 06:55:35 +0000 (06:55 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1701-performance

7 years agoMerge remote-tracking branch 'upstream/develop' into bugfix-sql-date
Michael [Thu, 23 Feb 2017 06:54:50 +0000 (06:54 +0000)]
Merge remote-tracking branch 'upstream/develop' into bugfix-sql-date

7 years agoMerge pull request #3173 from annando/more-temp-stuff
Tobias Diekershoff [Thu, 23 Feb 2017 06:15:46 +0000 (07:15 +0100)]
Merge pull request #3173 from annando/more-temp-stuff

Workaround for not createable spool path

7 years agoBugfix for bugfix :-)
Michael [Thu, 23 Feb 2017 05:45:06 +0000 (05:45 +0000)]
Bugfix for bugfix :-)

7 years agoAdded check for invalid "contact-type"
Michael [Wed, 22 Feb 2017 22:25:35 +0000 (22:25 +0000)]
Added check for invalid "contact-type"

7 years agoBugfix for badly formatted date time string.
Michael [Wed, 22 Feb 2017 22:04:56 +0000 (22:04 +0000)]
Bugfix for badly formatted date time string.

7 years agoMerge pull request #3181 from tobiasd/20170222-docinstall
rabuzarus [Wed, 22 Feb 2017 12:53:21 +0000 (13:53 +0100)]
Merge pull request #3181 from tobiasd/20170222-docinstall

sql_mode setting in code block

7 years agoMerge pull request #3177 from annando/disable-fulltext
rabuzarus [Wed, 22 Feb 2017 12:51:53 +0000 (13:51 +0100)]
Merge pull request #3177 from annando/disable-fulltext

See issue 3157: Fulltext is now disabled

7 years agoMerge pull request #3179 from tobiasd/20170222-docquickstarten
Michael Vogel [Wed, 22 Feb 2017 11:35:27 +0000 (12:35 +0100)]
Merge pull request #3179 from tobiasd/20170222-docquickstarten

EN quickstart had some dead links in it, DE version is ok

7 years agomake it a code block
Tobias Diekershoff [Wed, 22 Feb 2017 08:37:00 +0000 (09:37 +0100)]
make it a code block

7 years agoMerge remote-tracking branch 'upstream/develop' into more-temp-stuff
Michael [Wed, 22 Feb 2017 06:38:56 +0000 (06:38 +0000)]
Merge remote-tracking branch 'upstream/develop' into more-temp-stuff

7 years agoEN quickstart had some dead links in it, DE version is ok
Tobias Diekershoff [Wed, 22 Feb 2017 06:21:36 +0000 (07:21 +0100)]
EN quickstart had some dead links in it, DE version is ok