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

7 years agoMerge pull request #3082 from tobiasd/20170111-newyear
Michael Vogel [Wed, 11 Jan 2017 07:59:43 +0000 (08:59 +0100)]
Merge pull request #3082 from tobiasd/20170111-newyear

happy 2017

7 years agoFix typo in doc
Hypolite Petovan [Wed, 11 Jan 2017 07:42:49 +0000 (18:42 +1100)]
Fix typo in doc

7 years agohappy 2017
Tobias Diekershoff [Wed, 11 Jan 2017 07:09:13 +0000 (08:09 +0100)]
happy 2017

7 years agoMerge pull request #3075 from Hypolite/issue/#3039-theme
Michael Vogel [Wed, 11 Jan 2017 06:50:49 +0000 (07:50 +0100)]
Merge pull request #3075 from Hypolite/issue/#3039-theme

Normalize App parameter declaration (view folder)

7 years agoMerge branch 'develop' of https://github.com/friendica/friendica into issue/#3039...
Hypolite Petovan [Tue, 10 Jan 2017 22:39:38 +0000 (09:39 +1100)]
Merge branch 'develop' of https://github.com/friendica/friendica into issue/#3039-theme

# Conflicts:
# view/theme/frio/theme.php

7 years agoMerge pull request #3077 from Hypolite/issue/#3039-mod-1of3
Michael Vogel [Tue, 10 Jan 2017 16:28:21 +0000 (17:28 +0100)]
Merge pull request #3077 from Hypolite/issue/#3039-mod-1of3

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

7 years agoStandards stuff should make Hypolite happy.
Michael [Tue, 10 Jan 2017 16:11:08 +0000 (16:11 +0000)]
Standards stuff should make Hypolite happy.

7 years agoCompare instead of assign ...
Michael [Tue, 10 Jan 2017 10:23:51 +0000 (10:23 +0000)]
Compare instead of assign ...

7 years agoWe should check for the item, not the parent.
Michael [Tue, 10 Jan 2017 07:58:17 +0000 (07:58 +0000)]
We should check for the item, not the parent.

7 years agoWhen commenting too fast, messages weren't delivered to Diaspora
Michael [Tue, 10 Jan 2017 07:40:57 +0000 (07:40 +0000)]
When commenting too fast, messages weren't delivered to Diaspora

7 years agoDownload limit for fetching data via "z_fetch_url"
Michael [Mon, 9 Jan 2017 23:10:32 +0000 (23:10 +0000)]
Download limit for fetching data via "z_fetch_url"

7 years agoMerge pull request #3069 from annando/1612-unused-indexes
rabuzarus [Mon, 9 Jan 2017 21:30:46 +0000 (22:30 +0100)]
Merge pull request #3069 from annando/1612-unused-indexes

Index improvements

7 years agoNormalize App parameter declaration (mod folder, 3 out of 3)
Hypolite Petovan [Mon, 9 Jan 2017 12:14:55 +0000 (23:14 +1100)]
Normalize App parameter declaration (mod folder, 3 out of 3)

7 years agoNormalize App parameter declaration (mod folder, 2 out of 3)
Hypolite Petovan [Mon, 9 Jan 2017 12:14:25 +0000 (23:14 +1100)]
Normalize App parameter declaration (mod folder, 2 out of 3)

7 years agoNormalize App parameter declaration (mod folder, 1 out of 3)
Hypolite Petovan [Mon, 9 Jan 2017 12:12:54 +0000 (23:12 +1100)]
Normalize App parameter declaration (mod folder, 1 out of 3)

7 years agoNormalize App parameter declaration (doc-include folders, boot)
Hypolite Petovan [Mon, 9 Jan 2017 12:09:01 +0000 (23:09 +1100)]
Normalize App parameter declaration (doc-include folders, boot)

7 years agoNormalize App parameter declaration (view folder)
Hypolite Petovan [Mon, 9 Jan 2017 12:06:08 +0000 (23:06 +1100)]
Normalize App parameter declaration (view folder)

