Commit Graph

Select branches

Hide Pull Requests

1.1.x

1.2.x

1.20.x

chaotic

experimental

master

nightly

v3

v1.1.3release

v1.2.0beta4

v1.20.9release

Mono Color

• 7c80c9a1f9 Meh, let's just remove FirePHP, I don't think anyone uses it Mikael Nordfeldth 2016-01-28 13:48:44 +01:00
• dfc11f99ad Merge branch 'update-extlib-firephp' into 'nightly' mmn 2016-01-28 12:41:34 +00:00
• bb0cb9b3f6 Manual merge of !87 Update LDAP2 extlib to 2.2.0 (stable) released on 2015-10-30 Mikael Nordfeldth 2016-01-28 13:34:45 +01:00
• d73c264e25 Haha, forgot that the $content content must also be there! Mikael Nordfeldth 2016-01-27 23:04:19 +01:00
• 34093388a7 Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into mmn_fixes Mikael Nordfeldth 2016-01-27 22:43:37 +01:00
• a47563cf3d Don't add space if there's no string in new notice content Mikael Nordfeldth 2016-01-27 22:41:53 +01:00
• 03d2b680f8 Allow empty new-notice content via web if there's an upload Mikael Nordfeldth 2016-01-27 22:39:43 +01:00
• 52778e1882 Merge branch 'json_encode_fail_branch' into 'nightly' mmn 2016-01-26 21:16:24 +00:00
• 42545c6625 Merge branch 'mention_branch' into 'nightly' mmn 2016-01-26 21:15:25 +00:00
• e69715005d Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into mmn_fixes Mikael Nordfeldth 2016-01-26 22:10:23 +01:00
• c01982c917 Merge branch 'oembed_thumbnail_branch' into 'nightly' mmn 2016-01-26 21:09:07 +00:00
• aa76e5863f don't mess upp charsets in oembed/og! check for utf-8 in http header and meta tags, and add prolog when loading html with DOMDocument() hannes 2016-01-26 13:37:52 +00:00
• b8d1e1f4a6 silence errors on these xpath queries hannes 2016-01-26 11:28:24 +00:00
• 884aeb4d2e common_purify() doesn't remove wordpress' and facebook's javascript properly, maybe better to keep the data intact, and do strip_tags or something similar when using the data hannes 2016-01-26 01:10:15 +00:00
• 473f893d04 detab hannes 2016-01-26 01:07:44 +00:00
• 76c8139054 not pretty, but gives us better oembed data for wordpress and facebook hannes 2016-01-26 01:05:53 +00:00
• a48055a3cc Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into mmn_fixes Mikael Nordfeldth 2016-01-25 20:22:16 +01:00
• c0b0f8e2f9 Merge branch 'file_redirection_cleanup_branch' into 'nightly' mmn 2016-01-25 19:21:52 +00:00
• e447964639 remove my ugly debug info hannes 2016-01-25 19:10:35 +00:00
• b1b6a0a69c config['follow_redirects'] is the extlib's config! if max_redirs is set we want to do our own redirection following in this function hannes 2016-01-25 19:03:26 +00:00
• a888294135 add our own protected urls hannes 2016-01-25 19:00:46 +00:00
• ca0c792ed3 File and File_redirection records are saved in File_redirection::where() now hannes 2016-01-25 19:00:05 +00:00
• 48e1a2431b save File and File_redirection records in File_redirection::where(), because then we will have to run where() over and over again hannes 2016-01-25 18:55:48 +00:00
• b15434375c Show plain text files on attachment page. Mikael Nordfeldth 2016-01-25 16:54:40 +01:00
• 9614aba0e1 Removed plugin Google-Analytics as this is free/libre and decentralized software and should not promote centralized proprietary software. Please see the included Piwik plugin for a more decentralized alternative! Roland Haeder 2016-01-25 13:19:43 +01:00
• fef52d7b51 Update FirefPHP Core to v0.4.0 released on 23 Apr 2013 postblue 2016-01-24 21:11:38 +01:00
• a9d18a077e Harmonize, clarify, categorize URL schemes Mikael Nordfeldth 2016-01-24 12:47:31 +01:00
• 1cec627d72 Allow bitcoin scheme to URLs Mikael Nordfeldth 2016-01-24 12:42:53 +01:00
• 4e50717e12 output error if json_encode fails hannes 2016-01-23 15:01:27 +00:00
• ef005987a1 Did the OpportunisticQM fixes in the wrong order Mikael Nordfeldth 2016-01-11 13:35:29 +01:00
• 1121b38eb1 use connect_timeout value for execution margin Mikael Nordfeldth 2016-01-22 12:19:17 +01:00
• 89dd44bf3e default connect_timeout to 5 instead of extlib 10 Mikael Nordfeldth 2016-01-18 22:01:45 +01:00
• 81f9a59f25 use connect_timeout value for execution margin Mikael Nordfeldth 2016-01-22 12:19:17 +01:00
• d0e2f8745d add a thumbnail to oembed response hannes 2016-01-21 18:48:30 +00:00
• 3f9c1c142a Removing unnecessary debug messages etc. Mikael Nordfeldth 2016-01-21 02:49:34 +01:00
• 45446f17ad Only set selectVerbs if it's not set in class var Mikael Nordfeldth 2016-01-21 02:37:38 +01:00
• be1759f112 i18n Mikael Nordfeldth 2016-01-21 02:37:07 +01:00
• d3a4a2225f We want the profile stream to be as raw as possible! Mikael Nordfeldth 2016-01-21 02:33:43 +01:00
• 81bf0fd261 Various last fixes to RSVP I think Mikael Nordfeldth 2016-01-21 02:20:50 +01:00
• f74d2d555c Working on some RSVP code stuff Mikael Nordfeldth 2016-01-21 02:10:34 +01:00
• d13454fb84 Now we can delete a group logo. Akio Nishimura 2016-01-21 08:10:35 +09:00
• 5999171c11 Throw NoObjectTypeException on Notice->getObjectType if no string Mikael Nordfeldth 2016-01-20 21:37:14 +01:00
• 45b523bada Add xcal namespaces to location and url in event Mikael Nordfeldth 2016-01-20 21:07:55 +01:00
• 21cc737f5c Cancelling RSVPs now seems to work. Mikael Nordfeldth 2016-01-20 16:10:10 +01:00
• 9accd953e4 Merge branch 'master' into mmn_fixes Mikael Nordfeldth 2016-01-20 15:33:18 +01:00
• 64e74d527f Handle exceptions when salmon slapping Mikael Nordfeldth 2016-01-20 14:55:41 +01:00
• c393bc9563 In very specific circumstances we can bulkDistribute 0 notices Mikael Nordfeldth 2016-01-16 17:18:14 +01:00
• 912d65c767 bulkDistribute won't add empty lists to database Mikael Nordfeldth 2016-01-16 17:34:27 +01:00
• fa8e02b832 Handle exceptions when salmon slapping Mikael Nordfeldth 2016-01-20 14:55:41 +01:00
• de047f9727 correct mentions if parent mention multiple users with same nickname (don't use first one for all) hannes 2016-01-19 13:41:25 +00:00
• 80dc2788dd Started fiddling with CancelRSVP but more must be done Mikael Nordfeldth 2016-01-19 01:41:06 +01:00
• 477d71c0bf RSVP stuff, mostly forms. Mikael Nordfeldth 2016-01-19 01:33:09 +01:00
• 84dda697d6 RSVPs seem to be created now, just gotta fix CancelrsvpAction Mikael Nordfeldth 2016-01-19 01:10:06 +01:00
• 73992a1ed8 Use "newer" terminology and throw exceptions Mikael Nordfeldth 2016-01-19 00:21:16 +01:00
• 9eea255c79 Save with options so we get source=web Mikael Nordfeldth 2016-01-19 00:08:31 +01:00
• 358684a5ed end_str, not start_str Mikael Nordfeldth 2016-01-19 00:01:30 +01:00
• 385705c65b Events get rendered. Mikael Nordfeldth 2016-01-18 23:58:32 +01:00
• 15d12b209d Don't include delete verbs in profile notice stream. Mikael Nordfeldth 2016-01-18 22:04:42 +01:00
• 7715ea993b getVerb function in Notice class Mikael Nordfeldth 2016-01-18 22:02:05 +01:00
• f768de4b46 default connect_timeout to 5 instead of extlib 10 Mikael Nordfeldth 2016-01-18 22:01:45 +01:00
• cae344b67b Events are now saved but not displayed properly again Mikael Nordfeldth 2016-01-18 20:57:44 +01:00
• 6c46a93a81 Minor improvements on Notice::saveActivity Mikael Nordfeldth 2016-01-18 19:29:45 +01:00
• 486a02d60d First steps on making NeweventAction a FormAction Mikael Nordfeldth 2016-01-18 17:23:33 +01:00
• 11b925c4ca Use a function to getCreated() Mikael Nordfeldth 2016-01-18 17:03:37 +01:00
• c1655c2c0f Merge branch 'master' into mmn_fixes Mikael Nordfeldth 2016-01-17 00:41:43 +01:00
• b0416ae592 Initial user doesn't need as strict checking on email Mikael Nordfeldth 2016-01-16 17:20:26 +01:00
• 78346af572 Merge branch 'master' of git.gnu.io:gnu/gnu-social Mikael Nordfeldth 2016-01-17 00:40:14 +01:00
• bdc38a7204 Initial user doesn't need as strict checking on email Mikael Nordfeldth 2016-01-16 17:20:26 +01:00
• 6dc0477c00 Let the remote side know the Salmon was accepted (sorta) Mikael Nordfeldth 2016-01-16 22:39:59 +01:00
• deda83fdef Distinguish notice saving errors from others for Salmon Mikael Nordfeldth 2016-01-16 22:36:42 +01:00
• 4678546d33 We want exceptions to be noticable in activityhandlerplugin Mikael Nordfeldth 2016-01-16 21:19:34 +01:00
• a85a08ff35 Add a check in Notice->asActivityObject that we're actually returning such a thing! Mikael Nordfeldth 2016-01-16 21:13:26 +01:00
• 0797ee0871 EmptyIdException doesn't carry ->obj Mikael Nordfeldth 2016-01-16 21:12:53 +01:00
• 3019f8f23f dbqueuemanager logic Mikael Nordfeldth 2016-01-16 21:05:34 +01:00
• fdfa71a033 Extremely verbose debugging is annoying Mikael Nordfeldth 2016-01-16 18:04:04 +01:00
• c559b8ce2a bulkDistribute won't add empty lists to database Mikael Nordfeldth 2016-01-16 17:34:27 +01:00
• f53ebdeadb Start handling salmon entries directly with Notice::saveActivity Mikael Nordfeldth 2016-01-16 17:25:29 +01:00
• 1f76c1e4a9 Initial user doesn't need as strict checking on email Mikael Nordfeldth 2016-01-16 17:20:26 +01:00
• 2b67b53112 In very specific circumstances we can bulkDistribute 0 notices Mikael Nordfeldth 2016-01-16 17:18:14 +01:00
• 44c10bb2aa Merge branch 'oembed_branch' into 'nightly' mmn 2016-01-15 13:11:35 +00:00
• a1530b0e68 Removing superflous debug stuff Mikael Nordfeldth 2016-01-14 22:12:36 +01:00
• 8df38df5cb Get uploaded media_ids via File::getByID() Mikael Nordfeldth 2016-01-14 22:05:03 +01:00
• 16088d9439 ErrorAction and InfoAction fixes, are now ManagedAction Mikael Nordfeldth 2016-01-14 21:28:47 +01:00
• bc0a903bd4 ErrorAction to autodiscoverable file. Mikael Nordfeldth 2016-01-14 21:21:34 +01:00
• 818fb05cfe role examples in userrole.php Mikael Nordfeldth 2016-01-14 20:34:12 +01:00
• e5019c3858 Accept media_ids parameter from Twitter API v1.1 clients Mikael Nordfeldth 2016-01-14 20:24:01 +01:00
• b570f0d3cb Media files are accepted and uploaded via Twitter API now Mikael Nordfeldth 2016-01-14 19:15:02 +01:00
• 2af9de4f23 Minor fixes in Linkback plugin Mikael Nordfeldth 2016-01-14 19:14:24 +01:00
• b530d385bc Exception object was not supplied there Mikael Nordfeldth 2016-01-14 18:51:46 +01:00
• 0caf0612d0 Make Twitter Media upload API v1.1 reach us Mikael Nordfeldth 2016-01-14 18:29:21 +01:00
• 6e49281adb Use the Action class itself as error handler Mikael Nordfeldth 2016-01-14 18:11:54 +01:00
• 2f1bfe126b Debug message formatting gone wrong Mikael Nordfeldth 2016-01-14 13:52:11 +01:00
• c173c4faa5 Actually throw NoQueueHandlerException too. Mikael Nordfeldth 2016-01-14 13:48:33 +01:00
• 59e75ef966 Incorrect use of getByHashKey in HubSub Mikael Nordfeldth 2016-01-14 13:15:31 +01:00
• f092026541 Documentation fix from master Mikael Nordfeldth 2016-01-14 13:11:27 +01:00
• df00a88cb4 Forgot to add NoRouteMapException to 6834f355f2 Mikael Nordfeldth 2016-01-14 13:07:00 +01:00
• bacd49a6a8 Don't try to replace http with https if https already exists Mikael Nordfeldth 2016-01-14 13:06:37 +01:00
• 0781c2a7b9 Merge branch 'fix_readme' into 'master' mmn 2016-01-14 12:03:11 +00:00
• b7c849b5b0 array need to contain key/value pairs Björn Schießle 2016-01-14 12:39:39 +01:00
• 83cb1dfa68 Salmon debugging Mikael Nordfeldth 2016-01-14 03:45:11 +01:00