Changed markdown to enable diaspora postings with images that contain links
2012-08-02 01:46:28 +02:00
don't change to string in prune_deadguys()
2013-02-09 17:52:29 -07:00
Merge remote-tracking branch 'upstream/master'
2013-02-17 12:35:40 +01:00
add support for more file attachment types
2013-02-04 22:15:16 -07:00
delete cookie on browser close after logout
2012-12-24 12:52:49 -07:00
bbcode: New element "share" for shared content
2012-12-17 03:01:40 +01:00
merge
2013-03-02 15:46:54 -08:00
use mysql replace on cache items
2012-05-02 16:27:19 -07:00
fix util/config
2013-03-02 15:44:00 -08:00
insidious set_config bug
2013-01-18 23:38:49 -07:00
Reset network when showing a contact's posts
2013-02-01 09:12:37 +01:00
implement features
2012-11-22 09:14:22 -07:00
implement features
2012-11-22 09:14:22 -07:00
Merge remote-tracking branch 'upstream/master'
2013-02-17 12:35:40 +01:00
use explicit include paths
2012-12-28 14:51:50 -07:00
remove obsolete zot encapsulation functions
2012-07-05 20:58:45 -07:00
recover from datetime parse issues, inspired by https://github.com/friendica/friendica/pull/396
2012-07-15 21:00:11 -07:00
Several improvements for performance measuring
2013-01-26 18:35:39 +01:00
insidious set_config bug
2013-01-18 23:38:49 -07:00
use explicit include paths
2012-12-28 14:51:50 -07:00
Merge branch 'master' of https://github.com/annando/friendica
2013-01-20 14:17:09 +01:00
use explicit include paths
2012-12-28 14:51:50 -07:00
give post a chance to arrive before rejecting photos from Diaspora
2013-01-12 06:52:15 -07:00
send less messages to server; remove delete option
2012-09-29 17:50:34 -06:00
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
admin option to disable post content in email notifications for the site
2013-02-23 09:31:34 -07:00
event summary/title
2012-06-25 20:55:27 -07:00
use explicit include paths
2012-12-28 14:51:50 -07:00
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
features categories were un-translatable
2012-11-28 19:25:09 -08:00
Diaspora: Auto-adding users as friend who already sharing with us
2013-01-20 14:08:28 +01:00
allow Smarty use on international templates
2013-01-10 21:46:48 -07:00
use explicit include paths
2012-12-28 14:51:50 -07:00
prune all dead/blocked contacts from allowed permissions, ok to keep them in "deny" lists -
2012-12-13 21:02:14 -08:00
try and get unadulterated bb2md2html2bb for simple stuff, then we'll work up to harder stuff
2012-07-02 01:11:19 -07:00
* Add MIME types for file attachments
2013-01-12 06:31:32 -07:00
allow admin to prevent private image embedding on hub
2013-03-03 09:44:41 -07:00
don't check for was_recently_delayed in diaspora_transmit during a queue run
2012-07-09 09:39:09 -06:00
fix wallmessage
2012-11-14 13:59:31 -08:00
New bbcode element: "spoiler". Mail: Top post quotes are now embraced in "spoiler" elements
2012-03-17 11:07:49 +01:00
Decaf mobile: an (almost) Javascript-free theme
2013-01-26 13:01:57 -07:00
Merge https://github.com/friendica/friendica into pull
2013-02-21 16:43:01 -08:00
* Add MIME types for file attachments
2013-01-12 06:31:32 -07:00
api: add 'allow_api' to user authenticated via oauth
2012-12-27 10:20:51 -05:00
divide by zero on incorrectly specified oembed thumbnail size
2012-12-16 17:58:12 -08:00
run limit_body_size on imported emails, which don't go through consume_feed
2013-02-23 10:06:59 -07:00
OStatus conversations: Fixed a bug when a message hadn't got an id.
2013-03-06 23:23:04 +01:00
merge
2013-03-02 15:46:54 -08:00
improve performance of photo upload page
2012-11-25 19:34:54 -08:00
New script that checks if a script is running
2012-04-01 20:56:27 +02:00
plugin: orphaned hooks weren't deleted.
2013-02-17 18:05:30 +01:00
OStatus conversation are now checked every 30 minutes for new answers.
2013-02-04 00:57:23 +01:00
add like/dislike to profiles
2012-06-24 21:16:55 -07:00
add plugin hooks to gender, sexpref, and marital selectors
2012-05-27 22:35:01 -07:00
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
die forcefully but gracefully on missing api templates
2013-01-23 17:07:55 -08:00
fix to imported youtube videos, updating of contact profile photos, do not remove "dead" contacts but archive them.
2012-06-13 19:59:20 -07:00
New bbcode element: "spoiler". Mail: Top post quotes are now embraced in "spoiler" elements
2012-03-17 11:07:49 +01:00
php warning
2012-11-22 03:19:05 -08:00
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
Diaspora: Auto-adding users as friend who already sharing with us
2013-01-20 14:08:28 +01:00
fix bug that wouldn't show posts to a user who was in an allowed group when individual contacts were also specified in the permissions
2013-02-04 20:27:30 -07:00
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
We haven't Got Zot
2013-01-03 20:18:43 +00:00
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
Several improvements for performance measuring
2013-01-26 18:35:39 +01:00
Decaf mobile: an (almost) Javascript-free theme
2013-01-26 13:01:57 -07:00
allow admin to prevent private image embedding on hub
2013-03-03 09:44:41 -07:00
uimport: check check to ensure the username isn't already taken before import (issue 508)
2012-11-13 04:52:32 -05:00
email header encoding everywhere
2013-01-04 15:47:29 -08:00
c40c61c106