Michael Vogel
a2fa791bbd
Always include the direct parent in the mentions
2015-12-07 23:35:33 +01:00
fabrixxm
f359731fc1
Merge pull request #2159 from annando/1512-worker-processes
...
Better control for the number of workers
2015-12-07 23:20:02 +01:00
Michael Vogel
88da58ed3e
OStatus: Deactivated The resharing until it is tested completely.
2015-12-07 23:06:28 +01:00
root
e1c6d80c01
change api/user/group_* to api/friendica/group_*
2015-12-07 22:18:55 +01:00
Michael Vogel
bfc0857953
OStatus: Send even Friendica comments to OStatus
2015-12-07 21:52:42 +01:00
Gerhard Seeber
8128a28a6c
new API calls for managing contact groups
2015-12-07 19:38:11 +01:00
d944b65253
Merge pull request #2151 from annando/1512-misconfigured-friendica
...
Workaround for misconfigured Friendica servers with probe_url
2015-12-07 06:37:37 +01:00
Michael Vogel
6b0b9481cb
Bugfix for pull request #2147 (Fix for issue #2122 )
2015-12-06 20:05:57 +01:00
Michael Vogel
fbbba6828b
Some better logging
2015-12-06 20:04:33 +01:00
Michael Vogel
d06717798b
Code beautification
2015-12-06 18:57:23 +01:00
Michael Vogel
f880bdd33b
Workaround for misconfigured Friendica servers
2015-12-06 18:52:19 +01:00
Michael Vogel
9f8da37c99
Move the process check at the beginning of the script
2015-12-06 16:40:31 +01:00
Michael Vogel
54085508e5
Double check for maximum number of workers
2015-12-06 16:28:28 +01:00
Michael Vogel
7c7baa77d6
probe_url: Only cache successful results
2015-12-06 12:15:31 +01:00
Michael Vogel
b57ae80206
Issue 2122: Make sure to always return the correct number of entries
2015-12-05 23:05:48 +01:00
a8ab1bc947
Merge pull request #2146 from annando/1512-ostatus-picture-posts
...
Enhancements to picture posts to OStatus
2015-12-05 06:47:31 +01:00
root
37a70d3204
modified: include/dbstructure.php removed uneeded break; It causes errors with php 7.0.
2015-12-04 19:49:09 +00:00
Michael Vogel
25c2e219ee
Merge remote-tracking branch 'upstream/develop' into 1512-ostatus-picture-posts
2015-12-04 07:07:34 +01:00
7ac7caef08
Merge pull request #2136 from annando/1512-diaspora-retractions
...
Support for a new Diaspora command for post retraction
2015-12-04 06:54:55 +01:00
eaf975faae
Merge pull request #2130 from annando/1512-contact-rework
...
Some more contact rework
2015-12-04 06:53:29 +01:00
Michael Vogel
37bd03422b
The preview picture can now be remote or local
2015-12-04 06:50:23 +01:00
Michael Vogel
540d217134
Merge remote-tracking branch 'upstream/develop' into 1512-ostatus-picture-posts
2015-12-04 06:05:12 +01:00
Michael Vogel
f82ce0de66
Merge branch '1512-ostatus-picture-posts' of github.com:annando/friendica into 1512-ostatus-picture-posts
2015-12-04 06:00:56 +01:00
Michael Vogel
bb45112544
OStatus: Picture posts are reformatted
2015-12-04 05:57:33 +01:00
rabuzarus
d94b96e546
ping: docu fix
2015-12-03 22:51:00 +01:00
rabuzarus
4b7f080c46
ping: further work
2015-12-03 22:42:53 +01:00
rabuzarus
c0406918ec
ping: cleanup
2015-12-03 17:15:49 +01:00
Fabrixxm
95508bf4bb
Allow multicolunn primary keys in dbstructure
2015-12-03 16:39:20 +01:00
Michael Vogel
1a170c8743
Merge remote-tracking branch 'upstream/develop' into 1512-contact-rework
...
Conflicts:
mod/contacts.php
mod/crepair.php
2015-12-03 14:38:04 +01:00
Michael Vogel
24f1a24208
Support for a new Diaspora command for post retraction
2015-12-03 08:35:47 +01:00
rabuzarus
3af7cff281
remove unneeded function page_type_translate()
2015-12-03 00:08:43 +01:00
rabuzarus
d963cdfe48
photos-albms widget: add some classes
2015-12-02 20:01:22 +01:00
rabuzarus
cd7ec72b20
unify hcard and vcard: make $pdesc available in hcard&vcard
2015-12-01 19:47:23 +01:00
rabuzarus
39b37281a7
Merge develop into 3011_hcard_vcard
2015-12-01 18:34:13 +01:00
rabuzarus
89c5989cfb
unify hcard and vcard
2015-12-01 18:31:08 +01:00
Michael Vogel
107204f405
Diaspora comments/likes: The contact id and the network is now taken from the contact
2015-12-01 15:36:32 +01:00
146f386e37
Merge pull request #2126 from annando/1511-duplicates
...
Bugfix: The duplicate check sometimes seemed to have scrambled the posts
2015-12-01 06:07:18 +01:00
Michael Vogel
712b3c7593
Merge pull request #2121 from rabuzarus/3011_viewcontactstitle
...
make viewcontacts part of the profile tab
2015-11-30 23:29:35 +01:00
Michael Vogel
b0898cc461
Bugfix: The duplicate check sometimes seemed to have scrambled the posts
2015-11-30 23:13:56 +01:00
Michael Vogel
0278e60664
Merge pull request #2104 from rabuzarus/2611_contacts_directory
...
display contact information in contact and directory according to the…
2015-11-30 18:07:35 +01:00
rabuzarus
2ce64c2496
change shortcut for viewcontacts + shortcut docu
2015-11-30 16:23:03 +01:00
fabrixxm
2753e62483
Merge pull request #2119 from annando/1511-contact-evolution
...
Refurbished contact settings/contact posts
2015-11-30 14:45:23 +01:00
rabuzarus
45c2a4868e
make viewcontacts part of the profile tab
2015-11-30 03:25:23 +01:00
Michael Vogel
42d903dd68
Redesign of the contact pages, new tab for contact statuses
2015-11-29 23:22:05 +01:00
f45a8f1a03
Merge pull request #2106 from annando/1511-ostatus-bookmark-design
...
Small OStatus changes
2015-11-29 23:19:12 +01:00
d3d0647ff8
Merge pull request #2108 from annando/1511-optimize-tables
...
Optimize tables on a daily base that are written very often
2015-11-29 23:18:06 +01:00
93fd6dce84
Merge pull request #2111 from annando/issue-1925
...
Issue 1925 - display nickname@hostname.com
2015-11-29 19:48:08 +01:00
3f2a55c267
Merge pull request #2118 from annando/1511-supported-networks
...
Only show supported networks in sidebar and contact list
2015-11-29 16:03:10 +01:00
Michael Vogel
2fabde5d2d
Added the old Facebook addon for addon check
2015-11-29 13:42:31 +01:00
Michael Vogel
8b23e77171
Only show supported networks in sidebar and contact list
2015-11-29 13:37:24 +01:00
Michael Vogel
1cd06df5fa
Bugfix: Only show the feed link for local profiles
2015-11-29 12:02:14 +01:00
Michael Vogel
583a2f709b
Merge remote-tracking branch 'upstream/develop' into 1511-ostatus-bookmark-design
2015-11-29 10:25:44 +01:00
Michael Vogel
00cc409461
The photo menu now respects if the local users differs from the contact owner
2015-11-29 09:35:35 +01:00
b67f33f6d5
Merge pull request #2109 from annando/1511-duplicated-tags-diaspora
...
Avoid duplicated tags in postings to Diaspora
2015-11-29 08:42:10 +01:00
be40fb8186
Merge pull request #2110 from annando/1511-subscribe-feed
...
Issue 1779: Atom feed link under the connect link on the profile page
2015-11-29 08:40:39 +01:00
rabuzarus
f5597da059
forumlist - mark selected forum as selected
2015-11-28 23:52:12 +01:00
rabuzarus
a3059d02d4
group_side - unify look with forumlist
2015-11-28 20:09:28 +01:00
Michael Vogel
cd16eb14af
Show the name instead of the nick in the feed
2015-11-28 19:42:18 +01:00
Michael Vogel
25c0c5d4ad
Issue 1925 - display nickname@hostname.com
2015-11-28 18:49:37 +01:00
Michael Vogel
388847e1f3
Issue 1779: There is now an atom feed link under the connect link on the profile page
2015-11-28 18:11:34 +01:00
Michael Vogel
3f66e0a9f6
Automatically optimize tables that are smaller than a definable size
2015-11-28 15:43:25 +01:00
Michael Vogel
a34dbf76a4
Maybe it would take too long to optimize the photo table on larger systems
2015-11-28 14:35:59 +01:00
Michael Vogel
1c64090217
Avoid duplicated tags
2015-11-28 14:29:14 +01:00
Michael Vogel
c3068c8925
Optimize tables on a daily base that are written very often
2015-11-28 13:19:09 +01:00
Michael Vogel
32fa5d185c
Before the comparism the entities must be removed
2015-11-28 10:28:14 +01:00
Michael Vogel
59242d7932
Forgotten file
2015-11-28 07:37:56 +01:00
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
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
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
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
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
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
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
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
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
12d9c46ec5
Merge pull request #1979 from annando/1510-gnusocial
...
Statusnet is now GNU Social
2015-10-25 16:52:38 +01:00
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
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
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
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
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
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
be70dde61f
Merge pull request #1928 from annando/issue-1913
...
Issue 1913: Report invalid feed
2015-10-04 08:54:59 +02:00
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
05b2836d66
Merge pull request #1926 from annando/1510-permit-crawler
...
New option to permit crawlers
2015-10-04 08:53:32 +02:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
64655ee546
Merge pull request #1687 from annando/1506-location-api
...
API: Return the geo coordinates
2015-06-25 00:00:01 +02:00
