]> git.mxchange.org Git - friendica.git/log
friendica.git
7 years agoMerge pull request #2790 from gerhard6380/develop
Tobias Diekershoff [Wed, 28 Sep 2016 06:11:20 +0000 (08:11 +0200)]
Merge pull request #2790 from gerhard6380/develop

New API /api/friendica/profile/show

7 years agoMerge pull request #2802 from annando/xmpp-profile
Tobias Diekershoff [Tue, 27 Sep 2016 18:57:56 +0000 (20:57 +0200)]
Merge pull request #2802 from annando/xmpp-profile

New fields for the DFRN protocol (XMPP and Account Type)

7 years agoDocumentation added
Michael Vogel [Tue, 27 Sep 2016 18:29:50 +0000 (18:29 +0000)]
Documentation added

7 years ago"Company" is now "Organisation" and there is an auto update
Michael Vogel [Mon, 26 Sep 2016 19:35:01 +0000 (19:35 +0000)]
"Company" is now "Organisation" and there is an auto update

7 years agoWe are now having an account type and are publishing it
Michael Vogel [Sun, 25 Sep 2016 20:37:27 +0000 (20:37 +0000)]
We are now having an account type and are publishing it

7 years agoremove parameter from doxygen description
gerhard6380 [Sun, 25 Sep 2016 20:25:59 +0000 (22:25 +0200)]
remove parameter from doxygen description

7 years agoanother correction of spaces
gerhard6380 [Sun, 25 Sep 2016 16:52:59 +0000 (18:52 +0200)]
another correction of spaces

7 years agochange spaces/tabstopps
gerhard6380 [Sun, 25 Sep 2016 16:50:08 +0000 (18:50 +0200)]
change spaces/tabstopps

7 years agocorrect some spaces/tabs
gerhard6380 [Sun, 25 Sep 2016 16:45:00 +0000 (18:45 +0200)]
correct some spaces/tabs

7 years agocorrect tab indents and CRLF
gerhard6380 [Sun, 25 Sep 2016 16:22:42 +0000 (18:22 +0200)]
correct tab indents and CRLF

7 years agoThe XMPP address is now in the profile and will be transmitted
Michael Vogel [Sun, 25 Sep 2016 15:28:00 +0000 (15:28 +0000)]
The XMPP address is now in the profile and will be transmitted

7 years agoMerge pull request #2797 from tobiasd/20160924-de
rabuzarus [Sat, 24 Sep 2016 12:51:16 +0000 (14:51 +0200)]
Merge pull request #2797 from tobiasd/20160924-de

DE update to the translation

7 years agoDE update to the translation
Tobias Diekershoff [Sat, 24 Sep 2016 12:16:58 +0000 (14:16 +0200)]
DE update to the translation

7 years agoMerge pull request #2795 from tobiasd/20160924-fr
rabuzarus [Sat, 24 Sep 2016 07:52:33 +0000 (09:52 +0200)]
Merge pull request #2795 from tobiasd/20160924-fr

FR update to the strings, THX Hypolite Petovan

7 years agoMerge pull request #2796 from tobiasd/20160924-msg
rabuzarus [Sat, 24 Sep 2016 07:52:15 +0000 (09:52 +0200)]
Merge pull request #2796 from tobiasd/20160924-msg

regenerated messages.po to fix typos

7 years agoregenerated messages.po to fix typos
Tobias Diekershoff [Sat, 24 Sep 2016 07:45:44 +0000 (09:45 +0200)]
regenerated messages.po to fix typos

7 years agoFR update to the strings, THX Hypolite Petovan
Tobias Diekershoff [Sat, 24 Sep 2016 07:35:23 +0000 (09:35 +0200)]
FR update to the strings, THX Hypolite Petovan

7 years agoMerge pull request #2794 from tobiasd/20160924-typos
rabuzarus [Sat, 24 Sep 2016 06:50:12 +0000 (08:50 +0200)]
Merge pull request #2794 from tobiasd/20160924-typos

correction of typos

7 years agocorrection of typos
Tobias Diekershoff [Sat, 24 Sep 2016 06:08:04 +0000 (08:08 +0200)]
correction of typos

7 years agocorrection of typos
Tobias Diekershoff [Sat, 24 Sep 2016 06:07:48 +0000 (08:07 +0200)]
correction of typos

7 years agoMerge branch 'develop' of https://github.com/gerhard6380/friendica into develop
gerhard6380 [Fri, 23 Sep 2016 17:38:57 +0000 (19:38 +0200)]
Merge branch 'develop' of https://github.com/gerhard6380/friendica into develop

