]> git.mxchange.org Git - friendica.git/log
friendica.git
7 years agoMerge pull request #3165 from tobiasd/20170215-sv
fabrixxm [Wed, 15 Feb 2017 08:12:54 +0000 (09:12 +0100)]
Merge pull request #3165 from tobiasd/20170215-sv

SV update to the strings

7 years agoSV update to the strings
Tobias Diekershoff [Wed, 15 Feb 2017 07:13:06 +0000 (08:13 +0100)]
SV update to the strings

7 years agoMerge pull request #3162 from annando/bugfix-spooling
Tobias Diekershoff [Wed, 15 Feb 2017 06:29:38 +0000 (07:29 +0100)]
Merge pull request #3162 from annando/bugfix-spooling

Bugfix: Only delete spool files that are spool files

7 years agoBugfix: Only delete spool files that are spool files
Michael [Tue, 14 Feb 2017 21:13:00 +0000 (21:13 +0000)]
Bugfix: Only delete spool files that are spool files

7 years agoMerge pull request #3161 from annando/logging-diaspora-relay
rabuzarus [Sat, 11 Feb 2017 23:56:11 +0000 (00:56 +0100)]
Merge pull request #3161 from annando/logging-diaspora-relay

Better logging to analyze unwanted messages from Diaspora

7 years agoBetter logging to analyze unwanted messages from Diaspora
Michael [Sat, 11 Feb 2017 23:37:15 +0000 (23:37 +0000)]
Better logging to analyze unwanted messages from Diaspora

7 years agoMerge pull request #3159 from annando/bugfix-diaspora-relay
Tobias Diekershoff [Sat, 11 Feb 2017 07:58:38 +0000 (08:58 +0100)]
Merge pull request #3159 from annando/bugfix-diaspora-relay

Bugfix: Only accept postings from anyone when the relay is configured

7 years agoMerge pull request #3156 from rabuzarus/20170210_-_fix_pending_contacts_in_viewcontacts
Michael Vogel [Fri, 10 Feb 2017 20:51:17 +0000 (21:51 +0100)]
Merge pull request #3156 from rabuzarus/20170210_-_fix_pending_contacts_in_viewcontacts

Bugfix: pending contacts shouldn't be available in contacts widget and viewcontacts

7 years agoDiaspora Relay: Only accept postings from anyone when the relay is configured
Michael [Fri, 10 Feb 2017 20:45:22 +0000 (20:45 +0000)]
Diaspora Relay: Only accept postings from anyone when the relay is configured

7 years agofix - pending contacts shouldn't be shown in contacts widgit and viewcontacts
rabuzarus [Fri, 10 Feb 2017 02:51:01 +0000 (03:51 +0100)]
fix - pending contacts shouldn't be shown in contacts widgit and viewcontacts

7 years agoMerge pull request #3154 from rabuzarus/20170208_-_frio_fix_form_group_search_buttons
Tobias Diekershoff [Thu, 9 Feb 2017 09:20:52 +0000 (10:20 +0100)]
Merge pull request #3154 from rabuzarus/20170208_-_frio_fix_form_group_search_buttons

Bugfix: frio - fix text of input elements disappears behind the button

7 years agofix typo
rabuzarus [Wed, 8 Feb 2017 17:05:23 +0000 (18:05 +0100)]
fix typo

7 years agofrio - fix text of input elements disappears behind the button
rabuzarus [Wed, 8 Feb 2017 16:50:59 +0000 (17:50 +0100)]
frio - fix text of input elements disappears behind the button

7 years agoMerge pull request #3153 from tobiasd/20170208-quattroembedvideo
fabrixxm [Wed, 8 Feb 2017 08:34:28 +0000 (09:34 +0100)]
Merge pull request #3153 from tobiasd/20170208-quattroembedvideo

remove float left to fix issue 2987 in quattro theme

7 years agoremove float left to fix issue 2987 in quattro theme
Tobias Diekershoff [Wed, 8 Feb 2017 06:21:19 +0000 (07:21 +0100)]
remove float left to fix issue 2987 in quattro theme

7 years agoMerge pull request #3151 from rabuzarus/20170203_-_frio_fix_tabbar_glitch
Tobias Diekershoff [Wed, 8 Feb 2017 05:35:15 +0000 (06:35 +0100)]
Merge pull request #3151 from rabuzarus/20170203_-_frio_fix_tabbar_glitch

