]> git.mxchange.org Git - friendica.git/log
friendica.git
7 years agoMerge pull request #3329 from Alkarex/sql-type-contact.contact-type
Michael Vogel [Thu, 13 Apr 2017 04:44:41 +0000 (06:44 +0200)]
Merge pull request #3329 from Alkarex/sql-type-contact.contact-type

Allow negative contact.contat-type

7 years agoBump update version
Alexandre Alapetite [Wed, 12 Apr 2017 21:20:10 +0000 (23:20 +0200)]
Bump update version

7 years agoBump DB version
Alexandre Alapetite [Wed, 12 Apr 2017 21:14:33 +0000 (23:14 +0200)]
Bump DB version

7 years agoAllow negative contact.contat-type
Alexandre Alapetite [Wed, 12 Apr 2017 21:09:22 +0000 (23:09 +0200)]
Allow negative contact.contat-type

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

7 years agoMerge pull request #3315 from Hypolite/issue/#3285
Michael Vogel [Tue, 11 Apr 2017 16:28:43 +0000 (18:28 +0200)]
Merge pull request #3315 from Hypolite/issue/#3285

Add spoiler tags for Mastodon Content Warning

7 years agoAdded "braces" for @annando
Hypolite Petovan [Tue, 11 Apr 2017 06:12:14 +0000 (02:12 -0400)]
Added "braces" for @annando

7 years agoMerge pull request #3320 from Hypolite/issue/#3292
Michael Vogel [Tue, 11 Apr 2017 05:39:05 +0000 (07:39 +0200)]
Merge pull request #3320 from Hypolite/issue/#3292

Ignore Activity Streams `delete` messages from Mastodon

7 years agoIgnore Activity Streams `delete` messages from Mastodon
Hypolite Petovan [Tue, 11 Apr 2017 02:20:03 +0000 (22:20 -0400)]
Ignore Activity Streams `delete` messages from Mastodon

7 years agoRewrote code according to @annando feedback
Hypolite Petovan [Tue, 11 Apr 2017 01:11:28 +0000 (21:11 -0400)]
Rewrote code according to @annando feedback

- Normalize boolean operators

7 years agoAdd Content Warning support for comments too
Hypolite Petovan [Mon, 10 Apr 2017 04:57:36 +0000 (00:57 -0400)]
Add Content Warning support for comments too

Doh!

7 years agoAdd spoiler tags for Mastodon Content Warning
Hypolite Petovan [Mon, 10 Apr 2017 04:08:14 +0000 (00:08 -0400)]
Add spoiler tags for Mastodon Content Warning

7 years agoMerge pull request #3312 from rabuzarus/20170409_-_fix_desktop_notifs
Hypolite Petovan [Sun, 9 Apr 2017 13:22:20 +0000 (09:22 -0400)]
Merge pull request #3312 from rabuzarus/20170409_-_fix_desktop_notifs

Bugfix: Desktop-notifs - show notifs which have seen = false or seen = 0

7 years agoBugfix: Desktop-notifs - show notifs which have seen = false or seen = 0
rabuzarus [Sun, 9 Apr 2017 12:24:26 +0000 (14:24 +0200)]
Bugfix: Desktop-notifs - show notifs which have seen = false or seen = 0

7 years agoMerge pull request #3311 from tobiasd/20170409-ru
rabuzarus [Sun, 9 Apr 2017 10:50:33 +0000 (12:50 +0200)]
Merge pull request #3311 from tobiasd/20170409-ru

RU translations THX pztrn

7 years agoRU translations THX pztrn
Tobias Diekershoff [Sun, 9 Apr 2017 05:35:12 +0000 (07:35 +0200)]
RU translations THX pztrn

7 years agoMerge pull request #3310 from annando/1704-probing
Hypolite Petovan [Sun, 9 Apr 2017 05:08:12 +0000 (01:08 -0400)]
Merge pull request #3310 from annando/1704-probing

Avoid possible problems with numeric nicknames and GNU Social