7 years agoMerge remote-tracking branch 'upstream/develop' into develop
gerhard6380 [Fri, 23 Sep 2016 17:34:57 +0000 (19:34 +0200)]
Merge remote-tracking branch 'upstream/develop' into develop

7 years agoChange API documentation to contain new API call /api/friendica/profile/show
gerhard6380 [Fri, 23 Sep 2016 17:26:44 +0000 (19:26 +0200)]
Change API documentation to contain new API call /api/friendica/profile/show

7 years agoNew API /api/friendica/profile/show to return data of all profiles a user has to...
gerhard6380 [Fri, 23 Sep 2016 17:06:41 +0000 (19:06 +0200)]
New API /api/friendica/profile/show to return data of all profiles a user has to a client

7 years agoMerge pull request #2789 from annando/1609-escaping
Tobias Diekershoff [Fri, 23 Sep 2016 06:46:02 +0000 (08:46 +0200)]
Merge pull request #2789 from annando/1609-escaping

Special characters should be escaped

7 years agoAt the search we should do it as well.
Michael Vogel [Fri, 23 Sep 2016 06:36:48 +0000 (06:36 +0000)]
At the search we should do it as well.

7 years agoSpecial characters should be escaped
Michael Vogel [Fri, 23 Sep 2016 06:29:02 +0000 (06:29 +0000)]
Special characters should be escaped

7 years agoMerge pull request #2787 from annando/1609-xmpp-auth
Tobias Diekershoff [Thu, 22 Sep 2016 21:28:46 +0000 (23:28 +0200)]
Merge pull request #2787 from annando/1609-xmpp-auth

Reworked ejabberd authentification

7 years agochanging gitignore
gerhard6380 [Thu, 22 Sep 2016 20:08:24 +0000 (22:08 +0200)]
changing gitignore

7 years agoMerge branch 'master'
gerhard6380 [Thu, 22 Sep 2016 19:59:51 +0000 (21:59 +0200)]
Merge branch 'master'

7 years agoadd Visual Studio special files to gitignore
gerhard6380 [Thu, 22 Sep 2016 19:55:16 +0000 (21:55 +0200)]
add Visual Studio special files to gitignore

7 years agoMerge pull request #2788 from tobiasd/20160922-de
Michael Vogel [Thu, 22 Sep 2016 18:23:15 +0000 (20:23 +0200)]
Merge pull request #2788 from tobiasd/20160922-de

DE update to the translation

7 years agoSome additional beautification
Michael Vogel [Thu, 22 Sep 2016 18:18:26 +0000 (18:18 +0000)]
Some additional beautification

7 years agoThe string is an array ...
Michael Vogel [Thu, 22 Sep 2016 18:07:32 +0000 (18:07 +0000)]
The string is an array ...

7 years agoDE update to the translation
Tobias Diekershoff [Thu, 22 Sep 2016 10:37:39 +0000 (12:37 +0200)]
DE update to the translation

7 years agoReworked ejabberd authentification
Michael Vogel [Thu, 22 Sep 2016 02:57:40 +0000 (02:57 +0000)]
Reworked ejabberd authentification

7 years agoMerge pull request #2785 from tobiasd/20160921-msg
Michael Vogel [Wed, 21 Sep 2016 12:29:45 +0000 (14:29 +0200)]
Merge pull request #2785 from tobiasd/20160921-msg

regenerated messages.po

7 years agoMerge pull request #2784 from tobiasd/20160921-ptbr
Michael Vogel [Wed, 21 Sep 2016 12:29:23 +0000 (14:29 +0200)]
Merge pull request #2784 from tobiasd/20160921-ptbr

PT BR update to the strings

7 years agoregenerated messages.po
Tobias Diekershoff [Wed, 21 Sep 2016 10:13:32 +0000 (12:13 +0200)]
regenerated messages.po

7 years agoPT BR update to the strings
Tobias Diekershoff [Wed, 21 Sep 2016 09:44:01 +0000 (11:44 +0200)]
PT BR update to the strings

7 years agoMerge pull request #2782 from tobiasd/20160920-adm
Michael Vogel [Tue, 20 Sep 2016 17:25:45 +0000 (19:25 +0200)]
Merge pull request #2782 from tobiasd/20160920-adm

Show the worker queue count if the workers are active

