clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
11,779 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

3039 Commits

Author SHA1 Message Date
Tobias Diekershoff 631afe5810 Merge pull request #2035 from FlxAlbroscheit/develop 
Preview the last 5 conversations in message-sidebar
 2015-11-08 16:03:04 +01:00
fabrixxm e6a8a7c8a9 Merge pull request #2048 from strk/group_post 
Include per-group count of unseen items in /ping output
 2015-11-08 16:01:19 +01:00
Sandro Santilli d31c372376 Revert the rename of <groups> 2015-11-08 15:56:43 +01:00
Sandro Santilli e28072f548 Fix bugs and rename <groups> to <group_posts> 2015-11-08 15:56:08 +01:00
FlxAlbroscheit 613cf41fd6 Preview last five conversations in message-sidebar 2015-11-08 15:45:42 +01:00
Sandro Santilli ba158dfeb1 Include per-group count of unseen items in /ping output 
See #1718
Unfinished work
 2015-11-08 15:33:12 +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 c2beab0d56 Fixed an undefined variable 2015-11-08 15:17:08 +01:00
Michael Vogel 7de6f23f4a Now it is possible to search for @http://profile... 2015-11-08 15:00:52 +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
fabrixxm 24d807221b Image filebrowser dialog links images to image page 
fix #1991
 2015-11-08 12:05:23 +01:00
fabrixxm 28a8c2369a Not current theme settings in admin page 
fix #2022
 2015-11-07 21:22:55 +01:00
FlxAlbroscheit 14dff6b0e0 Preview last five conversations in message-sidebar 2015-11-07 18:53:32 +01:00
Tobias Diekershoff 83c45d8d4b Merge pull request #2029 from tugelbend/develop 
changed syntax to work with PHP 5.3 #2027
 2015-11-07 16:34:13 +01:00
hauke f3eebda4fa changed syntax to work with PHP 5.3 #2027 2015-11-07 16:24:59 +01:00
Michael Vogel 3ccff0c77f Merge pull request #2023 from tobiasd/20151107-registertext 
Following n4rky to resolve #1898
 2015-11-07 16:02:26 +01:00
Tobias Diekershoff 9a1c57f1bc Following n4rky to resolve #1898 2015-11-07 13:19:55 +01:00
Tobias Diekershoff bb5f7c4db7 Merge pull request #2020 from fabrixxm/install_checks 
Install checks
 2015-11-07 11:12:37 +01:00
fabrixxm 6befca288f Check for mcrypt_create_iv() for RINO2, update link to cron documentation 2015-11-07 11:03:08 +01:00
Tobias Diekershoff 4e7bf0028c Merge pull request #2019 from rabuzarus/0611_directory 
simple photo_menu for directory
 2015-11-07 06:54:16 +01:00
fabrixxm 16123f5ad5 Check for ImageMagick and for GIF support 2015-11-07 00:22:26 +01:00
rabuzarus df36ea0d03 simple photo_menu for directory 2015-11-07 00:08:35 +01:00
fabrixxm 5f6ea6357d Add 'Reload active themes' to admin 
It will call 'uninstall()' and 'install()' on every active themes
 2015-11-06 23:53:10 +01:00
Michael Vogel 0f41f35041 The contact template now displays the address if available 2015-11-06 00:47:54 +01:00
rabuzarus a0ae6eb905 template-rework:little cleanup 2015-11-03 14:33:17 +01:00
rabuzarus e785759a8b template-rework:make use of get_contact_details_by_url() 2015-11-03 14:31:15 +01:00
rabuzarus f196389580 Merge develop into allfriends 2015-11-02 14:31:20 +01:00
Michael Vogel 709aac0652 Only offer the choice to activate Diaspora and OStatus if the system is ready for it 2015-11-01 13:55:49 +01:00
Michael Vogel 2f47d63a29 Merge pull request #2000 from tobiasd/20151027-credits 
a credits page
 2015-10-31 22:34:30 +01:00
Tobias Diekershoff cfc9d2b88f Merge pull request #1998 from annando/1510-network-profile2 
New function for fetching contact data
 2015-10-31 19:02:01 +01:00
Tobias Diekershoff 7d0ea70cc1 Merge pull request #2001 from annando/1510-empty-poco 
Bugfix: /poco was always empty
 2015-10-31 12:48:30 +01:00
