]> git.mxchange.org Git - friendica.git/log
friendica.git
9 years agoMerge pull request #1397 from annando/release-3.3.3
Tobias Diekershoff [Tue, 17 Feb 2015 06:43:42 +0000 (07:43 +0100)]
Merge pull request #1397 from annando/release-3.3.3

Bugfix: Friendica contacts were detected as Diaspora contacts. (Poco)

9 years agoBugfix: Friendica contacts were detected as Diaspora contacts. (Poco)
Michael Vogel [Tue, 17 Feb 2015 06:34:04 +0000 (07:34 +0100)]
Bugfix: Friendica contacts were detected as Diaspora contacts. (Poco)

9 years agoMerge pull request #1395 from fabrixxm/escape_input_values
Tobias Diekershoff [Mon, 16 Feb 2015 08:56:00 +0000 (09:56 +0100)]
Merge pull request #1395 from fabrixxm/escape_input_values

Escape values to input fields (and some 'title' and 'alt')

9 years agoEscape values to input fields (and some 'title' and 'alt')
Fabrixxm [Mon, 16 Feb 2015 08:30:12 +0000 (09:30 +0100)]
Escape values to input fields (and some 'title' and 'alt')

9 years agoMerge pull request #1382 from fabrixxm/localize-activity-poke
Tobias Diekershoff [Mon, 9 Feb 2015 12:25:50 +0000 (13:25 +0100)]
Merge pull request #1382 from fabrixxm/localize-activity-poke

Fix localization of poke activity + update IT strings

9 years agoupdate IT strings
Fabrixxm [Mon, 9 Feb 2015 10:55:14 +0000 (11:55 +0100)]
update IT strings

9 years agofix translation of poke activity body
Fabrixxm [Mon, 9 Feb 2015 10:54:50 +0000 (11:54 +0100)]
fix translation of poke activity body

9 years agoMerge pull request #1380 from fabrixxm/plain-text-mail-option
Tobias Diekershoff [Mon, 9 Feb 2015 10:38:20 +0000 (11:38 +0100)]
Merge pull request #1380 from fabrixxm/plain-text-mail-option

Emailer: fix text-only email

9 years agoEmailer: fix text-only email
Fabrixxm [Mon, 9 Feb 2015 10:21:10 +0000 (11:21 +0100)]
Emailer: fix text-only email

9 years agoMerge pull request #1371 from fabrixxm/release-3.3.3
Michael Vogel [Sun, 8 Feb 2015 20:27:57 +0000 (21:27 +0100)]
Merge pull request #1371 from fabrixxm/release-3.3.3

Update CHANGELOG

9 years agoUpdate CHANGELOG
fabrixxm [Sun, 8 Feb 2015 19:53:30 +0000 (20:53 +0100)]
Update CHANGELOG
fix spelling

9 years agoUpdate CHANGELOG
fabrixxm [Sat, 7 Feb 2015 14:50:16 +0000 (15:50 +0100)]
Update CHANGELOG

9 years agoMerge pull request #1366 from ddorian1/release-3.3.3
fabrixxm [Fri, 6 Feb 2015 16:38:55 +0000 (17:38 +0100)]
Merge pull request #1366 from ddorian1/release-3.3.3

fix urls for pager

9 years agofix urls for pager
Johannes Schwab [Fri, 6 Feb 2015 15:56:09 +0000 (16:56 +0100)]
fix urls for pager

9 years agoMerge pull request #1337 from annando/1501-html-in-poco
fabrixxm [Wed, 4 Feb 2015 07:29:21 +0000 (08:29 +0100)]
Merge pull request #1337 from annando/1501-html-in-poco

Bugfix: The portable contacts send data as html

9 years agoBugfix: The portable contacts send data as html but was expected to be bbcode. Now...
Michael Vogel [Sat, 31 Jan 2015 21:57:05 +0000 (22:57 +0100)]
Bugfix: The portable contacts send data as html but was expected to be bbcode. Now the html is converted to bbcode.