7 years agoMerge pull request #2783 from tobiasd/20160920-license
Michael Vogel [Tue, 20 Sep 2016 17:24:05 +0000 (19:24 +0200)]
Merge pull request #2783 from tobiasd/20160920-license

it is 2016 by now

7 years agoit is 2016 by now
Tobias Diekershoff [Tue, 20 Sep 2016 14:57:18 +0000 (16:57 +0200)]
it is 2016 by now

7 years agoShow the worker queue count if the workers are active
Tobias Diekershoff [Tue, 20 Sep 2016 13:45:55 +0000 (15:45 +0200)]
Show the worker queue count if the workers are active

7 years agoMerge pull request #2779 from tobiasd/20160913-admin
Michael Vogel [Wed, 14 Sep 2016 05:00:38 +0000 (07:00 +0200)]
Merge pull request #2779 from tobiasd/20160913-admin

display current state of PHP logging in admin panel logging informations

7 years agoThe info is not that important
Tobias Diekershoff [Wed, 14 Sep 2016 04:45:05 +0000 (06:45 +0200)]
The info is not that important

7 years agoMerge pull request #2778 from annando/1609-xmpp-auth
Tobias Diekershoff [Tue, 13 Sep 2016 21:04:34 +0000 (23:04 +0200)]
Merge pull request #2778 from annando/1609-xmpp-auth

XMPP authentification for multi domain systems

7 years agodisplay current state of PHP logging in admin panel logging informations
Tobias Diekershoff [Tue, 13 Sep 2016 20:52:21 +0000 (22:52 +0200)]
display current state of PHP logging in admin panel logging informations

7 years agoXMPP authentification for multi domain systems
Michael Vogel [Tue, 13 Sep 2016 20:29:47 +0000 (20:29 +0000)]
XMPP authentification for multi domain systems

7 years agoBump version
fabrixxm [Tue, 13 Sep 2016 16:52:29 +0000 (18:52 +0200)]
Bump version

7 years agoMerge branch 'master' into develop
fabrixxm [Tue, 13 Sep 2016 15:19:57 +0000 (17:19 +0200)]
Merge branch 'master' into develop

7 years agoFriendica 3.5
fabrixxm [Tue, 13 Sep 2016 14:46:11 +0000 (16:46 +0200)]
Friendica 3.5

7 years agoMerge pull request #2776 from tobiasd/20160913-installtxt
fabrixxm [Tue, 13 Sep 2016 13:48:23 +0000 (15:48 +0200)]
Merge pull request #2776 from tobiasd/20160913-installtxt

reflect requirements from install.md also in install.txt

7 years agoMerge pull request #2777 from tobiasd/20160916-fr
fabrixxm [Tue, 13 Sep 2016 13:48:07 +0000 (15:48 +0200)]
Merge pull request #2777 from tobiasd/20160916-fr

FR update to the strings, THX Damien Goutte-Gattat

7 years agoFR update to the strings, THX Damien Goutte-Gattat
Tobias Diekershoff [Tue, 13 Sep 2016 13:41:38 +0000 (15:41 +0200)]
FR update to the strings, THX Damien Goutte-Gattat

7 years agoreflect requirements from install.md also in install.txt
Tobias Diekershoff [Tue, 13 Sep 2016 12:49:21 +0000 (14:49 +0200)]
reflect requirements from install.md also in install.txt

7 years agoMerge pull request #2768 from tobiasd/20160906-changes
Michael Vogel [Mon, 12 Sep 2016 05:56:08 +0000 (07:56 +0200)]
Merge pull request #2768 from tobiasd/20160906-changes

changes since 3.4.3

7 years agomissing bracket
Tobias Diekershoff [Sun, 11 Sep 2016 06:03:12 +0000 (08:03 +0200)]
missing bracket

7 years agowork on forumdirectory
Tobias Diekershoff [Fri, 9 Sep 2016 21:22:59 +0000 (23:22 +0200)]
work on forumdirectory

7 years agoMerge pull request #2774 from annando/1609-worker-processes
Tobias Diekershoff [Fri, 9 Sep 2016 21:14:02 +0000 (23:14 +0200)]
Merge pull request #2774 from annando/1609-worker-processes

New process table for a better detection of running workers

7 years agoRestructured the way, processes are inserted and removed
Michael Vogel [Fri, 9 Sep 2016 20:55:49 +0000 (20:55 +0000)]
Restructured the way, processes are inserted and removed

7 years agoNew process table for a better detection of running workers
Michael Vogel [Fri, 9 Sep 2016 20:33:54 +0000 (20:33 +0000)]
New process table for a better detection of running workers

