Commit Graph

  • bb0faaea56 Merge branch 'mmn_fixes' into nightly Mikael Nordfeldth 2015-12-15 12:34:12 +01:00
  • f5ed66280b $url should've been $file->getUrl() Mikael Nordfeldth 2015-12-15 12:30:35 +01:00
  • 2b4a6c7dd7 Don't check Link header if not set Mikael Nordfeldth 2015-12-15 11:51:16 +01:00
  • ef4c11d262 Better checks for defined array indexes Mikael Nordfeldth 2015-12-15 11:50:57 +01:00
  • 0d39337683 Merge branch 'master' into nightly Mikael Nordfeldth 2015-12-14 22:11:26 +01:00
  • 67c0c1b6c5 Merge branch 'send-twitter-replies-to-twitter' into 'master' mmn 2015-12-14 21:10:57 +00:00
  • 0baa9debbc Merge branch 'direct-feed-sub' into 'master' mmn 2015-12-14 21:09:56 +00:00
  • 1644608376 Merge branch 'twitter-show-rel-syndication' into 'master' mmn 2015-12-14 21:09:08 +00:00
  • 0e91a38c9c Merge branch 'firefox-sub-link' into 'master' mmn 2015-12-14 21:08:22 +00:00
  • 0f938ff234 Merge branch 'fix-twitter-uri' into 'master' mmn 2015-12-14 21:07:48 +00:00
  • c2ea85a5e2 Merge branch 'master' into nightly Mikael Nordfeldth 2015-12-14 22:07:06 +01:00
  • 1be376cf87 Merge branch 'inbound-linkback' into 'master' mmn 2015-12-14 21:05:25 +00:00
  • 1eff108561 Merge branch 'twitter-check-dupe-by-uri' into 'master' mmn 2015-12-14 21:04:22 +00:00
  • 2addf8e456 Merge branch 'repost-of-uf2' into 'master' mmn 2015-12-14 21:03:38 +00:00
  • ef4e61c91b Merge branch 'master' into nightly Mikael Nordfeldth 2015-12-14 22:03:04 +01:00
  • 4ea396f871 Merge branch 'master' into mmn_fixes Mikael Nordfeldth 2015-12-14 22:01:50 +01:00
  • edd62e58fd Merge branch 'at-mention-url' into 'master' mmn 2015-12-14 21:01:42 +00:00
  • 8d26d83d7a Merge branch 'group-join-approve-reject-button-icons' into 'nightly' mmn 2015-12-14 20:48:36 +00:00
  • 2dd968f94e Merge branch 'group-join-rejections' into 'nightly' mmn 2015-12-14 20:48:18 +00:00
  • d5d8068632 Merge branch 'group-members-pending' into 'nightly' mmn 2015-12-14 20:47:47 +00:00
  • 5f0412b9ee Merge branch 'api-docs' into 'nightly' mmn 2015-12-14 20:47:17 +00:00
  • 289116cb64 Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly Mikael Nordfeldth 2015-12-14 21:45:46 +01:00
  • 20592f184d getID() will complain loudly if something is wrong Mikael Nordfeldth 2015-12-14 21:44:59 +01:00
  • 42c653a9d0 Merge commit '5c4a7a10' into nightly Mikael Nordfeldth 2015-12-14 21:42:08 +01:00
  • c114c6bbad Merge branch 'php-minversion-detec' into 'nightly' mmn 2015-12-14 20:37:53 +00:00
  • 129bd1bf03 Merge branch 'fix-setpassword' into 'nightly' mmn 2015-12-14 20:37:26 +00:00
  • d659e0aaf9 We have to print/echo when outputting json (thanks hannes) Mikael Nordfeldth 2015-12-14 21:29:39 +01:00
  • 8d1105fe73 We have to print/echo when outputting json (thanks hannes) Mikael Nordfeldth 2015-12-14 21:29:39 +01:00
  • 441e2c8d34 redir_info only has data if we ran discovery Mikael Nordfeldth 2015-12-08 11:42:09 +01:00
  • 4fecda58ff Full identifiers for Autocomplete, less confusing Mikael Nordfeldth 2015-12-05 16:18:59 +01:00
  • 376d545082 Remember to purify HTML... Mikael Nordfeldth 2015-12-05 15:56:50 +01:00
  • c498db147a ircs URLs work fine in Firefox at least Mikael Nordfeldth 2015-12-05 13:02:49 +01:00
  • 10bb4cb659 Fix /scripts/setpassword.php Chimo 2015-12-04 17:09:06 +00:00
  • b537696370 Add icons to group-join approval/rejection buttons Chimo 2015-12-04 17:00:35 +00:00
  • 6d9ea620a3 Fix group-join request rejections Chimo 2015-12-04 16:09:51 +00:00
  • a06dc57621 Fix "pending members" group list Chimo 2015-12-04 15:47:40 +00:00
  • 3e16e31080 installer::checkPrereqs bump PHP version to 5.5.0 Chimo 2015-12-04 15:22:58 +00:00
  • 831e9db7ec Various minor theme enhancements in neo-gnu Mikael Nordfeldth 2015-11-30 02:31:51 +01:00
  • 4479d780e5 List groups with nickname instead of full name in sidebar Mikael Nordfeldth 2015-11-30 02:21:17 +01:00
  • 334a0d56e7 Oembed slimmed to only do discovery (soon we get og: discovery too) Mikael Nordfeldth 2015-11-30 02:06:04 +01:00
  • 8bab642cc7 quickGetJson for HTTP requests to return json objects Mikael Nordfeldth 2015-11-30 02:05:06 +01:00
  • b7edac2610 HTTPClient get $params array and oEmbedHelper uses it Mikael Nordfeldth 2015-11-30 01:28:18 +01:00
  • c95f74018d Add AtomPub, Twitter-compat. API documentation to doc-src/ Chimo 2015-11-24 12:59:43 -05:00
  • fbe0e68617 Events listing, but the stream will change soon Mikael Nordfeldth 2015-11-23 14:40:59 +01:00
  • 5b847eff12 bump beta version number Mikael Nordfeldth 2015-11-23 00:42:13 +01:00
  • bca4bb8373 allow form ->li() to set $class Mikael Nordfeldth 2015-11-23 00:40:28 +01:00
  • b01484a0a3 Managed_DataObject::newUri was called improperly Mikael Nordfeldth 2015-11-23 00:39:49 +01:00
  • 5c4a7a1052 make sure returned notice is a repeat, i.e. not a delete activity notice hannes 2015-11-22 20:28:07 +00:00
  • 1eba33590b ActivityVerb::SHARE instead of http://activitystrea.ms/schema/1.0/share hannes 2015-11-22 20:26:08 +00:00
  • 70695a1463 make sure the notice is a repeat, i.e. not a delete activity notice that also can have a repeat_of set hannes 2015-11-22 18:59:56 +00:00
  • 1630424797 Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly Mikael Nordfeldth 2015-11-20 18:50:26 +01:00
  • b33b40db45 Merge branch 'refactor-file-processNew' into 'nightly' mmn 2015-11-20 17:50:01 +00:00
  • 38c84a92c7 Merge request #59 which was directed at master Mikael Nordfeldth 2015-11-20 18:47:21 +01:00
  • 5d548d157f Merge branch 'master' into 'master' mmn 2015-11-20 17:46:53 +00:00
  • abb8d1273e block check can't be done inside the same try-expression as Subscription::getSubscription(), since if that throws a NoResultException, the block check will not be done. and if you're blocking someone you are not subscribing to them. hannes 2015-11-19 15:55:11 +00:00
  • 4f0fae9e90 Show better source for linback items Stephen Paul Weber 2015-10-27 17:13:11 +00:00
  • 11810bbf54 Update conversation when we update reply_to Stephen Paul Weber 2015-10-27 03:15:38 +00:00
  • 47db1ab063 Autodiscovery header for webmention Stephen Paul Weber 2015-10-25 18:42:14 +00:00
  • f09a82268f Ignore self pings Stephen Paul Weber 2015-10-25 17:30:51 +00:00
  • b95b318052 That never was meant to be in that if Stephen Paul Weber 2015-10-25 16:50:59 +00:00
  • 6aba21fcd8 Use author-declared URL as URI Stephen Paul Weber 2015-10-23 18:41:00 +00:00
  • fa1e4620cf Add pingback frontend Stephen Paul Weber 2015-10-22 20:15:44 +00:00
  • aa4d880148 Search in sub-items for links to the target as well Stephen Paul Weber 2015-10-22 19:29:04 +00:00
  • 96e0819f00 Catch exception that this generates when there is no result Stephen Paul Weber 2015-10-22 19:13:56 +00:00
  • c5bdf6924d Fix duplicate detection Stephen Paul Weber 2015-10-22 19:13:16 +00:00
  • 64ac344efa Update on duplicate linkback Stephen Paul Weber 2015-10-22 18:21:46 +00:00
  • b9971e8a80 Linkback to user should work Stephen Paul Weber 2015-10-22 17:39:15 +00:00
  • 1e3cf08d82 Ignore non-local notices as targets Stephen Paul Weber 2015-10-22 17:20:03 +00:00
  • dbfb698859 Webmention frontend Stephen Paul Weber 2015-10-22 17:18:20 +00:00
  • 96fb18da3f Initial helpers for verification and microformats Stephen Paul Weber 2015-10-22 17:17:14 +00:00
  • d0e7203d88 Make it clearer that we're handling group IDs Mikael Nordfeldth 2015-11-08 23:31:45 +01:00
  • acd4980ab4 Fix federation issue with groups (bad list order) Mikael Nordfeldth 2015-11-08 23:31:23 +01:00
  • 844670f88d Ooops, copypasted something into the wrong place. Mikael Nordfeldth 2015-11-08 23:24:20 +01:00
  • 65184782aa OStatus usage of static Validate::* calls fixed Mikael Nordfeldth 2015-11-08 10:33:41 +01:00
  • f29daa22b6 Merge branch 'master' of git.gnu.io:gnu/gnu-social into nightly Mikael Nordfeldth 2015-11-06 13:39:17 +01:00
  • dbdac9cfbe Merge branch 'in-reply-to-uf2' into 'master' mmn 2015-11-06 12:39:02 +00:00
  • e40014b4de separate classes into files in DirectMessage plugin Mikael Nordfeldth 2015-11-06 13:35:45 +01:00
  • c83deecba2 Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly Mikael Nordfeldth 2015-11-06 13:33:24 +01:00
  • 5f999e84d8 Merge branch 'nightly' into 'nightly' mmn 2015-11-06 12:28:00 +00:00
  • 507f9a28c0 Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly abjectio 2015-11-05 17:34:34 +01:00
  • 7ccd36849e Merge branch 'master' of git.gnu.io:gnu/gnu-social into nightly Mikael Nordfeldth 2015-11-05 16:16:02 +01:00
  • f345f1d605 Merge branch 'renew-pshb' into 'master' mmn 2015-11-05 15:13:16 +00:00
  • deb5275c7a Merge branch 'object-types-are-absolute' into 'master' mmn 2015-11-05 15:12:41 +00:00
  • 959f971a65 Merge branch 'fix-webfinger-link-header' into 'master' mmn 2015-11-05 15:12:10 +00:00
  • 9f83e60f25 Merge branch 'pings-interop' into 'master' mmn 2015-11-05 15:11:29 +00:00
  • 0e32729e59 Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly Mikael Nordfeldth 2015-11-05 16:07:42 +01:00
  • c950f18546 Merge branch 'master' into nightly Mikael Nordfeldth 2015-11-05 16:07:05 +01:00
  • 96e0867d4c Merge branch 'master' into 'master' mmn 2015-11-05 15:05:55 +00:00
  • 45b24286e5 Merge branch 'status-204' into 'master' mmn 2015-11-05 15:03:42 +00:00
  • f513ceac7d Merge branch 'handle-rss-guid' into 'master' mmn 2015-11-05 15:02:20 +00:00
  • 5c768d7ef7 Merge branch 'twitter-verb' into 'nightly' mmn 2015-11-05 15:01:07 +00:00
  • 4b7c904fe0 Merge branch 'correct-author-for-repeat' into 'master' mmn 2015-11-05 15:00:35 +00:00
  • a3ddc4ec0c Merge branch 'support-atom-namespaces-in-rss-author' into 'master' mmn 2015-11-05 15:00:07 +00:00
  • 3ca4af6868 Merge branch 'group-join' into 'nightly' mmn 2015-11-05 14:57:29 +00:00
  • ba623d2b4e update URL Matthias Fritzsche 2015-11-04 12:31:23 +01:00
  • a9b1b60a97 Refactor on File::processNew Stephen Paul Weber 2015-11-02 05:15:08 +00:00
  • d7b58491ce Add User_group::getObjectType Chimo 2015-10-29 20:11:57 -04:00
  • a74572b469 Use mb_strlen Stephen Paul Weber 2015-10-28 01:46:08 +00:00
  • 6ac8b845bf Improvements inspired by the OStatus code Stephen Paul Weber 2015-10-28 01:45:51 +00:00
  • fe4c8a771b Replace text with nickname if shorter Stephen Paul Weber 2015-10-28 01:24:58 +00:00