Bugfix: frio - fix tabbar on mobile view

7 years agoMerge pull request #3152 from rabuzarus/20170208_-_fix_oembed_video_floating
Tobias Diekershoff [Wed, 8 Feb 2017 05:33:44 +0000 (06:33 +0100)]
Merge pull request #3152 from rabuzarus/20170208_-_fix_oembed_video_floating

Bugfix: for "embedded videos are cut off" #2987

7 years agofix oembeded video floating
rabuzarus [Wed, 8 Feb 2017 01:18:42 +0000 (02:18 +0100)]
fix oembeded video floating

7 years agofrio - fix tabbar on mobile view
rabuzarus [Wed, 8 Feb 2017 00:34:36 +0000 (01:34 +0100)]
frio - fix tabbar on mobile view

7 years agoMerge pull request #3149 from annando/1601-new-diaspora-mention
Tobias Diekershoff [Sun, 5 Feb 2017 15:38:09 +0000 (16:38 +0100)]
Merge pull request #3149 from annando/1601-new-diaspora-mention

Support for the new Diaspora mention format

7 years agoremoved to-do
Michael [Sun, 5 Feb 2017 07:02:20 +0000 (07:02 +0000)]
removed to-do

7 years agoAdd include
Michael [Sat, 4 Feb 2017 22:27:49 +0000 (22:27 +0000)]
Add include

7 years agoSupport for the new Diaspora mention format
Michael [Sat, 4 Feb 2017 22:22:12 +0000 (22:22 +0000)]
Support for the new Diaspora mention format

7 years agoMerge pull request #3147 from rebeka-catalina/vier_dark_item_links
Tobias Diekershoff [Fri, 3 Feb 2017 19:28:39 +0000 (20:28 +0100)]
Merge pull request #3147 from rebeka-catalina/vier_dark_item_links

Vier dark item links

7 years agoMerge pull request #3148 from rabuzarus/20170203_-_frio_fix_tabbar_glitch
Tobias Diekershoff [Fri, 3 Feb 2017 19:28:23 +0000 (20:28 +0100)]
Merge pull request #3148 from rabuzarus/20170203_-_frio_fix_tabbar_glitch

Bugfix: frio - the tabbar should be hidden if it is a dirict child of the section element

7 years agofrio - append tabbar to nav only if it's a direct child of section
rabuzarus [Fri, 3 Feb 2017 18:37:47 +0000 (19:37 +0100)]
frio - append tabbar to nav only if it's a direct child of section

7 years agoBugfix: frio - move tabs to the top of the contacts-template
rabuzarus [Fri, 3 Feb 2017 18:18:10 +0000 (19:18 +0100)]
Bugfix: frio - move tabs to the top of the contacts-template

7 years agoUpdate dark.css
rebeka-catalina [Fri, 3 Feb 2017 18:07:39 +0000 (19:07 +0100)]
Update dark.css

7 years agoBugfix: frio - the tabbar should be hidden if it is in the section element
rabuzarus [Fri, 3 Feb 2017 18:00:55 +0000 (19:00 +0100)]
Bugfix: frio - the tabbar should be hidden if it is in the section element

7 years agoMake links visually different from normal text
rebeka-catalina [Fri, 3 Feb 2017 18:00:04 +0000 (19:00 +0100)]
Make links visually different from normal text

7 years agoMerge pull request #3141 from tobiasd/20170201-htconfig
Michael Vogel [Thu, 2 Feb 2017 08:40:05 +0000 (09:40 +0100)]
Merge pull request #3141 from tobiasd/20170201-htconfig

make sure all config done with the installer is represented in the emergency backup template as well

7 years agoMerge pull request #3146 from annando/1701-pnut
Tobias Diekershoff [Thu, 2 Feb 2017 08:10:28 +0000 (09:10 +0100)]
Merge pull request #3146 from annando/1701-pnut

Preparation to add the social network "pnut"

7 years agoPreparation to add the social network "pnut"
Michael [Thu, 2 Feb 2017 06:06:23 +0000 (06:06 +0000)]
Preparation to add the social network "pnut"

