Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into bootstrap | Christian Vogeley | 2013-12-22 | 1 | -7/+195 |
|\ | | | | | | | | | Conflicts: view/php/theme_init.php | ||||
| * | split private messages into two modules - "message" is just for message ↵ | friendica | 2013-12-21 | 1 | -1/+1 |
| | | | | | | | | lists, "mail" is for reading and writing conversations. This is so we can Comanchify it cleanly. | ||||
| * | split off mod_connections into mod_connections & mod_connedit - lots of ↵ | friendica | 2013-12-18 | 1 | -1/+1 |
| | | | | | | | | links to fix | ||||
| * | more htmlspecialchars sanitisation | friendica | 2013-12-12 | 1 | -2/+2 |
| | | |||||
| * | post_activity_item issues | friendica | 2013-12-07 | 1 | -0/+4 |
| | | |||||
| * | move profile tabs and network/matrix tabs to include/conversation | friendica | 2013-12-05 | 1 | -0/+184 |
| | | |||||
| * | Plurals for conversation.php | Olivier Migeot | 2013-11-28 | 1 | -3/+3 |
| | | |||||
* | | New modal dialog for item expiry | Christian Vogeley | 2013-12-22 | 1 | -0/+2 |
|/ | |||||
* | revert to prepare_page - but have it call prepare_body | friendica | 2013-11-15 | 1 | -1/+1 |
| | |||||
* | allow rpost to set source app | friendica | 2013-11-15 | 1 | -1/+1 |
| | |||||
* | e2ee in comments and a bit of cleanup so not every theme has to define how ↵ | friendica | 2013-11-14 | 1 | -3/+0 |
| | | | | to insert bbcode, only if they're doing something special (e.g. this is how to implement a javascript plugin :-)), and I got rid of the predefined http:// in the bbcode for urls. You're almost always pasting a url which already has that bit and it just creates an extra step. | ||||
* | ability to use other ciphers | friendica | 2013-11-11 | 1 | -0/+5 |
| | |||||
* | e2ee | friendica | 2013-11-10 | 1 | -0/+2 |
| | |||||
* | provide expire feature on post and comments as well as private messages. ↵ | friendica | 2013-11-07 | 1 | -1/+5 |
| | | | | This requires a feature setting and is currently unmaskable - if the author says it's gone, there's not a lot you can do to stop it or try and save it. It's gone. | ||||
* | issue #189 - show post edited time on relative date hovertip | friendica | 2013-10-30 | 1 | -0/+1 |
| | |||||
* | Comanche documentation and some cleanup of layout page (including link to ↵ | friendica | 2013-10-28 | 1 | -2/+7 |
| | | | | doco) and a few other webpage related cleanups | ||||
* | remote post module so that from anywhere on the web or at least within the ↵ | friendica | 2013-10-27 | 1 | -2/+2 |
| | | | | matrix you'll be able to share content or we can have apps on other sites that post status updates on your wall. All with your permission of course as you'll have to click "share" to actually post it. | ||||
* | Optionally pass a prepared "top level" item into conversation(). This will ↵ | friendica | 2013-10-24 | 1 | -3/+3 |
| | | | | eventually be used by the photos module where the "top level item" of the conversation is a photo with editing and album navigation controls and doesn't look anything like a post. | ||||
* | link to source - if it's on the display page link to original source ↵ | friendica | 2013-10-20 | 1 | -1/+1 |
| | | | | (probably on a different site). All other conversations link to 'llink' which is a local copy and may provide a richer possibility of interactions, especially if you're logged in locally and it's your own copy of the post. | ||||
* | Put a status editor on the display page if you're logged in. This fixes ↵ | friendica | 2013-10-18 | 1 | -1/+1 |
| | | | | issue #113 and also provides the ability to reshare from that page. | ||||
* | replace a bunch of graphic icons with vector icons | friendica | 2013-10-08 | 1 | -1/+1 |
| | |||||
* | post signatures | friendica | 2013-10-02 | 1 | -0/+7 |
| | |||||
* | OK, sure. | friendica | 2013-09-20 | 1 | -1/+1 |
| | |||||
* | use prepare_body in api calls to properly render content, add 'mode' to ↵ | friendica | 2013-09-16 | 1 | -0/+1 |
| | | | | conversation templates so that themes can use the module context to suppress or show comments as desired | ||||
* | implement what I hope will now be the server side of directory sync, add ↵ | friendica | 2013-09-15 | 1 | -8/+12 |
| | | | | viewsrc to item_photo_menu, and log what changed in import_xchan update objects so we can find out why there are so many updates when nothing _obvious_ has changed that should trigger it. | ||||
* | provide templating options in comanche for the underlying webpage element - ↵ | friendica | 2013-09-04 | 1 | -0/+6 |
| | | | | in this case the way the author is displayed. Leave this open for other forms templating options. | ||||
* | my bad | friendica | 2013-09-03 | 1 | -1/+1 |
| | |||||
* | typo | friendica | 2013-09-03 | 1 | -1/+1 |
| | |||||
* | personal config to just show the page content without author info - probably ↵ | friendica | 2013-09-03 | 1 | -3/+5 |
| | | | | this needs to be a page option | ||||
* | add a layout selector | friendica | 2013-09-02 | 1 | -0/+12 |
| | |||||
* | preserve mimetype on page edits | friendica | 2013-09-02 | 1 | -4/+5 |
| | |||||
* | oh that's why | friendica | 2013-09-02 | 1 | -1/+2 |
| | |||||
* | fix webpage storage | friendica | 2013-09-02 | 1 | -1/+1 |
| | |||||
* | only allow richtext editor on pages if bbcode is the default mimetype, ↵ | friendica | 2013-09-02 | 1 | -6/+6 |
| | | | | otherwise use plaintext editor. This will eventually need work to support a visual editor for html or other types. | ||||
* | allow a channel owner to define a default mimetype on webpages (otherwise ↵ | friendica | 2013-09-02 | 1 | -2/+8 |
| | | | | default to "choose") - also fix the selector w/r/t php code. There is no ui for setting either at the moment, but for instance with wiki pages we probably don't want to have multiple choice of the mimetype. Keep it simple. | ||||
* | webpage content-type -- needs cleaning up and a security check once all the ↵ | friendica | 2013-09-02 | 1 | -0/+8 |
| | | | | important bits are in place. | ||||
* | more debugging on localize_item top find out why likes are not translated in ↵ | friendica | 2013-08-31 | 1 | -1/+7 |
| | | | | notifications, but are in displayed posts (using 'new' on matrix page) - in one case we're successfully pulling stuff from item['object'] and in the other we aren't - and it's the same object. | ||||
* | silence some warnings at php E_ALL levels | friendica | 2013-08-28 | 1 | -0/+2 |
| | |||||
* | It's a wretched mess, but at least photo comments show up again when viewing ↵ | friendica | 2013-08-28 | 1 | -0/+1 |
| | | | | the photo. This is just temporary until these conversations are merged into the common conversation viewer, so it's not worth spending a lot of time cleaning up the remnants. | ||||
* | Preparatory work for photo conversations (third time). Also take away unused ↵ | friendica | 2013-08-27 | 1 | -7/+12 |
| | | | | "post new activity" preferences until they actually do something. | ||||
* | more loose ends | friendica | 2013-08-27 | 1 | -1/+4 |
| | |||||
* | extra logging for translating likes in notification emails - which is still ↵ | friendica | 2013-08-22 | 1 | -0/+3 |
| | | | | failing on occasion. | ||||
* | fix superblock for comments | friendica | 2013-08-20 | 1 | -0/+14 |
| | |||||
* | localize_item() thinks all likes on posts are likes on comments because we ↵ | friendica | 2013-08-19 | 1 | -1/+1 |
| | | | | didn't pass any info in the activity object to distinguish them from each other. | ||||
* | malformed ru string file | friendica | 2013-08-08 | 1 | -1/+1 |
| | |||||
* | convert all stored json calls to json_decode_plus() | friendica | 2013-08-06 | 1 | -2/+2 |
| | |||||
* | we've been storing json_encoded structures on disk in several places because ↵ | friendica | 2013-08-06 | 1 | -5/+3 |
| | | | | it's a lot easier to parse than xml - but OMG do they get mangled - stored as single quoted strings when escaped as if double quoted. We need to use my new function json_decode_plus() wherever we need to parse one of these babies to make sure we get it right. Maybe we should've just used serialize(). | ||||
* | enotify: localize things we know how to translate | friendica | 2013-08-05 | 1 | -4/+0 |
| | |||||
* | fix some weirdness on the zot feed | friendica | 2013-07-29 | 1 | -0/+2 |
| | |||||
* | remove double tags on search results, updates to install doco to get rid of ↵ | friendica | 2013-07-09 | 1 | -12/+0 |
| | | | | Friendica name there and clarify Red requirements. |