Commit graph

511 commits

Author SHA1 Message Date
redmatrix
8fb1356623 required for future work 2015-08-26 17:49:57 -07:00
redmatrix
91bbfcf554 photo permission inheritance. We want to use the folder permissions unless specific permissions have been set to over-ride them. If nothing is set, use the channel default. We may have to mess with his further in the case of somebody trying to create a public photo directory when their normal permissions are set to private. Kind of a chicken/egg problem because the folder permissions will be empty. 2015-08-06 17:09:09 -07:00
redmatrix
d5a40cac25 Merge branch 'master' of https://github.com/redmatrix/redmatrix
several dav fixes
Conflicts:
	include/items.php
2015-07-30 17:11:16 -07:00
redmatrix
03756c65fc make superblock block a channel if it's an owner as well as the current author; add @hostname to event hashes to make their use in vcalendar more RFC compliant 2015-07-28 17:55:21 -07:00
redmatrix
ec00c5b18a the view_photos and post_photos permissions are redundant and are now mapped to view_storage and write_storage 2015-07-19 17:53:52 -07:00
redmatrix
498e2f7279 since we've got a fresh start without a lot of legacy sites to support, provide 'naked' or authored=none (no date and attribution) as the default for webpages. It will be up to designers to add this if they desire it rather than force everybody to take it away. The code for adding it isn't yet provided. 2015-07-15 22:59:55 -07:00
redmatrix
be0459a98b convert the abook fields 2015-06-14 21:08:00 -07:00
friendica
c4221f3273 Merge branch 'master' into tres
Conflicts:
	include/notifier.php
2015-04-29 21:49:43 -07:00
Mario Vavti
310d122901 disable voting in blocks, layouts and webpages 2015-04-29 21:36:53 +02:00
Mario Vavti
31b5b06e42 Provide webpage layout description 2015-04-25 22:35:24 +02:00
Mario Vavti
b7f6cceaea provide block titles in blocklist 2015-04-24 22:37:22 +02: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
Mario Vavti
9e490d022b fix webpage perms 2015-04-22 12:00:15 +02:00
Mario Vavti
61e4ee753d allow jot to be displayed expanded, remove deprected datetimepicker js and some random fixes 2015-04-17 11:20:22 +02:00
Mario Vavti
9addc4581e provide a separate input field for rpost attachments 2015-04-16 23:26:11 +02:00
Mario Vavti
834044b15b title=>name 2015-04-15 09:20:27 +02:00
jeroenpraat
c2517eca56 Update/fix Dutch and removing an ugly space 2015-04-02 02:23:26 +02:00
Klaus Weidenbach
d0361582b0 Correcting reported Doxygen syntax warnings.
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.
2015-03-29 22:23:00 +02:00
friendica
47292c612c provide ways to over-ride the datetime pickers 2015-03-26 18:03:39 -07:00
Klaus Weidenbach
9d143e3f2d Fixed an exit of a loop in builtin_activity_puller().
There was a "$return", but I think it should be "return".
2015-03-21 22:28:07 +01:00
friendica
52374bcd6e phase one of the great file storage unification - use one button for uploads of any type (image or attachment). We'll sort out which one it is and deal with it appropriately. 2015-03-16 15:33:08 -07: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
Klaus Weidenbach
946beb6191 View upload photo button only if you have permission.
Check if post_photos permission is available otherwise hide the photo
upload button.
Or should we show the button and just disable it with a title, about
missing permission to upload photos?
In comments we use the same icon, but just add [img] bb-code. Should we
provide this if no permission to upload photos. Do we need different
icons for [img] and photo upload buttons?
2015-03-10 21:51:14 +01:00
friendica
533f39debe bring back like/dislike summaries on photos 2015-02-16 17:01:13 -08:00
friendica
78b8754856 Merge https://github.com/friendica/red into pending_merge 2015-02-11 16:12:47 -08:00
friendica
8c061f143f more efficient processing of response activities, plus a proof of concept fix for the problem of receiving a delete notification before we actually get the item which we're supposed to delete. 2015-02-11 15:26:35 -08:00
marijus
b86ed864aa to get the correct total count we should probably only count the arrays with count key set 2015-02-11 12:09:04 +01:00
marijus
499841a722 typo agree->disagree 2015-02-11 10:54:43 +01:00
friendica
3f76cbf40b cut/paste typo 2015-02-11 01:53:17 -08:00
friendica
e8bdf2b8d7 more permissions tweaking 2015-02-10 21:21:18 -08:00
friendica
79223b6b3d item voting tools 2015-02-10 19:10:18 -08:00
friendica
4632d30a78 more attendance 2015-02-10 14:47:09 -08:00
friendica
f7cce63447 cleanup event attendance - make sure it works in list mode. 2015-02-10 00:44:34 -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
4b348d2489 Merge branch 'master' into tres
Conflicts:
	view/css/mod_events.css
	view/theme/redbasic/css/style.css