7 years agoMerge pull request #3144 from annando/bugfix-index
Tobias Diekershoff [Wed, 1 Feb 2017 21:34:11 +0000 (22:34 +0100)]
Merge pull request #3144 from annando/bugfix-index

Bugfix: An index was missing

7 years agoBugfix: An index was missing
Michael [Wed, 1 Feb 2017 21:08:13 +0000 (21:08 +0000)]
Bugfix: An index was missing

7 years agoMerge pull request #3143 from annando/develop
Tobias Diekershoff [Wed, 1 Feb 2017 15:33:48 +0000 (16:33 +0100)]
Merge pull request #3143 from annando/develop

Bugfix for pull request 3125

7 years agoBugfix for pull request 3125
Michael [Wed, 1 Feb 2017 13:50:05 +0000 (13:50 +0000)]
Bugfix for pull request 3125

7 years agoRInO is not true / false anymore
Tobias Diekershoff [Wed, 1 Feb 2017 07:45:13 +0000 (08:45 +0100)]
RInO is not true / false anymore

7 years agomake sure all config done with the installer is represented in the emergency backup...
Tobias Diekershoff [Wed, 1 Feb 2017 07:26:22 +0000 (08:26 +0100)]
make sure all config done with the installer is represented in the emergency backup template as well

7 years agoRevert "make sure all config done with the installer is represented in the emergency...
Tobias Diekershoff [Wed, 1 Feb 2017 07:24:51 +0000 (08:24 +0100)]
Revert "make sure all config done with the installer is represented in the emergency backup template as well"

This reverts commit d78201cf50f6530c60c6a0abcc0392b461c81ec7.

7 years agomake sure all config done with the installer is represented in the emergency backup...
Tobias Diekershoff [Wed, 1 Feb 2017 07:23:41 +0000 (08:23 +0100)]
make sure all config done with the installer is represented in the emergency backup template as well

7 years agoMerge pull request #3140 from annando/issue-3116
Tobias Diekershoff [Tue, 31 Jan 2017 06:36:25 +0000 (07:36 +0100)]
Merge pull request #3140 from annando/issue-3116

Bugfix issue 3116: Only allowed themes are displayed

7 years agoMerge pull request #3139 from annando/issue-3135
Tobias Diekershoff [Tue, 31 Jan 2017 06:30:15 +0000 (07:30 +0100)]
Merge pull request #3139 from annando/issue-3135

Issue 3135: dbupdate is started again and again

7 years agoBugfix issue 3116: Only allowed themes are displayed
Michael [Tue, 31 Jan 2017 05:14:32 +0000 (05:14 +0000)]
Bugfix issue 3116: Only allowed themes are displayed

7 years agoIssue 3135: dbupdate is started again and again
Michael [Mon, 30 Jan 2017 21:18:08 +0000 (21:18 +0000)]
Issue 3135: dbupdate is started again and again

7 years agoMerge pull request #3137 from rabuzarus/20170130_-_fix_meta_element_in_display_module
Tobias Diekershoff [Mon, 30 Jan 2017 14:56:41 +0000 (15:56 +0100)]
Merge pull request #3137 from rabuzarus/20170130_-_fix_meta_element_in_display_module

Bugfix: fix the author image in the meta elements in html head (display module)

7 years agoMerge pull request #3136 from rabuzarus/20170130_vier_photo_album
Tobias Diekershoff [Mon, 30 Jan 2017 14:55:58 +0000 (15:55 +0100)]
Merge pull request #3136 from rabuzarus/20170130_vier_photo_album

style the photo album page of the vier theme

7 years agoBugfix: fix the author image in the meta elements in html head (display module)
rabuzarus [Mon, 30 Jan 2017 14:23:44 +0000 (15:23 +0100)]
Bugfix: fix the author image in the meta elements in html head (display module)

7 years agostyle the photo album page of the vier theme
rabuzarus [Mon, 30 Jan 2017 14:00:26 +0000 (15:00 +0100)]
style the photo album page of the vier theme

7 years agoMerge pull request #3128 from annando/bugfix-no-self-destroy
Tobias Diekershoff [Mon, 30 Jan 2017 08:11:10 +0000 (09:11 +0100)]
Merge pull request #3128 from annando/bugfix-no-self-destroy

