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
2e8caf7f27
Merge pull request #1915 from rabuzarus/hide_profilepics
...
don't show profile photos in albums to others than owner or remote
2015-09-30 08:57:31 +02:00
rabuzarus
3d7602a5a3
don't show profile photos in albums to others than the owner or remote user
2015-09-29 19:44:26 +02:00
Michael Vogel
6e981ed798
Merge remote-tracking branch 'upstream/develop' into 1509-i18n-events
2015-09-29 10:35:50 +02:00
Fabrixxm
880dda4257
Merge branch 'master' back into develop
2015-09-29 10:00:13 +02:00
Michael Vogel
c33957a6e9
Internationalisation of events/Move events to the navigation bar
2015-09-27 14:00:15 +02:00
fabrixxm
af5da5bece
Merge pull request #1903 from annando/1509-bbcode-notifications
...
The "about" field in the introductions should be send through bbcode
2015-09-25 18:24:48 +02:00
Michael Vogel
c7b80b532a
Bugfix: The "about" field in the introductions should be send through bbcode
2015-09-25 17:47:37 +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
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
5ac38b7f99
There is now only one central parameter for the global directory.
2015-09-15 22:29:02 +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
Tobias Diekershoff
8504cf4f05
Merge pull request #1880 from annando/1509-performance
...
Some settings to control the system load
2015-09-06 09:02:27 +02:00
Michael Vogel
f918109351
We forgot to include the title ...
2015-09-06 08:18:55 +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
c6d9b2da23
New setting for requery days
2015-09-05 10:54:39 +02:00
Michael Vogel
cecbc58729
Mass-subscribing to OStatus contacts is enabled again
2015-09-05 10:32:10 +02:00
Michael Vogel
3cccb5ecb1
The repair option is added to the settings
2015-09-05 04:54:48 +02:00
Michael Vogel
30e7ce2e2a
The links for nodeinfo in "well-known" need to be an array of objects.
2015-09-05 04:33:18 +02:00
Michael Vogel
d9f23dbb20
New switch that restricts the search only for registered users
2015-09-05 04:29:37 +02:00
Michael Vogel
635e92249a
Bugfix: The first contact was never repaired
2015-09-03 22:24:57 +02:00
Michael Vogel
fd239ebf7b
Try to repair OStatus subscriptions
2015-09-03 22:18:25 +02:00
Tobias Diekershoff
658c99dcf3
Merge pull request #1874 from annando/1509-pubsub
...
Bugfix: pubsub tend to unsubscribe subscriptions in the past
2015-09-01 07:07:22 +02:00
Michael Vogel
389738b1c1
Bugfix: pubsub tend to unsubscribe subscriptions in the past
2015-09-01 00:12:15 +02:00
Michael Vogel
3614df650f
Some admin settings hadn't been made translatable.
2015-08-31 19:32:01 +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
Tobias Diekershoff
5b78353fff
Merge pull request #1861 from annando/1508-deactivated-ostatus-contacts
...
There seems to be a problem with the function to add all friends of a GNU Social account.
2015-08-26 22:51:55 +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
fabrixxm
b988aa7cb4
fix warning in /dfrn_request
2015-08-26 19:17:41 +02:00
Michael Vogel
6942b16ef5
See issue 1855. OOhembed is removed.
2015-08-25 19:50:23 +02:00
Michael Vogel
5c084b754a
Don't show the alternate url syntax in searches
2015-08-25 05:31:21 +02:00
Michael Vogel
b52bc71c6c
Now you can define the duration of the cache entries.
2015-08-24 17:24:14 +02:00
Tobias Diekershoff
26c5c7991a
Merge pull request #1849 from fabrixxm/issue-1841
...
filebrowser: link image to original picture, show error messages
2015-08-24 14:26:09 +02:00
fabrixxm
cbabac298d
filebrowser: link image to original picture, show error messages
2015-08-24 13:54:41 +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
cf5fce855e
Bugfix: Don't show "appnet" in "inbound" when only "buffer" is enabled.
2015-08-24 08:18:17 +02:00
Michael Vogel
3e08024839
Moved the rss/atom part to the protocols.
2015-08-24 08:15:34 +02:00
Michael Vogel
157c64cac2
The rss/atom feed is added to the inofficial "services" section.
2015-08-24 08:02:46 +02:00
Michael Vogel
2a676ee312
The nodeinfo is changed to the new specifications
2015-08-24 07:47:42 +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
37ab7ee052
Merge pull request #1842 from annando/1508-directory-configurable
...
Make the hardcoded path to dir.friendica.com configurable
2015-08-23 15:10:34 +02:00
Michael Vogel
123ad84689
Make the hardcoded path to dir.friendica.com configurable
2015-08-23 11:05:10 +02:00
fabrixxm
81d1dfc006
add 'reload active plugins' button in admin/plugins
2015-08-20 15:01:15 +02:00
Tobias Diekershoff
033f89c6fa
Merge pull request #1831 from annando/1508-twidere-crash
...
New versions of Twidere crashed during posting.
2015-08-18 07:17:30 +02:00
Michael Vogel
57ebb00a1f
New versions of Twidere crashed during posting.
2015-08-17 22:38:05 +02:00
Tobias Diekershoff
86f6532c61
adding the subdir
2015-08-17 08:20:19 +02:00
Tobias Diekershoff
03e81b06d5
we dont need the or anymore
2015-08-17 07:24:48 +02:00
Tobias Diekershoff
621dec1606
reconstruct the description for more flexible translations
2015-08-17 07:20:50 +02:00
Tobias Diekershoff
eea258f74c
add the profile url to the settings pages as alternative to the webfinger. See issue 1621
2015-08-16 22:39:08 +02:00
Tobias Diekershoff
0f505b92f6
Merge pull request #1827 from annando/1508-only-real-contacts
...
In the contact search only suppress the "follow" link if you really d…
2015-08-16 22:25:32 +02:00
Michael Vogel
32e080933f
Improved the settings description
2015-08-16 22:17:36 +02:00
Michael Vogel
c2a1cf958d
The addon "statistics_json" becomes the system setting "nodeinfo"
2015-08-16 21:45:51 +02:00
Michael Vogel
46ec2638fa
In the contact search only suppress the "follow" link if you really don't follow the contact
2015-08-16 15:48:26 +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
0e9b2c132a
Bugfix: There are some problems with Friendica installed in subdirectories
2015-08-14 00:13:23 +02:00
Tobias Diekershoff
5013e5daf1
use to link to queue inspector
2015-08-12 19:58:53 +02:00
Tobias Diekershoff
f439ac47c4
admin panel: inspect queue
2015-08-12 15:44:59 +02:00
Tobias Diekershoff
9d0786531d
Merge pull request #1810 from annando/issue-1739
...
Contact requests now contain more information.
2015-08-12 08:17:27 +02:00
Michael Vogel
a0f69dc92c
Contact requests now contain more information.
2015-08-12 08:07:21 +02:00
Michael Vogel
d5f2d9b39a
Bugfix ...
2015-08-11 23:50:31 +02:00
Michael Vogel
bf9ab389a2
Just some removed blanks
2015-08-11 20:16:53 +02:00
Michael Vogel
c18c598baf
Nodeinfo: Include the sitename
2015-08-11 10:23:33 +02:00
Michael Vogel
986eee48ac
Some corrections in the addon names
2015-08-11 00:37:27 +02:00
Michael Vogel
e60456fb66
Metadata should be an object.
2015-08-10 23:11:07 +02:00
Michael Vogel
6aeb4c0ad7
Corrected the output
2015-08-10 21:54:57 +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
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
8974c147e0
First steps for a public relay for posts.
2015-08-09 08:31:42 +02:00
Michael Vogel
b4d09777b9
Added many accesskeys ...
2015-08-08 17:33:43 +02:00
fabrixxm
e94e6d7500
escape user data to sql
2015-08-06 16:08:14 +02:00
Tobias Diekershoff
cd8be48ca7
Merge pull request #1791 from annando/1507-new-poco
...
Improved Local Directory
2015-08-02 10:31:34 +02:00
Michael Vogel
2f147451f7
Just some more improved setting descriptions.
2015-08-02 10:08:08 +02:00
Michael Vogel
ebae45babc
Clarified the settings.
2015-08-02 10:05:50 +02:00
Michael Vogel
0a998f99df
Added community search mode
2015-07-30 23:27:50 +02:00
Fabrixxm
f5657e283c
fix folder links in filebrowser dialog
2015-07-29 11:55:26 +02:00
Fabrixxm
70b7de39a7
Upload/Browse popup for files and images
...
Jot buttons to upload images and files show a popup, where the
user can select a previously uploaded item o upload a new one
2015-07-28 17:20:40 +02:00
Michael Vogel
dcfcd6f906
Poco: added caching
2015-07-25 12:05:27 +02:00
Michael Vogel
68e318e316
Don't export contacts with empty network
2015-07-25 10:50:00 +02:00
Michael Vogel
e3e9de2e74
Export all federation contacts through poco
2015-07-24 07:23:57 +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
9717fa82fe
New field "created" in gcontacts. New option for timeframe when polling global contacts
2015-07-21 00:05:44 +02:00
Michael Vogel
f3c83fb514
Automatically updating the searched contacts while searching it.
2015-07-19 18:02:24 +02:00
Michael Vogel
0bede65a6b
Use local search
2015-07-19 13:23:01 +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
a0734ceede
Merge remote-tracking branch 'upstream/develop' into 1507-new-poco
2015-07-18 22:37:39 +02:00
Michael Vogel
cf3214c904
Query other servers periodically for their known contacts
2015-07-18 22:26:06 +02:00
Tobias Diekershoff
9bb805f3dc
show profile url in contact-edit overview listing
2015-07-18 10:57:31 +02:00
Michael Vogel
f1e7369283
Poco: Option to activate and deactivate detection of last activity.
2015-07-18 00:48:42 +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
fca8aecc9b
Show "Redmatrix" as network name.
2015-07-16 10:09:59 +02:00
Michael Vogel
6800b07fc5
Update the name in the "self" contact when it is changed.
2015-07-14 22:24:43 +02:00
Michael Vogel
0de1926113
removed logger entry
2015-07-14 08:52:54 +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
Michael Vogel
5f89cb0923
The autofollow option is moved from the addons to the core.
2015-07-12 21:37:49 +02:00
rabuzarus
e5809dce79
add jotnets for sharing posts
2015-07-12 17:52:25 +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
fe137a92ef
Automatically update contact data.
2015-07-11 14:36:04 +02:00
Tobias Diekershoff
a22581e86c
typo
2015-07-08 13:15:14 +02:00
Fabrixxm
95945ecae6
Merge branch 'master' into develop
2015-07-06 16:56:49 +02:00
fabrixxm
75998b62de
Merge pull request #1726 from rabuzarus/acl-var
...
fix for #1725
2015-07-02 12:13:14 +02:00
rabuzarus
b827c2e805
inlude jotnets for bookmark acl
2015-07-02 12:09:40 +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
836058c477
Added help text
2015-07-01 00:41:04 +02:00
Michael Vogel
055ee962c9
Ability to enter a password when the first user is created
2015-06-30 23:37:31 +02:00
rabuzarus
cf2a90dfa2
system settings is now a variable in settings_display.tpl
2015-06-30 14:51:14 +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
Michael Vogel
836432bb9a
Removed Google Maps
2015-06-30 07:42:59 +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
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
373bb0822b
get the themes settings of foreign profiles
2015-06-27 14:10:43 +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
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
bfebf9636b
acl for events and photos
2015-06-25 12:38:09 +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
e29d05ce4a
notifications order, unseen css class
...
ping return notfications ordered by notification id
notifications list get seen/unseen class from ping xml
global.css define 'notify-unseen'
2015-06-24 16:10:06 +02:00
Fabrixxm
4036ad2554
Fix desktop notification
...
use on/off field for enable/disable desktop notification
show only new notifications after enable
use localstorage to save enabled/disalbed and last notification id
hide settings on browsers without desktop notification
2015-06-24 09:49:53 +02:00
Fabrixxm
17e8c29768
fix spelling
2015-06-24 08:23:56 +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
d06beb1431
install: load htconfig template from templates/
2015-06-23 12:35:51 +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
Tobias Diekershoff
5549dd1dbe
Merge pull request #1682 from fabrixxm/issue-1625
...
admin: allow deletion of any users but yourself
2015-06-23 11:05:16 +02:00
Fabrixxm
3168b44317
admin: allow deletion of any users but yourself
...
fix #1625
2015-06-23 10:39:28 +02:00
Fabrixxm
53e6dd6637
Add contact detail to contact drop confirm
...
fix #1629
2015-06-23 10:09:27 +02:00
Tobias Diekershoff
24c91a4fed
Merge pull request #1679 from fabrixxm/smallfixestothemes
...
use fields template in photo edit form
2015-06-23 09:12:25 +02:00
Michael Vogel
a7cf3639f0
Just some more fixing for issue 1642
2015-06-22 23:47:08 +02:00
fabrixxm
35e9fc3b02
use fields template in photo edit form
2015-06-22 20:07:19 +02:00
Michael Vogel
df7b907bc4
Display: Look for the network name when fetching the contact (important because of the statusnet connector)
2015-06-21 01:34:57 +02:00
