]> git.mxchange.org Git - friendica.git/log
friendica.git
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 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

7 years agoMerge remote-tracking branch 'refs/remotes/friendica/develop' into develop
Hypolite Petovan [Sun, 22 Jan 2017 14:02:59 +0000 (09:02 -0500)]
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop

7 years agoUse cache instead of config for storing last proc_run time
Michael [Sun, 22 Jan 2017 05:20:14 +0000 (05:20 +0000)]
Use cache instead of config for storing last proc_run time

7 years agoSome added logging
Michael [Sat, 21 Jan 2017 20:15:49 +0000 (20:15 +0000)]
Some added logging

7 years agoBugfix for masses of php warnings
Michael [Sat, 21 Jan 2017 19:50:56 +0000 (19:50 +0000)]
Bugfix for masses of php warnings

7 years agoRearranged the logging
Michael [Sat, 21 Jan 2017 06:16:15 +0000 (06:16 +0000)]
Rearranged the logging

7 years agoSome changed logging
Michael [Sat, 21 Jan 2017 06:06:29 +0000 (06:06 +0000)]
Some changed logging

7 years agoAdded callstack
Michael [Sat, 21 Jan 2017 05:05:41 +0000 (05:05 +0000)]
Added callstack

7 years agoAvoiding some error messages
Michael [Fri, 20 Jan 2017 22:22:05 +0000 (22:22 +0000)]
Avoiding some error messages

7 years agoBetter number format
Michael [Fri, 20 Jan 2017 22:05:50 +0000 (22:05 +0000)]
Better number format

7 years agoSome more logging
Michael [Fri, 20 Jan 2017 21:58:53 +0000 (21:58 +0000)]
Some more logging

7 years agoMerge pull request #3099 from rabuzarus/20170120_-_fix_event_string_variables
Michael Vogel [Fri, 20 Jan 2017 15:14:13 +0000 (16:14 +0100)]
Merge pull request #3099 from rabuzarus/20170120_-_fix_event_string_variables

Bugfix: fix typo in event variable

7 years agoChanged database.sql
Michael [Fri, 20 Jan 2017 15:00:14 +0000 (15:00 +0000)]
Changed database.sql

7 years agoHopefully better index length.
Michael [Fri, 20 Jan 2017 13:30:06 +0000 (13:30 +0000)]
Hopefully better index length.

7 years agoBugfix: fix typo in event variable
rabuzarus [Fri, 20 Jan 2017 12:24:53 +0000 (13:24 +0100)]
Bugfix: fix typo in event variable

7 years agoBugfix: Quarter Hour cache was cleared every time.
Michael [Thu, 19 Jan 2017 23:07:12 +0000 (23:07 +0000)]
Bugfix: Quarter Hour cache was cleared every time.

7 years agoBugfix: The caching of values didn't really work for boolean values
Michael [Thu, 19 Jan 2017 22:47:20 +0000 (22:47 +0000)]
Bugfix: The caching of values didn't really work for boolean values

7 years agoThe worker now tells the process runtime length.
Michael [Thu, 19 Jan 2017 17:06:23 +0000 (17:06 +0000)]
The worker now tells the process runtime length.

7 years agoAdded limit
Michael [Thu, 19 Jan 2017 10:00:44 +0000 (10:00 +0000)]
Added limit

7 years agoMerge pull request #3098 from fabrixxm/lang/it
Michael Vogel [Thu, 19 Jan 2017 08:46:07 +0000 (09:46 +0100)]
Merge pull request #3098 from fabrixxm/lang/it

Update IT strings

7 years agoAdded reminder
Michael [Thu, 19 Jan 2017 07:09:56 +0000 (07:09 +0000)]
Added reminder

7 years agoThe config class now makes less database reads.
Michael [Wed, 18 Jan 2017 21:45:32 +0000 (21:45 +0000)]
The config class now makes less database reads.

7 years agotransifex-client config
Fabio [Wed, 18 Jan 2017 13:05:57 +0000 (14:05 +0100)]
transifex-client config

7 years agoUpdate IT strings
Fabio [Wed, 18 Jan 2017 11:38:09 +0000 (12:38 +0100)]
Update IT strings

7 years agoSome more config stuff
Michael [Tue, 17 Jan 2017 19:33:06 +0000 (19:33 +0000)]
Some more config stuff

7 years agoReplace the direct access of config variables
Michael [Tue, 17 Jan 2017 19:21:46 +0000 (19:21 +0000)]
Replace the direct access of config variables

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

