Commit graph

113 commits

Author SHA1 Message Date
Mario Vavti
c7cbd41c16 first iteration on the event item 2015-11-26 12:26:27 +01:00
redmatrix
a7e4553ea7 delivery report tweaks 2015-11-22 17:12:30 -08:00
redmatrix
77a03e376c Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	include/photo/photo_driver.php
	include/text.php
	mod/post.php
2015-11-03 20:46:47 -08:00
Mario Vavti
9cbca24f7a photo object compatibility revamped 2015-10-22 10:56:24 +02:00
Mario Vavti
6f8d29ad80 move photo object stuff from itemObject to prepare_body() so we can do more stuff with it 2015-10-22 10:52:10 +02:00
Mario Vavti
96f23758b4 hubzilla photo object compatibility 2015-10-20 09:40:32 +02:00
Mario Vavti
f7601756e9 create photo object if feature large photos is enabled and display those slightly different 2015-10-20 09:36:15 +02:00
Mario Vavti
f12ebffa39 really check for large photos feature 2015-10-14 22:24:13 +02:00
Mario Vavti
b4e83b6537 allow photo-items to appear full width if large photos feature is enabled. in prepare_body() split off mentions, tags, categories folders and attachments from body for easier theming. some other little fixes. 2015-10-14 22:14:19 +02:00
redmatrix
2869ccfe39 delivery reports - crude but mostly functional at least for zot deliveries 2015-09-22 04:04:51 -07:00
redmatrix
e521da05da consensus items not working correctly and make the collections widget abide 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. 2015-05-18 21:32:55 -07:00
friendica
6679734135 Merge branch 'master' into tres
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
2015-04-23 19:49:41 -07:00
jeroenpraat
c2517eca56 Update/fix Dutch and removing an ugly space 2015-04-02 02:23:26 +02:00
friendica
b3a9a6c802 remove the now redundant audio/video buttons and label the editor text style 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. 2015-03-11 18:56:28 -07:00
friendica
533f39debe bring back like/dislike summaries on photos 2015-02-16 17:01:13 -08:00
friendica
da2349bb6a provide relief to sites that are severely impacted by the slow ITEM_UNSEEN 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. 2015-02-12 17:45:25 -08:00
friendica
e8bdf2b8d7 more permissions tweaking 2015-02-10 21:21:18 -08:00
friendica
583af02f71 fix permissions 2015-02-10 20:43:04 -08:00
friendica
149a588b11 ensure we have permission before displaying buttons 2015-02-10 20:21:54 -08:00
friendica
79223b6b3d item voting tools 2015-02-10 19:10:18 -08:00
friendica
81e7b47b76 more progress on event confirmations 2015-02-10 00:11:37 -08:00
friendica
c694945245 like formatting for extended consensus items 2015-02-09 21:18:50 -08:00
friendica
912be23e16 Merge branch 'master' into tres
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
2015-01-29 15:09:35 -08:00
friendica
a496036066 local_user => local_channel 2015-01-28 20:56:04 -08:00
friendica
e46eba1258 heavy lifting converting item flag bits 2015-01-22 17:41:16 -08:00
friendica
0259051a87 basic backend work for creating consensus items 2015-01-11 14:41:33 -08:00
marijus
e1999ada58 fix label of preview button 2014-12-17 10:01:22 +01:00
marijus
dfb15e4a7b fix editing of posts 2014-12-17 09:50:55 +01:00
friendica
5b49211035 edit and preview removed from additional features and turned into core functionality (always enabled). 2014-12-16 14:28:07 -08:00
friendica
7bee4e5997 build a channel based thread viewing link when in list_mode and when using 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(). 2014-12-16 14:12:40 -08:00
friendica
e74a3926fe yet another option for the homepage 2014-11-20 17:38:41 -08:00
friendica
4893e64c1e there's still a permission issue delivering a public post directly to the 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). 2014-11-19 00:56:05 -08:00
friendica
c0ad4763b3 add unseen count and way to mark unseen to list mode. Also fix automatic mark of unseen so as to work with list mode. 2014-11-17 15:18:06 -08:00
friendica
b3383a2547 speed things up a wee bit 2014-11-16 20:23:22 -08:00
friendica
cbaee76dd9 "list mode" (forum and blog mode, no comments or comment boxes displayed on the summary page) 2014-11-16 16:19:24 -08:00
friendica
f299922df3 minor changes to support forum mode 2014-11-15 14:03:41 -08:00
friendica
7bbe700f3f mark signature forgeries 2014-10-16 16:19:19 -07:00
friendica
fb05919d90 make discover items interactive 2014-09-22 21:37:19 -07:00
Jeroen
9b80667326 Thanks to Thomas other people see now your posts on your channel page also linked to source. If enabled. 2014-09-14 13:59:27 +00:00
Jeroen
254dc0ec98 Made link post titles to source optional in display settings. Hopefully I did a right. 2014-09-14 12:39:11 +00:00
friendica
c6d07feff5 This is long overdue - use a symblic constant NULL_DATE instead of the easily mis-typed sequence '0000-00-00 00:00:00' 2014-09-08 20:35:15 -07:00
friendica
2c94d59cba use feed title for channel name before checking author, make feed items 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!) 2014-09-02 17:21:12 -07:00
jeroenpraat
ad378cbe07 Updated strings for show entire post and show less to expand and collapse. See last few comments from me and Mario at https://redmatrix.nl/channel/jeroenpraat/?f=&mid=5138fdee2ade50a7ef7a5a59e01a7dc91012c125e712d1ce483be6e31543dffe@redmatrix.nl 2014-06-03 12:14:51 +00:00
jeroenpraat
b4e7d7f7c0 Updated to [+] show more, [+] show more comments, etc. See https://redmatrix.nl/channel/jeroenpraat/?f=&mid=5138fdee2ade50a7ef7a5a59e01a7dc91012c125e712d1ce483be6e31543dffe@redmatrix.nl 2014-06-03 05:12:00 +00:00
friendica
33cf83175d use consistent capitalisation in the item actions menu 2014-05-29 21:34:08 -07:00
friendica
832cbbec15 testing new event code 2014-05-29 21:25:19 -07:00
friendica
22ed5b1d03 newevent: front end functions 2014-05-29 20:09:21 -07:00
Alexandre Hannud Abdo
d15e3776f3 Allow translation context with plural. Use that in Likes/Dislikes. 2014-05-21 05:39:35 -03:00
marijus
89b8bc07ac implement modal for more then 10 likes/dislikes 2014-05-18 09:14:21 +02:00
marijus
c7a0891bbe Typo 2014-05-12 11:27:53 +02:00