Michael Vogel 7cf4468353 Bugfix: /poco was always empty 2015-10-31 10:32:01 +01:00
Michael Vogel 09ff2f0dd5 Renamed the function 2015-10-31 00:01:33 +01:00
Tobias Diekershoff c00847a79d use section_title.tpl for page title 2015-10-30 18:05:45 +01:00
rabuzarus fc37f49f23 network.php: add a descriptive comment 2015-10-30 12:47:48 +01:00
rabuzarus 56c9f23e99 prvgroup mentioning in status_editor 2015-10-30 01:59:17 +01:00
Michael Vogel f3ce812a9e New function for fetching contact data 2015-10-30 01:30:42 +01:00
Tobias Diekershoff a48156aab6 display names listed in credits.txt from /credits 2015-10-29 08:48:41 +01:00
fabrixxm fb4adc83dc Merge pull request #1995 from rabuzarus/2810_fbrowser 
fbrowser: exclude Contact Photos
 2015-10-29 08:41:21 +01:00
Tobias Diekershoff 6f601bf47d Merge pull request #1996 from annando/1510-profile-network-page 
Show the profile in the network view when viewing single contacts
 2015-10-29 08:39:56 +01:00
Michael Vogel 2e316b5cf2 Show the profile in the network view when viewing single contacts 2015-10-29 08:10:39 +01:00
rabuzarus e88d9153a1 fbrowser: exclude Contact Photos 2015-10-28 23:22:42 +01:00
Tobias Diekershoff 8eda86d8bf lower number of postings displayed per page for not logged in users 2015-10-28 19:01:45 +01:00
Michael Vogel aee4522ad4 The contact page now shows the connection status. 2015-10-27 23:10:52 +01:00
rabuzarus 299c8b83ac template-rework: let common friends and allfriends use viewcontact_template.tpl 2015-10-27 15:27:26 +01:00
Tobias Diekershoff 367699f785 Merge pull request #1987 from annando/1510-manage-enhancements 
Some small optical and structural changes to the manage template
 2015-10-27 09:01:35 +01:00
Tobias Diekershoff 4079084492 Merge pull request #1975 from rabuzarus/template_rework 
Template rework for contact related pages
 2015-10-27 08:59:03 +01:00
Michael Vogel 99ee45e627 The username is now a link 2015-10-26 23:11:42 +01:00
rabuzarus 7b1a957474 template-rework: try to fix double entries at match.php 2015-10-26 16:15:08 +01:00
rabuzarus 9d720f69aa template-rework: don't show the findpeople_widget on contact edit page 2015-10-26 13:36:01 +01:00
rabuzarus fdda4be452 manage-selector: use an easier sql querry 2015-10-26 00:19:55 +01:00
rabuzarus 87c559d605 manage-selector: sql - check for same baseurl 2015-10-25 18:04:20 +01:00
rabuzarus 4c263aa4ac Merge develop into manage 
Conflicts:
	view/global.css
 2015-10-25 16:57:04 +01:00
Tobias Diekershoff 03ff349a94 Merge pull request #1982 from annando/1510-reduced-profile 
Profile data are now reduced to only the most important fields
 2015-10-25 16:54:24 +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
rabuzarus bac61cf596 manage-selector: some cleanup and css work 2015-10-25 16:49:45 +01:00
Michael Vogel 78a8db55c6 Merge pull request #1981 from rabuzarus/poke 
some work on poke template
 2015-10-25 14:59:39 +01:00
rabuzarus e0e6762ed8 some inital work to have profile pics on manage page 2015-10-25 14:00:08 +01:00
Michael Vogel 65403973c1 Merge pull request #1977 from rabuzarus/crepair 
move html from crepair.php to template
 2015-10-25 09:44:12 +01:00