7 years agoAvoid possible problems with numeric nicknames and GNU Social
Michael [Sun, 9 Apr 2017 04:29:02 +0000 (04:29 +0000)]
Avoid possible problems with numeric nicknames and GNU Social

7 years agoMerge pull request #3307 from rebeka-catalina/space_before_t
Hypolite Petovan [Sun, 9 Apr 2017 03:18:26 +0000 (23:18 -0400)]
Merge pull request #3307 from rebeka-catalina/space_before_t

Space before t

7 years agoMerge branch 'develop' into space_before_t
Hypolite Petovan [Sun, 9 Apr 2017 03:17:31 +0000 (23:17 -0400)]
Merge branch 'develop' into space_before_t

7 years agoMerge pull request #3308 from rabuzarus/20170408_-_fix_desktop_notifs
Michael Vogel [Sat, 8 Apr 2017 19:15:04 +0000 (21:15 +0200)]
Merge pull request #3308 from rabuzarus/20170408_-_fix_desktop_notifs

Desktop-Notifs: include the user id into the storage key for local browser storage

7 years agoDesktop-Notifs: include the user id into the storage key for local browser storage
rabuzarus [Sat, 8 Apr 2017 18:25:10 +0000 (20:25 +0200)]
Desktop-Notifs: include the user id into the storage key for local browser storage

7 years agoMerge pull request #3304 from rebeka-catalina/local_dir_warning
Hypolite Petovan [Sat, 8 Apr 2017 17:11:27 +0000 (13:11 -0400)]
Merge pull request #3304 from rebeka-catalina/local_dir_warning

Local dir warning

7 years agoThe other lone comma in 1177
rebeka-catalina [Sat, 8 Apr 2017 16:07:30 +0000 (18:07 +0200)]
The other lone comma in 1177

7 years agoAdded a whitespace between comma and t()
rebeka-catalina [Sat, 8 Apr 2017 14:57:24 +0000 (16:57 +0200)]
Added a whitespace between comma and t()

7 years agoModified the warning message
rebeka-catalina [Sat, 8 Apr 2017 14:48:11 +0000 (16:48 +0200)]
Modified the warning message

7 years agoDeleted the lone comma between paratheses
rebeka-catalina [Sat, 8 Apr 2017 14:37:18 +0000 (16:37 +0200)]
Deleted the lone comma between paratheses

7 years agoCorrection of 1177 and added modification to 1171
rebeka-catalina [Sat, 8 Apr 2017 13:48:15 +0000 (15:48 +0200)]
Correction of 1177 and added modification to 1171

7 years agoMerge pull request #3306 from Hypolite/issue/#3274
Tobias Diekershoff [Sat, 8 Apr 2017 13:24:16 +0000 (15:24 +0200)]
Merge pull request #3306 from Hypolite/issue/#3274

Fix path to default Text_Highlighter CSS

7 years agoFix path to default Text_Highlighter CSS
Hypolite Petovan [Sat, 8 Apr 2017 12:59:41 +0000 (08:59 -0400)]
Fix path to default Text_Highlighter CSS

7 years agoMerge branch 'develop' of git://github.com/friendica/friendica into develop
rebeka-catalina [Sat, 8 Apr 2017 12:50:45 +0000 (14:50 +0200)]
Merge branch 'develop' of git://github.com/friendica/friendica into develop

7 years agoadding space for readability
rebeka-catalina [Sat, 8 Apr 2017 11:52:37 +0000 (13:52 +0200)]
adding space for readability

7 years agoMerge pull request #3305 from rabuzarus/20170408_-_fix_frio_css_nav_account_button
Hypolite Petovan [Sat, 8 Apr 2017 11:49:12 +0000 (07:49 -0400)]
Merge pull request #3305 from rabuzarus/20170408_-_fix_frio_css_nav_account_button

Bugfix: there was a gui issue on the navbar account dropdown button