2015-02-05 19:38:43 -08:00
friendica
b948fbaeda allow post expiration to be set from a config (and therefore a plugin/addon) 2015-02-05 19:09:42 -08:00
friendica
0cc29af6d0 order ratings friends first 2015-02-03 22:55:01 -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
6e0e3b2433 more expanding item flags 2015-01-22 18:41:10 -08:00
friendica
e46eba1258 heavy lifting converting item flag bits 2015-01-22 17:41:16 -08:00
marijus
1c2d956d7f basic proof of concept file activity support - will send activity via the filestorage module and via attach_delete() 2015-01-18 14:44:58 +01:00
friendica
0259051a87 basic backend work for creating consensus items 2015-01-11 14:41:33 -08:00
marijus
978d78b953 basic changes for file activity 2015-01-09 15:18:45 +01:00
marijus
e1999ada58 fix label of preview button 2014-12-17 10:01:22 +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
Thomas Willingham
ad2c8a4cb7 Provide censorship. 2014-12-10 15:34:18 +00:00
marijus
242713ebef show clear browser location button only if use browser location option is set and minor css fixes 2014-12-09 15:09:19 +01:00
Stefan Parviainen
97d1072f9b Make it clear that title and categories are optional 2014-12-08 16:49:48 +01:00
Thomas Willingham
5087d783b7 Whitespace. Stupid £#@£@$ editor. 2014-11-29 22:06:04 +00:00
Thomas Willingham
f852a1f228 Issue #713 Arguably, we shouldn't allow poking yourself and stuff either
but I like that, so...
2014-11-29 02:34:49 +00:00
friendica
e74a3926fe yet another option for the homepage 2014-11-20 17:38:41 -08:00
friendica
cd404f5710 remove old timers 2014-11-16 20:33:50 -08:00
friendica
b3383a2547 speed things up a wee bit 2014-11-16 20:23:22 -08:00
friendica
f299922df3 minor changes to support forum mode 2014-11-15 14:03:41 -08:00
friendica
4b9ec6645b cleanup 2014-11-11 20:44:43 -08:00
marijus
fc704d1f2f if someone does not have permission to chat do not show the chatrooms tab 2014-10-29 14:29:38 +01:00
friendica
be8a01618e turn down the preview logging. Haven't needed that level of detail recently. 2014-10-26 21:56:56 -07:00
friendica
7bbe700f3f mark signature forgeries 2014-10-16 16:19:19 -07:00
Thomas Willingham
9de5b6b905 Pluggable page templates 2014-09-29 15:13:39 +01:00
friendica
e8854bb19d better way to deal with effective_uid 2014-09-22 22:03:19 -07:00
friendica
fb05919d90 make discover items interactive 2014-09-22 21:37:19 -07:00
Klaus Weidenbach
d2268a412d Don't link unknown likes.
Likes/Dislikes of unknown channels have disabled links now.
Fixed intention a bit, romved a unused variable.
2014-09-21 17:51:01 +02:00
friendica
44cb423f21 Merge https://github.com/friendica/red into pending_merge 2014-09-20 16:22:21 -07:00
friendica
8d23a8da8d fix empty likes 2014-09-20 16:21:49 -07:00
marijus
69a10e8ca7 oups... 2014-09-20 17:30:11 +02:00
marijus
6c806f6f48 aalso change the way we check for number of chatrooms 2014-09-20 17:28:42 +02:00
marijus
bd54358aa6 show bookmarks menu only if we have any bookmarks already 2014-09-20 16:31:56 +02: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
4875473c1b issue #451 - clear gid and cid from network tab if discover is selected 2014-09-04 22:41:02 -07:00
friendica
e20fe41f23 remove noisy log statement 2014-08-28 17:26:53 -07:00
friendica
ae3047791c when updating the commented timestamp on the parent post (item_store) don't include any time travelling posts. They can mess up the conversation sort order in a big way until they're actually published. 2014-08-28 17:25:00 -07:00
friendica
86fb165dc9 re-obscure item body if localize_item() changes it. It's already flagged as obscured so we need it to actually be obscured. 2014-08-25 02:14:48 -07:00
friendica
6feaa2689d follow => connect 2014-08-19 16:26:46 -07:00
friendica
3dbc3e263d add ability to follow somebody not already in your connections from "post actions" dropdown. bug: doesn't bring you back to this page. 2014-08-17 21:34:52 -07:00
friendica
0e57b6cc8c convert application strings to en-US 2014-07-31 02:33:34 -07:00
Thomas Willingham
3402fa5715 Quotes on strings. Dunno why it worked without. 2014-07-13 21:51:26 +01:00
Thomas Willingham
e03f2a97b6 Provide profile tabs opt-out. 2014-07-13 18:44:37 +01:00
friendica
0074ef0bf3 rule of snakes #1, kill the snake.
tinymce is gone. if you want a visual editor, figure out what you want and make it happen.
If you don't want a visual editor, do nothing.
This is in the community's hands. I don't need a visual editor.
2014-06-28 05:05:34 -07:00
friendica
74fe151f96 bring back profile_tabs for unauthenticated visitors to /cloud page 2014-06-25 21:21:54 -07:00
friendica
c4c1c37bd3 profile likes 2014-06-22 22:16:26 -07:00
friendica
224a2b9ddf put viewsrc back in a lightbox 2014-06-18 20:33:28 -07:00
friendica
38e0bb4530 document why this works 2014-06-15 19:25:16 -07:00
friendica
e1ec1e7c5f sort out the unobscure mess 2014-06-15 19:21:32 -07:00
marijus
bd06e58007 whitespace 2014-06-14 15:38:44 +02:00
marijus
b9256eed30 unclutter menues a little 2014-06-14 15:31:36 +02:00
friendica
30eb1b494a moods: simplify 'xyz is tired' rather than 'xyz is currently tired'. This is possible now that we have translation contexts, as before '$1 is $2' was ambiguous without a context - in this case 'mood'. 2014-05-28 17:58:49 -07:00
Thomas Willingham
4e0b85267a We know why third party zids didn't work now, so don't use hacky
workarounds anymore.
2014-04-18 16:34:48 +01:00
marijus
3197ccbf5e bootstrapify aclselector 2014-04-11 16:06:39 +02:00
friendica
8d8d739242 Merge https://github.com/friendica/red into pending_merge 2014-04-09 21:13:40 -07:00
friendica
795d741713 issue #400 - lock not showing up for previews of private mentions (or 'new/search' item view)
also reformat the new/search template to pick up recent changes to conv_item.tpl
2014-04-09 21:11:49 -07:00
marijus
b88a7fc23a use $showacl to show/hide acl in jot.tpl - remove $pvisit and repair editblock and editlayout which still depended on it. 2014-04-09 18:29:22 +02:00
marijus
9f621dac85 change the way jot tools are displayed/hidden 2014-04-08 22:07:06 +02:00
friendica
95751dddff some fixes to #395 2014-04-07 20:20:28 -07:00
friendica
6f555c50e1 a bit more work towards issue #395 - cleaning up some cases which were going to the url directly and which weren't going through chanview. Also worth noting - mentions in posts do not go through chanview. Perhaps it is time to kill chanview (except we then cannot implemented a "connected" or "connect" button since we don't have any control over the landing page). For the time being I'm just trying to trap as many of the "visit URL" links as possible and sending them to a common place. Then we can figure out how that common place should behave. 2014-04-06 18:40:37 -07:00
marijus
f7cb4e0ef0 jot and location style fixes 2014-04-06 21:14:24 +02:00
friendica
64dfe3ab64 issue #395, item 2 2014-04-06 03:47:53 -07:00
friendica
4901ef8faf provide the ability for rpost to post as another of your channels. This does not yet work, so the functionality has not been enabled. 2014-04-05 02:32:07 -07:00
Thomas Willingham
1093e8d83e Default discover to on. 2014-03-30 22:59:37 +01:00
friendica
9e5f424394 typo 2014-03-29 23:45:21 -07:00
friendica
0b7588b1eb issue #384 2014-03-29 23:43:31 -07:00
Alexandre Hannud Abdo
fedd19ec95 Let the site admin choose whether to display the Discover tab. 2014-03-30 00:03:12 -03:00
friendica
6925cf9fe5 external -> discover 2014-03-28 01:24:30 -07:00
friendica
a0674af416 firehose fixes and optimisations. In particular get rid of the unresponsive script warning when trying to load updates (sine they aren't our posts, we can't check for unseen, hence we can't really load updates). Also make the url selection pluggable. 2014-03-27 15:35:29 -07:00
friendica
41d8cfa72a link in the firehose 2014-03-27 00:25:34 -07:00
friendica
97739920eb create a new "subdued" CSS class for things that shouldn't be in your face unless you want them and intentionally hover over them. Typically this would be accomplished via an opacity or colour change, but themes are free to use other methods. Also changed the channel_tabs "chatroom" link to use the subdued class if no rooms have been created rather than a count of chatrooms. Themse should probably create a .subdued and .subdued:hover definition because we'll probably take most of the stuff which is now hardwired to use opacity by id and change it to use the class definition instead. 2014-02-08 00:48:19 -08:00
friendica
05a70a8760 add chatroom links 2014-02-05 19:16:12 -08:00
friendica
aede006970 bookmarks - mop up and go home 2014-02-04 17:12:13 -08:00
friendica
f104b4dc27 preserve expiration when editing 2014-01-27 23:49:42 -08:00
friendica
d296b02b0e The final piece of the DAV authentication puzzle. Provide a directory view to an un-auth'd person (without asking for a password) by adding a query parameter 'davguest=1'. This is a bit of a hack, but there was no response on the official forum about how to do this correctly so it will have to do. On the downside, if permission is denied, it won't ask for a password - but we're talking about unauthenticated folks who didn't go through magic auth so chances are even if they authenticate, permission will still be denied. 2014-01-26 14:15:57 -08:00
Thomas Willingham
ad67d3e483 Ooops, included site specific hack 2014-01-24 03:48:54 +00:00
Thomas Willingham
d57361ea4a Make share previews a bit longer. We can't go any longer than this
without suhosin starting to break things for channels with long names
 - this limit works with the channel with the longest name in the matrix
today, but we may need to make this a pconfig anyway.
2014-01-24 03:44:50 +00:00
friendica
e4bce90b53 Merge pull request #279 from git-marijus/master
make network tabs regard selected group (collection) and vice versa
2014-01-22 14:52:31 -08:00
marijus
040d87c999 update argument ?f= 2014-01-22 23:24:09 +01:00
Thomas Willingham
25f7a7fac9 Give pages enough to construct a share button. 2014-01-22 22:17:12 +00:00
marijus
eb868f6df8 make network tabs regard selected group (collection) and vice versa 2014-01-22 17:18:40 +01:00
friendica
3b375a3d3f fix location of string file in Translations.md, fix some permissions and owner vagueness (potential bugs) in profile_tabs() 2014-01-21 23:09:33 -08:00
friendica
49882f2be4 add cloud link to profile_tabs and Comanchify the sucker 2014-01-09 19:00:06 -08:00
friendica
a78d9b973d simplify permalink selection logic 2014-01-09 16:23:58 -08:00
friendica
7910221832 preparatory work for supporting a "list view" mode for conversations. This would be useful for forum-like channels and/or block-oriented themes. 2014-01-08 15:20:12 -08:00
Thomas Willingham
50e39c330d Zidification of author links in webpages. 2013-12-23 18:41:41 +00:00
Christian Vogeley
870df76463 Merge remote-tracking branch 'upstream/master' into bootstrap
Conflicts:
	view/php/theme_init.php
2013-12-22 14:31:27 +01:00
Christian Vogeley
25a533bd72 New modal dialog for item expiry 2013-12-22 14:21:57 +01:00
friendica
d32bbaf599 split private messages into two modules - "message" is just for message lists, "mail" is for reading and writing conversations. This is so we can Comanchify it cleanly. 2013-12-21 23:47:44 -08:00
friendica
38fd8410eb split off mod_connections into mod_connections & mod_connedit - lots of links to fix 2013-12-18 01:00:08 -08:00
friendica
303324cdff more htmlspecialchars sanitisation 2013-12-12 02:15:02 -08:00
friendica
b8454cbd1d post_activity_item issues 2013-12-07 23:29:26 -08:00
friendica
78d19f3395 move profile tabs and network/matrix tabs to include/conversation 2013-12-05 21:00:14 -08:00
Olivier Migeot
2239d472e5 Plurals for conversation.php 2013-11-28 12:24:37 +01:00
friendica
e8c9dafb90 revert to prepare_page - but have it call prepare_body 2013-11-15 15:32:26 -08:00
friendica
0b8c9654ea allow rpost to set source app 2013-11-15 03:10:00 -08:00
friendica
592c24e162 e2ee in comments and a bit of cleanup so not every theme has to define how 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. 2013-11-14 15:41:25 -08:00
friendica
a7c53d470b ability to use other ciphers 2013-11-11 18:42:49 -08:00
friendica
ca4103debe e2ee 2013-11-10 23:19:44 -08:00
friendica
7381326b7a provide expire feature on post and comments as well as private messages. 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. 2013-11-07 00:47:50 -08:00
friendica
a5693df07f issue #189 - show post edited time on relative date hovertip 2013-10-30 17:33:10 -07:00
friendica
1380bee82c Comanche documentation and some cleanup of layout page (including link to doco) and a few other webpage related cleanups 2013-10-28 17:48:42 -07:00
friendica
9b7994a9b7 remote post module so that from anywhere on the web or at least within the 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. 2013-10-27 20:01:28 -07:00
friendica
336768715c Optionally pass a prepared "top level" item into conversation(). This will 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. 2013-10-24 18:19:39 -07:00
friendica
c48da79adf link to source - if it's on the display page link to original source (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. 2013-10-20 20:29:52 -07:00
friendica
3772682204 Put a status editor on the display page if you're logged in. This fixes issue #113 and also provides the ability to reshare from that page. 2013-10-18 14:25:55 -07:00
friendica
0e793dea9b replace a bunch of graphic icons with vector icons 2013-10-08 21:17:11 -07:00
friendica
78a8d176ac post signatures 2013-10-02 21:04:48 -07:00
friendica
fb03195c3f OK, sure. 2013-09-20 18:07:16 -07:00
friendica
c6d6c01fb6 use prepare_body in api calls to properly render content, add 'mode' to conversation templates so that themes can use the module context to suppress or show comments as desired 2013-09-16 22:40:53 -07:00
friendica
129a119c84 implement what I hope will now be the server side of directory sync, add 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. 2013-09-15 03:48:43 -07:00
friendica
99ea251b12 provide templating options in comanche for the underlying webpage element - in this case the way the author is displayed. Leave this open for other forms templating options. 2013-09-04 21:24:57 -07:00
friendica
879ac35952 my bad 2013-09-03 18:00:09 -07:00
friendica
bac2dcd46a typo 2013-09-03 17:55:25 -07:00