Bugfix: Sometimes the self contact seems to destroy itself

7 years agoMerge pull request #3127 from annando/bugfix-ssl-issues
Tobias Diekershoff [Mon, 30 Jan 2017 07:46:25 +0000 (08:46 +0100)]
Merge pull request #3127 from annando/bugfix-ssl-issues

Bugfix: The SSL policy setting was not respected

7 years agoMerge pull request #3132 from annando/1701-remove-duplicates
Tobias Diekershoff [Mon, 30 Jan 2017 07:40:26 +0000 (08:40 +0100)]
Merge pull request #3132 from annando/1701-remove-duplicates

Adding unique indexes should now work with every MySQL flavour

7 years agoAddind unique indexes should now work with every MySQL flavour
Michael [Sun, 29 Jan 2017 17:31:20 +0000 (17:31 +0000)]
Addind unique indexes should now work with every MySQL flavour

7 years agoMake the code nicer
Michael [Sun, 29 Jan 2017 14:00:44 +0000 (14:00 +0000)]
Make the code nicer

7 years agoBugfix: Sometimes the self contact seems to destroy itself
Michael [Sun, 29 Jan 2017 13:57:03 +0000 (13:57 +0000)]
Bugfix: Sometimes the self contact seems to destroy itself

7 years agoBugfix: The SSL policy setting was not respected
Michael [Sun, 29 Jan 2017 13:50:57 +0000 (13:50 +0000)]
Bugfix: The SSL policy setting was not respected

7 years agoMerge pull request #3125 from annando/alternate-pr-3124
Tobias Diekershoff [Sat, 28 Jan 2017 14:25:30 +0000 (15:25 +0100)]
Merge pull request #3125 from annando/alternate-pr-3124

Alternate solution for pull request 3124

7 years agoTypo fixed
Michael [Sat, 28 Jan 2017 13:38:18 +0000 (13:38 +0000)]
Typo fixed

7 years agoAlternate solution for pull request 3124
Michael [Sat, 28 Jan 2017 12:19:04 +0000 (12:19 +0000)]
Alternate solution for pull request 3124

7 years agoMerge pull request #3123 from tobiasd/20170128-nodbpwd
Michael Vogel [Sat, 28 Jan 2017 10:25:55 +0000 (11:25 +0100)]
Merge pull request #3123 from tobiasd/20170128-nodbpwd

during installation inform user that pwd cannot be blank

7 years agoMerge pull request #3122 from tobiasd/20170128-allowedthemes
Michael Vogel [Sat, 28 Jan 2017 10:25:29 +0000 (11:25 +0100)]
Merge pull request #3122 from tobiasd/20170128-allowedthemes

system -> allowed_themes was not set in htconfig template

7 years agotypo
Tobias Diekershoff [Sat, 28 Jan 2017 10:20:39 +0000 (11:20 +0100)]
typo

7 years agowording
Tobias Diekershoff [Sat, 28 Jan 2017 10:12:31 +0000 (11:12 +0100)]
wording

7 years agosmoothly is also allowed
Tobias Diekershoff [Sat, 28 Jan 2017 10:08:05 +0000 (11:08 +0100)]
smoothly is also allowed

7 years agoenforce them, but inform the user about it
Tobias Diekershoff [Sat, 28 Jan 2017 09:10:35 +0000 (10:10 +0100)]
enforce them, but inform the user about it

7 years agodon't enfoce non-empty passwords during installation
Tobias Diekershoff [Sat, 28 Jan 2017 09:02:32 +0000 (10:02 +0100)]
don't enfoce non-empty passwords during installation

7 years agoMerge pull request #3121 from annando/1701-bugfix-config
Tobias Diekershoff [Sat, 28 Jan 2017 07:30:22 +0000 (08:30 +0100)]
Merge pull request #3121 from annando/1701-bugfix-config

Issue 3117: Can't store values that are only in the .htconfig.php

7 years agosystem -> allowed_themes was not set in htconfig template
Tobias Diekershoff [Sat, 28 Jan 2017 07:26:40 +0000 (08:26 +0100)]
system -> allowed_themes was not set in htconfig template

