]> git.mxchange.org Git - friendica.git/log
friendica.git
10 years agoMerge pull request #900 from annando/master
tobiasd [Sun, 19 Jan 2014 06:23:59 +0000 (22:23 -0800)]
Merge pull request #900 from annando/master

Beautifiying export of shared posts to other networks

10 years agoBeautifiying export of shared posts to other networks
Michael Vogel [Sat, 18 Jan 2014 20:32:14 +0000 (21:32 +0100)]
Beautifiying export of shared posts to other networks

10 years agoMerge pull request #890 from tobiasd/bbcode_in_registertext
fabrixxm [Sat, 18 Jan 2014 09:02:02 +0000 (01:02 -0800)]
Merge pull request #890 from tobiasd/bbcode_in_registertext

add bbcode support for the page register textfield (close #871)

10 years agoMerge pull request #891 from tobiasd/check_http_in_homepage
fabrixxm [Sat, 18 Jan 2014 08:59:17 +0000 (00:59 -0800)]
Merge pull request #891 from tobiasd/check_http_in_homepage

added a check for http in homepage url, this should fix issue #768

10 years agoMerge pull request #896 from annando/master
fabrixxm [Sat, 18 Jan 2014 08:57:46 +0000 (00:57 -0800)]
Merge pull request #896 from annando/master

API and Diaspora posting connector

10 years agored# links to redmatrix.me
tobiasd [Fri, 17 Jan 2014 08:25:52 +0000 (09:25 +0100)]
red# links to redmatrix.me

10 years agoIS: update to the update_fail_eml template
Tobias Diekershoff [Thu, 16 Jan 2014 09:55:31 +0000 (10:55 +0100)]
IS: update to the update_fail_eml template

10 years agoAPI: New function "conversation/show" - this is an unoffical Twitter command
Michael Vogel [Wed, 15 Jan 2014 19:35:34 +0000 (20:35 +0100)]
API: New function "conversation/show" - this is an unoffical Twitter command

10 years agoUpdate messages.po
fabrixxm [Tue, 14 Jan 2014 09:11:06 +0000 (10:11 +0100)]
Update messages.po

10 years agoAPI: Some more stuff to make the API more complete (compared to the original Twitter...
Michael Vogel [Mon, 13 Jan 2014 19:03:05 +0000 (20:03 +0100)]
API: Some more stuff to make the API more complete (compared to the original Twitter API)

10 years agoMerge remote-tracking branch 'upstream/master'
Michael Vogel [Mon, 13 Jan 2014 18:59:34 +0000 (19:59 +0100)]
Merge remote-tracking branch 'upstream/master'

Conflicts:
include/acl_selectors.php

10 years agoNew network constant for the Diaspora posting connector.
Michael Vogel [Mon, 13 Jan 2014 18:57:15 +0000 (19:57 +0100)]
New network constant for the Diaspora posting connector.

10 years agoremoved copy and paste leftover
Tobias Diekershoff [Mon, 13 Jan 2014 13:49:49 +0000 (14:49 +0100)]
removed copy and paste leftover

10 years agoremoved copy and paste leftover
Tobias Diekershoff [Mon, 13 Jan 2014 13:45:37 +0000 (14:45 +0100)]
removed copy and paste leftover

10 years agomove <div> to the register.tpl
Tobias Diekershoff [Mon, 13 Jan 2014 13:40:26 +0000 (14:40 +0100)]
move <div> to the register.tpl

10 years agobetter logic
Tobias Diekershoff [Mon, 13 Jan 2014 13:25:50 +0000 (14:25 +0100)]
better logic

10 years agoMerge pull request #894 from tobiasd/diabook_rememberme
tobiasd [Mon, 13 Jan 2014 07:49:43 +0000 (23:49 -0800)]
Merge pull request #894 from tobiasd/diabook_rememberme

added remember me checkbox to diabook login template

10 years agoadded remember me checkbox to diabook login template
Tobias Diekershoff [Mon, 13 Jan 2014 07:48:19 +0000 (08:48 +0100)]
added remember me checkbox to diabook login template

10 years agoAvoiding a warning in the error.log
Michael Vogel [Mon, 13 Jan 2014 06:49:10 +0000 (07:49 +0100)]
Avoiding a warning in the error.log

10 years agoSome small bugfixes (mostly warnings) and little improvements to the log
Michael Vogel [Mon, 13 Jan 2014 00:34:54 +0000 (01:34 +0100)]
Some small bugfixes (mostly warnings) and little improvements to the log

10 years agoQuick fix: star and lock position on starred posts
Oliver [Sun, 12 Jan 2014 11:42:56 +0000 (12:42 +0100)]
Quick fix: star and lock position on starred posts

10 years agoadded a check for http in homepage url, this should fix issue #768
Tobias Diekershoff [Sun, 12 Jan 2014 08:16:46 +0000 (09:16 +0100)]
added a check for http in homepage url, this should fix issue #768

10 years agoadd bbcode support for the page register textfield (Bug #871)
Tobias Diekershoff [Sun, 12 Jan 2014 07:40:52 +0000 (08:40 +0100)]
add bbcode support for the page register textfield (Bug #871)

10 years agoFR: update to the strings
Tobias Diekershoff [Thu, 9 Jan 2014 07:37:10 +0000 (08:37 +0100)]
FR: update to the strings

10 years agoMerge pull request #888 from annando/master
fabrixxm [Wed, 8 Jan 2014 13:57:43 +0000 (05:57 -0800)]
Merge pull request #888 from annando/master

Some more API improvements

10 years agoAPI: Repeat and destroy now are returning the correct values. The user object now...
Michael Vogel [Wed, 8 Jan 2014 00:14:58 +0000 (01:14 +0100)]
API: Repeat and destroy now are returning the correct values. The user object now returns the contact id. Repeating of shared items now work.

10 years agoZH_CN: update to the strings
Tobias Diekershoff [Tue, 7 Jan 2014 07:36:41 +0000 (08:36 +0100)]
ZH_CN: update to the strings

10 years agoCS: update to the strings
Tobias Diekershoff [Tue, 7 Jan 2014 07:32:26 +0000 (08:32 +0100)]
CS: update to the strings

10 years agoMerge pull request #886 from fabrixxm/illegaloffset
fabrixxm [Mon, 6 Jan 2014 10:01:01 +0000 (02:01 -0800)]
Merge pull request #886 from fabrixxm/illegaloffset

acl_automention: fix warning in include/config.php

10 years agoacl_automention: fix warning in include/config.php
fabrixxm [Mon, 6 Jan 2014 09:58:39 +0000 (10:58 +0100)]
acl_automention: fix warning in include/config.php

10 years agorev update
tobiasd [Mon, 6 Jan 2014 06:36:57 +0000 (07:36 +0100)]
rev update

10 years agoMerge pull request #884 from annando/master
tobiasd [Mon, 6 Jan 2014 06:34:51 +0000 (22:34 -0800)]
Merge pull request #884 from annando/master

Notifications for new posts, API changes, several other things ...

10 years agoAPI: Bugfix that wrong contact data was sent
Michael Vogel [Sun, 5 Jan 2014 15:57:05 +0000 (16:57 +0100)]
API: Bugfix that wrong contact data was sent

10 years agoCleaning up some changes from the merge
Michael Vogel [Sun, 5 Jan 2014 15:28:42 +0000 (16:28 +0100)]
Cleaning up some changes from the merge

10 years agoMerge remote-tracking branch 'upstream/master'
Michael Vogel [Sun, 5 Jan 2014 15:22:42 +0000 (16:22 +0100)]
Merge remote-tracking branch 'upstream/master'

Conflicts:
mod/crepair.php

10 years agoAPI: Several improvements to make the api more compatible
Michael Vogel [Sun, 5 Jan 2014 15:12:03 +0000 (16:12 +0100)]
API: Several improvements to make the api more compatible

10 years agoSend notifications for each new post of a contact, option for creating a summary...
Michael Vogel [Sun, 5 Jan 2014 15:10:02 +0000 (16:10 +0100)]
Send notifications for each new post of a contact, option for creating a summary for a feed post

10 years agoMerge pull request #879 from fabrixxm/acl_automention
fabrixxm [Fri, 3 Jan 2014 15:00:39 +0000 (07:00 -0800)]
Merge pull request #879 from fabrixxm/acl_automention

acl automention: fix stupid typo...

10 years agoacl automention: fix stupid typo...
fabrixxm [Fri, 3 Jan 2014 14:17:46 +0000 (15:17 +0100)]
acl automention: fix stupid typo...

10 years agoMerge pull request #864 from fabrixxm/acl_automention
fabrixxm [Fri, 3 Jan 2014 14:09:12 +0000 (06:09 -0800)]
Merge pull request #864 from fabrixxm/acl_automention

Acl automention

10 years agoadd fetaure switch for acl-automention
fabrixxm [Fri, 3 Jan 2014 13:40:43 +0000 (14:40 +0100)]
add fetaure switch for acl-automention

10 years agorev update
tobiasd [Fri, 3 Jan 2014 09:02:17 +0000 (10:02 +0100)]
rev update

10 years agoMerge pull request #876 from annando/master
tobiasd [Fri, 3 Jan 2014 09:00:21 +0000 (01:00 -0800)]
Merge pull request #876 from annando/master

API: Show shared messages as repeated messages, improvements with nick names

10 years agoAPI: Show shared messages as repeated messages, improvements with nick names
Michael Vogel [Thu, 2 Jan 2014 21:29:44 +0000 (22:29 +0100)]
API: Show shared messages as repeated messages, improvements with nick names

10 years agoMerge pull request #875 from fabrixxm/fix_api
fabrixxm [Thu, 2 Jan 2014 18:16:05 +0000 (10:16 -0800)]
Merge pull request #875 from fabrixxm/fix_api

api: fix call-time pass-by-reference error

10 years agoapi: fix call-time pass-by-reference error
fabrixxm [Thu, 2 Jan 2014 18:12:26 +0000 (19:12 +0100)]
api: fix call-time pass-by-reference error

10 years agoDE: update to the strings
Tobias Diekershoff [Wed, 1 Jan 2014 10:31:05 +0000 (11:31 +0100)]
DE: update to the strings

10 years agoMerge pull request #873 from annando/master
tobiasd [Wed, 1 Jan 2014 09:30:11 +0000 (01:30 -0800)]
Merge pull request #873 from annando/master

API: Bugfix: Wrong contact ids with direct messages

10 years agoMerge pull request #874 from tobiasd/20131231
tobiasd [Tue, 31 Dec 2013 17:22:53 +0000 (09:22 -0800)]
Merge pull request #874 from tobiasd/20131231

 regenerated the util/message.po

10 years agoregenerated the util/message.po file so translations can get the new strings
Tobias Diekershoff [Tue, 31 Dec 2013 17:18:47 +0000 (18:18 +0100)]
regenerated the util/message.po file so translations can get the new strings

10 years agorev update
tobiasd [Tue, 31 Dec 2013 17:01:20 +0000 (18:01 +0100)]
rev update

10 years agoAPI: Sending direct messages now works again. Some more things to make Friendica...
Michael Vogel [Sun, 29 Dec 2013 16:54:37 +0000 (17:54 +0100)]
API: Sending direct messages now works again. Some more things to make Friendica work better with AndStatus

10 years agoAPI: Bugfix: Wrong contact ids with direct messages
Michael Vogel [Fri, 27 Dec 2013 13:11:13 +0000 (14:11 +0100)]
API: Bugfix: Wrong contact ids with direct messages

10 years agoMerge pull request #872 from annando/master
fabrixxm [Fri, 27 Dec 2013 08:15:44 +0000 (00:15 -0800)]
Merge pull request #872 from annando/master

API: Supporting twidere, better supporting of the network field in the item table

10 years agoBetter handling of the network field in the item table.
Michael Vogel [Fri, 27 Dec 2013 00:58:21 +0000 (01:58 +0100)]
Better handling of the network field in the item table.

10 years agoAPI: Supporting twidere
Michael Vogel [Fri, 27 Dec 2013 00:48:43 +0000 (01:48 +0100)]
API: Supporting twidere

10 years agoMerge pull request #866 from annando/master
fabrixxm [Thu, 26 Dec 2013 10:12:27 +0000 (02:12 -0800)]
Merge pull request #866 from annando/master

API: reworked

10 years agoMerge pull request #867 from tobiasd/remote_me_option
fabrixxm [Thu, 26 Dec 2013 10:02:21 +0000 (02:02 -0800)]
Merge pull request #867 from tobiasd/remote_me_option

remote_self as option

10 years agoAPI: Add the network name to the application name
Michael Vogel [Mon, 23 Dec 2013 13:06:53 +0000 (14:06 +0100)]
API: Add the network name to the application name

10 years agoonly show the remote_self option if admin allows it
Tobias Diekershoff [Sun, 22 Dec 2013 18:30:09 +0000 (19:30 +0100)]
only show the remote_self option if admin allows it

10 years agoadded remote_self as option to the contact repair dislog
Tobias Diekershoff [Sun, 22 Dec 2013 16:05:49 +0000 (17:05 +0100)]
added remote_self as option to the contact repair dislog

10 years agoadded option to the admin panel to allow users to set the remote_self flag
Tobias Diekershoff [Sun, 22 Dec 2013 15:14:34 +0000 (16:14 +0100)]
added option to the admin panel to allow users to set the remote_self flag

10 years agoPL: update to the strings
Tobias Diekershoff [Sat, 21 Dec 2013 15:32:06 +0000 (16:32 +0100)]
PL: update to the strings

10 years agoAPI: Added better error handling, make some more api calls similar to statusnet
Michael Vogel [Fri, 20 Dec 2013 22:07:11 +0000 (23:07 +0100)]
API: Added better error handling, make some more api calls similar to statusnet

10 years agoAPI: reply-to-Values should be all correct now. "since_id" now works with mails.
Michael Vogel [Thu, 19 Dec 2013 05:58:11 +0000 (06:58 +0100)]
API: reply-to-Values should be all correct now. "since_id" now works with mails.

10 years agofix textarea/tinymce, add contact id to mention
Fabrixxm [Wed, 18 Dec 2013 15:48:09 +0000 (10:48 -0500)]
fix textarea/tinymce, add contact id to mention

10 years agoacl selector add and remove mentions when a forum is selected.
Fabrixxm [Wed, 18 Dec 2013 15:17:38 +0000 (10:17 -0500)]
acl selector add and remove mentions when a forum is selected.

10 years agoMerge pull request #862 from fabrixxm/manage_contacts
fabrixxm [Wed, 18 Dec 2013 11:40:41 +0000 (03:40 -0800)]
Merge pull request #862 from fabrixxm/manage_contacts

change action container div class to id. fix bug in quattro theme

10 years agochange action container div class to id. fix bug in quattro theme
Fabrixxm [Wed, 18 Dec 2013 11:38:57 +0000 (06:38 -0500)]
change action container div class to id. fix bug in quattro theme

10 years agoMerge pull request #859 from fabrixxm/manage_contacts
fabrixxm [Wed, 18 Dec 2013 10:14:13 +0000 (02:14 -0800)]
Merge pull request #859 from fabrixxm/manage_contacts

Improvements in contact management

10 years agouser contacts: fix #797 , add searching in url and nickname, add batch actions
Fabrixxm [Tue, 17 Dec 2013 10:19:06 +0000 (05:19 -0500)]
user contacts: fix #797 , add searching in url and nickname, add batch actions

10 years agoAPI: API is reworked in many parts so that it should be compatible to more statusnet...
Michael Vogel [Sun, 15 Dec 2013 22:00:47 +0000 (23:00 +0100)]
API: API is reworked in many parts so that it should be compatible to more statusnet clients then before (like AndStatus)

10 years agoMerge pull request #853 from annando/master
tobiasd [Thu, 12 Dec 2013 07:23:30 +0000 (23:23 -0800)]
Merge pull request #853 from annando/master

Bugfix of the previous bugfix :)

10 years agoMerge pull request #854 from fabrixxm/issue-823
fabrixxm [Wed, 11 Dec 2013 10:29:37 +0000 (02:29 -0800)]
Merge pull request #854 from fabrixxm/issue-823

Add better support to small screen to duepuntozero theme.

10 years agoAdd better support to small screen to duepuntozero theme.
Fabrixxm [Wed, 11 Dec 2013 10:25:41 +0000 (05:25 -0500)]
Add better support to small screen to duepuntozero theme.
This close #823. It also add some styles for screens less than 960px.
It's not a mobile theme, but should be better to see in case.

10 years agoBugfix of the bugfix :)
Michael Vogel [Tue, 10 Dec 2013 20:16:13 +0000 (21:16 +0100)]
Bugfix of the bugfix :)

10 years agovier: Screenshot updated
Michael Vogel [Tue, 10 Dec 2013 19:56:50 +0000 (20:56 +0100)]
vier: Screenshot updated

10 years agoMerge pull request #852 from annando/master
tobiasd [Tue, 10 Dec 2013 15:30:26 +0000 (07:30 -0800)]
Merge pull request #852 from annando/master

Bugfix: Problem with page switching with the old pager solved

10 years agoBugfix: Problem with page switching with the old pager solved
Michael Vogel [Tue, 10 Dec 2013 14:45:26 +0000 (15:45 +0100)]
Bugfix: Problem with page switching with the old pager solved

10 years agoMerge pull request #851 from annando/master
tobiasd [Tue, 10 Dec 2013 10:22:18 +0000 (02:22 -0800)]
Merge pull request #851 from annando/master

Keeping an offset for page switching

10 years agoKeeping an offset for page switching: This helps so that you don't see old messages
Michael Vogel [Mon, 9 Dec 2013 23:13:19 +0000 (00:13 +0100)]
Keeping an offset for page switching: This helps so that you don't see old messages

10 years agoMerge pull request #850 from annando/master
tobiasd [Mon, 9 Dec 2013 07:15:07 +0000 (23:15 -0800)]
Merge pull request #850 from annando/master

New style for shared links. Preparation for changes in some addons

10 years agoBugfix: Page switching had a problem with the search. And automatic reloading hadn...
Michael Vogel [Sun, 8 Dec 2013 19:10:28 +0000 (20:10 +0100)]
Bugfix: Page switching had a problem with the search. And automatic reloading hadn't worked with some search terms

10 years agoNew style for shared links. Preparation for changes in some addons
Michael Vogel [Sun, 8 Dec 2013 15:49:07 +0000 (16:49 +0100)]
New style for shared links. Preparation for changes in some addons

10 years agoMerge pull request #849 from annando/master
tobiasd [Sun, 8 Dec 2013 14:53:57 +0000 (06:53 -0800)]
Merge pull request #849 from annando/master

SQL improvements. New parameter for a maximum amount of comments per thread

10 years agoSQL improvements. New parameter for a maximum amount of comments per thread
Michael Vogel [Sun, 8 Dec 2013 13:49:24 +0000 (14:49 +0100)]
SQL improvements. New parameter for a maximum amount of comments per thread

10 years agoMerge pull request #848 from annando/master
tobiasd [Fri, 6 Dec 2013 11:31:19 +0000 (03:31 -0800)]
Merge pull request #848 from annando/master

New "minimal" mode for displaying the network content. Preparation for e.g. a multicolumn layout.

10 years agoMinimal: Disable loading of content at the end of the page, since it makes problems...
Michael Vogel [Thu, 5 Dec 2013 19:41:30 +0000 (20:41 +0100)]
Minimal: Disable loading of content at the end of the page, since it makes problems at the moment.

10 years agoMerge remote-tracking branch 'upstream/master'
Michael Vogel [Wed, 4 Dec 2013 23:13:31 +0000 (00:13 +0100)]
Merge remote-tracking branch 'upstream/master'

10 years agoNew "minimal" mode for displaying the network content. Preparation for e.g. a multico...
Michael Vogel [Wed, 4 Dec 2013 22:46:51 +0000 (23:46 +0100)]
New "minimal" mode for displaying the network content. Preparation for e.g. a multicolumn layout.

10 years agoMerge pull request #845 from annando/master
tobiasd [Tue, 3 Dec 2013 18:39:23 +0000 (10:39 -0800)]
Merge pull request #845 from annando/master

Many small bugfixes and features ...

10 years agoSolving some more SQL warnings ("limit" must never be used in update statements)
Michael Vogel [Mon, 2 Dec 2013 19:30:24 +0000 (20:30 +0100)]
Solving some more SQL warnings ("limit" must never be used in update statements)

10 years agoSorting plugins after priority and name (better for the configuration page)
Michael Vogel [Mon, 2 Dec 2013 19:28:30 +0000 (20:28 +0100)]
Sorting plugins after priority and name (better for the configuration page)

10 years agodangerous values in usernames for shared messages from diaspora are now encoded.
Michael Vogel [Mon, 2 Dec 2013 19:26:57 +0000 (20:26 +0100)]
dangerous values in usernames for shared messages from diaspora are now encoded.

10 years agodisable the output of the "posted" value in shares when item cache is enabled.
Michael Vogel [Mon, 2 Dec 2013 19:25:43 +0000 (20:25 +0100)]
disable the output of the "posted" value in shares when item cache is enabled.

10 years agoOptional parameter for parseurl to only fetch data from meta information
Michael Vogel [Mon, 2 Dec 2013 19:24:41 +0000 (20:24 +0100)]
Optional parameter for parseurl to only fetch data from meta information

10 years agoMerge pull request #843 from annando/master
fabrixxm [Mon, 2 Dec 2013 08:35:13 +0000 (00:35 -0800)]
Merge pull request #843 from annando/master

multiple admin mails

10 years agoJust some code beautification.
Michael Vogel [Sun, 1 Dec 2013 23:41:59 +0000 (00:41 +0100)]
Just some code beautification.

10 years agoMerge remote-tracking branch 'upstream/master'
Michael Vogel [Sun, 1 Dec 2013 23:33:46 +0000 (00:33 +0100)]
Merge remote-tracking branch 'upstream/master'

Conflicts:
mod/admin.php
mod/settings.php

10 years agomultiple admin mails. It is now possible to define more than one admin mail address...
Michael Vogel [Sun, 1 Dec 2013 23:11:31 +0000 (00:11 +0100)]
multiple admin mails. It is now possible to define more than one admin mail address. You can now add multiple addresses, separated by comma.