keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
10616 commits 4 branches 0 tags 179 MiB
Commit graph

2763 commits

Author SHA1 Message Date
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