fabrixxm
|
66e075ff95
|
Merge pull request #1402 from annando/release-3.3.3
Bugfix: See issue 1338
|
2015-02-17 21:19:39 +01:00 |
|
Michael Vogel
|
4b7ff42a89
|
Bugfix: See issue 1338
|
2015-02-17 19:48:02 +01:00 |
|
 Tobias Diekershoff
|
03d779971a
|
Merge pull request #1397 from annando/release-3.3.3
Bugfix: Friendica contacts were detected as Diaspora contacts. (Poco)
|
2015-02-17 07:43:42 +01:00 |
|
|
Michael Vogel
|
d9f222b330
|
Bugfix: Friendica contacts were detected as Diaspora contacts. (Poco)
|
2015-02-17 07:34:04 +01:00 |
|
|
Tobias Diekershoff
|
b86b6e8e77
|
Merge pull request #1395 from fabrixxm/escape_input_values
Escape values to input fields (and some 'title' and 'alt')
|
2015-02-16 09:56:00 +01:00 |
|
|
Fabrixxm
|
9d3fb417c2
|
Escape values to input fields (and some 'title' and 'alt')
|
2015-02-16 09:30:12 +01:00 |
|
|
Tobias Diekershoff
|
e051da8203
|
Merge pull request #1382 from fabrixxm/localize-activity-poke
Fix localization of poke activity + update IT strings
|
2015-02-09 13:25:50 +01:00 |
|
|
Fabrixxm
|
f4f0f2bbc7
|
update IT strings
|
2015-02-09 11:55:14 +01:00 |
|
|
Fabrixxm
|
5d19b21298
|
fix translation of poke activity body
|
2015-02-09 11:54:50 +01:00 |
|
|
Tobias Diekershoff
|
b383e53927
|
Merge pull request #1380 from fabrixxm/plain-text-mail-option
Emailer: fix text-only email
|
2015-02-09 11:38:20 +01:00 |
|
|
Fabrixxm
|
ff41cc24bd
|
Emailer: fix text-only email
|
2015-02-09 11:21:10 +01:00 |
|
|
Michael Vogel
|
6f78a4dcf2
|
Merge pull request #1371 from fabrixxm/release-3.3.3
Update CHANGELOG
|
2015-02-08 21:27:57 +01:00 |
|
|
fabrixxm
|
456b6b17c0
|
Update CHANGELOG
fix spelling
|
2015-02-08 20:53:30 +01:00 |
|
|
fabrixxm
|
fb6521cca2
|
Update CHANGELOG
|
2015-02-07 15:50:16 +01:00 |
|
|
fabrixxm
|
df6188f2c7
|
Merge pull request #1366 from ddorian1/release-3.3.3
fix urls for pager
|
2015-02-06 17:38:55 +01:00 |
|
Johannes Schwab
|
1114ae4c81
|
fix urls for pager
|
2015-02-06 17:04:48 +01:00 |
|
|
fabrixxm
|
04f91aafac
|
Merge pull request #1337 from annando/1501-html-in-poco
Bugfix: The portable contacts send data as html
|
2015-02-04 08:29:21 +01:00 |
|
|
Michael Vogel
|
a7e190b0cb
|
Bugfix: The portable contacts send data as html but was expected to be bbcode. Now the html is converted to bbcode.
|
2015-01-31 22:57:05 +01:00 |
|
|
fabrixxm
|
2d02153df1
|
Merge pull request #1328 from friendica/release-3.3.3
Update version to 3.3.3-RC
|
2015-01-29 10:18:46 +01:00 |
|
|
fabrixxm
|
4cf36ec2cf
|
Update FRIENDICA_VERSION
|
2015-01-29 09:44:48 +01:00 |
|
|
Tobias Diekershoff
|
cfb6d4c5c1
|
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
|
2015-01-29 08:19:20 +01:00 |
|
|
Michael Vogel
|
036ccf84de
|
And yet another two places where pictures have to be sent through the proxy.
|
2015-01-28 23:34:46 +01:00 |
|
|
Tobias Diekershoff
|
b91d8a1039
|
Merge pull request #1325 from annando/1501-more-stuff-to-proxy
Just two more places where pictures have to be send through the proxy
|
2015-01-28 11:16:50 +01:00 |
|
|
Michael Vogel
|
b309187e3d
|
Just two more places where pictures have to be send through the proxy function.
|
2015-01-28 10:09:16 +01:00 |
|
|
fabrixxm
|
147413507b
|
Merge pull request #1320 from tobiasd/20150127adminpanel
add links to the plugin config pages for active plugins
|
2015-01-28 08:24:29 +01:00 |
|
|
Tobias Diekershoff
|
5ad8b6abf6
|
Merge pull request #1322 from tugelbend/develop
bug fix: syntax error #1321
|
2015-01-28 08:04:04 +01:00 |
|
|
Tobias Diekershoff
|
a8206f6fe1
|
Merge pull request #1324 from annando/issue-1323
Issue 1323: Contact pictures from the acl selector weren't proxied.
|
2015-01-28 08:03:38 +01:00 |
|
|
Michael Vogel
|
c058be9908
|
Issue 1323: Contact pictures from the acl selector weren't proxied.
|
2015-01-28 01:22:42 +01:00 |
|
hauke
|
3dcc1da88b
|
bug fix: syntax error #1321
|
2015-01-27 18:21:32 +01:00 |
|
|
Tobias Diekershoff
|
d6d7ba87a0
|
Merge pull request #1319 from annando/1501-better-contact-list
In private mails the contact list now contains the user address as well
|
2015-01-27 14:36:56 +01:00 |
|
|
Tobias Diekershoff
|
3df7370fa8
|
add links to the plugin config pages for active plugins
|
2015-01-27 14:34:11 +01:00 |
|
|
Michael Vogel
|
6a34210353
|
Merge remote-tracking branch 'upstream/develop' into 1501-better-contact-list
|
2015-01-27 10:20:00 +01:00 |
|
|
Tobias Diekershoff
|
cd7d29d13e
|
Merge pull request #1318 from annando/1501-global-contacts
Many enhacenments to the global contacts
|
2015-01-27 08:25:30 +01:00 |
|
|
Michael Vogel
|
848c09935a
|
The contact list in mails now contains not only the name but also the address.
|
2015-01-27 08:04:24 +01:00 |
|
|
Michael Vogel
|
583c2ce13e
|
poco can now be used to query the global contacts.
|
2015-01-27 08:01:37 +01:00 |
|
|
Michael Vogel
|
e8bfa32b37
|
Scrape now doesn't fetch page data when its twitter and Co./Update script that updates the contacts from the profile
|
2015-01-26 01:07:15 +01:00 |
|
|
Michael Vogel
|
bc2c046446
|
poco: Only update the global contacts when there is a network value/Export your own contact as well
|
2015-01-25 16:40:20 +01:00 |
|
|
Michael Vogel
|
105d6a22a4
|
gender will be updated in the profiles as well.
|
2015-01-25 13:22:25 +01:00 |
|
|
Michael Vogel
|
2f400627c7
|
Support for keywords and gender in (global) contacts.
|
2015-01-25 13:19:37 +01:00 |
|
|
fabrixxm
|
44df625bad
|
Merge pull request #1305 from tobiasd/20150123-quaddro
making the ignore button in contact suggestions visible in quattro
|
2015-01-25 11:59:17 +01:00 |
|
|
fabrixxm
|
174d78c768
|
Merge pull request #1317 from tobiasd/20150125cs
CS update to the strings
|
2015-01-25 11:55:22 +01:00 |
|
|
Michael Vogel
|
dff2384e82
|
Merge remote-tracking branch 'upstream/develop' into 1501-global-contacts
|
2015-01-25 08:44:42 +01:00 |
|
|
Tobias Diekershoff
|
c35e92b201
|
Merge pull request #1314 from annando/1501-better-diaspora-reshare
Diaspora: Reshares are now working more reliable
|
2015-01-25 08:25:02 +01:00 |
|
|
Tobias Diekershoff
|
1c424a5425
|
Merge pull request #1315 from annando/1501-issue-1283
issue 1283 - Share-it button support for friendica
|
2015-01-25 08:24:21 +01:00 |
|
|
Tobias Diekershoff
|
fc62c329c5
|
Merge pull request #1316 from annando/issue-1197
Issue 1197: New hook for "oembed_fetch_url"
|
2015-01-25 08:23:52 +01:00 |
|
|
Tobias Diekershoff
|
5cb3a0fced
|
CS update to the strings
|
2015-01-25 08:21:55 +01:00 |
|
|
Michael Vogel
|
597ef20b71
|
"about" and "location" is now included in global contacts as well.
|
2015-01-25 02:29:46 +01:00 |
|
|
Michael Vogel
|
cd41746597
|
Moved the "test" folder to "local"
|
2015-01-25 01:09:47 +01:00 |
|
|
Michael Vogel
|
cb9196f6d6
|
Issue 1197: New hook for "oembed_fetch_url"
|
2015-01-25 00:58:51 +01:00 |
|
|
Michael Vogel
|
5639f0448b
|
Merge pull request #1309 from tobiasd/20150124-defr
DE + FR: update to the core strings
|
2015-01-25 00:43:13 +01:00 |
|