7 years agotwo more issues closed
Tobias Diekershoff [Fri, 9 Sep 2016 10:06:21 +0000 (12:06 +0200)]
two more issues closed

7 years agoMerge pull request #2771 from rabuzarus/0709-frio-dropItem-fix
Michael Vogel [Wed, 7 Sep 2016 04:53:53 +0000 (06:53 +0200)]
Merge pull request #2771 from rabuzarus/0709-frio-dropItem-fix

frio: fix dropItem() didn't work for hubzila posts

7 years agofrio: fix dropItem() didn't work for hubzila posts
rabuzarus [Wed, 7 Sep 2016 01:22:02 +0000 (03:22 +0200)]
frio: fix dropItem() didn't work for hubzila posts

7 years agoMerge branch '3.5rc' of https://github.com/friendica/friendica into 20160906-changes
Tobias Diekershoff [Tue, 6 Sep 2016 19:52:33 +0000 (21:52 +0200)]
Merge branch '3.5rc' of https://github.com/friendica/friendica into 20160906-changes

7 years agoMerge pull request #2770 from annando/sql-default-value
Tobias Diekershoff [Tue, 6 Sep 2016 19:37:28 +0000 (21:37 +0200)]
Merge pull request #2770 from annando/sql-default-value

No "NOT NULL" for text fields in database

7 years agoMerge remote-tracking branch 'upstream/3.5rc' into sql-default-value
Michael Vogel [Tue, 6 Sep 2016 19:10:57 +0000 (19:10 +0000)]
Merge remote-tracking branch 'upstream/3.5rc' into sql-default-value

7 years agoMerge pull request #2767 from tobiasd/20160906-credits
Michael Vogel [Tue, 6 Sep 2016 19:04:26 +0000 (21:04 +0200)]
Merge pull request #2767 from tobiasd/20160906-credits

new contributor to the docs

7 years agoNew database version
Michael Vogel [Tue, 6 Sep 2016 19:01:05 +0000 (19:01 +0000)]
New database version

7 years agoMerge pull request #2769 from rabuzarus/0609-frio-attachment
Tobias Diekershoff [Tue, 6 Sep 2016 14:33:31 +0000 (16:33 +0200)]
Merge pull request #2769 from rabuzarus/0609-frio-attachment

frio: show attachment icons in posts

7 years agofrio: show attachment icons in posts
rabuzarus [Tue, 6 Sep 2016 14:21:14 +0000 (16:21 +0200)]
frio: show attachment icons in posts

7 years agoone missing issue
Tobias Diekershoff [Tue, 6 Sep 2016 06:39:47 +0000 (08:39 +0200)]
one missing issue

7 years agochanges since 3.4.2
Tobias Diekershoff [Tue, 6 Sep 2016 06:36:47 +0000 (08:36 +0200)]
changes since 3.4.2

7 years agonew contributor to the docs
Tobias Diekershoff [Tue, 6 Sep 2016 06:30:15 +0000 (08:30 +0200)]
new contributor to the docs

7 years agoMerge remote-tracking branch 'upstream/3.5rc' into sql-default-value
Michael Vogel [Mon, 5 Sep 2016 11:52:41 +0000 (11:52 +0000)]
Merge remote-tracking branch 'upstream/3.5rc' into sql-default-value

7 years agoMerge pull request #2765 from annando/1609-attachments
rabuzarus [Mon, 5 Sep 2016 10:50:31 +0000 (12:50 +0200)]
Merge pull request #2765 from annando/1609-attachments

Attachments are now displayed again.

7 years agoMerge pull request #2766 from ben-utzer/patch-1
Michael Vogel [Mon, 5 Sep 2016 03:18:21 +0000 (05:18 +0200)]
Merge pull request #2766 from ben-utzer/patch-1

Update htconfig.md

7 years agoUpdate htconfig.md
ben-utzer [Sun, 4 Sep 2016 22:22:39 +0000 (00:22 +0200)]
Update htconfig.md

typo, siehe auch https://github.com/friendica/friendica/pull/2754

7 years agoAttachments are now displayed again.
Michael Vogel [Sun, 4 Sep 2016 16:06:07 +0000 (18:06 +0200)]
Attachments are now displayed again.

7 years agoMerge pull request #2760 from gerhard6380/3.5rc
Michael Vogel [Sat, 3 Sep 2016 18:47:52 +0000 (20:47 +0200)]
Merge pull request #2760 from gerhard6380/3.5rc

