Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-20 | 1 | -0/+1 |
|\ | | | | | | | | | | | | | | | Conflicts: include/items.php include/text.php mod/item.php view/nl/messages.po | ||||
| * | PRIVACY: possible privacy leakage under a defined set of circumstances | redmatrix | 2015-05-20 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' into tres | friendica | 2015-04-23 | 1 | -2/+11 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | title of preview button incorrect, fix ability to upload to webpages | friendica | 2015-03-30 | 1 | -1/+1 |
| | | |||||
| * | remove the now redundant audio/video buttons and label the editor text style ↵ | friendica | 2015-03-11 | 1 | -0/+5 |
| | | | | | | | | buttons which didn't have them. Unused editor buttons were commented in case we need to bring them back. If things go smoothly we can remove them. Use the link icon going forward - for all links. | ||||
| * | item voting tools | friendica | 2015-02-10 | 1 | -1/+5 |
| | | |||||
* | | Merge branch 'master' into tres | friendica | 2015-01-29 | 1 | -6/+6 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | local_user => local_channel | friendica | 2015-01-28 | 1 | -6/+6 |
| | | |||||
* | | more expanding item flags | friendica | 2015-01-22 | 1 | -1/+1 |
|/ | |||||
* | edit and preview removed from additional features and turned into core ↵ | friendica | 2014-12-16 | 1 | -1/+1 |
| | | | | functionality (always enabled). | ||||
* | Make it clear that title and categories are optional | Stefan Parviainen | 2014-12-08 | 1 | -2/+2 |
| | |||||
* | tinmymce zombie - kill it. | friendica | 2014-07-17 | 1 | -2/+2 |
| | |||||
* | use $showacl to show/hide acl in jot.tpl - remove $pvisit and repair ↵ | marijus | 2014-04-09 | 1 | -1/+0 |
| | | | | editblock and editlayout which still depended on it. | ||||
* | change the way jot tools are displayed/hidden | marijus | 2014-04-08 | 1 | -3/+3 |
| | |||||
* | preserve attachments when editing a post | friendica | 2014-02-14 | 1 | -0/+9 |
| | |||||
* | preserve expiration when editing | friendica | 2014-01-27 | 1 | -3/+9 |
| | |||||
* | Confirm webpage deletion prompt | Christian Vogeley | 2014-01-01 | 1 | -0/+1 |
| | |||||
* | Merge remote-tracking branch 'upstream/master' into bootstrap | Christian Vogeley | 2013-12-22 | 1 | -3/+3 |
|\ | | | | | | | | | Conflicts: view/php/theme_init.php | ||||
| * | check that every invocation of htmlspecialchars has the right arg list | friendica | 2013-12-12 | 1 | -1/+1 |
| | | |||||
| * | Protocol: now set data['alg'] on all encapsulated encrypted packets, so that ↵ | friendica | 2013-11-20 | 1 | -2/+2 |
| | | | | | | | | we can more easily retire 'aes256cbc' once it is no longer viable. | ||||
* | | New modal dialog for item expiry | Christian Vogeley | 2013-12-22 | 1 | -0/+2 |
|/ | |||||
* | fix editpost which showed an encrypt button but no other buttons | friendica | 2013-11-11 | 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. | ||||
* | remote post module so that from anywhere on the web or at least within the ↵ | friendica | 2013-10-27 | 1 | -2/+4 |
| | | | | 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. | ||||
* | allow categories to be edited when editing a post | Michael Johnston | 2013-09-03 | 1 | -1/+20 |
| | |||||
* | convert all stored json calls to json_decode_plus() | friendica | 2013-08-06 | 1 | -2/+2 |
| | |||||
* | missing include | friendica | 2013-07-30 | 1 | -0/+1 |
| | |||||
* | unencrypt private posts for editing | friendica | 2013-07-30 | 1 | -0/+9 |
| | |||||
* | source code re-org, move taxonomy to separate include | friendica | 2013-06-19 | 1 | -1/+1 |
| | |||||
* | issue with auto permissions | friendica | 2013-05-19 | 1 | -1/+1 |
| | |||||
* | . | friendica | 2013-03-10 | 1 | -3/+4 |
| | |||||
* | cleanup editpost | friendica | 2012-12-21 | 1 | -18/+12 |
| | |||||
* | plaintext default - richtext is a feature | friendica | 2012-11-05 | 1 | -3/+3 |
| | |||||
* | a few minor changes | friendica | 2012-08-26 | 1 | -25/+0 |
| | |||||
* | updates | friendica | 2012-08-05 | 1 | -3/+3 |
| | |||||
* | birthdays and events are now notifications | friendica | 2012-07-29 | 1 | -0/+1 |
| | |||||
* | Merge branch 'master' of https://github.com/friendica/friendica | Alexander Kampmann | 2012-04-05 | 1 | -1/+3 |
|\ | | | | | | | | | | | Conflicts: include/config.php update.php | ||||
| * | allow users to set categories on their posts | Michael Johnston | 2012-04-01 | 1 | -0/+2 |
| | | |||||
| * | ability to change tags in edited posts | friendica | 2012-03-22 | 1 | -1/+1 |
|/ | |||||
* | support plaintext on editpost, editorinit called before all buttons laid out | friendica | 2012-02-17 | 1 | -0/+4 |
| | |||||
* | edit post not working after plaintext editor fixes, missing some recent ↵ | friendica | 2012-02-09 | 1 | -0/+4 |
| | | | | editor template changes | ||||
* | add remove_user hook (it looks like dreamhost changed all my file ↵ | friendica | 2012-01-18 | 1 | -0/+0 |
| | | | | permissions, this will make a nasty commit) | ||||
* | w3c compliance fixes, owner attribution on likes defaulting to local owner, ↵ | Friendika | 2011-09-23 | 1 | -1/+1 |
| | | | | not item creator | ||||
* | Load tinyMCE on post editor only if needed. | Fabio Comuni | 2011-07-20 | 1 | -3/+5 |
| | |||||
* | file attachments | Friendika | 2011-05-25 | 1 | -0/+1 |
| | |||||
* | "notes" app | Friendika | 2011-05-20 | 1 | -1/+3 |
| | |||||
* | doc updates - connecting to services | Friendika | 2011-05-18 | 1 | -0/+1 |
| | |||||
* | deprecate load_view_file | Friendika | 2011-05-11 | 1 | -2/+2 |
| | |||||
* | bring back load_view_file for dispy templates | Friendika | 2011-05-10 | 1 | -2/+2 |
| | |||||
* | don't use load_view_file() except in email templates and install of htconfig ↵ | Friendika | 2011-05-10 | 1 | -2/+2 |
| | | | | - to avoid getting wrong file when package is updated by copying over an older version. |