| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| | |
Conflicts:
index.php
mod/setup.php
|
| |\
| | |
| | | |
Import security only when necessary, use correct variable in log
|
| | |
| | |
| | |
| | | |
Just some cleanup, seemed like the intent of previous changes was so
|
| |/
| |
| |
| | |
to typo
|
|\|
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
include/items.php
include/text.php
mod/item.php
view/nl/messages.po
|
| |
| |
| |
| | |
available on the clone site. This should make it less broken.
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| | |
cipher would be adequate for our requirements.
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
include/Import/refimport.php
include/activities.php
include/attach.php
include/event.php
include/externals.php
include/identity.php
include/items.php
include/notifier.php
include/photos.php
include/taxonomy.php
include/zot.php
mod/channel.php
mod/connedit.php
mod/events.php
mod/item.php
mod/like.php
mod/manage.php
mod/mood.php
mod/ping.php
mod/poke.php
mod/subthread.php
mod/tagger.php
mod/thing.php
|
| |\|
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
boot.php
include/api.php
include/enotify.php
|
| | |
| | |
| | |
| | | |
and RED_PLATFORM is equally problematic for other reasons.
|
| | | |
|
| | | |
|
| |/
| |
| |
| | |
us to search and cache private posts
|
|\|
| |
| |
| |
| | |
Conflicts:
include/notifier.php
|
| | |
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
include/Contact.php
include/ItemObject.php
include/api.php
include/attach.php
include/diaspora.php
include/dir_fns.php
include/enotify.php
include/event.php
include/expire.php
include/items.php
include/notifier.php
include/notify.php
include/photos.php
include/taxonomy.php
include/text.php
include/widgets.php
include/zot.php
mod/admin.php
mod/channel.php
mod/dirsearch.php
mod/display.php
mod/editwebpage.php
mod/events.php
mod/home.php
mod/item.php
mod/manage.php
mod/mood.php
mod/network.php
mod/page.php
mod/photos.php
mod/ping.php
mod/post.php
mod/thing.php
mod/viewsrc.php
view/css/mod_events.css
|
| | |
|
| | |
|
| |
| |
| |
| | |
specified
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
Fixed wrong Doxygen syntax and add some of the available FIXME to
Doxygen documentation.
Updated Doxygen configuration to add also all capital letter tags.
Adding some more Doxygen documentation.
|
| | |
|
| | |
|
| |
| |
| |
| | |
the site default.
|
| | |
|
| |
| |
| |
| | |
reduce the impact of expiration queries.
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| | |
body text. It could be any one of hundreds of functions that touch the message body. We really want to trim the body text, so I'm putting back all the trim statements - in mod/item and item_store and item_store_update. The last fix for random bad sigs noted that one of the trims wasn't there, so the others were removed. The correct fix is for all the trims to be there. We will probably have a few (quite a few) bad sigs during the transition back to trimmed text but this should nail it for anybody on recent code and with new content.
|
| | |
|
| |
| |
| |
| | |
hackish but I don't see any other way out.
|
| |
| |
| |
| | |
The issue remains what to do about comments which are already in the DB and have ITEM_ORIGIN incorrectly set. We can't exactly reset them because the "original" context has been lost. (Sorry but couldn't resist an insider pun that none of you will be able to follow anyway). Read the comments.
|
| |
| |
| |
| | |
There are some fields in the actual stored item that may change when we start the second delivery chain so a few plugins may not deal with these items correctly. Since we only source public items these effects will be slight.
|
| |
| |
| |
| |
| | |
Previous regex would cause matches to span several tags
when present, thus never recognizing the mention.
|
| |
| |
| |
| | |
searches. This does not incorporate any other flag optimisations as that will require a major DB update and possibly involve significant downtime. This is just to bite off a little chunk now and provide some much needed relief.
|
| | |
|
| | |
|
| |
| |
| |
| | |
fix for the problem of receiving a delete notification before we actually get the item which we're supposed to delete.
|
| | |
|
|\|
| |
| |
| |
| |
| | |
Conflicts:
view/css/mod_events.css
view/theme/redbasic/css/style.css
|
| |
| |
| |
| | |
few weeks back. This solution is not optimal as it also leaves you in the privacy ACL in some cases and not in others but it restores the previous functionality
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
include/group.php
include/text.php
mod/acl.php
mod/channel.php
mod/connections.php
mod/display.php
mod/group.php
mod/item.php
mod/locs.php
mod/network.php
mod/photos.php
mod/ping.php
mod/starred.php
mod/viewsrc.php
|
| | |
|