API: change friendica_activities to include arrays of users

7 years agosQL: No "NOT NULL" on text fields.
Michael Vogel [Sat, 3 Sep 2016 15:06:42 +0000 (15:06 +0000)]
sQL: No "NOT NULL" on text fields.

7 years agoMerge pull request #2762 from annando/1609-tagged
rabuzarus [Sat, 3 Sep 2016 11:06:43 +0000 (13:06 +0200)]
Merge pull request #2762 from annando/1609-tagged

The "tagged with" message now works again.

7 years agoThe "tagged with" message now works again.
Michael Vogel [Sat, 3 Sep 2016 10:48:51 +0000 (12:48 +0200)]
The "tagged with" message now works again.

7 years agoAPI: change friendica_activities to include arrays of users
gerhard6380 [Fri, 2 Sep 2016 15:01:52 +0000 (17:01 +0200)]
API: change friendica_activities to include arrays of users

7 years agoMerge pull request #2758 from annando/1609-sql-charset
Tobias Diekershoff [Thu, 1 Sep 2016 07:22:07 +0000 (09:22 +0200)]
Merge pull request #2758 from annando/1609-sql-charset

Set the charset for the SQL connection for new installations

7 years agoSet the PHP requirements to php 5.4
Michael Vogel [Thu, 1 Sep 2016 06:47:36 +0000 (06:47 +0000)]
Set the PHP requirements to php 5.4

7 years agoAdd the new charset parameter to the database creation
Michael Vogel [Thu, 1 Sep 2016 04:44:29 +0000 (04:44 +0000)]
Add the new charset parameter to the database creation

7 years agoSet the charset for the SQL connection for new installations
Michael Vogel [Thu, 1 Sep 2016 03:50:41 +0000 (03:50 +0000)]
Set the charset for the SQL connection for new installations

7 years agoMerge pull request #2748 from rabuzarus/rabuzarus-pending
Tobias Diekershoff [Wed, 31 Aug 2016 13:55:26 +0000 (15:55 +0200)]
Merge pull request #2748 from rabuzarus/rabuzarus-pending

best_link_url: don't use redirect for pending contacts

7 years agoMerge pull request #2755 from rabuzarus/theme-init-identity
Tobias Diekershoff [Wed, 31 Aug 2016 13:53:42 +0000 (15:53 +0200)]
Merge pull request #2755 from rabuzarus/theme-init-identity

fix theme loading

7 years agoUpdate identity.php
rabuzarus [Wed, 31 Aug 2016 11:49:24 +0000 (13:49 +0200)]
Update identity.php

7 years agoMerge pull request #2753 from annando/1608-sql-errors
rabuzarus [Mon, 29 Aug 2016 20:24:37 +0000 (22:24 +0200)]
Merge pull request #2753 from annando/1608-sql-errors

Bugfix: Fixed two bad sql queries

7 years agoBugfix: Fixed two bad sql queries
Michael Vogel [Mon, 29 Aug 2016 18:40:40 +0000 (18:40 +0000)]
Bugfix: Fixed two bad sql queries

7 years agoMerge pull request #2750 from annando/1608-worker-priority-again
rabuzarus [Sat, 27 Aug 2016 22:39:58 +0000 (00:39 +0200)]
Merge pull request #2750 from annando/1608-worker-priority-again

Prevent lowest priority calls from never being called

7 years agoMerge pull request #2749 from annando/1608-dbstructure
rabuzarus [Sat, 27 Aug 2016 22:39:15 +0000 (00:39 +0200)]
Merge pull request #2749 from annando/1608-dbstructure

dbstructure: Set the version when updating manually

7 years agoPrevent lowest priority calls from never being called
Michael Vogel [Sat, 27 Aug 2016 21:05:38 +0000 (21:05 +0000)]
Prevent lowest priority calls from never being called

7 years agoRemoved some accidentally written code
Michael Vogel [Sat, 27 Aug 2016 17:53:09 +0000 (19:53 +0200)]
Removed some accidentally written code

7 years agodbstructure: Set the version when updating manually
Michael Vogel [Sat, 27 Aug 2016 17:50:19 +0000 (19:50 +0200)]
dbstructure: Set the version when updating manually

7 years agobest_link_url: don't use redirect for pending contacts
rabuzarus [Fri, 26 Aug 2016 13:47:45 +0000 (15:47 +0200)]
best_link_url: don't use redirect for pending contacts