9 years agoMerge pull request #1328 from friendica/release-3.3.3
fabrixxm [Thu, 29 Jan 2015 09:18:46 +0000 (10:18 +0100)]
Merge pull request #1328 from friendica/release-3.3.3

Update version to 3.3.3-RC

9 years agoUpdate FRIENDICA_VERSION
fabrixxm [Thu, 29 Jan 2015 08:44:48 +0000 (09:44 +0100)]
Update FRIENDICA_VERSION

9 years agoMerge pull request #1327 from annando/1501-more-stuff-to-proxy
Tobias Diekershoff [Thu, 29 Jan 2015 07:19:20 +0000 (08:19 +0100)]
Merge pull request #1327 from annando/1501-more-stuff-to-proxy

And yet another two places where pictures have to be sent through the proxy

9 years agoAnd yet another two places where pictures have to be sent through the proxy.
Michael Vogel [Wed, 28 Jan 2015 22:34:46 +0000 (23:34 +0100)]
And yet another two places where pictures have to be sent through the proxy.

9 years agoMerge pull request #1325 from annando/1501-more-stuff-to-proxy
Tobias Diekershoff [Wed, 28 Jan 2015 10:16:50 +0000 (11:16 +0100)]
Merge pull request #1325 from annando/1501-more-stuff-to-proxy

Just two more places where pictures have to be send through the proxy

9 years agoJust two more places where pictures have to be send through the proxy function.
Michael Vogel [Wed, 28 Jan 2015 09:09:16 +0000 (10:09 +0100)]
Just two more places where pictures have to be send through the proxy function.

9 years agoMerge pull request #1320 from tobiasd/20150127adminpanel
fabrixxm [Wed, 28 Jan 2015 07:24:29 +0000 (08:24 +0100)]
Merge pull request #1320 from tobiasd/20150127adminpanel

add links to the plugin config pages for active plugins

9 years agoMerge pull request #1322 from tugelbend/develop
Tobias Diekershoff [Wed, 28 Jan 2015 07:04:04 +0000 (08:04 +0100)]
Merge pull request #1322 from tugelbend/develop

bug fix: syntax error #1321

9 years agoMerge pull request #1324 from annando/issue-1323
Tobias Diekershoff [Wed, 28 Jan 2015 07:03:38 +0000 (08:03 +0100)]
Merge pull request #1324 from annando/issue-1323

Issue 1323: Contact pictures from the acl selector weren't proxied.

9 years agoIssue 1323: Contact pictures from the acl selector weren't proxied.
Michael Vogel [Wed, 28 Jan 2015 00:22:42 +0000 (01:22 +0100)]
Issue 1323: Contact pictures from the acl selector weren't proxied.

9 years agobug fix: syntax error #1321
hauke [Tue, 27 Jan 2015 17:21:32 +0000 (18:21 +0100)]
bug fix: syntax error #1321

9 years agoMerge pull request #1319 from annando/1501-better-contact-list
Tobias Diekershoff [Tue, 27 Jan 2015 13:36:56 +0000 (14:36 +0100)]
Merge pull request #1319 from annando/1501-better-contact-list

In private mails the contact list now contains the user address as well

9 years agoadd links to the plugin config pages for active plugins
Tobias Diekershoff [Tue, 27 Jan 2015 13:34:11 +0000 (14:34 +0100)]
add links to the plugin config pages for active plugins

