Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-11-03 | 1 | -0/+1 |
|\ | | | | | | | | | | | | | Conflicts: include/photo/photo_driver.php include/text.php mod/post.php | ||||
| * | photo object compatibility revamped | Mario Vavti | 2015-10-22 | 1 | -14/+1 |
| | | |||||
| * | hubzilla photo object compatibility | Mario Vavti | 2015-10-20 | 1 | -1/+15 |
| | | |||||
* | | move photo object stuff from itemObject to prepare_body() so we can do more ↵ | Mario Vavti | 2015-10-22 | 1 | -13/+1 |
| | | | | | | | | stuff with it | ||||
* | | create photo object if feature large photos is enabled and display those ↵ | Mario Vavti | 2015-10-20 | 1 | -1/+11 |
| | | | | | | | | slightly different | ||||
* | | really check for large photos feature | Mario Vavti | 2015-10-14 | 1 | -1/+1 |
| | | |||||
* | | allow photo-items to appear full width if large photos feature is enabled. ↵ | Mario Vavti | 2015-10-14 | 1 | -3/+13 |
| | | | | | | | | in prepare_body() split off mentions, tags, categories folders and attachments from body for easier theming. some other little fixes. | ||||
* | | delivery reports - crude but mostly functional at least for zot deliveries | redmatrix | 2015-09-22 | 1 | -0/+2 |
| | | |||||
* | | consensus items not working correctly and make the collections widget abide ↵ | redmatrix | 2015-05-18 | 1 | -3/+7 |
| | | | | | | | | by the corresponding feature setting. This needs to be backported as it is borken in redmatrix. Also provide the ability to change the number of most recent expanded comments to conversations on a site-wide basis, increase it to 3 by default. We may also want this as a personal setting. | ||||
* | | Merge branch 'master' into tres | friendica | 2015-04-23 | 1 | -3/+42 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Update/fix Dutch and removing an ugly space | jeroenpraat | 2015-04-02 | 1 | -1/+1 |
| | | |||||
| * | remove the now redundant audio/video buttons and label the editor text style ↵ | friendica | 2015-03-11 | 1 | -1/+1 |
| | | | | | | | | 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. | ||||
| * | bring back like/dislike summaries on photos | friendica | 2015-02-16 | 1 | -4/+0 |
| | | |||||
| * | provide relief to sites that are severely impacted by the slow ITEM_UNSEEN ↵ | friendica | 2015-02-12 | 1 | -1/+1 |
| | | | | | | | | 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. | ||||
| * | more permissions tweaking | friendica | 2015-02-10 | 1 | -5/+16 |
| | | |||||
| * | fix permissions | friendica | 2015-02-10 | 1 | -2/+2 |
| | | |||||
| * | ensure we have permission before displaying buttons | friendica | 2015-02-10 | 1 | -2/+2 |
| | | |||||
| * | item voting tools | friendica | 2015-02-10 | 1 | -0/+4 |
| | | |||||
| * | more progress on event confirmations | friendica | 2015-02-10 | 1 | -2/+7 |
| | | |||||
| * | like formatting for extended consensus items | friendica | 2015-02-09 | 1 | -0/+23 |
| | | |||||
* | | Merge branch 'master' into tres | friendica | 2015-01-29 | 1 | -10/+10 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -10/+10 |
| | | |||||
* | | heavy lifting converting item flag bits | friendica | 2015-01-22 | 1 | -7/+7 |
|/ | |||||
* | basic backend work for creating consensus items | friendica | 2015-01-11 | 1 | -9/+9 |
| | |||||
* | fix label of preview button | marijus | 2014-12-17 | 1 | -1/+1 |
| | |||||
* | fix editing of posts | marijus | 2014-12-17 | 1 | -1/+1 |
| | |||||
* | edit and preview removed from additional features and turned into core ↵ | friendica | 2014-12-16 | 1 | -2/+2 |
| | | | | functionality (always enabled). | ||||
* | build a channel based thread viewing link when in list_mode and when using ↵ | friendica | 2014-12-16 | 1 | -1/+9 |
| | | | | the channel module, which will disable list_mode (this was checked in yesterday) for the benefit of viewing threads with the correct identities and comment permissions instead of relying on the semi-random uid chosen by mod/display when viewed by an authenticated remote_user(). | ||||
* | yet another option for the homepage | friendica | 2014-11-20 | 1 | -2/+2 |
| | |||||
* | there's still a permission issue delivering a public post directly to the ↵ | friendica | 2014-11-19 | 1 | -1/+1 |
| | | | | sys channel (on the local system), but this puts the local sys channel in the public delivery chain and fixes an issue with unseen counts showing on the discover page (where you can't do anything about it). | ||||
* | add unseen count and way to mark unseen to list mode. Also fix automatic ↵ | friendica | 2014-11-17 | 1 | -0/+24 |
| | | | | mark of unseen so as to work with list mode. | ||||
* | speed things up a wee bit | friendica | 2014-11-16 | 1 | -2/+13 |
| | |||||
* | "list mode" (forum and blog mode, no comments or comment boxes displayed on ↵ | friendica | 2014-11-16 | 1 | -2/+3 |
| | | | | the summary page) | ||||
* | minor changes to support forum mode | friendica | 2014-11-15 | 1 | -19/+5 |
| | |||||
* | mark signature forgeries | friendica | 2014-10-16 | 1 | -1/+3 |
| | |||||
* | make discover items interactive | friendica | 2014-09-22 | 1 | -2/+10 |
| | |||||
* | Thanks to Thomas other people see now your posts on your channel page also ↵ | Jeroen | 2014-09-14 | 1 | -1/+1 |
| | | | | linked to source. If enabled. | ||||
* | Made link post titles to source optional in display settings. Hopefully I ↵ | Jeroen | 2014-09-14 | 1 | -0/+1 |
| | | | | did a right. | ||||
* | This is long overdue - use a symblic constant NULL_DATE instead of the ↵ | friendica | 2014-09-08 | 1 | -1/+1 |
| | | | | easily mis-typed sequence '0000-00-00 00:00:00' | ||||
* | use feed title for channel name before checking author, make feed items ↵ | friendica | 2014-09-02 | 1 | -2/+7 |
| | | | | shareable (they're private to the channel so they won't be shown in searches), try and handle Diaspora mentions a bit more elegantly. (Bug: we don't convert mentions to Diaspora's format on outbound at all!) | ||||
* | Updated strings for show entire post and show less to expand and collapse. ↵ | jeroenpraat | 2014-06-03 | 1 | -1/+1 |
| | | | | See last few comments from me and Mario at https://redmatrix.nl/channel/jeroenpraat/?f=&mid=5138fdee2ade50a7ef7a5a59e01a7dc91012c125e712d1ce483be6e31543dffe@redmatrix.nl | ||||
* | Updated to [+] show more, [+] show more comments, etc. See ↵ | jeroenpraat | 2014-06-03 | 1 | -1/+1 |
| | | | | https://redmatrix.nl/channel/jeroenpraat/?f=&mid=5138fdee2ade50a7ef7a5a59e01a7dc91012c125e712d1ce483be6e31543dffe@redmatrix.nl | ||||
* | use consistent capitalisation in the item actions menu | friendica | 2014-05-29 | 1 | -6/+6 |
| | |||||
* | testing new event code | friendica | 2014-05-29 | 1 | -1/+1 |
| | |||||
* | newevent: front end functions | friendica | 2014-05-29 | 1 | -1/+5 |
| | |||||
* | Allow translation context with plural. Use that in Likes/Dislikes. | Alexandre Hannud Abdo | 2014-05-21 | 1 | -4/+4 |
| | |||||
* | implement modal for more then 10 likes/dislikes | marijus | 2014-05-18 | 1 | -0/+18 |
| | |||||
* | Typo | marijus | 2014-05-12 | 1 | -2/+2 |
| | |||||
* | like indicator rewrite | marijus | 2014-05-08 | 1 | -1/+14 |
| | |||||
* | Pass mids to conv_item template | Thomas Willingham | 2014-02-08 | 1 | -0/+1 |
| |