Commit Graph

9185 Commits

Author SHA1 Message Date
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
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
Michael Vogel 4f2af23122 Merge pull request #1310 from tobiasd/20150124admin
type email for email field in add user form
2015-01-25 00:42:11 +01:00
Michael Vogel 344210bd6d Global contacts are now added with reshares as well. Better support for "aboutme" and "location" in poco. 2015-01-25 00:19:59 +01:00
Michael Vogel 58d814b793 issue 1283 - Share-it button support for friendica 2015-01-25 00:10:58 +01:00
Michael Vogel 5c4d55c5e8 Diaspora: Reshares are now working more reliable 2015-01-25 00:01:58 +01:00
Tobias Diekershoff eaaed02ffd use type email in users settings as well 2015-01-24 09:40:01 +01:00
Tobias Diekershoff 8b558eb7ea type email for email field in add user form 2015-01-24 09:30:44 +01:00
Tobias Diekershoff a33ca89bb7 adding missing styling to the ignore button in quattro 2015-01-24 07:22:55 +01:00
Tobias Diekershoff c5b8956730 FR update to the strings 2015-01-24 07:05:55 +01:00
Tobias Diekershoff 619f2a86f3 DE update to the strings 2015-01-24 07:05:42 +01:00
Tobias Diekershoff d3bb944700 making the ignore button in contact suggestions visible in quattro 2015-01-23 09:51:24 +01:00
fabrixxm f3d49cbfa8 Merge pull request #1304 from tobiasd/20150122
updating master message.po and strings.php
2015-01-23 08:29:54 +01:00
Tobias Diekershoff 11f88e15be update to the master strings 2015-01-22 18:18:31 +01:00
fabrixxm 6e06169565 Merge pull request #1301 from annando/1501-bugfix-var_dump
Bugfix: Removed test code
2015-01-21 13:15:23 +01:00
Michael Vogel ee50b04382 Bugfix: Removed test code. 2015-01-21 12:42:34 +01:00
fabrixxm 62998bf8b5 Merge pull request #1300 from annando/1501-better-ostatus
Improvements for OStatus
2015-01-21 08:18:34 +01:00
Michael Vogel 1f23d691f3 Merge remote-tracking branch 'upstream/develop' into 1501-better-ostatus 2015-01-21 01:30:09 +01:00
Michael Vogel ed037124b3 Merge pull request #1299 from fabrixxm/optional-text-only-email
Optional text only email
2015-01-20 23:26:44 +01:00
Michael Vogel 184dcf75a7 Caching for scrape, keywords for remote_self, notifications for addresses that aren't in your contact list. 2015-01-20 22:54:25 +01:00
fabrixxm 36724eb8ea Merge pull request #1298 from tobiasd/20150116installer
polishing the installer
2015-01-20 22:18:37 +01:00
fabrixxm 816d3f86e7 reword checkbox help text 2015-01-20 22:17:03 +01:00
Tobias Diekershoff 3a3ea18384 typos 2015-01-20 21:23:27 +01:00
fabrixxm 3a0e7e3004 Merge pull request #1297 from tobiasd/20150116vagrantdocs
added info how to halt the VM to the vagrant docs.
2015-01-20 20:37:17 +01:00
fabrixxm 254968a99c fix random mime boundary generation
second and third random numbers in mime boundary was alwasy 10000000000
2015-01-20 19:21:49 +01:00
fabrixxm b2527039b7 add text-only email option
add a checkbok to notification settings. if checked, html body is not added to email.
2015-01-20 19:19:58 +01:00
Tobias Diekershoff c5200f9327 profile edit homepage field type URL 2015-01-19 08:15:20 +01:00
Tobias Diekershoff b1b1fe495b some documentation for the templating engine and basic templates for forms 2015-01-18 16:15:37 +01:00