Michael Vogel
|
5c94a2420a
|
Removed old library
|
2015-02-24 11:08:23 +01:00 |
|
|
Michael Vogel
|
671a36682a
|
Merge remote-tracking branch 'upstream/develop' into 1502-improved-markdown
|
2015-02-24 10:24:07 +01:00 |
|
|
Michael Vogel
|
d4b0a9ea2a
|
Solving parsing problems with the markdown library and html elements.
|
2015-02-24 10:21:09 +01:00 |
|
Fabrixxm
|
caa21e6021
|
Merge branch 'master' into develop
|
2015-02-24 09:09:02 +01:00 |
|
|
Michael Vogel
|
fcaf71691f
|
Diaspora: Bugfix for the hashtag detection of incoming posts
|
2015-02-24 00:12:30 +01:00 |
|
|
Michael Vogel
|
17bd46793e
|
Some fixes for the Markdown converter especially for Libertree.
|
2015-02-24 00:05:50 +01:00 |
|
|
Michael Vogel
|
440e2d82b1
|
Global setting for the behaviour of likes.
|
2015-02-23 12:44:50 +01:00 |
|
Johannes Schwab
|
1cd1f7587c
|
fix validate_email
|
2015-02-23 12:20:05 +01:00 |
|
|
Michael Vogel
|
4a6a6ca937
|
Bugfix for spaces in links
|
2015-02-22 20:06:13 +01:00 |
|
|
Michael Vogel
|
2f46675a89
|
New routines for markdown to html and html to markdown.
|
2015-02-22 17:38:28 +01:00 |
|
|
Michael Vogel
|
9eeff0d891
|
Received "likes" and "dislikes" don't update the "commented" value anymore.
|
2015-02-22 17:34:04 +01:00 |
|
|
Michael Vogel
|
dfdb804323
|
Beautified the poller logging
|
2015-02-19 22:38:02 +01:00 |
|
|
Michael Vogel
|
ab5bf06873
|
Restructured and simplified the poller check
|
2015-02-19 22:30:16 +01:00 |
|
|
Michael Vogel
|
68c9707221
|
The poller now always respects the priority setting for feeds.
|
2015-02-19 22:04:05 +01:00 |
|
|
Michael Vogel
|
4c901e60cc
|
More logging for the poller. Changed the query for the contacts to reduce the amount of contacts
|
2015-02-19 21:36:29 +01:00 |
|
|
Michael Vogel
|
6d8c126179
|
Do the directory change only when it is needed.
|
2015-02-19 10:45:46 +01:00 |
|
|
Michael Vogel
|
96c642661e
|
The poller can now be called even inside the "include" directory.
|
2015-02-19 10:26:49 +01:00 |
|
|
Michael Vogel
|
2f79e98cda
|
Issue 1228: Pictures aren't sent via API in comments.
|
2015-02-17 20:43:11 +01:00 |
|
|
Michael Vogel
|
d9f222b330
|
Bugfix: Friendica contacts were detected as Diaspora contacts. (Poco)
|
2015-02-17 07:34:04 +01:00 |
|
|
Michael Vogel
|
2e1acf7611
|
Just some more code beautification
|
2015-02-16 22:30:46 +01:00 |
|
|
Michael Vogel
|
9d920033e8
|
Just removing unused codelines
|
2015-02-16 22:28:24 +01:00 |
|
|
Michael Vogel
|
8b1b886797
|
Improved probe_url, fixed wrong network detection.
|
2015-02-16 22:11:51 +01:00 |
|
|
Michael Vogel
|
2dafc9eac1
|
Merge remote-tracking branch 'upstream/develop' into 1502-poco-generation-counter
|
2015-02-15 10:54:41 +01:00 |
|
|
Michael Vogel
|
d1d794f1ab
|
The global contacts now contain a "generation" value that defines how we know this contact
|
2015-02-15 10:52:45 +01:00 |
|
Tobias Diekershoff
|
d39612ac25
|
Merge pull request #1393 from annando/1502-cleaned-item-storage-code
Additional check for notifications
|
2015-02-14 15:40:35 +01:00 |
|
|
Michael Vogel
|
75797c61f2
|
Improved logging with receiving mails
|
2015-02-13 08:09:27 +01:00 |
|
|
Johannes Schwab
|
12d7ca9b84
|
improved infinite scrollling
|
2015-02-13 00:40:59 +01:00 |
|
|
Michael Vogel
|
3c8fc863a8
|
The "share a post" notification is now sent based upon mentions as well.
|
2015-02-11 07:19:48 +01:00 |
|
|
Michael Vogel
|
9287a0521a
|
Merge remote-tracking branch 'upstream/develop' into 1502-cleaned-item-storage-code
|
2015-02-11 07:07:31 +01:00 |
|
Matthew Exon
|
2bb8b77123
|
Close cURL handle before recursing, so that cookie file is flushed
|
2015-02-11 03:42:07 +00:00 |
|
|
Fabrixxm
|
135869fd1c
|
Merge branch 'release-3.3.3' into develop
|
2015-02-10 16:04:22 +01:00 |
|
|
Fabrixxm
|
87f9258834
|
Merge branch 'mat/mergerequest' of https://github.com/mexon/friendica into mexon-mat/mergerequest
|
2015-02-10 10:57:26 +01:00 |
|
|
Michael Vogel
|
1a75503b1c
|
Relocated the cache code.
|
2015-02-10 08:22:21 +01:00 |
|
Matthew Exon
|
d12b929c96
|
Accept lowercase location header
|
2015-02-10 03:14:08 +00:00 |
|
|
Michael Vogel
|
2dc5f1aefc
|
Removed cache code, since it was superfluous.
|
2015-02-09 23:04:18 +01:00 |
|
|
Michael Vogel
|
091c3e75ca
|
Rearranged code in item storage.
|
2015-02-09 21:52:08 +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
|
5d19b21298
|
fix translation of poke activity body
|
2015-02-09 11:54:50 +01:00 |
|
|
Matthew Exon
|
1c31dca5d6
|
Support feeds without XML headers
|
2015-02-09 10:21:27 +00:00 |
|
|
Fabrixxm
|
ff41cc24bd
|
Emailer: fix text-only email
|
2015-02-09 11:21:10 +01:00 |
|
|
Michael Vogel
|
136626c199
|
Just a little bit more code clean up.
|
2015-02-08 21:03:04 +01:00 |
|
|
Michael Vogel
|
7e9ae24511
|
Moved several settings from .htconfig.php to the admin settings page.
|
2015-02-08 20:35:40 +01:00 |
|
|
Michael Vogel
|
a97d4383a1
|
Searching for items now always searches public entries from the central item storage with uid=0.
|
2015-02-08 15:59:22 +01:00 |
|
|
fabrixxm
|
f620834d97
|
Merge branch 'release-3.3.3' into develop
|
2015-02-07 12:57:12 +01:00 |
|
|
Michael Vogel
|
d87ab3cd97
|
Correct the contact data if it was changed although the system don't thinks so.
|
2015-02-06 21:02:33 +01:00 |
|
|
Johannes Schwab
|
1114ae4c81
|
fix urls for pager
|
2015-02-06 17:04:48 +01:00 |
|
|
fabrixxm
|
aa720eb277
|
Merge pull request #1357 from annando/1502-html-poco-2
html to bbcode convertion in poco - 2nd try
|
2015-02-05 11:21:23 +01:00 |
|
|
Michael Vogel
|
9641436996
|
The relocate message hadn't changed the "nurl" value.
|
2015-02-04 20:22:05 +01:00 |
|
|
Michael Vogel
|
742a6dcf6e
|
Due to some git problems, just the same stuff again (html to bbcode conversation in poco)
|
2015-02-04 19:49:43 +01:00 |
|
|
Tobias Diekershoff
|
710bd08c30
|
adopting red matrix iconography for red#
|
2015-02-04 08:47:57 +01:00 |
|
|
Michael Vogel
|
226b551c85
|
Only some code beautification.
|
2015-02-03 07:00:01 +01:00 |
|
|
Michael Vogel
|
9851965090
|
Merge remote-tracking branch 'upstream/develop' into 1501-central-item-storage
|
2015-02-03 00:30:37 +01:00 |
|
|
Michael Vogel
|
86a968002d
|
Look for links to diaspora posts and try to fetch them if they aren't on the system.
|
2015-02-03 00:29:21 +01:00 |
|
|
Michael Vogel
|
8d0030c9d5
|
Revert some stuff from another pull request. I like git ...
|
2015-02-02 22:24:21 +01:00 |
|
|
Michael Vogel
|
8490bedefe
|
Merge remote-tracking branch 'upstream/develop' into 1501-central-item-storage
|
2015-02-02 22:15:39 +01:00 |
|
|
Michael Vogel
|
62b32e7c93
|
Merge remote-tracking branch 'upstream/develop' into 1501-api-speedup
|
2015-02-02 22:08:40 +01:00 |
|
|
Tobias Diekershoff
|
b41d14afe3
|
Merge pull request #1343 from annando/1502-diaspora-guid-links
Diaspora internal GUID links are now converted correctly
|
2015-02-02 22:03:09 +01:00 |
|
|
Tobias Diekershoff
|
2efc789aee
|
Merge pull request #1339 from annando/1502-bugfix-friend-notification-diaspora
Improvement for the "new friend" notification with Diaspora and "remote self"
|
2015-02-02 21:51:35 +01:00 |
|
|
Michael Vogel
|
46dd453e5b
|
Diaspora internal GUID links are now converted correctly.
|
2015-02-02 20:26:05 +01:00 |
|
|
Michael Vogel
|
80ee58f8aa
|
Just an added to-do comment
|
2015-02-02 20:24:19 +01:00 |
|
|
Michael Vogel
|
9d155a62f9
|
New function to fetch and store an item based on the guid.
|
2015-02-01 21:54:44 +01:00 |
|
|
Michael Vogel
|
75c60b2595
|
The alias can - or can not - be an SSL link.
|
2015-02-01 16:32:58 +01:00 |
|
|
Michael Vogel
|
d1dd50e9b0
|
Diaspora: The "new friend" notification now respects the corresponding setting/"new friend" notification isn't send via "remote self" anymore.
|
2015-02-01 16:04:16 +01:00 |
|
|
Michael Vogel
|
b95d34f9db
|
Aliases are now handled correctly. The public item copy gets a "real" contact id as well.
|
2015-02-01 13:32:05 +01:00 |
|
|
Michael Vogel
|
e02b982f77
|
Merge remote-tracking branch 'upstream/develop' into 1501-central-item-storage
|
2015-02-01 13:28:32 +01:00 |
|
|
Michael Vogel
|
e3da549ab5
|
Reshared diaspora items that aren't on this server are now stored with uid=0
|
2015-02-01 10:26:35 +01:00 |
|
|
Michael Vogel
|
6eb4254d06
|
The query after an API post was improved to make it faster.
|
2015-01-31 23:13: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 |
|
Silke Meyer
|
61a227dbaa
|
Changed the "From" field for system emails from product to sitename.
|
2015-01-31 18:44:30 +01:00 |
|
|
Silke Meyer
|
bb2413ddaf
|
deleted my comment of the original line
|
2015-01-31 18:41:05 +01:00 |
|
|
Silke Meyer
|
a485653d6b
|
Added setting to customize system notifications' sender email address
|
2015-01-31 08:46:05 +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 |
|
|
Tobias Diekershoff
|
5ad8b6abf6
|
Merge pull request #1322 from tugelbend/develop
bug fix: syntax error #1321
|
2015-01-28 08:04:04 +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 |
|
|
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
|
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
|
2f400627c7
|
Support for keywords and gender in (global) contacts.
|
2015-01-25 13:19:37 +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 |
|
|
Michael Vogel
|
597ef20b71
|
"about" and "location" is now included in global contacts as well.
|
2015-01-25 02:29:46 +01:00 |
|
|
Michael Vogel
|
cb9196f6d6
|
Issue 1197: New hook for "oembed_fetch_url"
|
2015-01-25 00:58:51 +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 |
|
|
Michael Vogel
|
ee50b04382
|
Bugfix: Removed test code.
|
2015-01-21 12:42: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
|
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
|
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 |
|
|
fabrixxm
|
b45a4b398b
|
api: call hook 'authenticate' from api_login()
|
2015-01-15 18:15:06 +01:00 |
|
|
Michael Vogel
|
beaca70126
|
OStatus: Replies now arrive their target.
|
2015-01-12 00:14:51 +01:00 |
|
|
fabrixxm
|
418ac91c31
|
Merge pull request #1274 from annando/issue-1218
Issue 1218: generate $argv and $argc from $_SERVER if it wasn't defined
|
2015-01-09 11:44:38 +01:00 |
|
|
Michael Vogel
|
ab3cad89ae
|
Only suggest contacts with networks.
|
2015-01-08 11:01:55 +01:00 |
|
|
Michael Vogel
|
8f1cfac20a
|
The global contacts now contain the network name so that the suggestions can select between this.
|
2015-01-08 07:59:20 +01:00 |
|
|
Michael Vogel
|
46db8575a0
|
The table "unique_contacts" now has an "about" and "location" field as well.
|
2015-01-08 01:32:19 +01:00 |
|
|
Michael Vogel
|
044eaa778f
|
Markdown is now supported in the location field as well.
|
2015-01-08 00:13:43 +01:00 |
|
|
Michael Vogel
|
b36d799044
|
Fetching "location" and "about" from diaspora. Displaying them on the "display" page.
|
2015-01-07 01:46:13 +01:00 |
|