d94f9031ff
Changelog deleted in php-gettext
2016-01-28 14:43:01 +01:00
10f16e4f32
php-gettext extlib updated as req !88
...
Thanks postblue
2016-01-28 14:41:25 +01:00
c459bded53
Markdown library updated to 1.6.0, merge req !90
...
Thanks postblue
2016-01-28 14:37:14 +01:00
fb15dc5080
htmLawed updated (manually merging !89 )
...
Thanks postblue
2016-01-28 14:24:03 +01:00
7c80c9a1f9
Meh, let's just remove FirePHP, I don't think anyone uses it
2016-01-28 13:48:44 +01:00
dfc11f99ad
Merge branch 'update-extlib-firephp' into 'nightly'
...
Update FirefPHP Core to v0.4.0 released on 23 Apr 2013
See merge request !92
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
...
Thanks postblue
2016-01-28 13:35:23 +01:00
d73c264e25
Haha, forgot that the $content content must also be there!
2016-01-27 23:04:19 +01:00
34093388a7
Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into mmn_fixes
2016-01-27 22:43:37 +01:00
a47563cf3d
Don't add space if there's no string in new notice content
2016-01-27 22:41:53 +01:00
03d2b680f8
Allow empty new-notice content via web if there's an upload
2016-01-27 22:39:43 +01:00
52778e1882
Merge branch 'json_encode_fail_branch' into 'nightly'
...
output error if json_encode fails
See merge request !86
2016-01-26 21:16:24 +00:00
42545c6625
Merge branch 'mention_branch' into 'nightly'
...
correct mentions if parent mentions multiple users with same nickname (don't use first one for all)
See merge request !82
2016-01-26 21:15:25 +00:00
e69715005d
Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into mmn_fixes
2016-01-26 22:10:23 +01:00
c01982c917
Merge branch 'oembed_thumbnail_branch' into 'nightly'
...
add a thumbnail to oembed response
just something i added to quitim
See merge request !85
2016-01-26 21:09:07 +00:00
a48055a3cc
Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into mmn_fixes
2016-01-25 20:22:16 +01:00
c0b0f8e2f9
Merge branch 'file_redirection_cleanup_branch' into 'nightly'
...
Proper URL redirection fix
This greatly reduces the number of times GNU social looks up the same URL with File_redirection::where().
Someone must have mixed up the exlib's internal setting "follow_redirects" with our own.
This also makes away with the weird backwards recursive handling of protected URLs in File_redirection::lookupWhere(), by saving the chain of redirects the first time HTTPClient:send() looks them up.
See merge request !95
2016-01-25 19:21:52 +00:00
e447964639
remove my ugly debug info
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
2016-01-25 19:03:26 +00:00
a888294135
add our own protected urls
2016-01-25 19:00:46 +00:00
ca0c792ed3
File and File_redirection records are saved in File_redirection::where() now
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
2016-01-25 18:55:48 +00:00
b15434375c
Show plain text files on attachment page.
2016-01-25 16:54:40 +01:00
fef52d7b51
Update FirefPHP Core to v0.4.0 released on 23 Apr 2013
2016-01-24 21:11:38 +01:00
a9d18a077e
Harmonize, clarify, categorize URL schemes
...
Regular expression + avoid-redirection list now match each other.
2016-01-24 12:47:31 +01:00
1cec627d72
Allow bitcoin scheme to URLs
2016-01-24 12:44:28 +01:00
4e50717e12
output error if json_encode fails
2016-01-23 15:01:27 +00:00
81f9a59f25
use connect_timeout value for execution margin
2016-01-22 12:19:17 +01:00
d0e2f8745d
add a thumbnail to oembed response
2016-01-21 18:48:30 +00:00
3f9c1c142a
Removing unnecessary debug messages etc.
2016-01-21 02:49:34 +01:00
45446f17ad
Only set selectVerbs if it's not set in class var
2016-01-21 02:37:38 +01:00
be1759f112
i18n
2016-01-21 02:37:07 +01:00
d3a4a2225f
We want the profile stream to be as raw as possible!
2016-01-21 02:33:43 +01:00
81bf0fd261
Various last fixes to RSVP I think
2016-01-21 02:20:57 +01:00
f74d2d555c
Working on some RSVP code stuff
2016-01-21 02:10:34 +01:00
5999171c11
Throw NoObjectTypeException on Notice->getObjectType if no string
2016-01-20 21:37:14 +01:00
45b523bada
Add xcal namespaces to location and url in event
...
Also, for fun, add stuff for RSS event module, see:
http://web.resource.org/rss/1.0/modules/event/
2016-01-20 21:07:55 +01:00
21cc737f5c
Cancelling RSVPs now seems to work.
2016-01-20 16:10:10 +01:00
9accd953e4
Merge branch 'master' into mmn_fixes
2016-01-20 15:33:18 +01:00
64e74d527f
Handle exceptions when salmon slapping
...
Make it so notifyDeferred actually _always_ throws exceptions and handle
them in the places it is called.
2016-01-20 15:32:39 +01:00
c393bc9563
In very specific circumstances we can bulkDistribute 0 notices
...
Seems to be what caused an infinite loop on quitter.es, or I guess so anyway.
2016-01-20 15:32:29 +01:00
912d65c767
bulkDistribute won't add empty lists to database
2016-01-20 15:32:24 +01:00
fa8e02b832
Handle exceptions when salmon slapping
...
Make it so notifyDeferred actually _always_ throws exceptions and handle
them in the places it is called.
2016-01-20 14:56:24 +01:00
de047f9727
correct mentions if parent mention multiple users with same nickname (don't use first one for all)
2016-01-19 13:41:25 +00:00
80dc2788dd
Started fiddling with CancelRSVP but more must be done
...
Remember to make event_uri be the selector for CancelRSVPForm and
preferrably even merge it into RSVPForm!
2016-01-19 01:41:06 +01:00
477d71c0bf
RSVP stuff, mostly forms.
...
Now fix CancelRSVP stuff so it gets by event_uri and can cancel existing RSVP.
2016-01-19 01:33:09 +01:00
84dda697d6
RSVPs seem to be created now, just gotta fix CancelrsvpAction
2016-01-19 01:10:06 +01:00
73992a1ed8
Use "newer" terminology and throw exceptions
2016-01-19 00:21:16 +01:00
9eea255c79
Save with options so we get source=web
2016-01-19 00:08:31 +01:00
358684a5ed
end_str, not start_str
2016-01-19 00:01:30 +01:00
Mikael Nordfeldth
hannes
postblue