GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity
17,019 Commits 8 Branches 4 Tags 310 MiB
df0f9547b5
Commit Graph

17019 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mikael Nordfeldth
62c4ffe889 Server exceptions should reasonably be 5xx 2015-12-27 02:15:37 +01:00
Mikael Nordfeldth
b76461fc78 syntax error 2015-12-27 01:42:03 +01:00
Mikael Nordfeldth
0ac71c2b7b Duplicate URI means we have it already, I assume 2015-12-27 01:40:00 +01:00
Mikael Nordfeldth
83c112e24b Handle lack of parent nicely 2015-12-26 16:36:03 +01:00
Mikael Nordfeldth
306df3dc3b Logging fixes 2015-12-26 16:27:06 +01:00
mmn
ace47a4512 Merge branch 'rm-design-config-doc' into 'nightly' 
Remove $config['design'] documentation

I believe those options are gone since
36d619480a

Ref. #109 

See merge request !70
 2015-12-23 21:04:25 +00:00
mmn
48f31928e9 Merge branch 'autocomplete-group' into 'nightly' 
Autocomplete group

Group autocompletion wasn't working for a couple of reasons:

1. $profile wasn't set (d8092207c0)
2. Profile::getUri() wasn't working for Groups, causing Profile::getAcctUri() to throw a ProfileNoAcctUriException (3e830dad37)

See merge request !68
 2015-12-23 21:04:18 +00:00
mmn
4904c2bc10 Merge branch 'profile-prefs-getall' into 'nightly' 
Fixup Profile_prefs::getAll() 

Ref. #98 

See merge request !69
 2015-12-23 21:03:55 +00:00
Chimo
cc26c4cb1a Remove $config['design'] documentation 
I believe those options are gone since
36d619480a
 2015-12-21 17:53:30 +00:00
Chimo
90945e548b Profile_prefs::getAll fix prefs loop 
DataObject::fetch doesn't return an object.
 2015-12-17 14:58:06 +00:00
Chimo
71119e4980 Profile_prefs::getAll fix call to listFind 
2nd argument needs to be an array
 2015-12-17 14:55:39 +00:00
Chimo
3e830dad37 Make Profile::getUri work with Groups 
and by extension Profile::getAcctUri
 2015-12-15 21:50:10 -05:00
Chimo
d8092207c0 Autocomplete: Fix $profile being null for groups 2015-12-15 21:48:18 -05:00
Mikael Nordfeldth
bb0faaea56 Merge branch 'mmn_fixes' into nightly 2015-12-15 12:34:12 +01:00
Mikael Nordfeldth
f5ed66280b $url should've been $file->getUrl() 2015-12-15 12:31:10 +01:00
Mikael Nordfeldth
2b4a6c7dd7 Don't check Link header if not set 2015-12-15 11:51:16 +01:00
Mikael Nordfeldth
ef4c11d262 Better checks for defined array indexes 2015-12-15 11:50:57 +01:00
Mikael Nordfeldth
0d39337683 Merge branch 'master' into nightly 2015-12-14 22:11:26 +01:00
mmn
67c0c1b6c5 Merge branch 'send-twitter-replies-to-twitter' into 'master' 
Always send Twitter replies to Twitter

If is_twitter_notice($notice->reply_to) then send it to Twitter, even
if twitter import is off.  It's a reply to a Twitter notice, it should
go there!

(Also retweets.)

See merge request !42
 2015-12-14 21:10:57 +00:00
mmn
0baa9debbc Merge branch 'direct-feed-sub' into 'master' 
If we are given a direct URL to a feed, use that



See merge request !54
 2015-12-14 21:09:56 +00:00
mmn
1644608376 Merge branch 'twitter-show-rel-syndication' into 'master' 
Include rel-syndication link for tweets

As per: <http://microformats.org/wiki/rel-syndication>
This allows some services to find a post in Twitter.

See merge request !44
 2015-12-14 21:09:08 +00:00
mmn
0e91a38c9c Merge branch 'firefox-sub-link' into 'master' 
Link to add to Firefox as feedreader

This allows easily subscribing to any feed firefox detects in your GNU Social instance.

See merge request !55
 2015-12-14 21:08:22 +00:00
mmn
0f938ff234 Merge branch 'fix-twitter-uri' into 'master' 
Twitter URIs have changed

The #! was deprecated ages ago, and Twitter forces HTTPS these days.

See merge request !43
 2015-12-14 21:07:48 +00:00
Mikael Nordfeldth
c2ea85a5e2 Merge branch 'master' into nightly 2015-12-14 22:07:06 +01:00
mmn
1be376cf87 Merge branch 'inbound-linkback' into 'master' 
Accept mentions/replies/rsvps/likes via pingback and webmention