7 years agoMerge pull request #3095 from annando/bugfix-app
Tobias Diekershoff [Tue, 17 Jan 2017 06:16:29 +0000 (07:16 +0100)]
Merge pull request #3095 from annando/bugfix-app

Bugfix for failed events page and api

7 years agoOOpppss ...
Michael [Mon, 16 Jan 2017 22:15:04 +0000 (22:15 +0000)]
OOpppss ...

7 years agoRedo some work
Michael [Mon, 16 Jan 2017 22:11:35 +0000 (22:11 +0000)]
Redo some work

7 years agoAdded documentation
Michael [Mon, 16 Jan 2017 22:00:58 +0000 (22:00 +0000)]
Added documentation

7 years agoRemoved commented text
Michael [Mon, 16 Jan 2017 21:48:35 +0000 (21:48 +0000)]
Removed commented text

7 years agoChanged database version
Michael [Mon, 16 Jan 2017 21:45:27 +0000 (21:45 +0000)]
Changed database version

7 years agoDeactivated the alternative update script by now
Michael [Mon, 16 Jan 2017 21:35:35 +0000 (21:35 +0000)]
Deactivated the alternative update script by now

7 years agoMerge remote-tracking branch 'upstream/develop' into 1701-index-again
Michael [Mon, 16 Jan 2017 21:06:43 +0000 (21:06 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1701-index-again

7 years agoBugfix for failed events page and api
Michael [Mon, 16 Jan 2017 20:59:16 +0000 (20:59 +0000)]
Bugfix for failed events page and api

7 years agoMerge pull request #3093 from annando/issue-3011
Tobias Diekershoff [Mon, 16 Jan 2017 06:31:53 +0000 (07:31 +0100)]
Merge pull request #3093 from annando/issue-3011

Issue 2364: OStatus: Don't fetch liked contents

7 years agoMerge pull request #3094 from annando/1701-hubzilla-probe
Tobias Diekershoff [Mon, 16 Jan 2017 06:27:03 +0000 (07:27 +0100)]
Merge pull request #3094 from annando/1701-hubzilla-probe

Fixing avatar problems when probing Hubzilla contacts

7 years agoSmarter way to create unique indexes
Michael [Sun, 15 Jan 2017 23:30:43 +0000 (23:30 +0000)]
Smarter way to create unique indexes

7 years agoHubzilla doesn't send a width attribute in the avatar picure in the hcard
Michael [Sun, 15 Jan 2017 19:46:04 +0000 (19:46 +0000)]
Hubzilla doesn't send a width attribute in the avatar picure in the hcard

7 years agoAs well here ...
Michael [Sun, 15 Jan 2017 15:18:31 +0000 (15:18 +0000)]
As well here ...

7 years agoWe fetched a little bit too much ...
Michael [Sun, 15 Jan 2017 15:06:32 +0000 (15:06 +0000)]
We fetched a little bit too much ...

7 years agoHide the calculation for "previous" and "next" behind a setting
Michael [Sun, 15 Jan 2017 14:50:26 +0000 (14:50 +0000)]
Hide the calculation for "previous" and "next" behind a setting

7 years agoSome more database stuff
Michael [Sun, 15 Jan 2017 12:36:06 +0000 (12:36 +0000)]
Some more database stuff

7 years agoIssue 3011 (and others): OStatus: Don't fetch liked contents
Michael [Sun, 15 Jan 2017 09:07:57 +0000 (09:07 +0000)]
Issue 3011 (and others): OStatus: Don't fetch liked contents

7 years agoSome more changed indexes and improved queries
Michael [Sat, 14 Jan 2017 21:36:34 +0000 (21:36 +0000)]
Some more changed indexes and improved queries

7 years agoSome removed indexes
Michael [Sat, 14 Jan 2017 00:49:41 +0000 (00:49 +0000)]
Some removed indexes

7 years agoBetter usage of text and mediumtext.
Michael [Fri, 13 Jan 2017 22:13:52 +0000 (22:13 +0000)]
Better usage of text and mediumtext.

7 years agoSome more caching
Michael [Fri, 13 Jan 2017 17:31:10 +0000 (17:31 +0000)]
Some more caching

7 years agoCaching the events.
Michael [Fri, 13 Jan 2017 13:04:37 +0000 (13:04 +0000)]
Caching the events.

7 years agoThe relay query now uses a better index
Michael [Fri, 13 Jan 2017 10:37:39 +0000 (10:37 +0000)]
The relay query now uses a better index

7 years agoNew function to detect heavily used indexes
Michael [Fri, 13 Jan 2017 07:46:47 +0000 (07:46 +0000)]
New function to detect heavily used indexes

7 years agoMerge pull request #3088 from beardyunixer/patch-1
Tobias Diekershoff [Thu, 12 Jan 2017 15:32:38 +0000 (16:32 +0100)]
Merge pull request #3088 from beardyunixer/patch-1

Update FAQ.md

7 years agoUpdate FAQ.md
beardyunixer [Thu, 12 Jan 2017 12:13:13 +0000 (12:13 +0000)]
Update FAQ.md

Grammar - a few sentences that are technically correct, but don't sound quite right to a native speaker.

7 years agoMerge pull request #3080 from annando/1701-curl-range
rabuzarus [Thu, 12 Jan 2017 11:15:58 +0000 (12:15 +0100)]
Merge pull request #3080 from annando/1701-curl-range

Download limit for fetching data via "z_fetch_url"

7 years agoMerge remote-tracking branch 'upstream/develop' into 1701-curl-range
Michael [Thu, 12 Jan 2017 07:25:44 +0000 (07:25 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1701-curl-range

Conflicts:
mod/oexchange.php
mod/uimport.php

7 years agoMerge pull request #3074 from annando/1701-diaspora-ostatus-mentions
rabuzarus [Thu, 12 Jan 2017 01:12:25 +0000 (02:12 +0100)]
Merge pull request #3074 from annando/1701-diaspora-ostatus-mentions

Bugfix: Answers to OStatus posts should never reach Diaspora

7 years agoMerge pull request #3081 from annando/1701-top-level
rabuzarus [Thu, 12 Jan 2017 01:11:43 +0000 (02:11 +0100)]
Merge pull request #3081 from annando/1701-top-level

When commenting too fast, messages weren't delivered to Diaspora

7 years agoMerge pull request #3085 from annando/1701-poll-contacts
rabuzarus [Wed, 11 Jan 2017 23:36:54 +0000 (00:36 +0100)]
Merge pull request #3085 from annando/1701-poll-contacts

Correction of commit a96eb3428dfd66e132ff834212be408ee64337b2

7 years agoCorrection of commit a96eb3428dfd66e132ff834212be408ee64337b2
Michael [Wed, 11 Jan 2017 23:18:51 +0000 (23:18 +0000)]
Correction of commit a96eb3428dfd66e132ff834212be408ee64337b2

7 years agoMerge remote-tracking branch 'upstream/develop' into 1701-top-level
Michael [Wed, 11 Jan 2017 23:15:23 +0000 (23:15 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1701-top-level

7 years agoMerge remote-tracking branch 'friendica/develop' into issue/#3062
Hypolite Petovan [Wed, 11 Jan 2017 22:19:59 +0000 (09:19 +1100)]
Merge remote-tracking branch 'friendica/develop' into issue/#3062

# Conflicts:
# view/theme/duepuntozero/theme.php
# view/theme/smoothly/theme.php

7 years agoMerge pull request #3078 from Hypolite/issue/#3039-mod-2of3
Michael Vogel [Wed, 11 Jan 2017 21:49:01 +0000 (22:49 +0100)]
Merge pull request #3078 from Hypolite/issue/#3039-mod-2of3

Normalize App parameter declaration (mod folder, 2 out of 3)

7 years agoMerge pull request #3079 from Hypolite/issue/#3039-mod-3of3
Michael Vogel [Wed, 11 Jan 2017 21:33:41 +0000 (22:33 +0100)]
Merge pull request #3079 from Hypolite/issue/#3039-mod-3of3

Normalize App parameter declaration (mod folder, 3 out of 3)

7 years agoMerge pull request #3083 from rabuzarus/20170111_-_diaspora_logger_debug
Michael Vogel [Wed, 11 Jan 2017 13:32:25 +0000 (14:32 +0100)]
Merge pull request #3083 from rabuzarus/20170111_-_diaspora_logger_debug

diaspora - switch logger for "non subscribed messages" to LOGGER_DEBUG

7 years agodiaspora - add braces
rabuzarus [Wed, 11 Jan 2017 12:02:18 +0000 (13:02 +0100)]
diaspora - add braces

7 years agodiaspora - switch logger for "non subscribed messages" to LOGGER_DEBUG
rabuzarus [Wed, 11 Jan 2017 11:45:25 +0000 (12:45 +0100)]
diaspora - switch logger for "non subscribed messages" to LOGGER_DEBUG

7 years agoMerge pull request #3076 from Hypolite/issue/#3039-boot-doc-include
Michael Vogel [Wed, 11 Jan 2017 08:01:48 +0000 (09:01 +0100)]
Merge pull request #3076 from Hypolite/issue/#3039-boot-doc-include

Normalize App parameter declaration (doc-include folders, boot)