cb40f72c7eUse the profile URI when linking instead of URL
Mikael Nordfeldth
2016-01-29 15:21:01 +01:00
f708a5b016Never save our /attachment/{file_id} links as links in the file table, return the old file
hannes
2016-01-29 00:36:30 +00:00
efd2326a29the last url in the redirection chain can actually also be a redirection (e.g. if it's one of our /attachment/{file_id} links)
hannes
2016-01-29 00:34:32 +00:00
5b11238010Don't use system include path
Mikael Nordfeldth
2016-01-28 20:31:46 +01:00
6b31feb70fStrict Standards: Declaration of MysqlSchema::get()
Mikael Nordfeldth
2016-01-28 20:18:06 +01:00
a6898b033dFullname and location are now text, not varchar, and can be >191|255
Mikael Nordfeldth
2016-01-28 19:11:43 +01:00
c0851d59f5migrateProfilePrefs added to scripts/upgrade.php
Mikael Nordfeldth
2016-01-28 19:03:24 +01:00
fb7f572eedPurify oembed html (again)
Mikael Nordfeldth
2016-01-28 19:01:45 +01:00
7e6783bb8fReplace htmLawed with HTMLPurifier
Mikael Nordfeldth
2016-01-28 18:57:36 +01:00
daea5647b6Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into mmn_fixes
Mikael Nordfeldth
2016-01-28 17:27:08 +01:00
9b3cbb373eMerge branch 'oembed_fb_wp_branch' into 'nightly'
mmn
2016-01-28 16:26:33 +00:00
efe23ed404updateWithKeys now understands multi-column keys
Mikael Nordfeldth
2016-01-28 16:42:59 +01:00
05439831e7add comment that DOMDocument('1.0', 'UTF-8') does not work
hannes
2016-01-28 15:32:11 +00:00
06e325d61bfixes two issues when the oembed thumbnail is blank
hannes
2016-01-28 15:19:29 +00:00
d94f9031ffChangelog deleted in php-gettext
Mikael Nordfeldth
2016-01-28 14:43:01 +01:00
10f16e4f32php-gettext extlib updated as req !88
Mikael Nordfeldth
2016-01-28 14:40:47 +01:00
c459bded53Markdown library updated to 1.6.0, merge req !90
Mikael Nordfeldth
2016-01-28 14:29:24 +01:00
fb15dc5080htmLawed updated (manually merging !89)
Mikael Nordfeldth
2016-01-28 14:24:03 +01:00
bf38fb7befMerge branch 'upstream-changes/google-analytics-removal' into 'master'
mmn
2016-01-28 12:55:10 +00:00
7c80c9a1f9Meh, let's just remove FirePHP, I don't think anyone uses it
Mikael Nordfeldth
2016-01-28 13:48:44 +01:00
dfc11f99adMerge branch 'update-extlib-firephp' into 'nightly'
mmn
2016-01-28 12:41:34 +00:00
bb0cb9b3f6Manual 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
d73c264e25Haha, forgot that the $content content must also be there!
Mikael Nordfeldth
2016-01-27 23:04:19 +01:00
34093388a7Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into mmn_fixes
Mikael Nordfeldth
2016-01-27 22:43:37 +01:00
a47563cf3dDon't add space if there's no string in new notice content
Mikael Nordfeldth
2016-01-27 22:41:53 +01:00
03d2b680f8Allow empty new-notice content via web if there's an upload
Mikael Nordfeldth
2016-01-27 22:39:43 +01:00
52778e1882Merge branch 'json_encode_fail_branch' into 'nightly'
mmn
2016-01-26 21:16:24 +00:00
42545c6625Merge branch 'mention_branch' into 'nightly'
mmn
2016-01-26 21:15:25 +00:00
e69715005dMerge branch 'nightly' of git.gnu.io:gnu/gnu-social into mmn_fixes
Mikael Nordfeldth
2016-01-26 22:10:23 +01:00
c01982c917Merge branch 'oembed_thumbnail_branch' into 'nightly'
mmn
2016-01-26 21:09:07 +00:00
aa76e5863fdon'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
b8d1e1f4a6silence errors on these xpath queries
hannes
2016-01-26 11:28:24 +00:00
884aeb4d2ecommon_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
76c8139054not pretty, but gives us better oembed data for wordpress and facebook
hannes
2016-01-26 01:05:53 +00:00
a48055a3ccMerge branch 'nightly' of git.gnu.io:gnu/gnu-social into mmn_fixes
Mikael Nordfeldth
2016-01-25 20:22:16 +01:00
c0b0f8e2f9Merge branch 'file_redirection_cleanup_branch' into 'nightly'
mmn
2016-01-25 19:21:52 +00:00
e447964639remove my ugly debug info
hannes
2016-01-25 19:10:35 +00:00
b1b6a0a69cconfig['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
a888294135add our own protected urls
hannes
2016-01-25 19:00:46 +00:00
ca0c792ed3File and File_redirection records are saved in File_redirection::where() now
hannes
2016-01-25 19:00:05 +00:00
48e1a2431bsave 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
b15434375cShow plain text files on attachment page.
Mikael Nordfeldth
2016-01-25 16:54:40 +01:00
9614aba0e1Removed 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
fef52d7b51Update FirefPHP Core to v0.4.0 released on 23 Apr 2013
postblue
2016-01-24 21:11:38 +01:00
a9d18a077eHarmonize, clarify, categorize URL schemes
Mikael Nordfeldth
2016-01-24 12:47:31 +01:00
1cec627d72Allow bitcoin scheme to URLs
Mikael Nordfeldth
2016-01-24 12:42:53 +01:00
4e50717e12output error if json_encode fails
hannes
2016-01-23 15:01:27 +00:00
ef005987a1Did the OpportunisticQM fixes in the wrong order
Mikael Nordfeldth
2016-01-11 13:35:29 +01:00
1121b38eb1use connect_timeout value for execution margin
Mikael Nordfeldth
2016-01-22 12:19:17 +01:00
89dd44bf3edefault connect_timeout to 5 instead of extlib 10
Mikael Nordfeldth
2016-01-18 22:01:45 +01:00
81f9a59f25use connect_timeout value for execution margin
Mikael Nordfeldth
2016-01-22 12:19:17 +01:00
d0e2f8745dadd a thumbnail to oembed response
hannes
2016-01-21 18:48:30 +00:00
3f9c1c142aRemoving unnecessary debug messages etc.
Mikael Nordfeldth
2016-01-21 02:49:34 +01:00
45446f17adOnly set selectVerbs if it's not set in class var
Mikael Nordfeldth
2016-01-21 02:37:38 +01:00
be1759f112i18n
Mikael Nordfeldth
2016-01-21 02:37:07 +01:00
d3a4a2225fWe want the profile stream to be as raw as possible!
Mikael Nordfeldth
2016-01-21 02:33:43 +01:00
81bf0fd261Various last fixes to RSVP I think
Mikael Nordfeldth
2016-01-21 02:20:50 +01:00
f74d2d555cWorking on some RSVP code stuff
Mikael Nordfeldth
2016-01-21 02:10:34 +01:00
d13454fb84Now we can delete a group logo.
Akio Nishimura
2016-01-21 08:10:35 +09:00
5999171c11Throw NoObjectTypeException on Notice->getObjectType if no string
Mikael Nordfeldth
2016-01-20 21:37:14 +01:00
45b523badaAdd xcal namespaces to location and url in event
Mikael Nordfeldth
2016-01-20 21:07:55 +01:00
21cc737f5cCancelling RSVPs now seems to work.
Mikael Nordfeldth
2016-01-20 16:10:10 +01:00
9accd953e4Merge branch 'master' into mmn_fixes
Mikael Nordfeldth
2016-01-20 15:33:18 +01:00
64e74d527fHandle exceptions when salmon slapping
Mikael Nordfeldth
2016-01-20 14:55:41 +01:00
c393bc9563In very specific circumstances we can bulkDistribute 0 notices
Mikael Nordfeldth
2016-01-16 17:18:14 +01:00
912d65c767bulkDistribute won't add empty lists to database
Mikael Nordfeldth
2016-01-16 17:34:27 +01:00
fa8e02b832Handle exceptions when salmon slapping
Mikael Nordfeldth
2016-01-20 14:55:41 +01:00
de047f9727correct 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
80dc2788ddStarted fiddling with CancelRSVP but more must be done
Mikael Nordfeldth
2016-01-19 01:41:06 +01:00
477d71c0bfRSVP stuff, mostly forms.
Mikael Nordfeldth
2016-01-19 01:33:09 +01:00
84dda697d6RSVPs seem to be created now, just gotta fix CancelrsvpAction
Mikael Nordfeldth
2016-01-19 01:10:06 +01:00
73992a1ed8Use "newer" terminology and throw exceptions
Mikael Nordfeldth
2016-01-19 00:21:16 +01:00
9eea255c79Save with options so we get source=web
Mikael Nordfeldth
2016-01-19 00:08:31 +01:00
358684a5edend_str, not start_str
Mikael Nordfeldth
2016-01-19 00:01:30 +01:00
385705c65bEvents get rendered.
Mikael Nordfeldth
2016-01-18 23:58:32 +01:00
15d12b209dDon't include delete verbs in profile notice stream.
Mikael Nordfeldth
2016-01-18 22:04:42 +01:00
7715ea993bgetVerb function in Notice class
Mikael Nordfeldth
2016-01-18 22:02:05 +01:00
f768de4b46default connect_timeout to 5 instead of extlib 10
Mikael Nordfeldth
2016-01-18 22:01:45 +01:00
cae344b67bEvents are now saved but not displayed properly again
Mikael Nordfeldth
2016-01-18 20:57:44 +01:00
6c46a93a81Minor improvements on Notice::saveActivity
Mikael Nordfeldth
2016-01-18 19:29:45 +01:00
486a02d60dFirst steps on making NeweventAction a FormAction
Mikael Nordfeldth
2016-01-18 17:23:33 +01:00
11b925c4caUse a function to getCreated()
Mikael Nordfeldth
2016-01-18 17:03:37 +01:00
c1655c2c0fMerge branch 'master' into mmn_fixes
Mikael Nordfeldth
2016-01-17 00:41:43 +01:00
b0416ae592Initial user doesn't need as strict checking on email
Mikael Nordfeldth
2016-01-16 17:20:26 +01:00
78346af572Merge branch 'master' of git.gnu.io:gnu/gnu-social
Mikael Nordfeldth
2016-01-17 00:40:14 +01:00
bdc38a7204Initial user doesn't need as strict checking on email
Mikael Nordfeldth
2016-01-16 17:20:26 +01:00
6dc0477c00Let the remote side know the Salmon was accepted (sorta)
Mikael Nordfeldth
2016-01-16 22:39:59 +01:00
deda83fdefDistinguish notice saving errors from others for Salmon
Mikael Nordfeldth
2016-01-16 22:36:42 +01:00
4678546d33We want exceptions to be noticable in activityhandlerplugin
Mikael Nordfeldth
2016-01-16 21:19:34 +01:00
a85a08ff35Add a check in Notice->asActivityObject that we're actually returning such a thing!
Mikael Nordfeldth
2016-01-16 21:13:26 +01:00
0797ee0871EmptyIdException doesn't carry ->obj
Mikael Nordfeldth
2016-01-16 21:12:53 +01:00
3019f8f23fdbqueuemanager logic
Mikael Nordfeldth
2016-01-16 21:05:34 +01:00
fdfa71a033Extremely verbose debugging is annoying
Mikael Nordfeldth
2016-01-16 18:04:04 +01:00
c559b8ce2abulkDistribute won't add empty lists to database
Mikael Nordfeldth
2016-01-16 17:34:27 +01:00
f53ebdeadbStart handling salmon entries directly with Notice::saveActivity
Mikael Nordfeldth
2016-01-16 17:25:29 +01:00
1f76c1e4a9Initial user doesn't need as strict checking on email
Mikael Nordfeldth
2016-01-16 17:20:26 +01:00
2b67b53112In very specific circumstances we can bulkDistribute 0 notices
Mikael Nordfeldth
2016-01-16 17:18:14 +01:00
44c10bb2aaMerge branch 'oembed_branch' into 'nightly'
mmn
2016-01-15 13:11:35 +00:00
a1530b0e68Removing superflous debug stuff
Mikael Nordfeldth
2016-01-14 22:12:36 +01:00