This makes the Linkback plugin bidirectional, allowing reply/mention federation between GNU Social and any pingback-enabled service (including any Wordpress site).

See merge request !41
 2015-12-14 21:05:25 +00:00
mmn
1eff108561 Merge branch 'twitter-check-dupe-by-uri' into 'master' 
TwitterBridge also check for dupe by uri

In case a twitter item came in from some other source (such as linkback).

See merge request !45
 2015-12-14 21:04:22 +00:00
mmn
2addf8e456 Merge branch 'repost-of-uf2' into 'master' 
Mark up link to original as a repost for repeats

http://indiewebcamp.com/repost

See merge request !46
 2015-12-14 21:03:38 +00:00
Mikael Nordfeldth
ef4e61c91b Merge branch 'master' into nightly 2015-12-14 22:03:04 +01:00
Mikael Nordfeldth
4ea396f871 Merge branch 'master' into mmn_fixes 2015-12-14 22:01:50 +01:00
mmn
edd62e58fd Merge branch 'at-mention-url' into 'master' 
MentionURL Plugin

This plugin enables users to use the syntax `@twitter.com/singpolyma` to mention users the system does not know about, or to be more specific when a nickname is ambiguous.

See merge request !53
 2015-12-14 21:01:42 +00:00
mmn
8d26d83d7a Merge branch 'group-join-approve-reject-button-icons' into 'nightly' 
Add icons to group-join approval/rejection buttons

Relates to #106 

See merge request !66
 2015-12-14 20:48:36 +00:00
mmn
2dd968f94e Merge branch 'group-join-rejections' into 'nightly' 
Fix group-join request rejections

Relates to #105 

See merge request !65
 2015-12-14 20:48:18 +00:00
mmn
d5d8068632 Merge branch 'group-members-pending' into 'nightly' 
Fix "pending members" group list

Related to #104 

See merge request !64
 2015-12-14 20:47:47 +00:00
mmn
5f0412b9ee Merge branch 'api-docs' into 'nightly' 
Add AtomPub, Twitter-compat. API documentation to doc-src/



See merge request !62
 2015-12-14 20:47:17 +00:00
Mikael Nordfeldth
289116cb64 Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly 2015-12-14 21:45:46 +01:00
Mikael Nordfeldth
20592f184d getID() will complain loudly if something is wrong 
(just ->id would not)
 2015-12-14 21:44:59 +01:00
Mikael Nordfeldth
42c653a9d0 Merge commit '5c4a7a10' into nightly 
hannes making sure notice is a repeat and not a delete activity notice
 2015-12-14 21:42:08 +01:00
mmn
c114c6bbad Merge branch 'php-minversion-detec' into 'nightly' 
installer::checkPrereqs bump PHP version to 5.5.0

Related to #102 

See merge request !63
 2015-12-14 20:37:53 +00:00
mmn
129bd1bf03 Merge branch 'fix-setpassword' into 'nightly' 
Fix /scripts/setpassword.php

common_munge_password is expecting a Profile, we were passing a user_id.

Thanks @aroque for the fix ( ref. #100 )

See merge request !67
 2015-12-14 20:37:26 +00:00
Mikael Nordfeldth
d659e0aaf9 We have to print/echo when outputting json (thanks hannes) 2015-12-14 21:31:10 +01:00
Mikael Nordfeldth
8d1105fe73 We have to print/echo when outputting json (thanks hannes) 2015-12-14 21:29:39 +01:00
Mikael Nordfeldth
441e2c8d34 redir_info only has data if we ran discovery 2015-12-08 11:42:09 +01:00
Mikael Nordfeldth
4fecda58ff Full identifiers for Autocomplete, less confusing 2015-12-05 16:18:59 +01:00
Mikael Nordfeldth
376d545082 Remember to purify HTML... 2015-12-05 15:56:50 +01:00
Mikael Nordfeldth
c498db147a ircs URLs work fine in Firefox at least 2015-12-05 13:02:49 +01:00
Chimo
10bb4cb659 Fix /scripts/setpassword.php 
common_munge_password is expecting a Profile, we were passing a user_id.

Thanks @aroque for the fix ( ref. #100 )
 2015-12-04 17:09:06 +00:00
Chimo
b537696370 Add icons to group-join approval/rejection buttons 2015-12-04 17:00:35 +00:00
Chimo
6d9ea620a3 Fix group-join request rejections 2015-12-04 16:11:15 +00:00
Chimo
a06dc57621 Fix "pending members" group list 2015-12-04 15:47:40 +00:00
Chimo
3e16e31080 installer::checkPrereqs bump PHP version to 5.5.0 2015-12-04 15:22:58 +00:00