7 years agoMerge pull request #3120 from tobiasd/20170128-editor
Michael Vogel [Sat, 28 Jan 2017 06:34:04 +0000 (07:34 +0100)]
Merge pull request #3120 from tobiasd/20170128-editor

added editorconfig config file

7 years agoMerge pull request #3072 from Hypolite/issue/#3062
Michael Vogel [Sat, 28 Jan 2017 06:32:18 +0000 (07:32 +0100)]
Merge pull request #3072 from Hypolite/issue/#3062

Using placeholder attribute instead of hacky JS

7 years agoMerge pull request #3119 from annando/1701-bugfix-events
Tobias Diekershoff [Sat, 28 Jan 2017 06:29:29 +0000 (07:29 +0100)]
Merge pull request #3119 from annando/1701-bugfix-events

Bugfix: Avoid duplicated birthday events

7 years agoDon't forget the brackets
Michael [Sat, 28 Jan 2017 06:21:58 +0000 (06:21 +0000)]
Don't forget the brackets

7 years agoBugfix: When a value was only in the .htconfig.php then it never was stored
Michael [Sat, 28 Jan 2017 06:18:16 +0000 (06:18 +0000)]
Bugfix: When a value was only in the .htconfig.php then it never was stored

7 years agoadded editorconfig config file
Tobias Diekershoff [Sat, 28 Jan 2017 06:15:57 +0000 (07:15 +0100)]
added editorconfig config file

7 years agoMerge branch 'develop' into issue/#3062
Hypolite Petovan [Fri, 27 Jan 2017 20:30:21 +0000 (15:30 -0500)]
Merge branch 'develop' into issue/#3062

* develop: (68 commits)
  Added documentation
  update to the translation
  update to the translations
  translation docs now contain basic usage of the Transifex client
  - Replace TinyMCE-enabled filebrowser.tpl by filebrowser_plain.tpl content
  - Remove misc TinyMCE mentions in docs and minifyjs
  - Remove $theme_richtext_editor boot var - Remove "richtext" feature - Remove fix_mce_lf() function - Remove nomce parameter
  - Remove TinyMCE mentions in themes
  - Remove tinyMCE mentions or convert to addeditortext() - Remove $editselect template value
  Remove tinyMCE libraries
  limit the description of the meta tag to 160 characters in /mod/display
  Improved handling of non string values in the config
  Bugfix: Caching of non string cache values now works.
  Reformatted stuff, improved query
  Auto-focus first input field of modal when shown
  Use cache instead of config for storing last proc_run time
  Some added logging
  Bugfix for masses of php warnings
  Rearranged the logging
  Some changed logging
  ...

# Conflicts:
# view/theme/frost-mobile/js/theme.js
# view/theme/frost/js/theme.js

7 years agoMerge pull request #3109 from Hypolite/issue/scrap-tinymce
Michael Vogel [Fri, 27 Jan 2017 20:08:33 +0000 (21:08 +0100)]
Merge pull request #3109 from Hypolite/issue/scrap-tinymce

Scrap TinyMCE

7 years agoAdded to-do
Michael [Fri, 27 Jan 2017 19:57:57 +0000 (19:57 +0000)]
Added to-do

7 years agoMerge pull request #3110 from tobiasd/20170127-translationdocs
Michael Vogel [Fri, 27 Jan 2017 17:14:08 +0000 (18:14 +0100)]
Merge pull request #3110 from tobiasd/20170127-translationdocs

translation docs now contain basic usage of the Transifex client

7 years agoMerge pull request #3111 from tobiasd/20170127-lang
Michael Vogel [Fri, 27 Jan 2017 17:13:16 +0000 (18:13 +0100)]
Merge pull request #3111 from tobiasd/20170127-lang

translation updates

7 years agoBugfix: Avoid duplicated birthday events
Michael [Fri, 27 Jan 2017 17:04:52 +0000 (17:04 +0000)]
Bugfix: Avoid duplicated birthday events

7 years agoMerge pull request #3096 from annando/1701-index-again
Tobias Diekershoff [Fri, 27 Jan 2017 15:52:12 +0000 (16:52 +0100)]
Merge pull request #3096 from annando/1701-index-again

Some more index stuff

7 years agoAdded documentation
Michael [Fri, 27 Jan 2017 15:13:37 +0000 (15:13 +0000)]
Added documentation

