Michael Vogel
|
ab67788b4e
|
SQL speed increase for query and search.
|
2015-05-23 01:23:31 +02:00 |
|
rabuzarus
|
2ad8fdc40b
|
port of red matrix datepicker implementation
|
2015-05-22 18:53:18 +02:00 |
|
fabrixxm
|
51f8427333
|
Merge pull request #1585 from annando/issue-1572
Contact requests to a "FREELOVE" account resulted in "read only" contacts
|
2015-05-21 08:40:37 +02:00 |
|
Michael Vogel
|
1c8b9b73f7
|
Issue 1572: Contact requests to a "FREELOVE" account resulted in "read only" contacts
|
2015-05-20 21:35:57 +02:00 |
|
rabuzarus
|
30348a1bc0
|
port of red matrix archive-widget
|
2015-05-19 01:03:08 +02:00 |
|
fabrixxm
|
996224a8a4
|
Merge pull request #1567 from fabrixxm/feature/map
Fix stupid typo in include/event.php
|
2015-05-18 10:08:30 +02:00 |
|
fabrixxm
|
fc54ee2928
|
Fix stupid typo in include/event.php
That leads to blank events page
|
2015-05-18 09:54:43 +02:00 |
|
Michael Vogel
|
2038e65a57
|
Bugfix: The function "z_fetch_url" created warnings under certain circumstances.
|
2015-05-16 22:38:41 +02:00 |
|
|
|
72e3ffbb4d
|
Merge pull request #1563 from annando/1505-no-intelligent-shortening
Disable intelligent shortening - issue 1540
|
2015-05-16 12:04:28 +02:00 |
|
fabrixxm
|
19ee5797fa
|
add map to events
|
2015-05-15 21:10:43 +02:00 |
|
Michael Vogel
|
d995fc3994
|
The intelligent shortening for social media systems like Twitter, GNU Social and App.net can now be disabled.
|
2015-05-15 20:56:05 +02:00 |
|
fabrixxm
|
6258a21434
|
map bbcode tag from Red
|
2015-05-15 20:41:10 +02:00 |
|
|
|
2dd8db7de8
|
Merge pull request #1554 from FlxAlbroscheit/develop-1
Issue #1504: Creating groups directly from the sidebar in contacts-page
|
2015-05-13 19:59:58 +02:00 |
|
FlxAlbroscheit
|
57c47a8e36
|
Add a group with one click
|
2015-05-12 14:04:42 +02:00 |
|
|
|
a138d5d8c0
|
Merge pull request #1549 from annando/1505-diaspora-fetch-missing
Fetch missing Diaspora posts
|
2015-05-12 07:14:16 +02:00 |
|
Michael Vogel
|
33e572409d
|
There was no check for duplicated GUIDs, so doubled posts could occur.
|
2015-05-10 20:43:41 +02:00 |
|
Michael Vogel
|
5d1bd96076
|
Set the login date for every identity of the user.
|
2015-05-09 23:47:45 +02:00 |
|
Michael Vogel
|
9d257df700
|
Fetch missing Diaspora posts
|
2015-05-09 19:39:47 +02:00 |
|
Michael Vogel
|
b2ecf805ea
|
Missing $
|
2015-05-03 22:40:20 +02:00 |
|
Michael Vogel
|
faeae280c7
|
Bugfix: There should be no problems anymore with empty Diaspora reshares.
|
2015-05-03 22:15:26 +02:00 |
|
Michael Vogel
|
d4a172c142
|
Bugfix: Shadow copy. Improvement: Fetching of missing items for pictures
|
2015-05-03 21:25:03 +02:00 |
|
|
|
a37f31b82f
|
Merge pull request #1545 from annando/1503-load-issues
Value for maximum load until the frontend quits service
|
2015-05-03 09:15:54 +02:00 |
|
Michael Vogel
|
0812b7a7ac
|
Merge remote-tracking branch 'upstream/develop' into 1503-load-issues
|
2015-05-02 21:47:34 +02:00 |
|
Michael Vogel
|
439aee0a82
|
Automatically resize iframe if no height was provided.
|
2015-05-01 14:29:53 +02:00 |
|
Michael Vogel
|
747607fe97
|
Merge remote-tracking branch 'upstream/develop' into 1505-oembed-bbcode
|
2015-05-01 11:06:39 +02:00 |
|
Michael Vogel
|
be96b1eaa4
|
rich content in oembed now replaces the content in attachments
|
2015-05-01 10:42:43 +02:00 |
|
Michael Vogel
|
b5e10329f2
|
The oembed iframe now has a class name to use it for stylesheets.
|
2015-04-30 06:12:21 +02:00 |
|
Michael Vogel
|
d8558366aa
|
Redefined the conditions when notifications and introductions are shown.
|
2015-04-26 22:16:38 +02:00 |
|
Michael Vogel
|
58aeb1879b
|
API: The "conversation" function can now be called with every message id of a post in that conversation. Not only the parent.
|
2015-04-26 13:26:48 +02:00 |
|
Michael Vogel
|
20fc0e5285
|
Don't generate a preview in an item from Diaspora if it is a posting from red matrix.
|
2015-04-25 00:50:48 +02:00 |
|
Michael Vogel
|
e2827c0af7
|
The ID field will be stored with notifications as well.
|
2015-04-21 10:14:20 +02:00 |
|
Michael Vogel
|
261cd441c7
|
Merge remote-tracking branch 'upstream/develop' into 1504-condensed-notifications
|
2015-04-21 10:13:28 +02:00 |
|
Hauke Altmann
|
62b4f117bf
|
bug fix: "local_" has 6 not 5 characters
|
2015-04-17 10:02:17 +02:00 |
|
Hauke Altmann
|
c292d01723
|
bug fix: substring is not a PHP function %-)
|
2015-04-17 09:59:28 +02:00 |
|
hauke
|
00cbc383f5
|
code cleanup
|
2015-04-16 21:07:46 +02:00 |
|
hauke
|
0d61e462fe
|
preserve local index of friendica database when updating
|
2015-04-16 21:05:37 +02:00 |
|
Michael Vogel
|
d42cea51a2
|
The item id is now stored in every notification as well
|
2015-04-16 07:18:06 +02:00 |
|
Michael Vogel
|
2285b3b7a7
|
Storing the parent with every notification
|
2015-04-14 06:54:41 +02:00 |
|
Michael Vogel
|
178b7eba1b
|
Merge pull request #1487 from fabrixxm/projects
new api dfrn/remoteauth, allow plugins to use update_structure
|
2015-04-13 15:47:11 +02:00 |
|
Gregory Smith
|
ce821d0891
|
use ImageMagick for orientation when available
|
2015-04-12 21:09:25 -04:00 |
|
Michael Vogel
|
9a35e861ce
|
New field in the contact table to better detect "dead profiles"
|
2015-04-12 11:40:38 +02:00 |
|
fabrixxm
|
a0adf8c6a2
|
change remoteauth endpoint path
|
2015-04-12 08:53:30 +02:00 |
|
fabrixxm
|
8b2742dc7d
|
Merge pull request #1505 from annando/1504-unified-follow
The behaviour when following a new contact is now unified
|
2015-04-12 08:48:36 +02:00 |
|
Michael Vogel
|
04d9d9863d
|
Fixed "Copy and paste" bug.
|
2015-04-11 23:56:53 +02:00 |
|
Michael Vogel
|
0e895e24f7
|
Code reworks: replaced hardcoded network text with the corresponding constants.
|
2015-04-11 22:14:56 +02:00 |
|
Michael Vogel
|
f6ea872986
|
The behaviour when following a new contact is now unified.
|
2015-04-09 00:10:21 +02:00 |
|
fabrixxm
|
73248f7dda
|
allow to update generic subsets of tables
|
2015-04-06 21:03:11 +02:00 |
|
fabrixxm
|
11a83b2345
|
add new api dfrn/remoteauth
allow 'user@server' as username in api_login()
|
2015-04-06 21:03:11 +02:00 |
|
Michael Vogel
|
5e2c93e80c
|
Merge remote-tracking branch 'upstream/develop' into 1503-load-issues
|
2015-04-06 13:30:22 +02:00 |
|
|
|
81901f39e5
|
Merge pull request #1484 from annando/1504-bugfix-sql-warning
Bugfix: Avoid SQL warnings because of empty id list
|
2015-04-06 12:56:03 +02:00 |
|
Michael Vogel
|
4768c6c6b6
|
Diaspora: Central "plink" function
|
2015-04-06 12:26:31 +02:00 |
|
Michael Vogel
|
739219278b
|
Avoid SQL warnings because of empty id list.
|
2015-04-06 10:12:37 +02:00 |
|
Michael Vogel
|
3cbd72d907
|
API: New picture upload function (Enhanced Twidere support)
|
2015-04-06 03:19:12 +02:00 |
|
Michael Vogel
|
cdebdc777e
|
Removed test logger
|
2015-04-05 21:06:32 +02:00 |
|
Michael Vogel
|
57528cb987
|
New function for building the "share" header
|
2015-04-05 20:43:06 +02:00 |
|
fabrixxm
|
1523aecebd
|
Merge pull request #1472 from annando/issue-1063
The unseen marker is now set according to the api output
|
2015-04-03 15:07:56 +02:00 |
|
Michael Vogel
|
e9a2cf7a91
|
The unseen marker is now set according to the query that is used for the home timeline.
|
2015-04-03 14:58:42 +02:00 |
|
Michael Vogel
|
796b13673d
|
Reshared posts weren't always recognized as such.
|
2015-04-03 13:06:19 +02:00 |
|
Michael Vogel
|
7c0c56d20b
|
The conversion of Repeated posts to markdown had a problem with a missing linefeed before the quote.
|
2015-04-03 12:37:29 +02:00 |
|
Michael Vogel
|
c3f3a239f4
|
Issue 1038: Send update to directory when account is removed.
|
2015-03-30 22:22:11 +02:00 |
|
Michael Vogel
|
51cd55c8ad
|
Some more logging added for the DDoS prevention
|
2015-03-28 08:49:24 +01:00 |
|
Michael Vogel
|
0206f447e1
|
Preventing a DDoS with the zrl parameter.
|
2015-03-28 08:29:01 +01:00 |
|
Michael Vogel
|
dbb164ca4a
|
Merge pull request #1449 from fabrixxm/issue-1370
Create `database.sql` from `include\dbstructure.php`
|
2015-03-25 22:02:50 +01:00 |
|
fabrixxm
|
7c33c9cca1
|
fix SQL generation, update database.sql
|
2015-03-25 10:03:17 +01:00 |
|
fabrixxm
|
b2b1de5a01
|
Create database.sql from include\dbstructure.php
add two commands to `dbstructure.php` when called from cli:
'update' updates the database schema
'dumpsql' dump database sql to stdout
|
2015-03-25 09:47:59 +01:00 |
|
Michael Vogel
|
25dbf26345
|
Removed the special detection for facebook and app.net since both provide RSS feeds.
|
2015-03-24 23:08:46 +01:00 |
|
Michael Vogel
|
3d297c065e
|
Merge pull request #1444 from fabrixxm/issue-1341
fix paginate url
|
2015-03-23 15:19:35 +01:00 |
|
fabrixxm
|
8b5d9c32a7
|
Merge pull request #1446 from annando/issue-905
Diaspora: The signature of likes are checked now correctly
|
2015-03-23 12:06:46 +01:00 |
|
Michael Vogel
|
b40f19262a
|
Diaspora: The signature of likes are checked now correctly.
enter the commit message for your changes. Lines starting
|
2015-03-22 21:53:13 +01:00 |
|
fabrixxm
|
a98d2ee387
|
ignore tags inside code block
should fix issue #1041
|
2015-03-22 17:12:51 +01:00 |
|
fabrixxm
|
add3411542
|
fix paginate url
pagination url wasn't alway stripping 'page' parameter from url
related to issue #1341
|
2015-03-22 16:38:05 +01:00 |
|
hauke
|
b2a86ceeaa
|
bugfix #1307
|
2015-03-22 10:02:00 +01:00 |
|
Michael Vogel
|
81b199cfdc
|
The global copy now copies comments as well. This is important for the search.
|
2015-03-21 20:23:47 +01:00 |
|
Michael Vogel
|
ae172a9cec
|
If the load is too high, now not only the poller but also the page delivery will stop.
|
2015-03-15 07:45:50 +01:00 |
|
|
|
82abc32a14
|
Merge pull request #1426 from annando/1503-term-search
The index for the term search is now massively improved
|
2015-03-12 07:15:05 +01:00 |
|
Michael Vogel
|
7a39626a6c
|
The index for the term search is now massively improved.
|
2015-03-10 00:23:49 +01:00 |
|
Michael Vogel
|
94302a7924
|
Reworked guid function.
|
2015-03-09 20:59:57 +01:00 |
|
Michael Vogel
|
ea06a1ec45
|
There is now a "global" field in the item table that tells if this item is present as global copy as well.
|
2015-03-09 00:45:53 +01:00 |
|
Michael Vogel
|
2260415ca9
|
"global" flag for terms that indicate if the term is present in the global posts.
|
2015-03-08 03:27:14 +01:00 |
|
Michael Vogel
|
e2965c9ec5
|
Removed the timestamp for parser.
|
2015-03-08 03:25:32 +01:00 |
|
Michael Vogel
|
dbe8275ae5
|
Added some more timestamp measuring
|
2015-03-07 23:14:26 +01:00 |
|
Michael Vogel
|
7c4a1a059d
|
New fields for the term table, improved query for the tag search. Changed the cache handling for rendered bbcode.
|
2015-03-07 21:24:39 +01:00 |
|
Michael Vogel
|
e5fc28bb31
|
Removed some unnecessary code
|
2015-03-07 21:10:02 +01:00 |
|
Michael Vogel
|
dc380d7800
|
Adding some more data to Diaspora reshares
|
2015-03-07 21:09:32 +01:00 |
|
Michael Vogel
|
30548dfeed
|
Improving performance measuring for the bbcode parser.
|
2015-03-07 21:08:22 +01:00 |
|
Michael Vogel
|
df880f7fd2
|
Adding performance measuring to the photo functions.
|
2015-03-07 21:07:26 +01:00 |
|
Michael Vogel
|
4a10cb1b99
|
Disabled the rewriting of hashtag links
|
2015-03-03 14:10:42 +01:00 |
|
Michael Vogel
|
027b11ebb5
|
Small bugfix for likes
|
2015-03-02 23:34:59 +01:00 |
|
Michael Vogel
|
3b9a8daeeb
|
Merge remote-tracking branch 'upstream/develop' into 1503-hashtag-handling
|
2015-03-02 07:37:31 +01:00 |
|
Michael Vogel
|
9e55dbf1db
|
There is already a setting for that ...
|
2015-03-02 00:32:46 +01:00 |
|
Michael Vogel
|
52e33d50ad
|
Changing header sizes and changing the header type of oembed data.
|
2015-03-01 21:58:31 +01:00 |
|
Michael Vogel
|
da49814cbb
|
Use a header element for the oembed data.
|
2015-03-01 21:24:10 +01:00 |
|
Michael Vogel
|
579ac83547
|
Fixing problems with single linefeeds in the Markdown conversion.
|
2015-03-01 21:22:06 +01:00 |
|
Michael Vogel
|
3f1d186106
|
Remove the old hashtag functions, change it to the new functionality.
|
2015-03-01 20:40:38 +01:00 |
|
Michael Vogel
|
bf0f7c3d0a
|
New bbcode elements h1 to h6 for a better conversion of Diaspora content
|
2015-03-01 20:07:56 +01:00 |
|
Michael Vogel
|
ac3a4824df
|
Check for hashtags when storing them and eventually adding hashtag links
|
2015-03-01 17:33:55 +01:00 |
|
Michael Vogel
|
5cb6d6e537
|
We have to disable the SSL checks, otherwise the communication will fail for servers with self-signed certificates
|
2015-03-01 10:53:49 +01:00 |
|
|
|
20208acb23
|
Merge pull request #1417 from annando/1502-improved-markdown
Updated libraries for Markdown and mobile detection
|
2015-02-28 08:17:22 +01:00 |
|
|
|
f1b0258fdd
|
Merge pull request #1415 from annando/1502-like-no-update-commented
New Global setting: like shouldn't set "commented"
|
2015-02-28 08:15:12 +01:00 |
|
Michael Vogel
|
b827824faf
|
Trying to avoid parser problems.
|
2015-02-24 20:39:02 +01:00 |
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
Michael Vogel
|
a2a393a3c6
|
Better check for Diaspora accounts so you can connect them from the /suggest page.
|
2015-01-06 12:31:44 +01:00 |
|
Michael Vogel
|
5684ba4442
|
Now the glink table is written as well in the poco_check function.
|
2015-01-06 08:16:15 +01:00 |
|
Michael Vogel
|
1a5a00bef8
|
While storing an item, now every contact is stored in the gcontact table.
|
2015-01-06 07:23:11 +01:00 |
|
Michael Vogel
|
011f5b9cae
|
Bugfix: Postings disappeared due to a small variable ...
|
2015-01-05 14:28:17 +01:00 |
|
Michael Vogel
|
d49c3e99ac
|
Suggest only active accounts. Remove duplicates from gcontact table.
|
2015-01-05 08:03:29 +01:00 |
|
Michael Vogel
|
47560fc6c7
|
Merge remote-tracking branch 'upstream/develop' into 1501-enhanced-poco
|
2015-01-04 21:07:45 +01:00 |
|
Michael Vogel
|
003e87b112
|
Merge remote-tracking branch 'upstream/develop' into issue-1218
|
2015-01-04 20:21:49 +01:00 |
|
Michael Vogel
|
7084adfd1c
|
Merge remote-tracking branch 'upstream/develop' into 1501-enhanced-poco
Conflicts:
boot.php
update.php
|
2015-01-04 19:32:08 +01:00 |
|
Michael Vogel
|
11c82816b3
|
Poco now returns the last update date as well. This date will be stored in the gcontact table.
|
2015-01-04 19:19:47 +01:00 |
|
Michael Vogel
|
aa6275356a
|
The function to fetch the original url (without shortener) failed if a linked file was too large.
|
2015-01-04 15:31:47 +01:00 |
|
Michael Vogel
|
cce561708a
|
Replaced $argv and $argc with the $_SERVER array
|
2015-01-04 13:24:16 +01:00 |
|
Michael Vogel
|
a86c143e24
|
The "scrape" bugfix lead to partly damaged encodings. This is fixed now.
|
2015-01-04 11:56:41 +01:00 |
|
fabrixxm
|
3195bacd9e
|
Merge pull request #1275 from annando/1501-hashtags-in-attachments
Titles in attached link description now don't create misformatted text anymore
|
2015-01-03 21:32:55 +01:00 |
|
Michael Vogel
|
7156294055
|
Items that were stored via "remote-self" hadn't contained a valid avatar picture.
|
2015-01-02 12:45:09 +01:00 |
|
Michael Vogel
|
bf147ca9d9
|
Hashtags in attached link description now don't create misformatted text anymore.
|
2015-01-02 01:43:31 +01:00 |
|
Michael Vogel
|
38a45d325f
|
See issue 1218: generate $argv and $argc from $_SERVER if it wasn't defined.
|
2015-01-02 00:01:17 +01:00 |
|
Michael Vogel
|
1520a3feab
|
Using a better placeholder. Could solve this issue: https://github.com/friendica/friendica/issues/920
|
2015-01-01 21:19:07 +01:00 |
|
|
|
22ae03c1a3
|
Merge pull request #1271 from fabrixxm/api/favorites
api: favorite create/destroy update also thread table
|
2015-01-01 19:06:59 +01:00 |
|
Michael Vogel
|
a94673ccb4
|
API: Support for attachments
|
2015-01-01 18:31:50 +01:00 |
|
fabrixxm
|
35bb7816af
|
api: favorite create/destroy update also thread table
|
2014-12-31 18:08:11 +01:00 |
|
Michael Vogel
|
26d5746d99
|
Support for attachments in the API (for better AndStatus support)
|
2014-12-31 17:01:55 +01:00 |
|
Michael Vogel
|
d80c375220
|
Merge remote-tracking branch 'upstream/develop' into 1412-api-attachments
|
2014-12-31 15:45:51 +01:00 |
|
Michael Vogel
|
33c0aba5b7
|
Add the file size to the photo data array
|
2014-12-31 15:44:32 +01:00 |
|
fabrixxm
|
5d91e5418b
|
api: add support to star/unstar items
|
2014-12-31 12:34:32 +01:00 |
|
fabrixxm
|
d66fda2eab
|
Fix syntax error in include/Emailer.php
|
2014-12-29 16:40:04 +01:00 |
|
fabrixxm
|
917ce5b411
|
Adds optional parameter 'uid' to Emailer::send()
that is the user id of the recipient of the mail.
Make enotify pass it to Emailer::send()
|
2014-12-29 16:04:51 +01:00 |
|
Fabio Comuni
|
a659b34117
|
Adds 'emailer_send_prepare' and 'emailer_send' hooks
Adds relative documentation in doc/Plugins
|
2014-12-29 15:44:30 +01:00 |
|
Michael Vogel
|
c15b7d8d04
|
Merge remote-tracking branch 'upstream/develop' into 1409-shadow-items
|
2014-12-23 07:41:47 +01:00 |
|
Michael Vogel
|
dc47ef65f9
|
Issue 1234: Add the account name to the notification mails.
|
2014-12-23 00:55:36 +01:00 |
|
Michael Vogel
|
41014735f1
|
Feeds are never public so the posts can never be duplicated.
|
2014-12-22 07:32:04 +01:00 |
|
Michael Vogel
|
2ab38de59c
|
Additional check if the duplicated entry isn't from a hidden or blocked contact.
|
2014-12-21 23:47:19 +01:00 |
|
Michael Vogel
|
043c406091
|
Update function for creating the shadow entries.
|
2014-12-21 21:19:37 +01:00 |
|
Michael Vogel
|
d054ac8d9c
|
redone the changes I accidentally overwrote ... Me and GIT will never be in love ...
|
2014-12-21 11:02:31 +01:00 |
|
Michael Vogel
|
2c5281cbf1
|
reverted a change that wasn't intended to be published yet/Delete thread was missing at Diaspora items.
|
2014-12-21 02:10:49 +01:00 |
|
Michael Vogel
|
4fb059095f
|
Performance stuff: Caching for getsiteinfo function, check before running onepoll.php
|
2014-12-21 02:03:06 +01:00 |
|
Michael Vogel
|
2ac42036fb
|
Fix for error in delete function, improved query for community.
|
2014-12-21 01:59:38 +01:00 |
|
Michael Vogel
|
1a0a80c310
|
Merge remote-tracking branch 'upstream/develop' into 1409-shadow-items
|
2014-12-20 09:37:33 +01:00 |
|
Michael Vogel
|
15f43d8ca3
|
Generate preview pictures from enclosed data from feeds.
|
2014-12-17 21:57:38 +01:00 |
|
Michael Vogel
|
bc5c470cac
|
Fix for issue 1191 - Embedded Youtube video isn't playing when SSL is active
|
2014-12-14 12:47:16 +01:00 |
|
Michael Vogel
|
3d26e1d233
|
When converting bbcode for Libertree then an empty line has to be before a honrizontal ruler.
|
2014-12-13 23:07:15 +01:00 |
|
Michael Vogel
|
04106ff6f5
|
Moving the clean up code to a central place.
|
2014-12-08 22:37:49 +01:00 |
|
Michael Vogel
|
620ee6be0b
|
Cleanup the HTML before parsing it.
|
2014-12-08 14:26:44 +01:00 |
|
Michael Vogel
|
c398974918
|
Logging to analyse the stale gprobe processes
|
2014-12-08 11:02:03 +01:00 |
|
|
|
f2d0baae84
|
Merge pull request #1236 from annando/1412-make-preview-picture-smaller
When a post contains a picture then a picture in the added information is displayed only as a small preview picture
|
2014-12-07 10:43:32 +01:00 |
|
|
|
e218c2470a
|
Merge pull request #1235 from annando/1412-some-more-tracker-removed
1412 some more tracker removed
|
2014-12-07 10:42:42 +01:00 |
|
|
|
d0ddf00efe
|
Merge pull request #1237 from annando/1412-added-hashtags-for-diaspora
When exporting shared posts to diaspora now removed hashtags will be added again
|
2014-12-07 10:42:00 +01:00 |
|
Michael Vogel
|
0bfe57bb48
|
Merge remote-tracking branch 'upstream/develop' into 1409-shadow-items
|
2014-12-01 23:32:23 +01:00 |
|
Michael Vogel
|
0c60eb18f7
|
Some more typical tracking parameter is removed
|
2014-12-01 22:52:51 +01:00 |
|
Michael Vogel
|
d2d3804e09
|
If a link contains BBCode stuff, make a short link out of this to avoid parsing problems
|
2014-12-01 22:51:41 +01:00 |
|
Michael Vogel
|
e475cf131d
|
When a post contains a picture then a picture in the added information is displayed only as a small preview picture.
|
2014-12-01 22:49:35 +01:00 |
|
Michael Vogel
|
7b26aa2b84
|
When exporting shared posts to diaspora now removed hashtags will be added again.
|
2014-12-01 22:45:13 +01:00 |
|
Michael Vogel
|
a3f7578085
|
Merge branch 'develop' of github.com:annando/friendica into 1409-shadow-items
|
2014-11-19 00:19:30 +01:00 |
|
Michael Vogel
|
f8f7cc9292
|
API: Possibilty of throttling when posting limit is reached
|
2014-11-18 23:55:45 +01:00 |
|
Michael Vogel
|
5379e07c4e
|
Setting default values for all database fields.
|
2014-11-09 13:29:27 +01:00 |
|
Michael Vogel
|
9172ea2246
|
Some more values that need to be set to avoid SQL warnings.
|
2014-11-09 01:13:07 +01:00 |
|
Michael Vogel
|
3eed5bbd3e
|
Further improvement for newlines after attachments
|
2014-11-02 18:39:23 +01:00 |
|
Michael Vogel
|
14ea4b972e
|
BBCode: Newlines under attachments are now removed
|
2014-11-02 17:35:49 +01:00 |
|
Michael Vogel
|
5e303f9905
|
Removed some more special characters from hashtags
|
2014-10-30 11:33:33 +01:00 |
|
Michael Vogel
|
691aa17025
|
fetch further information: it is now possible to define a blacklist for keywords for "fetch further information"
|
2014-10-30 00:24:23 +01:00 |
|
Michael Vogel
|
17f87ef9b2
|
Remote-self: It does only make sense to check for duplicates from friendica
|
2014-10-29 08:24:05 +01:00 |
|
Michael Vogel
|
59517f6e58
|
Remote self is now working for diaspora contacts as well.
|
2014-10-29 01:42:43 +01:00 |
|
Michael Vogel
|
338ad1d85f
|
Additional check for repeated posts
|
2014-10-29 01:31:29 +01:00 |
|
Michael Vogel
|
3e57954807
|
remote-self: Moved the code in a single function and cleaned it up.
|
2014-10-29 01:05:09 +01:00 |
|
Michael Vogel
|
01cb340752
|
Let remote-self posts appear as own posts - for test reasons
|
2014-10-28 22:10:58 +01:00 |
|
Michael Vogel
|
e46f597b00
|
Remote-self functionality added at another place - time for a separated function. (tbd)
|
2014-10-28 08:30:04 +01:00 |
|
Michael Vogel
|
f4860d3fd0
|
Remote-self: relocated the code (may now work?)
|
2014-10-27 21:44:30 +01:00 |
|
Michael Vogel
|
332531599e
|
Create a new guid and a separated item if remote self is used on a network that isn't a feed
|
2014-10-27 21:13:21 +01:00 |
|
Michael Vogel
|
b1cdaefcb2
|
Merge branch 'develop' of github.com:annando/friendica into 1410-remote-self
|
2014-10-27 11:45:39 +01:00 |
|
|
|
f1697d3e5d
|
Merge pull request #1209 from FX7/master
Added exact time to items after 24 hours
|
2014-10-25 19:21:21 +02:00 |
|
effex7
|
eb5bf2a733
|
Added exact time to items after 24 hours
|
2014-10-25 16:44:24 +02:00 |
|
fabrixxm
|
4c66a3486a
|
Merge pull request #1207 from annando/1410-remote-self-with-keywords
remote self: There is now an option if the keyswords should be used as tags or not
|
2014-10-24 10:55:22 +02:00 |
|
Michael Vogel
|
c77a63fb27
|
remote self: There is now an option if the keyswords should be used as tags or not.
|
2014-10-24 01:37:33 +02:00 |
|
Michael Vogel
|
bd4410f11b
|
Merge pull request #1200 from fabrixxm/issues/1193
Fix #1193
|
2014-10-23 18:18:31 +02:00 |
|
Fabrixxm
|
ba6f391635
|
replace embedded images before statustext is shortened
|
2014-10-23 17:04:07 +02:00 |
|
Fabrixxm
|
b1e83f331e
|
workaround for issue #1134
|
2014-10-23 16:27:30 +02:00 |
|
Fabrixxm
|
8bf19aabb0
|
api: allow filter of direct messages sender by user_id or screen_name
|
2014-10-23 08:59:48 +02:00 |
|
Fabrixxm
|
634a03dd45
|
Fix #1193
|
2014-10-22 09:46:51 +02:00 |
|
Michael Vogel
|
f6522658f6
|
Using "remote self" to synchronize Frandiaca accounts
|
2014-10-22 08:30:16 +02:00 |
|
Michael Vogel
|
0c1fdb7da1
|
New hook "page_info_data"
|
2014-10-20 08:10:21 +02:00 |
|
Michael Vogel
|
3600289262
|
New hook "getsiteinfo", separating fetching site info from generating bbcode
|
2014-10-20 08:03:47 +02:00 |
|
Fabrixxm
|
9053417179
|
fix small bug in direct messages api
|
2014-10-16 11:55:59 +02:00 |
|
Fabrixxm
|
a490140218
|
add jsonp support to api
|
2014-10-16 10:51:36 +02:00 |
|
fabrixxm
|
3092d34a7a
|
Merge pull request #1177 from annando/1410-feed-with-tags
Importing feed with hashtags from keywords
|
2014-10-06 09:54:36 +02:00 |
|
Michael Vogel
|
759f199b6f
|
Created hashtags from keywords now are links. URL are cleaned from tracking data.
|
2014-10-03 13:02:15 +02:00 |
|
Michael Vogel
|
904f8ac422
|
Creating hashtags from keywords of a feed, when additional data should be fetched.
|
2014-10-03 12:18:33 +02:00 |
|
Michael Vogel
|
eb592030eb
|
Merge remote-tracking branch 'upstream/master' into 1409-diaspora-repeated-twitter-cleanup
|
2014-09-29 09:42:47 +02:00 |
|
fabrixxm
|
3a0b18fa36
|
Merge pull request #1168 from annando/1409-application-source-name
API: Detecting the source name of the application
|
2014-09-29 09:24:41 +02:00 |
|
Michael Vogel
|
335855a40b
|
API: Fetching the application name of the client.
|
2014-09-28 17:23:01 +02:00 |
|
Michael Vogel
|
2b26181509
|
Issue 1158: muting of threads now works with the API as well.
|
2014-09-28 00:42:27 +02:00 |
|
Michael Vogel
|
778ed772d2
|
Diaspora: Repeated items from twitter to Diaspora now only include a link, since Diaspora is showing the whole tweet.
|
2014-09-27 23:39:06 +02:00 |
|
Michael Vogel
|
21c09c0732
|
API: Set the application name to "api" (if not defined), "remote_self" has an application name as well.
|
2014-09-27 23:37:05 +02:00 |
|
Michael Vogel
|
459fc2fabd
|
Security issue: Encoding of GUID in itemcache to avoid directory bypassing with a malificious formatted GUID.
|
2014-09-27 12:49:00 +02:00 |
|
fabrixxm
|
8f2f7f8380
|
Override 'enotify_no_content' system option if type is SYSTEM_EMAIL
|
2014-09-10 18:30:30 +02:00 |
|
fabrixxm
|
7687342849
|
fix email for
- registration request
- registration approval
- account created by admin
add a reditect after registration approval or deny
|
2014-09-09 22:07:47 +02:00 |
|
|
|
e767e2d750
|
Merge pull request #1131 from fabrixxm/master
Bug fixes!
|
2014-09-07 17:52:52 +02:00 |
|
fabrixxm
|
3ac5e4508b
|
fix email to new registerd users.
fix notification in case of error sending email.
|
2014-09-07 17:46:31 +02:00 |
|
fabrixxm
|
6db73c0b6d
|
fix update routine to support update from 3.2
disable PDO support
|
2014-09-07 17:28:38 +02:00 |
|
|
|
2eb74a9b42
|
fixing a typo
|
2014-09-07 16:59:01 +02:00 |
|
Beanow
|
2fe79c564b
|
Fixed whitespace issue causing trueish results in templates.
For example: profiles would show labels with no content.
|
2014-09-07 15:48:44 +02:00 |
|
fabrixxm
|
21b1e09fad
|
Merge remote-tracking branch 'friendica/master' into mail_notification_cleanup
|
2014-09-07 14:28:03 +02:00 |
|
