]>
git.mxchange.org Git - friendica.git/log
gerhard6380 [Sun, 25 Sep 2016 16:45:00 +0000 (18:45 +0200)]
correct some spaces/tabs
gerhard6380 [Sun, 25 Sep 2016 16:22:42 +0000 (18:22 +0200)]
correct tab indents and CRLF
gerhard6380 [Fri, 23 Sep 2016 17:38:57 +0000 (19:38 +0200)]
Merge branch 'develop' of https://github.com/gerhard6380/friendica into develop
gerhard6380 [Fri, 23 Sep 2016 17:34:57 +0000 (19:34 +0200)]
Merge remote-tracking branch 'upstream/develop' into develop
gerhard6380 [Fri, 23 Sep 2016 17:26:44 +0000 (19:26 +0200)]
Change API documentation to contain new API call /api/friendica/profile/show
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
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
Michael Vogel [Fri, 23 Sep 2016 06:36:48 +0000 (06:36 +0000)]
At the search we should do it as well.
Michael Vogel [Fri, 23 Sep 2016 06:29:02 +0000 (06:29 +0000)]
Special characters should be escaped
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
gerhard6380 [Thu, 22 Sep 2016 20:08:24 +0000 (22:08 +0200)]
changing gitignore
gerhard6380 [Thu, 22 Sep 2016 19:59:51 +0000 (21:59 +0200)]
Merge branch 'master'
gerhard6380 [Thu, 22 Sep 2016 19:55:16 +0000 (21:55 +0200)]
add Visual Studio special files to gitignore
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
Michael Vogel [Thu, 22 Sep 2016 18:18:26 +0000 (18:18 +0000)]
Some additional beautification
Michael Vogel [Thu, 22 Sep 2016 18:07:32 +0000 (18:07 +0000)]
The string is an array ...
Tobias Diekershoff [Thu, 22 Sep 2016 10:37:39 +0000 (12:37 +0200)]
DE update to the translation
Michael Vogel [Thu, 22 Sep 2016 02:57:40 +0000 (02:57 +0000)]
Reworked ejabberd authentification
Michael Vogel [Wed, 21 Sep 2016 12:29:45 +0000 (14:29 +0200)]
Merge pull request #2785 from tobiasd/
20160921-msg
regenerated messages.po
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
Tobias Diekershoff [Wed, 21 Sep 2016 10:13:32 +0000 (12:13 +0200)]
regenerated messages.po
Tobias Diekershoff [Wed, 21 Sep 2016 09:44:01 +0000 (11:44 +0200)]
PT BR update to the strings
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
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
Tobias Diekershoff [Tue, 20 Sep 2016 14:57:18 +0000 (16:57 +0200)]
it is 2016 by now
Tobias Diekershoff [Tue, 20 Sep 2016 13:45:55 +0000 (15:45 +0200)]
Show the worker queue count if the workers are active
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
Tobias Diekershoff [Wed, 14 Sep 2016 04:45:05 +0000 (06:45 +0200)]
The info is not that important
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
Tobias Diekershoff [Tue, 13 Sep 2016 20:52:21 +0000 (22:52 +0200)]
display current state of PHP logging in admin panel logging informations
Michael Vogel [Tue, 13 Sep 2016 20:29:47 +0000 (20:29 +0000)]
XMPP authentification for multi domain systems
fabrixxm [Tue, 13 Sep 2016 16:52:29 +0000 (18:52 +0200)]
Bump version
fabrixxm [Tue, 13 Sep 2016 15:19:57 +0000 (17:19 +0200)]
Merge branch 'master' into develop
fabrixxm [Tue, 13 Sep 2016 14:46:11 +0000 (16:46 +0200)]
Friendica 3.5
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
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
Tobias Diekershoff [Tue, 13 Sep 2016 13:41:38 +0000 (15:41 +0200)]
FR update to the strings, THX Damien Goutte-Gattat
Tobias Diekershoff [Tue, 13 Sep 2016 12:49:21 +0000 (14:49 +0200)]
reflect requirements from install.md also in install.txt
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
Tobias Diekershoff [Sun, 11 Sep 2016 06:03:12 +0000 (08:03 +0200)]
missing bracket
Tobias Diekershoff [Fri, 9 Sep 2016 21:22:59 +0000 (23:22 +0200)]
work on forumdirectory
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
Michael Vogel [Fri, 9 Sep 2016 20:55:49 +0000 (20:55 +0000)]
Restructured the way, processes are inserted and removed
Michael Vogel [Fri, 9 Sep 2016 20:33:54 +0000 (20:33 +0000)]
New process table for a better detection of running workers
Tobias Diekershoff [Fri, 9 Sep 2016 10:06:21 +0000 (12:06 +0200)]
two more issues closed
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
rabuzarus [Wed, 7 Sep 2016 01:22:02 +0000 (03:22 +0200)]
frio: fix dropItem() didn't work for hubzila posts
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
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
Michael Vogel [Tue, 6 Sep 2016 19:10:57 +0000 (19:10 +0000)]
Merge remote-tracking branch 'upstream/3.5rc' into sql-default-value
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
Michael Vogel [Tue, 6 Sep 2016 19:01:05 +0000 (19:01 +0000)]
New database version
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
rabuzarus [Tue, 6 Sep 2016 14:21:14 +0000 (16:21 +0200)]
frio: show attachment icons in posts
Tobias Diekershoff [Tue, 6 Sep 2016 06:39:47 +0000 (08:39 +0200)]
one missing issue
Tobias Diekershoff [Tue, 6 Sep 2016 06:36:47 +0000 (08:36 +0200)]
changes since 3.4.2
Tobias Diekershoff [Tue, 6 Sep 2016 06:30:15 +0000 (08:30 +0200)]
new contributor to the docs
Michael Vogel [Mon, 5 Sep 2016 11:52:41 +0000 (11:52 +0000)]
Merge remote-tracking branch 'upstream/3.5rc' into sql-default-value
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.
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
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
Michael Vogel [Sun, 4 Sep 2016 16:06:07 +0000 (18:06 +0200)]
Attachments are now displayed again.
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
Michael Vogel [Sat, 3 Sep 2016 15:06:42 +0000 (15:06 +0000)]
sQL: No "NOT NULL" on text fields.
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.
Michael Vogel [Sat, 3 Sep 2016 10:48:51 +0000 (12:48 +0200)]
The "tagged with" message now works again.
gerhard6380 [Fri, 2 Sep 2016 15:01:52 +0000 (17:01 +0200)]
API: change friendica_activities to include arrays of users
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
Michael Vogel [Thu, 1 Sep 2016 06:47:36 +0000 (06:47 +0000)]
Set the PHP requirements to php 5.4
Michael Vogel [Thu, 1 Sep 2016 04:44:29 +0000 (04:44 +0000)]
Add the new charset parameter to the database creation
Michael Vogel [Thu, 1 Sep 2016 03:50:41 +0000 (03:50 +0000)]
Set the charset for the SQL connection for new installations
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
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
rabuzarus [Wed, 31 Aug 2016 11:49:24 +0000 (13:49 +0200)]
Update identity.php
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
Michael Vogel [Mon, 29 Aug 2016 18:40:40 +0000 (18:40 +0000)]
Bugfix: Fixed two bad sql queries
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
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
Michael Vogel [Sat, 27 Aug 2016 21:05:38 +0000 (21:05 +0000)]
Prevent lowest priority calls from never being called
Michael Vogel [Sat, 27 Aug 2016 17:53:09 +0000 (19:53 +0200)]
Removed some accidentally written code
Michael Vogel [Sat, 27 Aug 2016 17:50:19 +0000 (19:50 +0200)]
dbstructure: Set the version when updating manually
rabuzarus [Fri, 26 Aug 2016 13:47:45 +0000 (15:47 +0200)]
best_link_url: don't use redirect for pending contacts
Tobias Diekershoff [Tue, 23 Aug 2016 15:23:38 +0000 (17:23 +0200)]
Merge pull request #2747 from rabuzarus/2308-frio_autosize
frio: resize textareas on typing.
rabuzarus [Tue, 23 Aug 2016 14:48:13 +0000 (16:48 +0200)]
frio: resize textareas on typing.
Tobias Diekershoff [Tue, 23 Aug 2016 05:52:35 +0000 (07:52 +0200)]
Merge pull request #2746 from annando/1608-diaspora-handle-lowercase
The handle for Diaspora contacts must always be low…
Michael Vogel [Tue, 23 Aug 2016 05:48:48 +0000 (07:48 +0200)]
The handle (user@domain.tld) for Diaspora contacts must always be lowercase
Tobias Diekershoff [Tue, 23 Aug 2016 05:48:18 +0000 (07:48 +0200)]
Merge pull request #2745 from annando/1608-atachments
Bugfix: Handle attachments with bbcode inside/handle the [p] bbcode
Michael Vogel [Tue, 23 Aug 2016 05:40:16 +0000 (07:40 +0200)]
Bugfix: Handle attachments with bbcode inside/handle the [p] bbcode
Michael Vogel [Tue, 23 Aug 2016 04:31:49 +0000 (06:31 +0200)]
Merge pull request #2744 from tobiasd/
20160820-cal
events with no finish should not export it to ical
Michael Vogel [Tue, 23 Aug 2016 04:30:17 +0000 (06:30 +0200)]
Merge pull request #2743 from tobiasd/
20160819-credits
updated the credits
Tobias Diekershoff [Sat, 20 Aug 2016 14:16:19 +0000 (16:16 +0200)]
events with no finish should not export it to ical
Tobias Diekershoff [Fri, 19 Aug 2016 10:38:45 +0000 (12:38 +0200)]
updated the credits
Tobias Diekershoff [Fri, 19 Aug 2016 05:19:32 +0000 (07:19 +0200)]
Merge pull request #2742 from annando/1608-priority-rearranges
New priority level for stale processes
Michael Vogel [Thu, 18 Aug 2016 10:33:17 +0000 (12:33 +0200)]
New priority level for stale processes.
Tobias Diekershoff [Wed, 17 Aug 2016 14:58:00 +0000 (16:58 +0200)]
Merge pull request #2741 from rabuzarus/1708-frio_fix_contact_edit_delete
fix contact dropping on contact edit page also for other themes
rabuzarus [Wed, 17 Aug 2016 14:51:04 +0000 (16:51 +0200)]
fix contact dropping on contact edit page also for other themes
Tobias Diekershoff [Wed, 17 Aug 2016 13:29:37 +0000 (15:29 +0200)]
Merge pull request #2740 from rabuzarus/1708-frio_fix_contact_edit_delete
frio: fix contact dropping on contact edit page
rabuzarus [Wed, 17 Aug 2016 12:32:43 +0000 (14:32 +0200)]
frio: fix contact dropping on contact edit page
Tobias Diekershoff [Wed, 17 Aug 2016 05:37:33 +0000 (07:37 +0200)]
Merge pull request #2739 from annando/1608-session-close
Only close the session if it had been opened.
Michael Vogel [Tue, 16 Aug 2016 19:35:12 +0000 (21:35 +0200)]
Only close the session if it had been opened.
projects / friendica.git / log