7 years agoupdate to the translation
Tobias Diekershoff [Fri, 27 Jan 2017 12:31:51 +0000 (13:31 +0100)]
update to the translation

7 years agoupdate to the translations
Tobias Diekershoff [Fri, 27 Jan 2017 12:31:04 +0000 (13:31 +0100)]
update to the translations

7 years agotranslation docs now contain basic usage of the Transifex client
Tobias Diekershoff [Fri, 27 Jan 2017 11:39:21 +0000 (12:39 +0100)]
translation docs now contain basic usage of the Transifex client

7 years ago- Replace TinyMCE-enabled filebrowser.tpl by filebrowser_plain.tpl content
Hypolite Petovan [Fri, 27 Jan 2017 04:04:38 +0000 (23:04 -0500)]
- Replace TinyMCE-enabled filebrowser.tpl by filebrowser_plain.tpl content

7 years ago- Remove misc TinyMCE mentions in docs and minifyjs
Hypolite Petovan [Fri, 27 Jan 2017 03:58:25 +0000 (22:58 -0500)]
- Remove misc TinyMCE mentions in docs and minifyjs

7 years ago- Remove $theme_richtext_editor boot var
Hypolite Petovan [Fri, 27 Jan 2017 03:57:53 +0000 (22:57 -0500)]
- Remove $theme_richtext_editor boot var
- Remove "richtext" feature
- Remove fix_mce_lf() function
- Remove nomce parameter

7 years ago- Remove TinyMCE mentions in themes
Hypolite Petovan [Fri, 27 Jan 2017 03:54:32 +0000 (22:54 -0500)]
- Remove TinyMCE mentions in themes

7 years ago- Remove tinyMCE mentions or convert to addeditortext()
Hypolite Petovan [Fri, 27 Jan 2017 03:50:27 +0000 (22:50 -0500)]
- Remove tinyMCE mentions or convert to addeditortext()
- Remove $editselect template value

7 years agoMerge pull request #3106 from rabuzarus/20170125_-_meta_description
Michael Vogel [Thu, 26 Jan 2017 05:42:50 +0000 (06:42 +0100)]
Merge pull request #3106 from rabuzarus/20170125_-_meta_description

limit the description of the meta tag to 160 characters in /mod/display

7 years agoRemove tinyMCE libraries
Hypolite Petovan [Wed, 25 Jan 2017 21:04:42 +0000 (16:04 -0500)]
Remove tinyMCE libraries

7 years agoMerge remote-tracking branch 'refs/remotes/friendica/develop' into develop
Hypolite Petovan [Wed, 25 Jan 2017 20:28:54 +0000 (15:28 -0500)]
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop

7 years agolimit the description of the meta tag to 160 characters in /mod/display
rabuzarus [Wed, 25 Jan 2017 12:10:42 +0000 (13:10 +0100)]
limit the description of the meta tag to 160 characters in /mod/display

7 years agoImproved handling of non string values in the config
Michael [Wed, 25 Jan 2017 05:33:23 +0000 (05:33 +0000)]
Improved handling of non string values in the config

7 years agoBugfix: Caching of non string cache values now works.
Michael [Tue, 24 Jan 2017 18:55:07 +0000 (18:55 +0000)]
Bugfix: Caching of non string cache values now works.

7 years agoMerge remote-tracking branch 'upstream/develop' into 1701-index-again
Michael [Tue, 24 Jan 2017 06:48:05 +0000 (06:48 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1701-index-again

7 years agoReformatted stuff, improved query
Michael [Tue, 24 Jan 2017 06:45:46 +0000 (06:45 +0000)]
Reformatted stuff, improved query

7 years agoMerge pull request #3102 from Hypolite/feature/3101-modal-auto-focus
Michael Vogel [Sun, 22 Jan 2017 21:51:24 +0000 (22:51 +0100)]
Merge pull request #3102 from Hypolite/feature/3101-modal-auto-focus

Feature 3101 modal auto focus

7 years agoAuto-focus first input field of modal when shown
Hypolite Petovan [Sun, 22 Jan 2017 16:01:10 +0000 (11:01 -0500)]
Auto-focus first input field of modal when shown

Fixes #3101