Michael Vogel 4631c13d08 Profile data are now reduced to only the most important fields 2015-10-25 09:15:36 +01:00
Michael Vogel a11833e248 Statusnet is now GNU Social 2015-10-24 20:44:18 +02:00
rabuzarus 8f92b6eea4 some work on poke template 2015-10-24 19:51:58 +02:00
rabuzarus ea2b3b2f76 move html from crepair.php to template 2015-10-24 15:57:46 +02:00
rabuzarus 87ecd8f658 tabs have now an ID 2015-10-24 15:04:27 +02:00
rabuzarus eaf5d05030 template rework: display more infos for match and dirfind 2015-10-23 16:48:32 +02:00
rabuzarus 0c3979720f template rework: rearrange sidebar widgets for contact related pages 2015-10-23 00:12:00 +02:00
rabuzarus 2aad62190f template rework: use viewcontact_template.tpl also for directory 2015-10-22 22:48:49 +02:00
rabuzarus f9c0c1d696 template rework: use viewcontact_template.tpl for contact dealing pages 2015-10-18 17:12:48 +02:00
rabuzarus 452a3011f7 Merge suggest into template_rework 2015-10-17 22:22:52 +02:00
rabuzarus dbf1f9efcd Merge dirfind into template_rework 2015-10-17 22:22:35 +02:00
rabuzarus e55f9f8f07 Merge dir into template_rework 2015-10-17 22:22:20 +02:00
rabuzarus 4b8ca578d1 dirfind: move pagination into template 2015-10-17 22:09:19 +02:00
rabuzarus b9d9bf8ecd directory: move pagination into template 2015-10-17 21:45:55 +02:00
rabuzarus 9176e739a4 sugest.php: themeable as whole page 2015-10-17 21:25:21 +02:00
rabuzarus 72896b0f6b unify directory page 2015-10-17 19:45:57 +02:00
Michael Vogel 2070c96dd1 Changing the acl does not work when editing posts - so it is disabled for events. 2015-10-17 08:46:45 +02:00
Michael Vogel 316276cb6d Editing an item with an event is now opeing the event edit form. 2015-10-17 08:27:33 +02:00
rabuzarus 67f699403a match.php: restructure acdording to the change of match.tpl 2015-10-17 00:39:50 +02:00
rabuzarus 20bb16859f dirfind.php: move html to templates 2015-10-17 00:19:01 +02:00
rabuzarus 6ebb21a935 directory.php: move html to templates 2015-10-16 21:44:10 +02:00
fabrixxm 5299f25920 default value for firstDay in events page 2015-10-12 20:23:09 +02:00
rabuzarus 649578ae33 Merge develop-new into event-attendance-new 
Conflicts:
	include/conversation.php
 2015-10-11 19:39:55 +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
Michael Vogel bb0dff2c75 Improved contact menu 2015-10-10 16:23:20 +02:00
Michael Vogel efbdb57f92 Reworked contact relations between Friendica and Diaspora 2015-10-10 11:06:18 +02:00
Michael Vogel ab0fbc3a65 Bugfix: Unidirectional Diaspora connect request have to be followers - not sharers 2015-10-10 04:56:40 +02:00
rabuzarus 0eae67ea48 update attendance state on profile wall 2015-10-09 14:20:01 +02:00
rabuzarus d85d215bb8 attendance update in network stream 2015-10-09 13:46:08 +02:00
Michael Vogel 16da708e07 Contact names with ">" and "<" are a problem ... 2015-10-09 07:39:38 +02:00
rabuzarus 6a9ec14878 small bugfix in like.php 2015-10-08 20:26:11 +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
Michael Vogel 14e17b944f Reworked fetching of contact data on "display" page 2015-10-06 18:31:08 +02:00
Michael Vogel eefedc019b Merge remote-tracking branch 'upstream/develop' into 1510-diaspora-privacy 2015-10-06 07:41:09 +02:00
Michael Vogel 901b95e935 Hide some profile data if not connected. 2015-10-06 06:56:31 +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 d3ac3f8490 Added the contact menu to the search as well. 2015-10-05 08:08:59 +02:00
Michael Vogel 8a2d1fe301 Show RedMatrix and use the proxy for the profile pictures 2015-10-04 22:24:58 +02:00
Michael Vogel 05ae3d528e A contact that couldn't be resolved is know known as "UNKNOWN" 2015-10-04 19:48:29 +02:00
Michael Vogel 72ecb9e67b Bugfix: Repairing a contact was more like killing the contact ... 2015-10-04 19:39:55 +02:00
Michael Vogel 8c514307cf For safety reasons include the include 2015-10-04 17:20:47 +02:00
Michael Vogel 4003b9cc5d Let the notification look more like the follow dialog 2015-10-04 17:18:58 +02:00
Michael Vogel 83ea4f7253 transfer some stuff from "follow" to the "notifications" to reduce the differences in the two dialogues. 2015-10-04 15:55:24 +02:00
Michael Vogel ba41336099 Preparation for a not found contact. 2015-10-04 14:49:12 +02:00
Michael Vogel d0ae5ce326 Show more information when following a new contact 2015-10-04 14:41:39 +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 05b2836d66 Merge pull request #1926 from annando/1510-permit-crawler 
New option to permit crawlers
 2015-10-04 08:53:32 +02:00