7 years agoDBClean now has a smaller limit/Query improvements
Michael [Mon, 9 Jan 2017 09:37:37 +0000 (09:37 +0000)]
DBClean now has a smaller limit/Query improvements

7 years agoMore standards
Michael [Mon, 9 Jan 2017 06:40:56 +0000 (06:40 +0000)]
More standards

7 years agoMaking Hypolite smile
Michael [Sun, 8 Jan 2017 22:29:55 +0000 (22:29 +0000)]
Making Hypolite smile

7 years agoBugfix: Answers to OStatus posts should never reach Diaspora
Michael [Sun, 8 Jan 2017 20:35:41 +0000 (20:35 +0000)]
Bugfix: Answers to OStatus posts should never reach Diaspora

7 years agoit should be "gid" not "cid"
Michael [Sun, 8 Jan 2017 20:11:15 +0000 (20:11 +0000)]
it should be "gid" not "cid"

7 years agodatabase.sql was updated
Michael [Sat, 7 Jan 2017 22:04:57 +0000 (22:04 +0000)]
database.sql was updated

7 years agoMerge remote-tracking branch 'upstream/develop' into 1612-unused-indexes
Michael [Sat, 7 Jan 2017 16:13:57 +0000 (16:13 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes

7 years agoMerge pull request #3043 from Quix0r/rewrites/dbm_is_result
Michael Vogel [Sat, 7 Jan 2017 16:09:23 +0000 (17:09 +0100)]
Merge pull request #3043 from Quix0r/rewrites/dbm_is_result

More usage of dbm::is_result + coding convention applied

7 years agoMerge pull request #3071 from Hypolite/issue/#1034-2
Michael Vogel [Sat, 7 Jan 2017 14:40:24 +0000 (15:40 +0100)]
Merge pull request #3071 from Hypolite/issue/#1034-2

Updated SSL english docs

7 years agoMerge remote-tracking branch 'upstream/develop' into 1612-unused-indexes
Michael [Sat, 7 Jan 2017 14:31:25 +0000 (14:31 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes

7 years agoLast minutes changes
Michael [Sat, 7 Jan 2017 13:52:30 +0000 (13:52 +0000)]
Last minutes changes

7 years agoUpdated SSL english docs
Hypolite Petovan [Sat, 7 Jan 2017 12:27:50 +0000 (23:27 +1100)]
Updated SSL english docs

Fixes #1034

7 years agoMerge remote-tracking branch 'friendica/develop' into develop
Hypolite Petovan [Sat, 7 Jan 2017 12:23:50 +0000 (23:23 +1100)]
Merge remote-tracking branch 'friendica/develop' into develop

7 years agoDon't do queries if not needed
Michael [Sat, 7 Jan 2017 11:28:18 +0000 (11:28 +0000)]
Don't do queries if not needed

7 years agoUse Config class/Option to deactivate the count on albums
Michael [Sat, 7 Jan 2017 09:05:52 +0000 (09:05 +0000)]
Use Config class/Option to deactivate the count on albums

7 years agoMerge branch 'develop' into rewrites/dbm_is_result
Roland Häder [Sat, 7 Jan 2017 08:24:07 +0000 (09:24 +0100)]
Merge branch 'develop' into rewrites/dbm_is_result

7 years agoMerge remote-tracking branch 'upstream/develop' into develop
Roland Häder [Sat, 7 Jan 2017 08:23:58 +0000 (09:23 +0100)]
Merge remote-tracking branch 'upstream/develop' into develop

7 years agoMerge pull request #3068 from rabuzarus/20170105_-_frio_mobile_theme_selection
Michael Vogel [Sat, 7 Jan 2017 02:00:38 +0000 (03:00 +0100)]
Merge pull request #3068 from rabuzarus/20170105_-_frio_mobile_theme_selection

Frio: Show mobile theme selection only if mobile themes are available

7 years agoShow mobile theme selection only if mobile themes are available (default template)
rabuzarus [Fri, 6 Jan 2017 23:22:22 +0000 (00:22 +0100)]
Show mobile theme selection only if mobile themes are available (default template)

7 years agoMerge branch 'develop' into rewrites/dbm_is_result
Roland Häder [Fri, 6 Jan 2017 16:11:07 +0000 (17:11 +0100)]
Merge branch 'develop' into rewrites/dbm_is_result

7 years agoMerge remote-tracking branch 'upstream/develop' into develop
Roland Häder [Fri, 6 Jan 2017 16:10:40 +0000 (17:10 +0100)]
Merge remote-tracking branch 'upstream/develop' into develop

7 years agoSome corrections
Michael [Fri, 6 Jan 2017 13:30:12 +0000 (13:30 +0000)]
Some corrections

7 years agoAdded documentation
Michael [Fri, 6 Jan 2017 07:03:35 +0000 (07:03 +0000)]
Added documentation

7 years agoMerge pull request #3067 from rabuzarus/20170105_-_fix_dfrn_doxygen_todos
Michael Vogel [Fri, 6 Jan 2017 06:52:34 +0000 (07:52 +0100)]
Merge pull request #3067 from rabuzarus/20170105_-_fix_dfrn_doxygen_todos

Bugfix: make some todos usable for doxygen in dfrn.php

7 years agoRemoved some removed indexes
Michael [Fri, 6 Jan 2017 06:37:27 +0000 (06:37 +0000)]
Removed some removed indexes

7 years agoNow for the database version
Michael [Thu, 5 Jan 2017 22:56:49 +0000 (22:56 +0000)]
Now for the database version

7 years agoCleaning up the stuff
Michael [Thu, 5 Jan 2017 22:51:31 +0000 (22:51 +0000)]
Cleaning up the stuff

7 years agoSome new indexes and some removed.
Michael [Thu, 5 Jan 2017 22:23:00 +0000 (22:23 +0000)]
Some new indexes and some removed.

7 years agoWill we now find the best index fort the contact?
Michael [Thu, 5 Jan 2017 17:48:51 +0000 (17:48 +0000)]
Will we now find the best index fort the contact?

7 years agoRemoving and adding some indexes
Michael [Thu, 5 Jan 2017 13:16:27 +0000 (13:16 +0000)]
Removing and adding some indexes

7 years agoAnother index
Michael [Thu, 5 Jan 2017 09:32:16 +0000 (09:32 +0000)]
Another index

7 years agoContact testing
Michael [Thu, 5 Jan 2017 09:10:02 +0000 (09:10 +0000)]
Contact testing

7 years agoHopefully this it it ...
Michael [Thu, 5 Jan 2017 08:02:21 +0000 (08:02 +0000)]
Hopefully this it it ...

7 years agoMerge branch 'develop' into rewrites/dbm_is_result
Roland Häder [Thu, 5 Jan 2017 07:56:39 +0000 (08:56 +0100)]
Merge branch 'develop' into rewrites/dbm_is_result

7 years agoMerge remote-tracking branch 'upstream/develop' into develop
Roland Häder [Thu, 5 Jan 2017 07:56:05 +0000 (08:56 +0100)]
Merge remote-tracking branch 'upstream/develop' into develop

7 years agoFinding the best index ...
Michael [Thu, 5 Jan 2017 07:30:10 +0000 (07:30 +0000)]
Finding the best index ...

7 years agoSome more contact indexes
Michael [Thu, 5 Jan 2017 07:12:13 +0000 (07:12 +0000)]
Some more contact indexes

7 years agoFrio: Show mobile theme selection only if mobile themes are available
rabuzarus [Thu, 5 Jan 2017 01:52:39 +0000 (02:52 +0100)]
Frio: Show mobile theme selection only if mobile themes are available

7 years agoBugfix: make some todos usable for doxygen in dfrn.php
rabuzarus [Thu, 5 Jan 2017 01:23:34 +0000 (02:23 +0100)]
Bugfix: make some todos usable for doxygen in dfrn.php

7 years agoSome more indexes on the contact table
Michael [Wed, 4 Jan 2017 23:28:51 +0000 (23:28 +0000)]
Some more indexes on the contact table

7 years agoSome notification thingy
Michael [Wed, 4 Jan 2017 23:12:28 +0000 (23:12 +0000)]
Some notification thingy

7 years agoSome more indexes and other query improvements
Michael [Wed, 4 Jan 2017 19:13:50 +0000 (19:13 +0000)]
Some more indexes and other query improvements

7 years agoMerge remote-tracking branch 'upstream/develop' into 1612-unused-indexes
Michael [Wed, 4 Jan 2017 13:57:27 +0000 (13:57 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes

7 years agoMerge pull request #3064 from rabuzarus/20170102_-_add_switch_element_to_frio
Tobias Diekershoff [Wed, 4 Jan 2017 12:54:48 +0000 (13:54 +0100)]
Merge pull request #3064 from rabuzarus/20170102_-_add_switch_element_to_frio

Frio: implement On/Off switcher element

7 years agoMerge pull request #3065 from rabuzarus/20170103_-_frio_fix_nav_help_string
Tobias Diekershoff [Wed, 4 Jan 2017 12:52:51 +0000 (13:52 +0100)]
Merge pull request #3065 from rabuzarus/20170103_-_frio_fix_nav_help_string

Bugfix: Frio - use "Help" instead of "Help And Documentation" as label in the nav user menu

7 years agoMerge branch 'develop' into rewrites/dbm_is_result
Roland Häder [Wed, 4 Jan 2017 08:04:51 +0000 (09:04 +0100)]
Merge branch 'develop' into rewrites/dbm_is_result

7 years agoMerge remote-tracking branch 'upstream/develop' into develop
Roland Häder [Wed, 4 Jan 2017 08:03:00 +0000 (09:03 +0100)]
Merge remote-tracking branch 'upstream/develop' into develop

7 years agoMerge pull request #3063 from tobiasd/20170103-de
rabuzarus [Tue, 3 Jan 2017 16:53:17 +0000 (17:53 +0100)]
Merge pull request #3063 from tobiasd/20170103-de

DE translations THX Rabuzarus

7 years agoBugfix: Frio - use "Help" instead of "Help And Documentation" as label in the nav...
rabuzarus [Tue, 3 Jan 2017 16:49:40 +0000 (17:49 +0100)]
Bugfix: Frio - use "Help" instead of "Help And Documentation" as label in the nav user menu

7 years agoFrio: add "aria-describedby" to the field templates
rabuzarus [Tue, 3 Jan 2017 16:38:08 +0000 (17:38 +0100)]
Frio: add "aria-describedby" to the field templates

7 years agoFrio: implent switcher element
rabuzarus [Tue, 3 Jan 2017 16:33:01 +0000 (17:33 +0100)]
Frio: implent switcher element

7 years agoDE translations THX Rabuzarus
Tobias Diekershoff [Tue, 3 Jan 2017 09:42:11 +0000 (10:42 +0100)]
DE translations THX Rabuzarus

7 years agoMerge remote-tracking branch 'friendica/develop' into develop
Hypolite Petovan [Mon, 2 Jan 2017 22:11:05 +0000 (09:11 +1100)]
Merge remote-tracking branch 'friendica/develop' into develop

7 years agoMerge pull request #3060 from rabuzarus/20170102_-_frio_badge_z-index
Michael Vogel [Mon, 2 Jan 2017 17:16:49 +0000 (18:16 +0100)]
Merge pull request #3060 from rabuzarus/20170102_-_frio_badge_z-index

Bugfix: Frio css - add z-index to badges

7 years agoBugfix: Frio css - add z-index to badges
rabuzarus [Mon, 2 Jan 2017 12:38:10 +0000 (13:38 +0100)]
Bugfix: Frio css - add z-index to badges

7 years agoMerge pull request #3059 from tobiasd/20170102-lang
Michael Vogel [Mon, 2 Jan 2017 09:37:56 +0000 (10:37 +0100)]
Merge pull request #3059 from tobiasd/20170102-lang

DE / ES update of the translation