Michael Vogel
643e228d6b
Bookmark links are now looking again like bookmark links
2015-11-28 07:37:02 +01:00
rabuzarus
9189971cb8
display contact information in contact and directory according to the other contact related pages
2015-11-28 02:56:36 +01:00
Michael Vogel
79092f149c
Requests for soapbox and freelove accounts are automatically accepted
2015-11-28 01:03:26 +01:00
Michael Vogel
a9b2b48d08
Some small improvements to the OStatus export
2015-11-27 23:16:54 +01:00
Tobias Diekershoff
5fe8ae514b
Merge pull request #2102 from annando/1511-unseen-forums
...
Bugfix: Now the unseen counter for forums work
2015-11-27 22:17:17 +01:00
Michael Vogel
3b6d3d1ade
Merge pull request #2099 from rabuzarus/2611_new_user_addr
...
generate addr for new registered users
2015-11-27 21:35:46 +01:00
Michael Vogel
75710df61a
Bugfix: Now the unseen counter works.
2015-11-27 21:18:54 +01:00
Michael Vogel
9c37fc320e
Merge pull request #2095 from rabuzarus/unread_forums
...
count unread forum items for forumlist widget (ping.php)
2015-11-27 16:28:21 +01:00
Michael Vogel
b1a9e9b6d4
OStatus: Commented out some "to-do" stuff
2015-11-27 08:09:19 +01:00
Michael Vogel
b45ca80656
Merge remote-tracking branch 'upstream/develop' into 1511-new-ostatus-delivery
2015-11-27 07:30:03 +01:00
Michael Vogel
fa8b4738ee
Bugfix: There was an endless loop in the probe_url function ...
2015-11-26 21:58:01 +01:00
rabuzarus
620299dc25
include friendica address in hcard
2015-11-26 17:46:38 +01:00
rabuzarus
84ec36d52c
generate addr for new registered users
2015-11-26 14:08:32 +01:00
Michael Vogel
fc250bbc20
Merge remote-tracking branch 'upstream/develop' into 1511-new-ostatus-delivery
2015-11-26 11:46:58 +01:00
Tobias Diekershoff
e146b42d15
Merge pull request #2098 from annando/1511-self-contact
...
Only update contact data for OStatus contacts
2015-11-26 09:59:19 +01:00
Michael Vogel
1203088c3e
Only update contact data for OStatus contacts
2015-11-26 08:26:29 +01:00
Michael Vogel
602821279a
scrape_dfrn now scrapes the address as well.
2015-11-25 18:46:02 +01:00
Michael Vogel
6b5ea74bbd
Deactivated some attachment part in the old functions
2015-11-25 08:28:17 +01:00
rabuzarus
bc61d76b56
forumlist: little doxygen polishing
2015-11-24 22:34:23 +01:00
rabuzarus
ddf3589fc5
count unread forum items for forumlist widget (ping.php)
2015-11-24 22:14:26 +01:00
Michael Vogel
034f573374
Bugfix: Bookmarks doesn't federate well.
2015-11-24 21:03:06 +01:00
Michael Vogel
3b101c9d98
Merge remote-tracking branch 'upstream/develop' into 1511-new-ostatus-delivery
2015-11-24 09:38:46 +01:00
root
c73d961198
Merge branch 'develop' of https://github.com/gerhard6380/friendica into develop
2015-11-24 02:56:35 +01:00
root
2c89a43286
Test
2015-11-24 02:49:29 +01:00
Michael Vogel
7d7e2e74f4
The generated XML is now valid and it seems to work.
2015-11-23 23:49:14 +01:00
Michael Vogel
64b3881e73
API: Show the remote profile so that AndStatus uses the correct webfinger address
2015-11-23 19:16:27 +01:00
Michael Vogel
75f1a17f7e
New function for creating the OStatus messages
2015-11-23 18:44:47 +01:00
Michael Vogel
6d2a9e44a7
API: Improvements for fetching the nick name
2015-11-23 18:42:45 +01:00
Michael Vogel
37f466d16e
Prevention of endless loops in the conversation
2015-11-18 23:57:53 +01:00
Michael Vogel
41fe07e128
Merge remote-tracking branch 'upstream/develop' into 1511-forumlist-fix
2015-11-17 21:34:01 +01:00
Michael Vogel
cd059aa68f
Some SQL fixes
2015-11-17 20:31:40 +01:00
fabrixxm
d1319d97a2
Merge pull request #2081 from annando/1511-avatar-fix
...
The own avatar was (sometimes?) changed back when it was changed
2015-11-17 09:13:08 +01:00
Michael Vogel
e43c7a4447
Merge pull request #2061 from rabuzarus/0711_forumlist
...
move forumlist addon to core
2015-11-17 08:46:15 +01:00
Michael Vogel
b53ae0d42a
Bugfix: The own avatar was (sometimes?) changed back when it was changed.
2015-11-17 08:39:09 +01:00
Michael Vogel
e1774acbde
Bugfix: Avoid error messages because of an already used function
2015-11-13 23:55:01 +01:00
rabuzarus
cec5afe2c9
forumlist: don't raise db version in dbstructure.php
2015-11-13 23:49:37 +01:00
Tobias Diekershoff
a552845d8f
Merge pull request #2072 from fabrixxm/issue_2066
...
Remove anonymous function, 5.2 is still minimal requirement
2015-11-13 12:51:17 +01:00
Tobias Diekershoff
009b3364e5
Merge pull request #2074 from fabrixxm/issue_2071
...
Use static css in install procedure
2015-11-13 12:50:41 +01:00
Fabrixxm
6605e30cf2
pass to all templates by default
2015-11-13 10:56:37 +01:00
Michael Vogel
6ddf62bdf7
Merge remote-tracking branch 'upstream/develop' into 1511-avatar
2015-11-13 09:48:34 +01:00
Michael Vogel
c951123b76
Cleaned code
2015-11-13 09:45:15 +01:00
Fabrixxm
fa4ee05312
Remove anonymous function, 5.2 is still minimal requirement
2015-11-13 09:36:22 +01:00
fabrixxm
98f524db67
Merge pull request #2067 from annando/1511-optimize-sql
...
Optimized SQL queries to reduce the amount of write operations
2015-11-13 09:16:52 +01:00
Michael Vogel
11905c0bec
The avatar picture wasn't updated at the contact table
2015-11-13 08:45:14 +01:00
rabuzarus
86e720c99d
forumlist: some more doxygen for plugin.php
2015-11-13 00:33:32 +01:00
Michael Vogel
1ea82ea355
Only allow non top level posts to soap boxes
2015-11-12 21:55:33 +01:00
Michael Vogel
3648094927
Local delivery of comments to soap boxes are working now
2015-11-12 21:43:42 +01:00
Michael Vogel
c95afa525e
Some SQL queries were optimized to reduce the amount of write operations.
2015-11-12 08:59:29 +01:00
rabuzarus
902735f6d4
forumlist: dbupdate
2015-11-11 23:39:14 +01:00
rabuzarus
862ccb95d2
forumlist: doxygen corrections
2015-11-11 22:41:44 +01:00
rabuzarus
7bba9c783f
forumlist: function get_feature_default()
2015-11-11 22:36:14 +01:00
rabuzarus
215205d376
forumlist: nodeinfo_plugin_enabled() is now plugin_enabled()
2015-11-11 21:31:26 +01:00
rabuzarus
dac6f39f41
forumlist: use a more unique identifier
2015-11-11 01:29:31 +01:00
rabuzarus
a67710bc7c
forumlist: some little code unification
2015-11-10 20:31:13 +01:00
rabuzarus
dd58a713d8
forumlist: move include to header
2015-11-10 19:23:45 +01:00
rabuzarus
96b764425e
move forumlist addon to core
2015-11-09 15:56:20 +01:00
Michael Vogel
1c5eaa646c
Only show valid contacts on the group side
2015-11-08 16:41:00 +01:00
Tobias Diekershoff
d9e56e0450
Merge pull request #2047 from annando/1511-ostatus-warning
...
This is a bugfix for pull request 2040
2015-11-08 15:43:53 +01:00
Michael Vogel
ea0397b676
This is a bugfix for pull request 2040
2015-11-08 15:32:16 +01:00
Tobias Diekershoff
c0e87b2bea
Merge pull request #2045 from annando/1511-dirfind-addr
...
You can now discover previously unknown users via the dirsearch
2015-11-08 15:19:11 +01:00
Michael Vogel
e12b0d27bb
You can now search for @username@domain.tld in dirfind and the search will resolve that.
2015-11-08 14:48:47 +01:00
fabrixxm
ae9c9829fa
Remove language selectors from themes
...
This is now a user setting
2015-11-08 14:42:54 +01:00
fabrixxm
fb3ac68cc0
Add user language in settings, use that field as language for UI
2015-11-08 14:23:49 +01:00
Michael Vogel
27b166caf6
Bugfix for not working pagination in GNU Social
2015-11-08 11:10:20 +01:00
Tobias Diekershoff
294b4ecf5e
Merge pull request #2034 from fabrixxm/issue_1986
...
fix the contact photo menu
2015-11-07 20:29:20 +01:00
fabrixxm
35302d4274
fix the contact photo menu
...
fix "should open a new tab" attribute
fix javascript deletion dialog (fix #1986 )
2015-11-07 18:25:35 +01:00
fabrixxm
d5a32ef214
cron: move update_suggestions in separated thread
...
Move the call in discover_poco.php.
This should fix expiration and other cron related issues
2015-11-07 17:52:52 +01:00
Michael Vogel
88e1ac9654
API Bugfix: This fixes the problem that posts to AndStatus appeared as empty posts
2015-11-07 14:36:00 +01:00
fabrixxm
80b62071e1
Use old style array declaration
2015-11-07 12:21:54 +01:00
fabrixxm
0aa69f134f
Fix template_var hook
...
move it to smarty3 replate_macro, pass the theme name in $b
2015-11-06 19:52:00 +01:00
fabrixxm
545a7a80e4
Add 'template_vars' hook
2015-11-06 19:33:14 +01:00
Michael Vogel
0f563525bd
Optical adjustments for contacts/set "last_failure" when inaccessible
2015-11-06 09:15:20 +01:00
Michael Vogel
f42a3c9bc6
Update the contact table as well.
2015-11-06 01:19:37 +01:00
Michael Vogel
0f41f35041
The contact template now displays the address if available
2015-11-06 00:47:54 +01:00
Michael Vogel
2e81d0a2b3
Fetch the "addr" value whenever it is empty
2015-11-05 10:55:00 +01:00
Michael Vogel
d6080f4c76
The "addr" field is now in the global contacts as well.
2015-11-05 08:37:00 +01:00
Michael Vogel
a193a482cd
Friendica contacts where detected as OStatus contacts when they should be Diaspora contacts
2015-11-05 00:42:38 +01:00
Michael Vogel
3b11436b02
Merge pull request #1989 from rabuzarus/allfriends
...
template-rework: let common friends and allfriends use viewcontact_te…
2015-11-03 23:27:24 +01:00
rabuzarus
e785759a8b
template-rework:make use of get_contact_details_by_url()
2015-11-03 14:31:15 +01:00
Michael Vogel
6a15dded0e
Bugfix: The timeout value of z_fetch_url couldn't be set manually
2015-11-03 00:48:49 +01:00
Michael Vogel
b87d7ef1af
Return the contact id at "all_friends" and "common_contacts"
2015-11-01 08:54:44 +01:00
Michael Vogel
09ff2f0dd5
Renamed the function
2015-10-31 00:01:33 +01:00
Michael Vogel
f3ce812a9e
New function for fetching contact data
2015-10-30 01:30:42 +01:00
Tobias Diekershoff
bb4efb01a7
Merge pull request #1980 from annando/1510-coord-ostatus
...
OStatus: send the coordinates in an additional field
2015-10-25 16:53:17 +01:00
Tobias Diekershoff
12d9c46ec5
Merge pull request #1979 from annando/1510-gnusocial
...
Statusnet is now GNU Social
2015-10-25 16:52:38 +01:00
Tobias Diekershoff
4e78d439e2
Merge pull request #1978 from annando/1510-bad-servers
...
Workaround for bad configured servers
2015-10-25 16:52:10 +01:00
Michael Vogel
c7205ea705
Bugfix: Authorization at ejabberd only worked for uid=1
2015-10-25 10:17:23 +01:00
Michael Vogel
a11833e248
Statusnet is now GNU Social
2015-10-24 20:44:18 +02:00
Michael Vogel
ecf65e52ee
OStatus: send the coordinates in an additional field
2015-10-24 20:42:47 +02:00
Michael Vogel
ddc8f069f2
Workaround for bad configured servers
2015-10-24 20:41:21 +02:00
Michael Vogel
891ad5b39d
Support for additional passwords for ejabberd
2015-10-19 19:03:11 +02:00
Tobias Diekershoff
ddaacc1e53
Merge pull request #1965 from rabuzarus/event-attendance
...
fix translation bug for likers
2015-10-17 12:51:19 +02:00
Michael Vogel
8a79e1afb3
The datepicker is now localised
2015-10-17 10:48:13 +02:00
Michael Vogel
8395f67351
Events on Diaspora now looking okay.
2015-10-17 09:41:58 +02:00
Michael Vogel
485e65871e
Avoid wrong birthdays
2015-10-17 02:36:16 +02:00
Michael Vogel
7f9711ffe6
Delete event when the item is deleted
2015-10-17 01:25:25 +02:00
Michael Vogel
dd46a6ff68
Store the event when a summary or a description is set
2015-10-17 00:58:22 +02:00
Michael Vogel
fcc185a182
Unsure to store the guid with new events
2015-10-16 23:50:34 +02:00
rabuzarus
642f3fca1a
fix translation bug for likers
2015-10-14 19:48:57 +02:00
Michael Vogel
65228e37bb
Avoid a warning when a feed contains no items.
2015-10-14 08:10:06 +02:00
Tobias Diekershoff
ce03ccc95c
Merge pull request #1929 from rabuzarus/event-attendance
...
port of reds event attendance feature
2015-10-12 15:10:03 +02:00
Michael Vogel
a58be37930
Merge pull request #1943 from tobiasd/20151007-adminname
...
personalise emails send from the server
2015-10-12 07:50:40 +02:00
rabuzarus
5c2923869a
this got lost by merge
2015-10-11 20:00:54 +02:00
rabuzarus
649578ae33
Merge develop-new into event-attendance-new
...
Conflicts:
include/conversation.php
2015-10-11 19:39:55 +02:00
rabuzarus
a539455d81
correct a little mistake (delivery.php was not commited)
2015-10-11 18:20:06 +02:00
rabuzarus
6f04c57ed3
correct a little mistake (ACTIVITY_LIKE is supported)
2015-10-11 15:34:56 +02:00
rabuzarus
0b36b09823
don't send attendance activities to diaspora (unsupported)
2015-10-11 13:07:19 +02:00
Michael Vogel
48309a25ec
Merge remote-tracking branch 'upstream/develop' into 1510-contact-menu
...
Conflicts:
include/conversation.php
2015-10-11 05:11:46 +02:00
Tobias Diekershoff
27fa20ab22
Merge pull request #1947 from annando/1510-diaspora-follower
...
Reworked contact relations between Diaspora and Friendica
2015-10-10 18:50:20 +02:00
Tobias Diekershoff
9e2b62b082
Merge pull request #1948 from annando/1510-more-escaping
...
Handling contact names with > and <
2015-10-10 18:48:20 +02:00
Michael Vogel
bb0dff2c75
Improved contact menu
2015-10-10 16:23:20 +02:00
Michael Vogel
ba06d659f1
Bugfix: Feeds weren't imported if a post with the same URI existed.
2015-10-10 14:26:07 +02:00
Michael Vogel
efbdb57f92
Reworked contact relations between Friendica and Diaspora
2015-10-10 11:06:18 +02:00
Michael Vogel
1c21401751
acl lookup now works fine as well.
2015-10-09 23:27:00 +02:00
rabuzarus
0eae67ea48
update attendance state on profile wall
2015-10-09 14:20:01 +02:00
Michael Vogel
16da708e07
Contact names with ">" and "<" are a problem ...
2015-10-09 07:39:38 +02:00
rabuzarus
ba1207e6e1
translate attendance with localize_item()
2015-10-08 22:23:09 +02:00
rabuzarus
d2d084b814
treat attendance as like activity
2015-10-08 18:35:33 +02:00
Michael Vogel
61c3ce7a21
Bugfix: The contact names had to be escaped
2015-10-08 00:25:55 +02:00
Michael Vogel
1f0b759e2f
Added resize possibility to proxy function
2015-10-07 08:25:10 +02:00
Tobias Diekershoff
dd9f475ff6
personalise emails send from the server
2015-10-07 06:22:15 +02:00
Michael Vogel
7ed61b2edc
Removed "proxy_parse_html" since it is now done in the bbcode function.
2015-10-05 22:25:14 +02:00
Michael Vogel
2676a0f0e5
The proxy function sometimes kills embedded pictures ...
2015-10-05 22:19:34 +02:00
Michael Vogel
133d38be20
Rearranged the contact menu so that it fits the menu at the conversations.
2015-10-05 00:19:58 +02:00
Michael Vogel
caa9073a8f
Remove all menu entries on the contact list that are empty
2015-10-05 00:14:39 +02:00
Michael Vogel
a663e4693f
Further improvement of the contact menu
2015-10-04 23:41:13 +02:00
Michael Vogel
b037f977fa
The contact menu is now improved (for example a "Follow" link)
2015-10-04 21:17:28 +02:00
Tobias Diekershoff
be70dde61f
Merge pull request #1928 from annando/issue-1913
...
Issue 1913: Report invalid feed
2015-10-04 08:54:59 +02:00
Tobias Diekershoff
5d6f02da41
Merge pull request #1927 from annando/issue-1914
...
Issue 1914: A feed was falsely detected as OStatus
2015-10-04 08:54:01 +02:00
Tobias Diekershoff
05b2836d66
Merge pull request #1926 from annando/1510-permit-crawler
...
New option to permit crawlers
2015-10-04 08:53:32 +02:00
Tobias Diekershoff
a3221945d0
Merge pull request #1923 from annando/1510-feed-remote-self
...
Bugfix: Remote self hadn't worked anymore since the new feed import
2015-10-04 08:51:58 +02:00
Michael Vogel
c0e277cec8
Issue 1913: Report invalid feed
2015-10-04 00:28:15 +02:00
Michael Vogel
4e1bffd0a9
Issue 1914: A feed was falsely detected as OStatus
2015-10-03 23:57:00 +02:00
Michael Vogel
2840bf2293
New option to permit crawlers
2015-10-03 23:16:40 +02:00
rabuzarus
c775d6885b
port of reds geotag feature
2015-10-03 20:24:35 +02:00
Michael Vogel
f92a253946
Bugfix: Remote self worked anymore
2015-10-03 13:58:10 +02:00
Michael Vogel
68a6f0298e
The events moved from the profile to the navigation bar - for supported themes
2015-09-30 18:50:44 +02:00
rabuzarus
7cb4ea52fd
port of the event attendance feature of red matrix with example implementation for vier theme.
2015-09-30 16:58:02 +02:00
rabuzarus
2ff67ef5ed
fixes like/dislike for photos
2015-09-30 14:39:00 +02:00
rabuzarus
f5c7006f30
rest of the consensus porting work and integration into friendica
...
Credits to Mike Macgirvin for the code
2015-09-30 14:38:13 +02:00
rabuzarus
0077494396
make event confirmation work
2015-09-30 14:35:17 +02:00
rabuzarus
37fccee503
first work for consensus
2015-09-30 14:34:10 +02:00
fabrixxm
67638118e7
Merge pull request #1912 from annando/1509-worker
...
New way of background processing
2015-09-30 08:56:54 +02:00
fabrixxm
2e9e17baad
Merge pull request #1911 from annando/1509-i18n-events
...
Localisation of the event page
2015-09-30 08:46:57 +02:00
Michael Vogel
6e981ed798
Merge remote-tracking branch 'upstream/develop' into 1509-i18n-events
2015-09-29 10:35:50 +02:00
Michael Vogel
abe31d7e60
Merge remote-tracking branch 'upstream/develop' into 1509-new-feed-import
2015-09-29 10:27:04 +02:00
Michael Vogel
5d5d85eb4a
Merge remote-tracking branch 'upstream/develop' into 1509-worker
2015-09-29 10:25:59 +02:00
Fabrixxm
880dda4257
Merge branch 'master' back into develop
2015-09-29 10:00:13 +02:00
Michael Vogel
c3ee255b0c
Reduction of double executions - hopefully
2015-09-29 06:15:26 +02:00
Michael Vogel
ed8cdc7d85
Logging message added
2015-09-28 22:32:56 +02:00
Michael Vogel
f0cf9ce519
Prevent double execution
2015-09-28 21:58:58 +02:00
Michael Vogel
eb75d9532b
Magical mathematics to reduce the number of workers
2015-09-28 19:14:07 +02:00
Michael Vogel
9767801be4
Load depending number of worker queues.
2015-09-28 07:54:28 +02:00
Michael Vogel
7f8284eb1b
New functionality to import feeds. Now with support of every used feed format (RSS, RDF, Atom)
2015-09-27 14:02:05 +02:00
Michael Vogel
c33957a6e9
Internationalisation of events/Move events to the navigation bar
2015-09-27 14:00:15 +02:00
Michael Vogel
ae21c40f21
Load depending number of workers
2015-09-27 13:56:20 +02:00
Michael Vogel
173d1390df
Mute warnings in pidfile/Quit poller after an hour.
2015-09-25 17:38:56 +02:00
Sandro Santilli
e9f001aa5d
Use ampersend to separate postopts, and explicit test for empty string
2015-09-23 11:39:36 +02:00
Sandro Santilli
741b82ccab
Use x() function to check for array containement (I think)
...
this is response to @fabrixxxm comment
2015-09-23 11:11:12 +02:00
Sandro Santilli
2a2dd6a1b9
Remove duplicated calls to language detection
...
Also avoids overriding existing "lang" specification in an item
2015-09-23 10:47:34 +02:00
Michael Vogel
f8e4a71eda
Do a load check during execution of the queue.
2015-09-23 08:56:48 +02:00
Tobias Diekershoff
53719d4ecc
Merge pull request #1897 from annando/3.4.2
...
Bugfix: Following mail accounts is now possible again
2015-09-23 06:20:49 +02:00
Michael Vogel
7c8c8b821a
Bugfix: Following mail accounts is now possible again
2015-09-22 22:31:22 +02:00
Fabrixxm
554948c22a
Adds checks for mcrypt module for RINO2
...
- check for module on install
- check for module when RINO2 is enabled in admin
- check for module when RINO2 is used in communications
2015-09-22 09:50:24 +02:00
Michael Vogel
25fc2c9799
Some changes to stay compatible to Diaspora
2015-09-19 14:00:33 +02:00
Tobias Diekershoff
bca4d31410
Merge pull request #1890 from annando/1509-directory
...
There is now only one central parameter for the global directory.
2015-09-15 22:48:34 +02:00
Michael Vogel
5ac38b7f99
There is now only one central parameter for the global directory.
2015-09-15 22:29:02 +02:00
Tobias Diekershoff
7a432a6739
Merge pull request #1889 from annando/1509-diaspora-images
...
Bugfix: Picture import from Diaspora often failed
2015-09-15 06:21:19 +02:00
Michael Vogel
345b0d81dd
Picture import from Diaspora often failed
2015-09-14 23:14:21 +02:00
Michael Vogel
3ace2136f0
Checking includes for valid paths
2015-09-13 18:47:10 +02:00
Michael Vogel
69daaa61ba
With the new queue we don't need "delivery_batch_count" anymore
2015-09-13 08:08:13 +02:00
Michael Vogel
12659fc3a1
Let the cronhook be called different from the cron job.
2015-09-12 20:22:58 +02:00
Michael Vogel
7edce8e266
Don't use a delivery interval when using the worker
2015-09-12 18:08:03 +02:00
Michael Vogel
0a2c161230
Fork as many processes as possible from the start on.
2015-09-12 17:51:27 +02:00
Michael Vogel
32e8f3468d
Moved some functionality back to the cron. Speed up things
2015-09-11 21:35:58 +02:00
Michael Vogel
91d5c31656
Issue 1886: Some speedup for poco
2015-09-11 20:46:55 +02:00
Michael Vogel
ff739b0a23
Just changed some script names
2015-09-10 23:32:56 +02:00
Michael Vogel
d3a6ebfe7e
The worker is now working
2015-09-10 23:10:31 +02:00
Michael Vogel
17b1d45968
Worker: New method for running background processes
2015-09-09 22:42:31 +02:00
Michael Vogel
f2cb9b889e
Only set a prefix for the guid if it is a locally stored item
2015-09-07 23:33:02 +02:00
Michael Vogel
6088f59c33
Bugfix: "remote self" items weren't posted by connectors
2015-09-07 23:14:18 +02:00
Michael Vogel
92a15d9178
Include the server list from the-federation.info
2015-09-06 12:20:31 +02:00
Michael Vogel
d20dbedddd
Merge remote-tracking branch 'upstream/develop' into 1509-diaspora-import
2015-09-06 09:15:23 +02:00
Tobias Diekershoff
c67fbc89c4
Merge pull request #1879 from annando/1509-fixing-ostatus
...
Improvements to OStatus subscriptions
2015-09-06 09:03:28 +02:00
Michael Vogel
c555b1b5cb
Only look for the GUID when checking for duplicates.
2015-09-06 07:34:51 +02:00
Michael Vogel
988f32dfc8
Rearranged the dispatcher
2015-09-05 13:26:14 +02:00
Michael Vogel
6aac9dfc9c
Merge branch '1509-diaspora-import' of github.com:annando/friendica into 1509-diaspora-import
2015-09-05 12:13:38 +02:00
Michael Vogel
4b858650ce
Check if the author should be ignored when fetching missing posts
2015-09-05 12:11:14 +02:00
Michael Vogel
c6d9b2da23
New setting for requery days
2015-09-05 10:54:39 +02:00
Michael Vogel
3cccb5ecb1
The repair option is added to the settings
2015-09-05 04:54:48 +02:00
Michael Vogel
fd239ebf7b
Try to repair OStatus subscriptions
2015-09-03 22:18:25 +02:00
Michael Vogel
94dcccd1b9
Increase the discover timeframe
2015-09-03 22:16:29 +02:00
Michael Vogel
d1e3ea7b46
Soapbox-Improvements
2015-08-30 19:07:30 +02:00
Michael Vogel
3246352ba8
More detailled log entries
2015-08-29 16:55:25 +02:00
Michael Vogel
38c8431527
Rino Bugfix: A variable was used that never was fetched
2015-08-29 11:38:40 +02:00
Michael Vogel
1dad181acb
See issue 1864. Bugfix for the Oembed handling.
2015-08-28 11:39:52 +02:00
Tobias Diekershoff
6d9d34ab54
Merge pull request #1862 from tobiasd/20150827-littlelessdebug
...
commented out a debugging call that produced a bit too much noise in t…
2015-08-27 09:21:56 +02:00
Tobias Diekershoff
257a600e2a
commented out a debuggin call that produced a bit too much noise in the logs
2015-08-27 09:17:28 +02:00
Michael Vogel
86f2eb005f
There seems to be a problem with the function to add all friends of a GNU Social account. So it is deactivated by now.
2015-08-26 22:46:59 +02:00
Michael Vogel
6942b16ef5
See issue 1855. OOhembed is removed.
2015-08-25 19:50:23 +02:00
Tobias Diekershoff
445dcd3051
Merge pull request #1853 from annando/1508-search-forum
...
Only offer forum search in local mode
2015-08-25 07:10:54 +02:00
Michael Vogel
b1dddd2936
Only offer forum search in local mode.
2015-08-25 05:54:50 +02:00
Michael Vogel
5c084b754a
Don't show the alternate url syntax in searches
2015-08-25 05:31:21 +02:00
Michael Vogel
2fe6156d54
Delete the alternate OStatus profile url if present.
2015-08-24 18:36:13 +02:00
Michael Vogel
9ae4528d8b
Merge remote-tracking branch 'upstream/develop' into 1508-poco-ostatus
2015-08-24 18:16:14 +02:00
Michael Vogel
b52bc71c6c
Now you can define the duration of the cache entries.
2015-08-24 17:24:14 +02:00
Michael Vogel
98cd37438f
Delete the old OStatus entries
2015-08-24 16:35:05 +02:00
Michael Vogel
2d589a7d0c
Movew the alternate OStatus profile link into the regular one
2015-08-24 14:23:30 +02:00
Michael Vogel
3bca2db11b
Don't show search options in side bar.
2015-08-24 12:12:14 +02:00
Michael Vogel
3ff196f00d
Now you can set search options so that searching for contacts or forums isn't occult science anymore.
2015-08-24 11:55:29 +02:00
Michael Vogel
b0ddde22c0
By entering a GNU Social account name, the friends of this contact will be added to the friendica account
2015-08-23 22:21:15 +02:00
Tobias Diekershoff
fc18123082
Merge pull request #1837 from fabrixxm/feature-1796
...
add support for oneline,in-text code tag
2015-08-23 17:27:45 +02:00
Michael Vogel
123ad84689
Make the hardcoded path to dir.friendica.com configurable
2015-08-23 11:05:10 +02:00
fabrixxm
2d75e1f422
add support for oneline,in-text code tag
2015-08-20 15:08:55 +02:00
Michael Vogel
37f4a79462
Relocated the "require_once" for the htmlpurifier
2015-08-18 08:38:42 +02:00
Michael Vogel
57ebb00a1f
New versions of Twidere crashed during posting.
2015-08-17 22:38:05 +02:00
Michael Vogel
fe8f8ade69
The new link description should be better.
2015-08-14 12:48:54 +02:00
Michael Vogel
bacd71e1c6
Replace random strings with guids where appropriate.
2015-08-14 07:48:28 +02:00
Michael Vogel
43fda0d626
Merge remote-tracking branch 'upstream/develop' into 1508-random-becomes-guid
2015-08-14 07:19:11 +02:00
Michael Vogel
a2d742ec91
For unique values we should use our guid function - not the random function
2015-08-14 00:40:36 +02:00
Michael Vogel
887372a0d7
Bugfix: Conversations with Diaspora now work reliable
2015-08-13 22:49:57 +02:00
Michael Vogel
bb7ec55f1f
Diaspora now uses a 32 digit guid.
2015-08-12 23:37:50 +02:00
Michael Vogel
d5ba3b3b54
Only show real contacts (Friendica, Diaspora, OStatus) on profile page (no Twitter, Facebook, ...)
2015-08-12 17:48:06 +02:00
Tobias Diekershoff
a784762d21
Merge pull request #1809 from annando/issue-1491
...
We need to generate a new guid to make Diaspora work
2015-08-12 08:16:22 +02:00
Michael Vogel
9eca83e29c
See issue 1491: We need to generate a new guid to make Diaspora work
2015-08-11 23:44:00 +02:00
Michael Vogel
820ded2c2d
Support for the new nodeinfo protocol that will replace statistics.json
2015-08-10 21:33:57 +02:00
Michael Vogel
c8e0685788
Merge remote-tracking branch 'upstream/develop' into 1508-public-relay
2015-08-10 10:52:54 +02:00
Tobias Diekershoff
c076c56016
Merge pull request #1802 from annando/1508-valid-username
...
On OStatus and Diaspora the usernames mustn't contain "-"
I don't like it, but if GNU Social and Diaspora have this limitation...
2015-08-10 08:49:56 +02:00
Tobias Diekershoff
6cfe7b698e
Merge pull request #1803 from annando/1508-accessibility
...
Improved accessibility
2015-08-10 08:48:48 +02:00
Michael Vogel
b24453f8da
Messages are now sent to the relay server - and the options are configurable
2015-08-09 20:39:11 +02:00
Michael Vogel
65921bf2e7
Posts from Diaspora are always accepted for the global contact
2015-08-09 14:28:59 +02:00
Michael Vogel
ccaeb00973
Better link descriptions.
2015-08-08 22:30:43 +02:00
Michael Vogel
2356d6a9ae
On OStatus and Diaspora the usernames mustn't contain "-" - so we adopt this here.
2015-08-08 17:45:18 +02:00
Michael Vogel
b4d09777b9
Added many accesskeys ...
2015-08-08 17:33:43 +02:00
fabrixxm
f9e61f20cc
log call to hooks in debug
2015-08-06 16:06:18 +02:00
Michael Vogel
a8a21da6f5
Some steps for a better screen reader compatibility
2015-08-06 08:13:15 +02:00
Michael Vogel
6ab304b564
Bugfix: Fetching data from noscrape had several issues
2015-07-30 16:30:18 +02:00
Michael Vogel
d5a48c4621
Code beautification
2015-07-29 07:57:28 +02:00
Michael Vogel
016f9cb8c3
Only suggest friendica contacts that where recently active
2015-07-29 07:32:00 +02:00
Michael Vogel
098ccd09fa
Moved the detection for centralized networks.
2015-07-29 06:31:18 +02:00
Michael Vogel
b7c9b942f1
Set the network name for some centralized networks.
2015-07-29 00:21:08 +02:00
Michael Vogel
678de014ad
Some code beautification.
2015-07-28 18:26:30 +02:00
Michael Vogel
9f073f2fd5
Some correction stuff for old entries in the global contacts
2015-07-28 15:28:58 +02:00
Michael Vogel
ec161d798f
The discovery should check all profiles.
2015-07-28 08:25:30 +02:00
Michael Vogel
4b2c2c4802
Check all contacts that we haven't contacted in a month
2015-07-27 08:14:04 +02:00
Michael Vogel
e095553590
Mark contacts from not reachable servers as unreachable
2015-07-27 07:16:06 +02:00
Michael Vogel
a0011ba58e
Discover users who never are contacted.
2015-07-26 17:14:32 +02:00
Michael Vogel
e5bf7bae7b
Just some improvements ...
2015-07-26 16:52:37 +02:00
Michael Vogel
7136a39f9e
Discovery for unchecked contacts
2015-07-26 16:37:05 +02:00
Michael Vogel
166519fc4d
Move the contact discovery into the background
2015-07-26 14:41:34 +02:00
Michael Vogel
fc9c6e6bfd
Poco: always do a forced check for availability of the server
2015-07-25 20:10:42 +02:00
Michael Vogel
072d7f6b3c
Do a recheck when the server isn't available.
2015-07-25 19:59:27 +02:00
Michael Vogel
5f524006dd
Poco: Only fetch the latest post if it wasn't provided.
2015-07-25 14:51:56 +02:00
Michael Vogel
e3e9de2e74
Export all federation contacts through poco
2015-07-24 07:23:57 +02:00
Michael Vogel
39d2720e7b
Update the contact when activated
2015-07-23 23:27:15 +02:00
Michael Vogel
880f486044
Check not only for the last contact but also for the last update for the sanity check.
2015-07-23 22:21:22 +02:00
Michael Vogel
cbd2fc1572
"last_contact" is now set automatically if it is lower than the update value.
2015-07-23 20:57:08 +02:00
Michael Vogel
201d95a855
Set contact as reachable when there was data from noscrape
2015-07-23 10:28:40 +02:00
Michael Vogel
bb5186ae27
Use an ID as a primary field.
2015-07-23 08:35:45 +02:00
Michael Vogel
56a43dcbdf
New Diaspora detection
2015-07-23 00:32:41 +02:00
Michael Vogel
749a646480
Improved scraping and poco discovery.
2015-07-22 11:51:37 +02:00
Michael Vogel
9717fa82fe
New field "created" in gcontacts. New option for timeframe when polling global contacts
2015-07-21 00:05:44 +02:00
Michael Vogel
a4aec06e5b
Support for detecting "Hubzilla" (and some bugfixing in the server detection)
2015-07-20 00:14:14 +02:00
Michael Vogel
3622f1a335
Do some caching
2015-07-19 21:29:24 +02:00
Michael Vogel
f3c83fb514
Automatically updating the searched contacts while searching it.
2015-07-19 18:02:24 +02:00
Michael Vogel
93e93f58bd
Query Redmatrix contacts for their contacts as well.
2015-07-19 10:40:33 +02:00
Michael Vogel
2a5fb7b175
Option to discover contacts from remote users (fallback option)
2015-07-19 09:41:36 +02:00
Michael Vogel
e47c65eb13
Query the other servers for their users.
2015-07-18 23:33:54 +02:00
Michael Vogel
cf3214c904
Query other servers periodically for their known contacts
2015-07-18 22:26:06 +02:00
Michael Vogel
38d7b5e326
New table "gserver" for server data of the global contacts
2015-07-18 20:15:21 +02:00
Michael Vogel
f1e7369283
Poco: Option to activate and deactivate detection of last activity.
2015-07-18 00:48:42 +02:00
Michael Vogel
639f94f8b9
Onepoll: mark the last request failure for this contact
2015-07-17 23:05:50 +02:00
Michael Vogel
09d71abbfc
poco: Only fetch last update manually if it wasn't provided
2015-07-17 08:58:42 +02:00
Michael Vogel
fdfd524e74
Only suggest contacts that haven't failed recently
2015-07-17 08:38:20 +02:00
root
54a5a80b24
Poco: New fields for last contact and last failure of a contact.
2015-07-17 01:08:28 +02:00
Michael Vogel
8b276e53c3
Merge remote-tracking branch 'upstream/develop' into 1507-redmatrix-network-name
2015-07-16 10:18:07 +02:00
Michael Vogel
fca8aecc9b
Show "Redmatrix" as network name.
2015-07-16 10:09:59 +02:00
Michael Vogel
05f8abcfa6
OStatus: Handling of unsupported verbs
2015-07-15 18:27:44 +02:00
Michael Vogel
52c4b8684b
OStatus: Support for "Favorite" (like)
2015-07-15 08:16:41 +02:00
Michael Vogel
2b3ebb9c3e
Follow/Unfollow now works from OStatus.
2015-07-13 23:50:33 +02:00
Michael Vogel
3457f85833
Salmon: Don't store contact data before the message was authenticated.
2015-07-13 14:34:28 +02:00
Michael Vogel
0398bb67be
Reworked salmon import
2015-07-13 08:06:51 +02:00
Tobias Diekershoff
179201d2bf
Merge pull request #1750 from annando/1507-contact-update
...
Automatic contact update
2015-07-12 15:32:29 +02:00
Michael Vogel
f6352aa9c6
Remove a useless comment
2015-07-12 12:17:12 +02:00
Michael Vogel
65468bf202
Moved the needed include to a better place.
2015-07-12 12:03:39 +02:00
Michael Vogel
f48f7394e9
Only update communication relevant data. And only update if needed.
2015-07-12 11:46:08 +02:00
Michael Vogel
9106baf10f
Some more test code removed
2015-07-12 11:24:01 +02:00
Michael Vogel
cf663df69f
Testing code removed
2015-07-12 11:22:36 +02:00
Michael Vogel
0ac75deee1
Some precaution to avoid overwriting of existing data with blanks
2015-07-12 11:19:40 +02:00
Michael Vogel
d55275f211
GUID should be urlencoded in template since it is urlencoded in uri as well.
2015-07-11 14:37:02 +02:00
Michael Vogel
fe137a92ef
Automatically update contact data.
2015-07-11 14:36:04 +02:00
Michael Vogel
d6d51e0259
Don't deliver answers to OStatus messages to Diaspora
2015-07-05 16:27:03 +02:00
Michael Vogel
c356da2cad
Diaspora: Improved parsing of linefeeds
2015-07-05 02:33:28 +02:00
Michael Vogel
43f98bc854
When posting to Diaspora, now the contact names are containing the link to the user profile.
2015-07-04 23:49:52 +02:00
Tobias Diekershoff
3349bba665
Merge pull request #1722 from annando/1506-password-on-install
...
Ability to enter a password when the first user is created
2015-07-01 07:53:25 +02:00
Michael Vogel
055ee962c9
Ability to enter a password when the first user is created
2015-06-30 23:37:31 +02:00
fabrixxm
5a23bd400c
Merge pull request #1715 from rabuzarus/theme_uid
...
use local theme settings for visitors
2015-06-30 08:41:07 +02:00
fabrixxm
97161413e7
Merge pull request #1714 from annando/1506-mail-link-profile
...
Show preselected mail receivers
2015-06-30 08:37:40 +02:00
fabrixxm
7a0f2b61ab
Merge pull request #1713 from annando/1506-ostatus-completion-timeframe
...
There is now two different checks for the completion of conversations
2015-06-30 08:36:33 +02:00
fabrixxm
76737fbf7b
Merge pull request #1712 from annando/1506-ostatus-guid
...
OStatus: Use the GUID format for the link to the item
2015-06-30 08:35:33 +02:00
fabrixxm
f121184158
Merge pull request #1716 from annando/1506-no-googlemap
...
Removed Google Maps
2015-06-30 08:27:59 +02:00
Michael Vogel
06d446595e
OStatus: By using Qvitter, users can delete items. We can't handle that by now, so we ignore it.
2015-06-30 08:08:02 +02:00
Michael Vogel
836432bb9a
Removed Google Maps
2015-06-30 07:42:59 +02:00
Michael Vogel
ab074e200b
Mail link in profile page
2015-06-29 22:54:26 +02:00
Michael Vogel
bffe35ab71
There is now two different checks for the completion of conversations
2015-06-29 21:53:59 +02:00
Michael Vogel
fcb3cbffe4
OStatus: Use the GUID format for the link to the item
2015-06-29 21:49:42 +02:00
fabrixxm
28f0e9a2de
Merge pull request #1696 from rabuzarus/acl-var
...
move jotnets to populate_acl
2015-06-29 13:53:37 +02:00
fabrixxm
1a1c2d74f6
Merge pull request #1698 from rabuzarus/identity
...
move some identity related functions to identity.php
2015-06-29 13:52:07 +02:00
fabrixxm
17514e0d68
Merge pull request #1703 from rabuzarus/readable_bytes
...
show maximagesize warning in a human readable format
2015-06-29 13:50:55 +02:00
fabrixxm
6c5b4b96a5
Merge pull request #1710 from rabuzarus/deactivate_log
...
deactivate logger in acl_lookup
2015-06-29 13:48:42 +02:00
rabuzarus
eedf829d5c
deactivate logger in acl_lookup
2015-06-29 13:46:47 +02:00
rabuzarus
68e565889d
moved formatBytes() to /include/text.php
2015-06-29 11:22:29 +02:00
rabuzarus
a982320ba9
show maximagesize warning in a human readable format
2015-06-29 02:39:08 +02:00
Michael Vogel
b795bf2935
Merge pull request #1683 from fabrixxm/issue-1655
...
Deprecate RINO1 function, implements RINO2, remove unused crypro functions
2015-06-27 17:39:00 +02:00
rabuzarus
8cca849c2e
Merge acl-var into develop
...
Conflicts:
mod/settings.php
2015-06-27 15:23:19 +02:00
rabuzarus
729b7f0e72
restore jotplugins
2015-06-27 15:11:18 +02:00
rabuzarus
373bb0822b
get the themes settings of foreign profiles
2015-06-27 14:10:43 +02:00
Tobias Diekershoff
d0bf3c06a4
Merge pull request #1694 from annando/1506-ostatus-mention
...
OStatus: Notifications now work - even if not mentioned in the post
2015-06-27 11:12:31 +02:00
rabuzarus
787604026f
move some identity based functions to identity.php
2015-06-26 18:57:20 +02:00
rabuzarus
5ce125d6e0
cleanup of some unused code
2015-06-26 15:13:52 +02:00
Michael Vogel
e0f6bd6c28
Merge pull request #1695 from strk/accepted
...
Spelling error: "acepted" -> "accepted"
2015-06-26 13:51:22 +02:00
Sandro Santilli
904b76df85
Spelling error: "acepted" -> "accepted"
2015-06-26 12:03:32 +02:00
Michael Vogel
58b624f877
OStatus: Mentions should work now
2015-06-26 10:41:11 +02:00
Michael Vogel
6eebfb2e13
Merge pull request #1692 from fabrixxm/desktopnotifications
...
Desktop notifications
2015-06-26 08:45:16 +02:00
rabuzarus
37501a883e
make notes work
2015-06-25 22:57:26 +02:00
rabuzarus
65286f79ed
respect hidewall
2015-06-25 20:29:09 +02:00
rabuzarus
94b21245bc
some more work to get acl data into populate_acl
2015-06-25 18:57:42 +02:00
rabuzarus
12528f033a
include jotnets in populate_acl
2015-06-25 12:33:05 +02:00
Fabrixxm
6fc864c947
rework mod/ping and desktop notification logic
...
`mod/ping.php` returns all notifications ordered by date
mixing system notifications, private messages, intros, registrations
remove 'notify_full' mode
remove `&arr;` from unseen notes, 'seen' attrib now is "1" or "0"
new note attribute 'timestamp'
desktop notification logic use timestamp to check which notification show to the user
notification html template use timestamp to show full date to user in tooltip
`relative_date()` don't append full date on dates older than 24 hours
2015-06-25 10:02:26 +02:00
fabrixxm
33f0d00ee1
Merge pull request #1691 from annando/1506-ostatus-evenbetter
...
OStatus: Bugfix in threading, answers to OStatus messages in Friendica posts
2015-06-25 08:38:47 +02:00
Michael Vogel
704110456a
Removed test code
2015-06-25 07:30:14 +02:00
Michael Vogel
7f052b654f
PuSH now supports answers to OStatus messages inside of Friendica threads as well.
2015-06-25 07:18:02 +02:00
Michael Vogel
7581bd0f36
Send a salmon notice whenever an OStatus user is mentioned.
2015-06-25 00:47:59 +02:00
Tobias Diekershoff
64655ee546
Merge pull request #1687 from annando/1506-location-api
...
API: Return the geo coordinates
2015-06-25 00:00:01 +02:00
Michael Vogel
db256217e6
Removed test
2015-06-24 22:51:46 +02:00
Michael Vogel
5bf7a3b7a5
Fixed inReplyTo in conversations
2015-06-24 22:31:38 +02:00
Michael Vogel
87ade53162
Some test code added
2015-06-24 14:21:42 +02:00
Fabrixxm
511c2d2c91
rino: settings in admin, choose lowest common on notify
2015-06-23 17:36:26 +02:00
Fabrixxm
6fbb02fb93
RINO 2 based on php-encryption
...
reenable RINO 1 functions, add a deprecation note.
use by default RINO 2 , with crypto from php-encryption
fallback to RINO 1 for old nodes.
2015-06-23 16:13:09 +02:00
Fabrixxm
7d83a19fd4
Disable RINO
...
Comment out functions for RINO crypt and disable RINO request and response.
2015-06-23 12:02:35 +02:00
Fabrixxm
4203132e1a
Remove various unused crypto functions
2015-06-23 10:52:02 +02:00
Michael Vogel
7e4fc930b4
API: Return the geo coordinates
2015-06-23 07:32:14 +02:00
Michael Vogel
a7cf3639f0
Just some more fixing for issue 1642
2015-06-22 23:47:08 +02:00
Tobias Diekershoff
a58596e00a
Merge pull request #1678 from annando/1506-ostatus-completion
...
OStatus: Still some room for improvements
2015-06-22 07:59:40 +02:00
Michael Vogel
e9542a8d17
OStatus: Support for events and questions
2015-06-21 22:36:24 +02:00
Michael Vogel
da9bbc92d3
OStatus: Support for bookmarks
2015-06-21 22:02:44 +02:00
Michael Vogel
2afc9c31f9
Changed logging behaviour
2015-06-21 08:32:03 +02:00
Michael Vogel
5221f38db7
ACL: Don't show OStatus contacts in ACL, since you cannot send private messages to them.
2015-06-21 01:37:09 +02:00
Michael Vogel
8229737d2d
Small restructuring
2015-06-21 01:36:23 +02:00
Michael Vogel
846edd5bbb
Bugfix for repeated items in conversations
2015-06-20 17:26:47 +02:00
Michael Vogel
1bbbf2a5f2
Stuff ...
2015-06-20 14:41:53 +02:00
Michael Vogel
c8430f4c44
Moved all OStatus code in a single file.
2015-06-20 14:40:30 +02:00
Tobias Diekershoff
7c48ed60eb
hide some HTML coded chars from markdownification
2015-06-20 14:27:42 +02:00
Tobias Diekershoff
8fa2030023
<3 causes troubles in D*
2015-06-20 12:31:34 +02:00
Michael Vogel
168906f9c9
Code cleanup
2015-06-20 09:15:19 +02:00
Michael Vogel
6fbb03801c
The OStatus completion is now called before the original item is stored.
2015-06-20 08:44:29 +02:00
Michael Vogel
9ca04e4e69
Just a to-do added
2015-06-14 11:39:15 +02:00
Michael Vogel
fa288173c3
OStatus: Force parent when storing item.
2015-06-14 10:56:57 +02:00
Michael Vogel
b7f270de28
probe_url: Better detection for non-standard installations of GNU Social
2015-06-14 01:52:26 +02:00
Michael Vogel
e0147a24ad
Send poco data in the atom entries.
2015-06-13 09:59:17 +02:00
Michael Vogel
9a6511dc38
Send a salmon notification when its a ostatus thread or you reply to an ostatus message
2015-06-13 09:12:28 +02:00
Michael Vogel
740bc41680
Update contact from poco fields when importing messages/repeated items now het the same uri.
2015-06-13 09:11:17 +02:00
Michael Vogel
e36627c7b7
fetch the full name of a contact from the poco fields (if present)
2015-06-13 09:08:52 +02:00
Michael Vogel
4704933b6e
Use the display name (full name) instead of the nick name when importing.
2015-06-13 09:07:13 +02:00
Michael Vogel
60ad7af6f3
Some bugfixing.
2015-06-12 01:08:06 +02:00
Michael Vogel
ad45ff7eb1
OStatus: Notifier for Friendica, better thread completion
2015-06-12 00:39:56 +02:00
Michael Vogel
cad591b1ec
Improved OEmbed detection
2015-06-10 23:45:56 +02:00
fabrixxm
8e800af306
Merge pull request #1659 from annando/1506-ostatus-enclosures
...
Many OStatus improvements
2015-06-10 09:23:42 +02:00
Michael Vogel
f1fe38d5c7
Just two to-dos added
2015-06-10 08:36:51 +02:00
Michael Vogel
81b609562e
Fetch the hub adress while parsing OStatus messages.
2015-06-09 23:53:53 +02:00
fabrixxm
a32147f722
Merge pull request #1648 from tobiasd/20150603
...
uncomment replacement
2015-06-09 08:55:49 +02:00
Michael Vogel
cb0351dba0
Send a salmon notification to every mentioned person.
2015-06-09 08:27:04 +02:00
Michael Vogel
fb72871f66
Bugfix: The user id wasn't fetched correctly.
2015-06-08 00:50:02 +02:00
Michael Vogel
b24a46f889
Adding link information
2015-06-08 00:18:44 +02:00
Michael Vogel
af79cd316c
Some code beautification.
2015-06-07 23:53:51 +02:00
Michael Vogel
a3c497190d
Complete new OStatus import.
2015-06-07 23:18:02 +02:00
Michael Vogel
f34135f34d
OStatus: Attachment links are now added as enclosures
2015-06-06 13:15:37 +02:00
Michael Vogel
ba36910343
Removed bad plink detection.
2015-06-03 21:03:46 +02:00
Tobias Diekershoff
c00f73c836
uncomment replacement
2015-06-03 10:17:54 +02:00
Michael Vogel
b60677ef1b
OStatus: New fields in OStatus export/ Auto-tagging of replyed authors.
2015-06-03 01:26:46 +02:00
Tobias Diekershoff
209e957de4
Merge pull request #1645 from annando/1506-api
...
Small change in the API (some new Twitter fields - but without function)
2015-06-02 22:47:41 +02:00
Tobias Diekershoff
6e5ba7bb9b
Merge pull request #1646 from annando/1506-no-url-cleaning
...
BBCode: In [url] the removing of unknown protocols is disabled
2015-06-02 22:46:37 +02:00
Tobias Diekershoff
7305a27392
Merge pull request #1647 from annando/1506-performance
...
Performance improvements when searching for existing GUIDs
2015-06-02 22:46:07 +02:00
Michael Vogel
bea70296bf
Fixes slow performance after one of the last pull requests.
2015-06-02 22:07:39 +02:00
Michael Vogel
dd06912493
Avoiding performance problems.
2015-06-02 20:34:48 +02:00
Tobias Diekershoff
941c784fa2
Merge pull request #1643 from fabrixxm/issue-1612
...
close correctly `span` tag in `oembed_format_object()`
2015-06-02 19:38:42 +02:00
fabrixxm
20b14b053a
mask '#' in [url]
url
...
fix #1514
2015-06-02 18:59:46 +02:00
fabrixxm
e028263ca8
close correctly span
tag in oembed_format_object()
...
fix issue #1612
2015-06-02 18:38:16 +02:00
Michael Vogel
896cb6ebf0
Small change in the API (some new Twitter fields - but without function)
2015-06-02 16:19:40 +02:00
Michael Vogel
939e5abfee
BBCode: In [url] the removing of unknown protocols is disabled
2015-06-02 16:16:40 +02:00
fabrixxm
620455c4de
Merge pull request #1641 from tobiasd/20150601-navinfo_hook
...
nav_info hook and documentation in en and de
2015-06-01 14:01:47 +02:00
Tobias Diekershoff
ec7f70e9aa
nav_info hook and documentation in en and de
2015-06-01 12:00:00 +02:00
Michael Vogel
2856042824
Send a hubsub notification for every comment
2015-05-31 10:38:00 +02:00
fabrixxm
18e44001e5
Merge pull request #1630 from annando/1505-ostatus
...
OStatus communication improvements
2015-05-31 10:08:24 +02:00
Michael Vogel
d732d9d1a8
OStatus replies should now work even if the thread starter isn't in the mentions.
2015-05-31 00:26:11 +02:00
Michael Vogel
a3118e0a6e
Cleaning the code from several tests.
2015-05-30 21:08:24 +02:00
Michael Vogel
4750775752
Cleaning the code.
2015-05-30 21:00:38 +02:00
Michael Vogel
e66489d67f
PuSH: Publishing moved to a new process. OStatus comments are now published to all subscribers.
2015-05-30 20:47:53 +02:00
rabuzarus
74267310d6
html to section_title.tpl
2015-05-30 02:21:30 +02:00
Michael Vogel
594f3e2815
Merge remote-tracking branch 'upstream/develop' into 1505-ostatus
2015-05-29 10:55:07 +02:00
Michael Vogel
b763c810fb
OStatus: Trying to deliver a comment to all contacts - not only the thread owner. (Not working by now)
2015-05-29 10:35:13 +02:00
fabrixxm
f12430a285
Merge pull request #1617 from annando/1505-diaspora-objecttype
...
OStatus and Diaspora improvements
2015-05-29 08:40:58 +02:00
Michael Vogel
487d57df45
Fetch the author url and not the id.
2015-05-28 08:02:34 +02:00
Michael Vogel
24962f3002
OStatus completion: The id and the plink for fetched items should now have reliable values.
2015-05-28 07:51:12 +02:00
fabrixxm
b3992e1c65
Merge pull request #1599 from fabrixxm/issue-1574
...
Issue #1574
2015-05-27 11:07:30 +02:00
Michael Vogel
bdd5c05668
OStatus: Don't be confused by posts from the statusnet connector.
2015-05-27 08:16:05 +02:00
Michael Vogel
03214254ff
OStatus: Improved duplicate check.
2015-05-26 23:33:38 +02:00
Michael Vogel
7e401ca199
Improved check for duplicates. Improvements with reshared Diaspora items.
2015-05-25 19:07:59 +02:00
Michael Vogel
0c752a2190
Diaspora: Store the original XML and the object type.
2015-05-25 13:27:45 +02:00
rabuzarus
b3054ee9d0
template for searchbox
2015-05-24 20:01:08 +02:00
fabrixxm
b29b01fad4
Merge branch 'develop' into issue-1574
2015-05-24 10:26:21 +02:00
fabrixxm
4554526515
Merge pull request #1570 from rabuzarus/archive-widget
...
port of red matrix archive widget
2015-05-24 10:18:10 +02:00
fabrixxm
3a71978b0d
Merge pull request #1598 from rabuzarus/datepicker
...
new datetimepicker for event creation
2015-05-24 10:16:29 +02:00
fabrixxm
83697cf3e5
Delete attachments on item deletion
...
Delete video from videos page
2015-05-23 22:35:02 +02:00
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
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
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
Tobias Diekershoff
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
tobiasd
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
tobiasd
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
tobiasd
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
tobiasd
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
tobiasd
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
Tobias Diekershoff
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
fabrixxm
a8c90155f8
db update mail via notification()
...
remove last template
2014-09-07 14:23:03 +02:00
fabrixxm
5861bdd6e9
registration request as system notification
...
kill the template
send email to all admins
2014-09-07 13:55:02 +02:00
fabrixxm
5997fb19ee
More template gore!
2014-09-07 12:29:13 +02:00
fabrixxm
36a67158d2
Merge pull request #1119 from annando/1409-issue-881
...
The useragent string doesn't contains of the words "Mozilla" anymore
2014-09-07 11:41:51 +02:00
fabrixxm
9a0c37eb47
new password mail via notification()
...
new include/text.php::deindent() function
remove unused templates
2014-09-07 11:20:06 +02:00
Michael Vogel
7af5c3c560
The useragent string doesn't contains of the words "Mozilla" anymore - but the name "Friendica" and the base url
2014-09-07 10:47:37 +02:00
fabrixxm
d85bdd8fb0
lost password verification mail via notification()
2014-09-07 10:27:39 +02:00
Michael Vogel
a333036f00
API: The command "users/search" is now supported.
2014-09-07 07:32:09 +02:00
fabrixxm
0e628f840f
send ostatus follow/share notifications via notification()
...
remove unused templates
2014-09-06 18:15:18 +02:00
fabrixxm
16a07e6d83
cleanup multipart email sending code
...
remove 'EmailNotification' class and rename 'enotify' class as 'Emailer'
2014-09-06 15:52:53 +02:00
Michael Vogel
5e3b8b3432
Creating a shadow entry for every public post and show it on the community page.
2014-09-06 12:38:06 +02:00
fabrixxm
325f2b1697
fix avatars urls on profile import
2014-09-06 11:29:24 +02:00
tobiasd
7eef05e4f5
Merge pull request #1098 from Beanow/release/profile-editor-improvements
...
Profile editor improvements
2014-09-05 22:20:31 +02:00
Beanow
992684c362
Merge branch 'feature/edit-profile-improvements' into develop
2014-09-04 23:58:22 +02:00
Michael Vogel
e21bcb82d2
Enhance the database structure checks when they failed.
2014-09-04 09:26:56 +02:00
Michael Vogel
24b3befc4d
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
boot.php
update.php
2014-09-04 02:29:12 +02:00
Michael Vogel
56f0af2067
The "ignore" feature can be disabled and enabled, the value will now be retrieved.
2014-09-04 01:27:28 +02:00
Michael Vogel
7eeb320085
It is now possible to ignore threads.
2014-09-04 00:58:52 +02:00
fabrixxm
f17e6f534f
Merge pull request #1093 from annando/master
...
Added an alternate link to the profile in the atom feeds (feature request #925 )
2014-09-03 09:59:51 +02:00
Michael Vogel
73904bfa03
Added an alternate link to the profile in the atom feeds (feature request #925 )
2014-09-03 09:52:31 +02:00
tobiasd
ae2094487b
Merge pull request #1092 from annando/master
...
Bugfix: Messages when ignoring, blocking and archiving contacts now returns the correct text.
2014-09-03 07:44:17 +02:00
Michael Vogel
500dbecfe7
Fix for issue #1060 (Missing Entries in Archive Dropdown)
2014-09-03 01:43:04 +02:00
friendica
910293729c
Merge https://github.com/friendica/friendica into pull
2014-09-02 01:09:23 -07:00
friendica
3e0a84afa9
so this is why my db updates were reverted ;-)
2014-09-02 01:08:50 -07:00
Michael Vogel
7144d22cc1
If a picture was too small it got cropped
2014-09-02 02:36:04 +02:00
Michael Vogel
961440e48f
Cutting the text has to be made UTF-8 aware as well.
2014-09-02 02:14:16 +02:00
Michael Vogel
b66a031b34
The plaintext conversion had issues with counting the text size of posts with german umlauts
2014-09-02 01:31:31 +02:00
Michael Vogel
150310ea3a
dbstructure: Delete indexes before the database structure is changed
2014-09-01 23:41:21 +02:00
Michael Vogel
23c4c39a1f
remote-self: "origin" and "last-child" need to be set as well.
2014-09-01 15:28:31 +02:00
Michael Vogel
3e9e682723
remote-self: Moved some functionality from other place into the "item_store" function
2014-09-01 14:40:29 +02:00
Michael Vogel
e35c55dd3b
Remote-self: It is now possible to chose between two different modes of mirroring.
2014-09-01 14:00:21 +02:00
Michael Vogel
522b9edffe
remote-self: Seting the author name to the owner name
2014-09-01 09:59:58 +02:00
Michael Vogel
c81df2c005
Remote-self is now working immediately
2014-08-31 23:52:25 +02:00
Michael Vogel
5468b9b2a5
oembed: Prevent empty links
2014-08-28 01:14:46 +02:00
Michael Vogel
b4e8ec2806
bbcode: mask "[" and "]" for attachments.
2014-08-28 01:11:43 +02:00
Michael Vogel
4bdd905b3e
Only show foreign items if the profile of the user isn't hidden. Show the user's theme - not the theme of the viewed profile.
2014-08-28 01:06:41 +02:00
Michael Vogel
4ad2bbddc7
If a post is a pure reshare, then show the profile of the original author on the display page.
2014-08-26 17:10:46 +02:00
Michael Vogel
4976b1c153
BBCode: Add a linefeed between a picture and the following text. This is important for exports (e.g. to pumpio)
2014-08-25 23:40:18 +02:00
Michael Vogel
6aeaf0815f
If a message is transmitted to a network that requires shortening (Twitter, Statusnet, ADN), then the shortened link will be the link to the friendica post if it was a shared post.
2014-08-25 23:38:13 +02:00
Michael Vogel
dd511ac70a
The "display" page now shows the current author profile with a "connect" link (if there is no current connection)
2014-08-25 14:09:56 +02:00
Michael Vogel
c5cc99c716
BBCode: Depending upon the image size of the preview picture for a link, the image is displayed differently
2014-08-25 14:08:26 +02:00
Michael Vogel
845805bf34
Provide a parent in the notification, so that threading of the notification mails is working.
2014-08-21 01:00:12 +02:00
Michael Vogel
716e0b073f
Notification by mail: Improvement for the threading of notifications, new headers to support filtering.
2014-08-21 00:53:01 +02:00
Michael Vogel
2769089120
bbcode: Don't use a preview picture in the "attachment" element if it is a video attachment.
2014-08-21 00:51:18 +02:00
Michael Vogel
de75d8ca7f
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
mod/admin.php
2014-08-13 00:18:05 +02:00
Michael Vogel
d4b2d3bf8a
Moved "privacy_image_cache" into the core. Enabled by default, can be disabled in the page settings.
2014-08-13 00:13:13 +02:00
tobiasd
d28c1febc7
Merge pull request #1069 from annando/master
...
Solved (possible) encoding problem, encoding of URLs with GUID
2014-08-12 09:01:12 +02:00
friendica
ca3fc788b2
photo export functions for the api
2014-08-11 02:29:14 -07:00
Michael Vogel
731d944ab5
bb2diaspora: added one more page break. In the future it could be replaced by a regular expression.
2014-08-09 09:20:37 +02:00
Michael Vogel
b99737986d
The GUID in the link to the items has to be encoded, since it could contain special characters
2014-08-09 09:17:28 +02:00
Michael Vogel
2e75e37c93
There seems to be problems with encoding - this should fix it.
2014-08-07 21:55:17 +02:00
tobiasd
cf0ebd952f
Merge pull request #1065 from annando/master
...
Refreshing of the network page only when the page is at the beginning
2014-08-07 08:42:25 +02:00
Michael Vogel
07bc8ca166
fetch_url: Logging the data only when at the "data" loglevel
2014-08-07 08:22:32 +02:00
Michael Vogel
2ba258e1ca
In PHP versions lower than 5.4 the notification mails could have been sent with the wrog charset.
2014-08-07 08:00:53 +02:00
Michael Vogel
1104ad4f26
Only some blanks removed, no changes in functionality
2014-08-07 07:59:43 +02:00
Michael Vogel
e974e586cc
Unified user agent string when fetching data.
2014-08-07 07:58:20 +02:00
fabrixxm
27024e3b1d
preferred item image size for theme, get smallest photo near scale requested
...
themes can declare preferred image size for images in items, with
$a->theme_info = array(
"item_image_size" => 1
);
0: original, 1:640px, 2:320px
mod/photo.php returns the nearest scaled image near requested one
if it doesn't exists, instead of nothing
2014-07-30 15:37:34 +02:00
Michael Vogel
9f09d90c6d
Better detection for links in the body that can be removed because of added information.
2014-07-27 21:59:44 +02:00
Michael Vogel
72eee45b92
The title of bookmark links is now taken instead of the data that was fetched via oembed
2014-07-27 16:10:09 +02:00
Michael Vogel
25237c0929
Make the friendica android client work again (it had problems with the GUID in the notifications)
2014-07-26 15:01:01 +02:00
Michael Vogel
10090a6070
Removing of warnings to make dav work
2014-07-24 23:24:10 +02:00
Michael Vogel
a588ae4022
Merge remote-tracking branch 'upstream/master'
2014-07-24 22:54:35 +02:00
Michael Vogel
e2f9ae3970
Removing of some warnings
2014-07-24 22:53:09 +02:00
Michael Vogel
46c7cb5b72
bbcode: New mode for conversion of shared content that will be used for g+ and facebook export.
2014-07-24 22:51:28 +02:00
tobiasd
1940905454
Merge pull request #1055 from annando/master
...
Working with GUID and Object-Type - bugfix for API
2014-07-24 08:40:29 +02:00
tobiasd
27895b3744
Merge pull request #1048 from tobiasd/20140711
...
initialize intErrorCode / mobile themes
2014-07-24 08:40:02 +02:00
Michael Vogel
b1afaa50de
Bugfix: When fetching a feed's name, take the title or description, but not the author name.
2014-07-22 07:59:11 +02:00
Michael Vogel
ed1dce93d6
Usage of /display/(guid) as path instead of /display/(user)/(id)
...
Bugfix for adding tags to photos
2014-07-22 00:36:20 +02:00
Michael Vogel
f920fa229b
API: Bugfix for an API result where "in reply to" was equal to the id of the post.
2014-07-22 00:33:48 +02:00
Michael Vogel
5114e018d0
Setting "verb" for postings from Diaspora, Feeds and Mails
2014-07-15 08:50:49 +02:00
Michael Vogel
a553dda2ef
New function to upload photos to the wall. (Will be used in connectors)
2014-07-15 08:49:41 +02:00
Michael Vogel
4e6e09a44f
The function "get_attached_data" hasn't always detected photos
2014-07-15 08:48:40 +02:00
Michael Vogel
6541247bd3
Use the GUID to refer to items (preparation for future changes)
2014-07-15 08:47:36 +02:00
Tobias Diekershoff
659c01ccc3
initialize intErrorCode if no Error occured
2014-07-11 07:37:27 +02:00
Michael Vogel
6f5bc8d9a7
Setting the user agent to "Mozilla/5.0 (compatible; Friendica)"
2014-07-10 23:13:07 +02:00
Michael Vogel
cd7f05801a
bbcode: Changed the format of repeated messages once more.
2014-07-10 23:12:07 +02:00
tobiasd
829a92a10e
Merge pull request #1042 from annando/master
...
Workaround for likes from Diaspora, disabling of the automatic reload of the network page
2014-07-10 07:45:27 +02:00
Michael Vogel
431a4d40eb
using the recycle sign instead of "RD" for statusnet.
2014-07-10 00:16:03 +02:00
Michael Vogel
31dbf23c47
bbcode: Shared posts to app.net will now have an @ before the username.
2014-07-10 00:12:12 +02:00
Michael Vogel
d9f6f5181f
Using @ before username when repeating messages to twitter and statusnet
2014-07-10 00:00:09 +02:00
Michael Vogel
c32735cde6
bbcode: Use shorter method for shared content to networks where size matters.
2014-07-09 23:33:38 +02:00
Michael Vogel
c7f1f2e4f2
Diaspora: Possibility to disable the checking of the signature of likes. This is a workaround for the known problem of not receiving likes from Diaspora.
2014-07-09 21:44:12 +02:00
Michael Vogel
fe71272e1e
Plaintext: The function now returns images from video links as well.
2014-07-09 21:28:42 +02:00
Michael Vogel
660bd39efa
Let an item be accssible via the GUI (additionally to uid and item id)
2014-07-09 20:48:34 +02:00
Michael Vogel
f68bbffb64
Adding preview value to "prepare_body" hook. (Will be used in addons for network related previews)
2014-07-09 20:44:12 +02:00
Beanow
e9dc6e4faa
Some changes to the labels and an edit profile button.
2014-07-03 18:39:22 +02:00
Beanow
0225652a53
Minor bugfixes in nav.php:
...
* Added videos to usermenu
* Fixed alt for personal notes
2014-06-27 16:46:11 +02:00
Michael Vogel
79f7f609b3
dbstructure: the indexes for longer table fields are now shortened
2014-06-23 01:27:00 +02:00
Michael Vogel
14bacc1e8c
markdown export for libertree now handles horizontal tulers correct.
2014-06-23 01:25:58 +02:00
Michael Vogel
5ed5773f57
The temporary paths (temp, lock, itemcache) are now detected automatically when used.
2014-06-23 01:24:39 +02:00
Michael Vogel
7eea5fc212
Merge remote-tracking branch 'upstream/master'
2014-06-19 23:01:33 +02:00
Tobias Diekershoff
8bfd506051
make translation of addons work again
2014-06-18 21:18:50 +02:00
Michael Vogel
e0219cf6af
API: Support of privacy_image_cache for calls without entities added
2014-06-16 22:36:59 +02:00
Michael Vogel
a1dbfdee65
API: Support of privacy_image_cache - if enabled
2014-06-16 21:49:45 +02:00
Michael Vogel
a05ed41fb2
Only some code cleanup
2014-06-15 23:33:25 +02:00
Michael Vogel
52474847cb
New function to fetch image information. (Will be used in the addons at a later time)
2014-06-15 23:32:14 +02:00
Michael Vogel
ac78989fc9
shortening message: Solved issue with non latin characters
2014-06-15 20:46:56 +02:00
Michael Vogel
dd685a4afc
The network widget is now ordered by network name
2014-06-15 18:51:46 +02:00
Michael Vogel
e6328104ea
dbstructure: New tables wasn't created due to some bugs
2014-06-15 10:47:20 +02:00
Michael Vogel
82c4e3fe50
The page info function can now be called with a picture link, support for big and preview images for attachments in global.css
2014-06-15 01:59:19 +02:00
Michael Vogel
4c9a6ed2fb
BBCode: Support for preview parameter in attachment, rearranged code for share
2014-06-15 01:57:31 +02:00
Michael Vogel
724a5192da
Merge remote-tracking branch 'upstream/master'
2014-06-15 01:49:03 +02:00
Michael Vogel
83935d6797
API: Corrected wrong variable name
2014-06-15 01:48:35 +02:00
fabrixxm
adefb06ff7
Merge pull request #1008 from annando/master
...
Expire, "attachment" element and database structure
2014-06-14 20:05:10 +02:00
Michael Vogel
ce29f55536
Vier: Some small color changes
2014-06-10 20:22:53 +02:00
Michael Vogel
c5f993eb42
Added support for detecting app.net profiles
2014-06-10 20:20:51 +02:00
Simó Albert i Beltran
85ece01485
Fix API string values
2014-06-08 18:36:06 +02:00
Michael Vogel
a41cc6f45f
Added app.net
2014-06-05 17:44:35 +02:00
Michael Vogel
0c77cee667
New database update system that uses the database structure defined in dbstructure.php
2014-06-04 00:44:58 +02:00
Michael Vogel
d3878d717c
bbcode: new element "attachment" for attached links.
2014-06-02 23:45:32 +02:00
Michael Vogel
d8d745891a
New hook that is called when items expire
2014-06-02 23:41:33 +02:00
Michael Vogel
6a28ae8b52
Just some better handling of tracker variables (url encoding)
2014-05-30 01:02:32 +02:00
Michael Vogel
13fea42d8c
Merge remote-tracking branch 'upstream/master'
2014-05-29 23:04:57 +02:00
Michael Vogel
c759ee55e1
Better handling of app.net feeds.
2014-05-29 20:26:33 +02:00
fabrixxm
77a54c66be
Merge pull request #998 from annando/master
...
"Vier": New font version, fallback for oembed, more tracking variables removed
2014-05-29 14:04:04 +02:00
Michael Vogel
53d925095f
Added some functionality if oembed isn't working. (Should be extended in the future)
2014-05-29 11:45:32 +02:00
Michael Vogel
135a403cec
Added some tracking variables from facebook in the function to clean up URLs.
2014-05-29 11:43:37 +02:00
Michael Vogel
d001e19035
Detecting "type-video" at the conversion. (Mostly used by reimporting posts from pump.io that come from friendica)
2014-05-29 11:42:41 +02:00
tobiasd
97e74f1570
Merge pull request #987 from annando/master
...
Auto-killing processes, somce changed code in the plaintext function and speed issues in network
2014-05-25 07:59:22 +02:00
Michael Vogel
5ae9c5e538
Added some logging
2014-05-24 11:01:33 +02:00
Michael Vogel
4924f527d2
plaintext: Moving some code from "plaintext" function to "get_attached_data" to have it accessible for non-plaintext exports
2014-05-24 11:00:05 +02:00
Michael Vogel
e32f9c4fff
Dead processes will be deleted when they are running for more than 9 minutes.
2014-05-22 00:16:36 +02:00
Michael Vogel
58cea13707
Cron/Queue: Setting a limit to avoid endless PHP jobs.
2014-05-21 07:28:33 +02:00
tobiasd
1388b7ac27
Merge pull request #984 from annando/master
...
Better look for embedded videos, removing tracking parameters, new shortening function
2014-05-19 08:05:16 +02:00
Michael Vogel
d964e7e08f
New function for shortening of text (is used by the buffer export)/Vier: comment bubble is now grey.
2014-05-18 23:39:34 +02:00
Michael Vogel
6b461a74cb
Cleaning up tracking parameters in urls.
2014-05-18 20:32:06 +02:00
tobiasd
d3db9365cb
Merge pull request #983 from annando/master
...
"red"-bookmarks and better plaintext export
2014-05-18 20:01:29 +02:00
Michael Vogel
31886ecd4f
Content got lost sometimes due to a needless security function (HTML content is handled in the bbcode function)
2014-05-18 18:59:10 +02:00
Michael Vogel
7cc2723e2d
Improvement for shortening of the new plaintext option.
2014-05-18 18:57:31 +02:00
Michael Vogel
35fbe3be14
Diaspora: Better handling of "red"-links
2014-05-18 18:56:07 +02:00
fabrixxm
b072b8f284
Update bbcode.php
...
Fix translatable string.
2014-05-16 10:55:29 +02:00
fabrixxm
f55a22cb19
fix query as @annado comment
2014-05-12 19:02:03 +02:00
Fabrixxm
d7b514c2c0
add check for expiration time in item_store()
2014-05-12 15:33:20 +02:00
fabrixxm
1a5da0ae60
Merge pull request #954 from fabrixxm/issue_936
...
Show unknown contacts in thread comment mention autocomplete
2014-05-12 11:56:05 +02:00
Fabrixxm
bb4296e686
exclude know contacts from unknown contact list
2014-05-12 05:46:02 -04:00
Michael Vogel
a6742d3db6
Repeated messages to Diaspora now contain a link to the original content at the bottom of the message.
2014-05-11 22:07:37 +02:00