9 years agoMerge remote-tracking branch 'upstream/develop' into 1501-better-contact-list
Michael Vogel [Tue, 27 Jan 2015 09:20:00 +0000 (10:20 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1501-better-contact-list

9 years agoMerge pull request #1318 from annando/1501-global-contacts
Tobias Diekershoff [Tue, 27 Jan 2015 07:25:30 +0000 (08:25 +0100)]
Merge pull request #1318 from annando/1501-global-contacts

Many enhacenments to the global contacts

9 years agoThe contact list in mails now contains not only the name but also the address.
Michael Vogel [Tue, 27 Jan 2015 07:04:24 +0000 (08:04 +0100)]
The contact list in mails now contains not only the name but also the address.

9 years agopoco can now be used to query the global contacts.
Michael Vogel [Tue, 27 Jan 2015 07:01:37 +0000 (08:01 +0100)]
poco can now be used to query the global contacts.

9 years agoScrape now doesn't fetch page data when its twitter and Co./Update script that update...
Michael Vogel [Mon, 26 Jan 2015 00:07:15 +0000 (01:07 +0100)]
Scrape now doesn't fetch page data when its twitter and Co./Update script that updates the contacts from the profile

9 years agopoco: Only update the global contacts when there is a network value/Export your own...
Michael Vogel [Sun, 25 Jan 2015 15:40:20 +0000 (16:40 +0100)]
poco: Only update the global contacts when there is a network value/Export your own contact as well

9 years agogender will be updated in the profiles as well.
Michael Vogel [Sun, 25 Jan 2015 12:22:25 +0000 (13:22 +0100)]
gender will be updated in the profiles as well.

9 years agoSupport for keywords and gender in (global) contacts.
Michael Vogel [Sun, 25 Jan 2015 12:19:37 +0000 (13:19 +0100)]
Support for keywords and gender in (global) contacts.

9 years agoMerge pull request #1305 from tobiasd/20150123-quaddro
fabrixxm [Sun, 25 Jan 2015 10:59:17 +0000 (11:59 +0100)]
Merge pull request #1305 from tobiasd/20150123-quaddro

making the ignore button in contact suggestions visible in quattro

9 years agoMerge pull request #1317 from tobiasd/20150125cs
fabrixxm [Sun, 25 Jan 2015 10:55:22 +0000 (11:55 +0100)]
Merge pull request #1317 from tobiasd/20150125cs

CS update to the strings

9 years agoMerge remote-tracking branch 'upstream/develop' into 1501-global-contacts
Michael Vogel [Sun, 25 Jan 2015 07:44:42 +0000 (08:44 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1501-global-contacts

9 years agoMerge pull request #1314 from annando/1501-better-diaspora-reshare
Tobias Diekershoff [Sun, 25 Jan 2015 07:25:02 +0000 (08:25 +0100)]
Merge pull request #1314 from annando/1501-better-diaspora-reshare

Diaspora: Reshares are now working more reliable

9 years agoMerge pull request #1315 from annando/1501-issue-1283
Tobias Diekershoff [Sun, 25 Jan 2015 07:24:21 +0000 (08:24 +0100)]
Merge pull request #1315 from annando/1501-issue-1283

issue 1283 - Share-it button support for friendica

9 years agoMerge pull request #1316 from annando/issue-1197
Tobias Diekershoff [Sun, 25 Jan 2015 07:23:52 +0000 (08:23 +0100)]
Merge pull request #1316 from annando/issue-1197

Issue 1197: New hook for "oembed_fetch_url"

9 years agoCS update to the strings
Tobias Diekershoff [Sun, 25 Jan 2015 07:21:55 +0000 (08:21 +0100)]
CS update to the strings

9 years ago"about" and "location" is now included in global contacts as well.
Michael Vogel [Sun, 25 Jan 2015 01:29:46 +0000 (02:29 +0100)]
"about" and "location" is now included in global contacts as well.

9 years agoMoved the "test" folder to "local"
Michael Vogel [Sun, 25 Jan 2015 00:09:47 +0000 (01:09 +0100)]
Moved the "test" folder to "local"

9 years agoIssue 1197: New hook for "oembed_fetch_url"
Michael Vogel [Sat, 24 Jan 2015 23:58:51 +0000 (00:58 +0100)]
Issue 1197: New hook for "oembed_fetch_url"

9 years agoMerge pull request #1309 from tobiasd/20150124-defr
Michael Vogel [Sat, 24 Jan 2015 23:43:13 +0000 (00:43 +0100)]
Merge pull request #1309 from tobiasd/20150124-defr

DE + FR: update to the core strings

9 years agoMerge pull request #1310 from tobiasd/20150124admin
Michael Vogel [Sat, 24 Jan 2015 23:42:11 +0000 (00:42 +0100)]
Merge pull request #1310 from tobiasd/20150124admin

type email for email field in add user form

9 years agoGlobal contacts are now added with reshares as well. Better support for "aboutme...
Michael Vogel [Sat, 24 Jan 2015 23:19:59 +0000 (00:19 +0100)]
Global contacts are now added with reshares as well. Better support for "aboutme" and "location" in poco.

9 years agoissue 1283 - Share-it button support for friendica
Michael Vogel [Sat, 24 Jan 2015 23:10:58 +0000 (00:10 +0100)]
issue 1283 - Share-it button support for friendica

9 years agoDiaspora: Reshares are now working more reliable
Michael Vogel [Sat, 24 Jan 2015 23:01:58 +0000 (00:01 +0100)]
Diaspora: Reshares are now working more reliable

9 years agouse type email in users settings as well
Tobias Diekershoff [Sat, 24 Jan 2015 08:40:01 +0000 (09:40 +0100)]
use type email in users settings as well

9 years agotype email for email field in add user form
Tobias Diekershoff [Sat, 24 Jan 2015 08:30:44 +0000 (09:30 +0100)]
type email for email field in add user form

9 years agoadding missing styling to the ignore button in quattro
Tobias Diekershoff [Sat, 24 Jan 2015 06:22:55 +0000 (07:22 +0100)]
adding missing styling to the ignore button in quattro

9 years agoFR update to the strings
Tobias Diekershoff [Sat, 24 Jan 2015 06:05:55 +0000 (07:05 +0100)]
FR update to the strings

9 years agoDE update to the strings
Tobias Diekershoff [Sat, 24 Jan 2015 06:05:42 +0000 (07:05 +0100)]
DE update to the strings

9 years agomaking the ignore button in contact suggestions visible in quattro
Tobias Diekershoff [Fri, 23 Jan 2015 08:51:24 +0000 (09:51 +0100)]
making the ignore button in contact suggestions visible in quattro

9 years agoMerge pull request #1304 from tobiasd/20150122
fabrixxm [Fri, 23 Jan 2015 07:29:54 +0000 (08:29 +0100)]
Merge pull request #1304 from tobiasd/20150122

updating master message.po and strings.php

9 years agoupdate to the master strings
Tobias Diekershoff [Thu, 22 Jan 2015 17:18:31 +0000 (18:18 +0100)]
update to the master strings

9 years agoMerge pull request #1301 from annando/1501-bugfix-var_dump
fabrixxm [Wed, 21 Jan 2015 12:15:23 +0000 (13:15 +0100)]
Merge pull request #1301 from annando/1501-bugfix-var_dump

Bugfix: Removed test code

9 years agoBugfix: Removed test code.
Michael Vogel [Wed, 21 Jan 2015 11:42:34 +0000 (12:42 +0100)]
Bugfix: Removed test code.

9 years agoMerge pull request #1300 from annando/1501-better-ostatus
fabrixxm [Wed, 21 Jan 2015 07:18:34 +0000 (08:18 +0100)]
Merge pull request #1300 from annando/1501-better-ostatus

Improvements for OStatus

9 years agoMerge remote-tracking branch 'upstream/develop' into 1501-better-ostatus
Michael Vogel [Wed, 21 Jan 2015 00:30:09 +0000 (01:30 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1501-better-ostatus

9 years agoMerge pull request #1299 from fabrixxm/optional-text-only-email
Michael Vogel [Tue, 20 Jan 2015 22:26:44 +0000 (23:26 +0100)]
Merge pull request #1299 from fabrixxm/optional-text-only-email

Optional text only email

9 years agoCaching for scrape, keywords for remote_self, notifications for addresses that aren...
Michael Vogel [Tue, 20 Jan 2015 21:54:25 +0000 (22:54 +0100)]
Caching for scrape, keywords for remote_self, notifications for addresses that aren't in your contact list.

9 years agoMerge pull request #1298 from tobiasd/20150116installer
fabrixxm [Tue, 20 Jan 2015 21:18:37 +0000 (22:18 +0100)]
Merge pull request #1298 from tobiasd/20150116installer

polishing the installer

9 years agoreword checkbox help text
fabrixxm [Tue, 20 Jan 2015 21:17:03 +0000 (22:17 +0100)]
reword checkbox help text

9 years agotypos
Tobias Diekershoff [Tue, 20 Jan 2015 20:23:27 +0000 (21:23 +0100)]
typos

9 years agoMerge pull request #1297 from tobiasd/20150116vagrantdocs
fabrixxm [Tue, 20 Jan 2015 19:37:17 +0000 (20:37 +0100)]
Merge pull request #1297 from tobiasd/20150116vagrantdocs

added info how to halt the VM to the vagrant docs.

9 years agofix random mime boundary generation
fabrixxm [Tue, 20 Jan 2015 18:21:49 +0000 (19:21 +0100)]
fix random mime boundary generation
second and third random numbers in mime boundary was alwasy 10000000000

9 years agoadd text-only email option
fabrixxm [Tue, 20 Jan 2015 18:19:58 +0000 (19:19 +0100)]
add text-only email option
add a checkbok to notification settings. if checked, html body is not added to email.

9 years agoprofile edit homepage field type URL
Tobias Diekershoff [Mon, 19 Jan 2015 07:15:20 +0000 (08:15 +0100)]
profile edit homepage field type URL

9 years agosome documentation for the templating engine and basic templates for forms
Tobias Diekershoff [Sun, 18 Jan 2015 15:15:37 +0000 (16:15 +0100)]
some documentation for the templating engine and basic templates for forms

9 years agotemplate for password now support required and autofocus
Tobias Diekershoff [Fri, 16 Jan 2015 18:36:09 +0000 (19:36 +0100)]
template for password now support required and autofocus

9 years agouse HTML5 attributes in the installer wizard
Tobias Diekershoff [Fri, 16 Jan 2015 18:32:31 +0000 (19:32 +0100)]
use HTML5 attributes in the installer wizard

9 years agotemplate for input fields now supports required, autofocus and types email, url
Tobias Diekershoff [Fri, 16 Jan 2015 18:31:23 +0000 (19:31 +0100)]
template for input fields now supports required, autofocus and types email, url

9 years agoadded info how to halt the VM to the vagrant docs.
Tobias Diekershoff [Fri, 16 Jan 2015 10:20:48 +0000 (11:20 +0100)]
added info how to halt the VM to the vagrant docs.

9 years agoMerge pull request #1296 from ddorian1/develop
Tobias Diekershoff [Fri, 16 Jan 2015 06:58:04 +0000 (07:58 +0100)]
Merge pull request #1296 from ddorian1/develop

Fix network tab urls

9 years agoMerge pull request #1295 from fabrixxm/issue-1286
Tobias Diekershoff [Fri, 16 Jan 2015 06:56:53 +0000 (07:56 +0100)]
Merge pull request #1295 from fabrixxm/issue-1286

api: call hook 'authenticate' from api_login()

9 years agofix network tab urls
Johannes Schwab [Fri, 16 Jan 2015 01:25:17 +0000 (02:25 +0100)]
fix network tab urls

9 years agoapi: call hook 'authenticate' from api_login()
fabrixxm [Thu, 15 Jan 2015 17:15:06 +0000 (18:15 +0100)]
api: call hook 'authenticate' from api_login()

9 years agoMerge pull request #1292 from silke/develop
fabrixxm [Thu, 15 Jan 2015 09:15:50 +0000 (10:15 +0100)]
Merge pull request #1292 from silke/develop

Script now installs missing add-apt-repository tool.

9 years agoMerge pull request #1293 from silke/vagrant-docs
Tobias Diekershoff [Wed, 14 Jan 2015 18:06:21 +0000 (19:06 +0100)]
Merge pull request #1293 from silke/vagrant-docs

Added more explanation to developing with Vagrant

9 years agoAdded more explanation to developing with Vagrant
Silke Meyer [Wed, 14 Jan 2015 17:32:10 +0000 (18:32 +0100)]
Added more explanation to developing with Vagrant

9 years agoScript now installs missing add-apt-repository tool.
Silke Meyer [Wed, 14 Jan 2015 16:57:25 +0000 (17:57 +0100)]
Script now installs missing add-apt-repository tool.

9 years agoMerge pull request #1291 from silke/docs
fabrixxm [Wed, 14 Jan 2015 13:58:46 +0000 (14:58 +0100)]
Merge pull request #1291 from silke/docs

Update docs

9 years agoUpdated "Tips for new members" section
Silke Meyer [Wed, 14 Jan 2015 13:05:21 +0000 (14:05 +0100)]
Updated "Tips for new members" section

9 years agoRemoved part about sponsored bugs.
Silke Meyer [Wed, 14 Jan 2015 12:50:01 +0000 (13:50 +0100)]
Removed part about sponsored bugs.

9 years agoMerge remote-tracking branch 'upstream/develop' into 1501-better-ostatus
Michael Vogel [Mon, 12 Jan 2015 19:49:00 +0000 (20:49 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1501-better-ostatus

9 years agoMerge pull request #1287 from annando/1501-poci-with-location
Tobias Diekershoff [Mon, 12 Jan 2015 06:35:42 +0000 (07:35 +0100)]
Merge pull request #1287 from annando/1501-poci-with-location

Poco now shows "about" and the location as well

9 years agoOStatus: Replies now arrive their target.
Michael Vogel [Sun, 11 Jan 2015 23:14:51 +0000 (00:14 +0100)]
OStatus: Replies now arrive their target.

9 years agoMerge remote-tracking branch 'upstream/develop' into 1501-poci-with-location
Michael Vogel [Sat, 10 Jan 2015 23:51:14 +0000 (00:51 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1501-poci-with-location

9 years agoPoco now shows "about" and the location as well.
Michael Vogel [Fri, 9 Jan 2015 23:34:08 +0000 (00:34 +0100)]
Poco now shows "about" and the location as well.

9 years agoMerge pull request #1274 from annando/issue-1218
fabrixxm [Fri, 9 Jan 2015 10:44:38 +0000 (11:44 +0100)]
Merge pull request #1274 from annando/issue-1218

Issue 1218: generate $argv and $argc from $_SERVER if it wasn't defined

9 years agoMerge pull request #1284 from ddorian1/develop
Tobias Diekershoff [Fri, 9 Jan 2015 07:43:53 +0000 (08:43 +0100)]
Merge pull request #1284 from ddorian1/develop

fix merge function of util/run_xgettext.sh

9 years agoMerge pull request #1285 from annando/1501-enhanced-poco
Tobias Diekershoff [Fri, 9 Jan 2015 07:37:05 +0000 (08:37 +0100)]
Merge pull request #1285 from annando/1501-enhanced-poco

"location" and "about" for contacts, improved suggestions, improved contacts exchange

9 years agofix merge function of util/run_xgettext.sh
Johannes Schwab [Thu, 8 Jan 2015 12:59:42 +0000 (13:59 +0100)]
fix merge function of util/run_xgettext.sh

9 years agoOnly suggest contacts with networks.
Michael Vogel [Thu, 8 Jan 2015 10:01:55 +0000 (11:01 +0100)]
Only suggest contacts with networks.

9 years agoThe global contacts now contain the network name so that the suggestions can select...
Michael Vogel [Thu, 8 Jan 2015 06:59:20 +0000 (07:59 +0100)]
The global contacts now contain the network name so that the suggestions can select between this.