rabuzarus f93a2242e0 missed one to delete 2015-10-04 01:00:24 +02:00
Michael Vogel c0e277cec8 Issue 1913: Report invalid feed 2015-10-04 00:28:15 +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
Tobias Diekershoff d6beb7db1f add a header to seperate the beginning of week settings 2015-10-01 06:19:57 +02:00
Michael Vogel 389b7de451 Setting for the first day of the week 2015-09-30 19:18:13 +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 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
Tobias Diekershoff 78321c2a43 Merge pull request #1670 from annando/setup-rewrite-check 
The installation prozess has a problem with self signed certificates
 2015-06-15 13:25:54 +02:00
Michael Vogel 7feda0120f This is working fix for issue 1642 2015-06-15 01:20:04 +02:00
Michael Vogel 0e157b1288 Merge remote-tracking branch 'upstream/develop' into setup-rewrite-check 2015-06-15 00:55:05 +02:00
fabrixxm 42f4f3fce9 Merge pull request #1668 from annando/issue-1642 
Better detection for the mobile client to avoid "{0}" in notifications
 2015-06-14 15:58:52 +02:00
Michael Vogel abc84f96ab The installation prozess has a problem with self signed certificates. 2015-06-13 21:58:40 +02:00
Michael Vogel c89c0916e2 Better detection for the mobile client to avoid "{0}" in notifications. 2015-06-13 20:23:26 +02:00
Michael Vogel 66058c6cf4 Remote subscribe from a GNU Social site is now possible 2015-06-13 19:51:45 +02:00
Tobias Diekershoff e02546880f Merge pull request #1662 from annando/issue-1628 
The values for "sitename" and "register_text" was nedlessly encoded
 2015-06-11 06:33:38 +02:00
Michael Vogel 5907c62851 The values for "sitename" and "register_text" was nedlessly encoded with "htmlentities" 2015-06-11 00:12:16 +02:00
Michael Vogel df3b38679f This fixes issue 1657 2015-06-10 22:54:41 +02:00
Michael Vogel cb0351dba0 Send a salmon notification to every mentioned person. 2015-06-09 08:27:04 +02:00
Michael Vogel 419a3ab2d3 Better behaviour when contact wasn't found. 2015-06-08 01:19:40 +02:00
Michael Vogel a3c497190d Complete new OStatus import. 2015-06-07 23:18:02 +02:00
Michael Vogel ba36910343 Removed bad plink detection. 2015-06-03 21:03:46 +02:00
Michael Vogel c416ce4893 Improved tagging 2015-06-03 11:27:56 +02:00
Michael Vogel b60677ef1b OStatus: New fields in OStatus export/ Auto-tagging of replyed authors. 2015-06-03 01:26:46 +02:00
Michael Vogel 39d4856abb Merge remote-tracking branch 'upstream/develop' into 1506-tag-users 2015-06-02 23:19:00 +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 b5129a3e11 Store the GUID from here as well. 2015-06-02 22:10:28 +02:00
Michael Vogel 1a26d464dd Always add the addressed contacts in a post to the tags. 2015-06-02 20:36:10 +02:00
fabrixxm a36014fb0f Merge pull request #1619 from rabuzarus/block-local-dir 
block local directory for public access
 2015-06-02 17:53:19 +02:00
fabrixxm 46052740be Merge pull request #1632 from annando/1505-ostatus2 
Send a hubsub notification for every comment
 2015-06-01 09:00:17 +02:00
fabrixxm c12a647f13 Merge pull request #1639 from rabuzarus/albums_widget 
fix photo_albums upload
 2015-06-01 08:34:18 +02:00
rabuzarus 8257e7e1e5 block poco if block_local_dir is true 2015-06-01 01:50:27 +02:00
rabuzarus a674e782b2 fix Issue #1638 2015-06-01 01:36:37 +02:00
Michael Vogel fae3592c79 Bugfix: You wasn't able to add an OStatus contact when you are following the same contact via Statusnet connector. 2015-05-31 13:28:16 +02:00
fabrixxm 18e44001e5 Merge pull request #1630 from annando/1505-ostatus 
OStatus communication improvements
 2015-05-31 10:08:24 +02:00
fabrixxm 1cf3e778e8 Merge pull request #1622 from rabuzarus/albums_widget 
move html to photo_albums.tpl
 2015-05-31 10:07:43 +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 788d3cf1ab Ostatus: The automatical adding of @-replies now uses the correct contact. 2015-05-30 21:45:43 +02:00
rabuzarus 74267310d6 html to section_title.tpl 2015-05-30 02:21:30 +02:00