7 years agoBugfix: there was a gui issue on the navbar account dropdown button
rabuzarus [Sat, 8 Apr 2017 11:30:16 +0000 (13:30 +0200)]
Bugfix: there was a gui issue on the navbar account dropdown button

7 years agoWarning, that profile published in local directory may be visible in public
rebeka-catalina [Sat, 8 Apr 2017 11:21:35 +0000 (13:21 +0200)]
Warning, that profile published in local directory may be visible in public

7 years agoMerge pull request #3303 from annando/1704-duplicate-feed
rabuzarus [Sat, 8 Apr 2017 11:20:46 +0000 (13:20 +0200)]
Merge pull request #3303 from annando/1704-duplicate-feed

Avoid duplicates with feeds and "remote self"

7 years agoWarning, that profile published in local directory may be visible in public
rebeka-catalina [Sat, 8 Apr 2017 11:13:38 +0000 (13:13 +0200)]
Warning, that profile published in local directory may be visible in public

7 years agoMerge remote-tracking branch 'upstream/develop' into 1704-duplicate-feed
Michael [Sat, 8 Apr 2017 10:05:01 +0000 (10:05 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1704-duplicate-feed

7 years agoMerge branch 'develop' of http://github.com/rebeka-catalina/friendica into develop
rebeka-catalina [Sat, 8 Apr 2017 09:42:20 +0000 (11:42 +0200)]
Merge branch 'develop' of http://github.com/rebeka-catalina/friendica into develop

7 years agoAvoid duplicates with feeds and "remote self"
Michael [Sat, 8 Apr 2017 08:12:14 +0000 (08:12 +0000)]
Avoid duplicates with feeds and "remote self"

7 years agoMerge pull request #3301 from annando/issue-3300
rabuzarus [Fri, 7 Apr 2017 21:48:32 +0000 (23:48 +0200)]
Merge pull request #3301 from annando/issue-3300

The temp path creation couldn't create a subdirectory with the hostname

7 years agoIssue 3300: The temp path creation couldn't create a subdirectory with the hostname
Michael [Fri, 7 Apr 2017 21:34:06 +0000 (21:34 +0000)]
Issue 3300: The temp path creation couldn't create a subdirectory with the hostname

7 years agoMerge pull request #3295 from Hypolite/issue/#3274
Michael Vogel [Fri, 7 Apr 2017 20:59:44 +0000 (22:59 +0200)]
Merge pull request #3295 from Hypolite/issue/#3274

Friendica code blocks aren't rendered in Diaspora

7 years agoMerge pull request #3298 from tobiasd/20170407-quattroadin
fabrixxm [Fri, 7 Apr 2017 12:31:28 +0000 (14:31 +0200)]
Merge pull request #3298 from tobiasd/20170407-quattroadin

the Quattro admin_user template was missing the users note for the admin

7 years agothe Quattro admin_user template was missing the users note for the admin
Tobias Diekershoff [Fri, 7 Apr 2017 10:59:22 +0000 (12:59 +0200)]
the Quattro admin_user template was missing the users note for the admin

7 years agoMerge pull request #3297 from rabuzarus/20170407_-_fix_bulk_deletion_button
Tobias Diekershoff [Fri, 7 Apr 2017 09:45:00 +0000 (11:45 +0200)]
Merge pull request #3297 from rabuzarus/20170407_-_fix_bulk_deletion_button

Bugfix: bulk deletion button was not available anymore

7 years agoMerge pull request #3296 from tobiasd/20170407-isresult
rabuzarus [Fri, 7 Apr 2017 09:41:38 +0000 (11:41 +0200)]
Merge pull request #3296 from tobiasd/20170407-isresult

small fix for #3254

7 years agoBugfix: bulk deletion button was not available anymore
rabuzarus [Fri, 7 Apr 2017 09:35:45 +0000 (11:35 +0200)]
Bugfix: bulk deletion button was not available anymore

7 years agosmall fix for #3254
Tobias Diekershoff [Fri, 7 Apr 2017 09:26:11 +0000 (11:26 +0200)]
small fix for #3254

7 years agoMerge pull request #3266 from rabuzarus/20170321_-_frio-fbbrowser
Hypolite Petovan [Fri, 7 Apr 2017 04:01:46 +0000 (00:01 -0400)]
Merge pull request #3266 from rabuzarus/20170321_-_frio-fbbrowser

frio: fbrowser styling

7 years agoFix code blocks to Diaspora
Hypolite Petovan [Fri, 7 Apr 2017 03:49:56 +0000 (23:49 -0400)]
Fix code blocks to Diaspora

- Extracts code blocks before BBCode conversion to prevent code
highlighting and whitespace meddling
- Use the improved HTLM To Markdown library
- Use <code>  instead of <key> for Diaspora inline code blocks

7 years agoEnforce standards
Hypolite Petovan [Fri, 7 Apr 2017 03:43:55 +0000 (23:43 -0400)]
Enforce standards

7 years agoMove HTML to Markdown library to Composer
Hypolite Petovan [Fri, 7 Apr 2017 03:33:12 +0000 (23:33 -0400)]
Move HTML to Markdown library to Composer

7 years agoMerge pull request #3294 from strk/openid-input-type-text
Hypolite Petovan [Fri, 7 Apr 2017 01:58:01 +0000 (21:58 -0400)]
Merge pull request #3294 from strk/openid-input-type-text

Add type="text" attribute for openid input field

7 years agoAdd type="text" attribute for openid input field
Sandro Santilli [Thu, 6 Apr 2017 19:48:20 +0000 (21:48 +0200)]
Add type="text" attribute for openid input field

7 years agoMerge pull request #3290 from Hypolite/issue/#3274
Michael Vogel [Wed, 5 Apr 2017 19:39:10 +0000 (21:39 +0200)]
Merge pull request #3290 from Hypolite/issue/#3274

Add Text_highlighter to Composer

7 years agochange fbrowser image margin and box-shadow
rabuzarus [Wed, 5 Apr 2017 10:46:09 +0000 (12:46 +0200)]
change fbrowser image margin and box-shadow

7 years agoadd aria attributes for filebrowser
rabuzarus [Wed, 5 Apr 2017 10:34:00 +0000 (12:34 +0200)]
add aria attributes for filebrowser

7 years agoadd aria attributes + restructure some js to change the aria attributes
rabuzarus [Wed, 5 Apr 2017 09:46:42 +0000 (11:46 +0200)]
add aria attributes + restructure some js to change the aria attributes

7 years agoAdd Text_Highlighter to Composer
Hypolite Petovan [Wed, 5 Apr 2017 04:31:49 +0000 (00:31 -0400)]
Add Text_Highlighter to Composer

- Fixes critical mistake in boot.php regarding set_include_path
- Fixes minor mistake in text.php regarding strpos order of arguments

Note: This change significantly increases Composer running time because
Text_Highlither is a PEAR package. I'm already planning to replace it
with scrivo/highlight.php.

7 years agoMerge pull request #3289 from Hypolite/improvement/add-composer
Michael Vogel [Wed, 5 Apr 2017 03:21:15 +0000 (05:21 +0200)]
Merge pull request #3289 from Hypolite/improvement/add-composer

Add Composer FAQ

7 years agoMerge branch 'develop' of https://github.com/Hypolite/friendica into develop
Hypolite Petovan [Wed, 5 Apr 2017 01:48:36 +0000 (21:48 -0400)]
Merge branch 'develop' of https://github.com/Hypolite/friendica into develop

7 years agoAdd Composer FAQ
Hypolite Petovan [Wed, 5 Apr 2017 00:34:06 +0000 (20:34 -0400)]
Add Composer FAQ

7 years agoMerge pull request #3286 from annando/issue-1720
Tobias Diekershoff [Tue, 4 Apr 2017 05:50:33 +0000 (07:50 +0200)]
Merge pull request #3286 from annando/issue-1720

Issue 1720: Group filter and new tab don't like each other

7 years agoSome little standard stuff
Michael [Tue, 4 Apr 2017 05:39:43 +0000 (05:39 +0000)]
Some little standard stuff

7 years agoIssue 1720: Group filter and new tab don't like each other
Michael [Tue, 4 Apr 2017 05:35:04 +0000 (05:35 +0000)]
Issue 1720: Group filter and new tab don't like each other

7 years agoMerge remote-tracking branch 'refs/remotes/friendica/develop' into develop
Hypolite Petovan [Tue, 4 Apr 2017 02:06:09 +0000 (22:06 -0400)]
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop

7 years agosmall css fix
rabuzarus [Mon, 3 Apr 2017 13:04:54 +0000 (15:04 +0200)]
small css fix

7 years agouse buttons for mobile jot nav
rabuzarus [Mon, 3 Apr 2017 12:32:54 +0000 (14:32 +0200)]
use buttons for mobile jot nav

7 years agouse box-shadow instead of border
rabuzarus [Mon, 3 Apr 2017 12:20:34 +0000 (14:20 +0200)]
use box-shadow instead of border

7 years agoadd href attribute to jot links
rabuzarus [Mon, 3 Apr 2017 12:00:27 +0000 (14:00 +0200)]
add href attribute to jot links

7 years agouse height: 0 instead of display: none to hide jot sections
rabuzarus [Mon, 3 Apr 2017 11:38:07 +0000 (13:38 +0200)]
use height: 0 instead of display: none to hide jot sections

7 years agoadd missing overflow to css
rabuzarus [Mon, 3 Apr 2017 10:55:06 +0000 (12:55 +0200)]
add missing overflow to css

7 years agofix max-height for screens bigger than 768px
rabuzarus [Mon, 3 Apr 2017 10:46:31 +0000 (12:46 +0200)]
fix max-height for screens bigger than 768px

7 years agoMerge pull request #3254 from Quix0r/rewrites/coding-convention-split2
Hypolite Petovan [Mon, 3 Apr 2017 10:38:10 +0000 (06:38 -0400)]
Merge pull request #3254 from Quix0r/rewrites/coding-convention-split2

Rewrites/coding convention split2

7 years agoMerge branch 'develop' into rewrites/coding-convention-split2
Hypolite Petovan [Mon, 3 Apr 2017 10:35:27 +0000 (06:35 -0400)]
Merge branch 'develop' into rewrites/coding-convention-split2

7 years agoMerge pull request #3284 from annando/issue-3278
Hypolite Petovan [Mon, 3 Apr 2017 02:49:07 +0000 (22:49 -0400)]
Merge pull request #3284 from annando/issue-3278

Issue 3278: Attachments in Reshares should now work

7 years agore-enabel browser for small screens
rabuzarus [Mon, 3 Apr 2017 00:04:13 +0000 (02:04 +0200)]
re-enabel browser for small screens

7 years agoMerge develop into 20170321_-_frio-fbbrowser
rabuzarus [Sun, 2 Apr 2017 22:51:34 +0000 (00:51 +0200)]
Merge develop into 20170321_-_frio-fbbrowser

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

7 years agoMerge pull request #3204 from Hypolite/improvement/frio-action-links-to-buttons
rabuzarus [Sun, 2 Apr 2017 21:15:57 +0000 (23:15 +0200)]
Merge pull request #3204 from Hypolite/improvement/frio-action-links-to-buttons

Frio: Turn action links into buttons

7 years agoRemoved unneeded comment
Michael [Sun, 2 Apr 2017 20:43:54 +0000 (20:43 +0000)]
Removed unneeded comment

7 years agoIssue 3278: Attachments in Reshares should now work
Michael [Sun, 2 Apr 2017 19:18:11 +0000 (19:18 +0000)]
Issue 3278: Attachments in Reshares should now work

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

7 years agoMerge pull request #3279 from Hypolite/improvement/add-composer
Michael Vogel [Sun, 2 Apr 2017 12:57:37 +0000 (14:57 +0200)]
Merge pull request #3279 from Hypolite/improvement/add-composer

Add Composer

7 years agoMerge pull request #3283 from annando/issue-2957-2
Hypolite Petovan [Sun, 2 Apr 2017 12:56:35 +0000 (08:56 -0400)]
Merge pull request #3283 from annando/issue-2957-2

Issue 2957: The avatar problem with mastodon should now be solved

7 years agoAdd links to EN pages in DE help
Hypolite Petovan [Sun, 2 Apr 2017 12:54:11 +0000 (08:54 -0400)]
Add links to EN pages in DE help

7 years agoIssue 2957: The avatar problem with mastodon should now finally be solved
Michael [Sun, 2 Apr 2017 12:37:22 +0000 (12:37 +0000)]
Issue 2957: The avatar problem with mastodon should now finally be solved

7 years agoMerge pull request #3282 from annando/1704-platform-name
Tobias Diekershoff [Sun, 2 Apr 2017 08:03:57 +0000 (10:03 +0200)]
Merge pull request #3282 from annando/1704-platform-name

Show real platform names

7 years agoShow real platform names
Michael [Sun, 2 Apr 2017 07:53:55 +0000 (07:53 +0000)]
Show real platform names

7 years agoMerge pull request #3281 from annando/issue-3206-2957
Hypolite Petovan [Sun, 2 Apr 2017 01:24:28 +0000 (21:24 -0400)]
Merge pull request #3281 from annando/issue-3206-2957

Mastodon: plink for reshares, missing hostnames for avatars

7 years agoAdd EOF newline to composer.json
Hypolite Petovan [Sun, 2 Apr 2017 01:09:36 +0000 (21:09 -0400)]
Add EOF newline to composer.json

7 years agoMastodon: plink for reshares, missing hostnames for avatars
Michael [Sat, 1 Apr 2017 23:39:19 +0000 (23:39 +0000)]
Mastodon: plink for reshares, missing hostnames for avatars

7 years agofrio: Fix help pages inline code display
Hypolite Petovan [Sat, 1 Apr 2017 21:58:35 +0000 (17:58 -0400)]
frio: Fix help pages inline code display

7 years agoAdd Composer documentation
Hypolite Petovan [Sat, 1 Apr 2017 21:58:21 +0000 (17:58 -0400)]
Add Composer documentation

7 years agoMerge branch 'develop' into rewrites/coding-convention-split2
Roland Häder [Sat, 1 Apr 2017 20:16:08 +0000 (22:16 +0200)]
Merge branch 'develop' into rewrites/coding-convention-split2

7 years agoadded spaces + used x ()
Roland Haeder [Sat, 1 Apr 2017 19:46:57 +0000 (21:46 +0200)]
added spaces + used x ()

Signed-off-by: Roland Haeder <roland@mxchange.org>
7 years agoMerge pull request #3280 from annando/issue-3142-2
Hypolite Petovan [Sat, 1 Apr 2017 18:32:27 +0000 (14:32 -0400)]
Merge pull request #3280 from annando/issue-3142-2

Issue 3142: mcrypt is no more (as well as phpseclib)

7 years agoStandards ...
Michael [Sat, 1 Apr 2017 17:08:11 +0000 (17:08 +0000)]
Standards ...

7 years agoMore mcrypt is removed
Michael [Sat, 1 Apr 2017 10:07:12 +0000 (10:07 +0000)]
More mcrypt is removed

7 years agoDocumentation added
Michael [Sat, 1 Apr 2017 09:05:56 +0000 (09:05 +0000)]
Documentation added

7 years agoIssue 3142: mcrypt is no more (as well as phpseclib)
Michael [Sat, 1 Apr 2017 08:28:42 +0000 (08:28 +0000)]
Issue 3142: mcrypt is no more (as well as phpseclib)