Commit graph

513 commits

Author SHA1 Message Date
redmatrix
ec3ca11d0d bad code format 2016-08-09 16:59:35 -07:00
redmatrix
5243dd153b use config system.server_role and deprecate 'UNO' 2016-08-07 17:29:35 -07:00
Mario Vavti
908e15bc90 multi acl: port events 2016-08-03 23:57:41 +02:00
Mario Vavti
c50bfa07ca multiple acl work 2016-08-03 21:16:57 +02:00
redmatrix
b3a785711c deprecate/remove json_decode_plus 2016-07-13 22:11:06 -07:00
redmatrix
9ef710c557 provide wiki as a feature (default is on so there aren't any surprises) and add to channel menu and profile tabs 2016-06-29 20:59:00 -07:00
redmatrix
0ef2622621 some work to provide propagation and honouring of the item_notshown flag. 2016-06-13 22:09:22 -07:00
Andrew Manning
7fc2b13fe6 Stashing changes. Not a functional state. 2016-06-09 20:06:36 -04:00
redmatrix
a9d7acda27 the rest of the schema updates - WARNING: some third party plugins may fail; e.g. embedphotos and chess. $item['object'] is now $item['obj'] and $photo['type'] is $photo['mimetype'], $photo['scale'] is $photo['imgscale'] and $photo['data'] is now $photo['content']. There are a number of other changes, but these are the ones noted to cause issues with third-party plugins. The project plugins have been updated. Please note any new issues as this effort touched a lot of code in a lot of files. 2016-06-01 21:48:54 -07:00
redmatrix
80f2ba640e code cleanup 2016-05-24 20:49:23 -07:00
redmatrix
1aa3051e97 move chatroom stuff to zlib 2016-05-22 20:54:52 -07:00
redmatrix
de006771c7 renamed include files identity.php (channel.php) and Contact.php (connections.php) 2016-05-22 16:54:30 -07:00
redmatrix
d8ace38041 rework the conversation object stuff at a high level - still needs a bit of refactoring 2016-05-20 22:52:47 -07:00
Mario Vavti
61909d2480 if we do not have a layout $layout should be empty not default 2016-05-09 12:24:48 +02:00
Mario Vavti
7aeff7505b remove unused code and whitespace 2016-05-09 12:09:04 +02:00
Mario Vavti
24c1dc528d make editwebpage use status_editor() and fix storing of layout on webpage creation 2016-05-09 11:56:42 +02:00
Mario Vavti
75128e8f68 make editblock use status_editor() 2016-05-07 23:05:48 +02:00
Mario Vavti
fa80a5c113 make weblink and attach button hideable and some minor fixes 2016-05-01 15:45:42 +02:00
redmatrix
9446d0cbb4 Merge pull request #362 from Treer/fontawesome
Update Font-Awesome to 4.6.1
2016-05-01 08:02:03 +10:00
Mario Vavti
c96b20c559 make mod editlayout use status_editor() 2016-04-30 21:56:52 +02:00
Treer
8f16e9ad33 update icon names in include/ 2016-05-01 04:39:57 +10:00
Mario Vavti
931a4fafe3 get rid of the unused ispublic variable 2016-04-29 21:38:36 +02:00
Mario Vavti
b797528b78 some work on making mod editpost use status_editor() - if you find anything related to jot broken please revert this commit 2016-04-29 13:18:42 +02:00
Mario Vavti
1fdac57d61 jot: cleanup unused variables 2016-04-29 09:58:44 +02:00
Mario Vavti
e2b4d33627 some work on comanche autocomplete 2016-04-09 12:16:42 +02:00
redmatrix
bf3f3564e0 issue #138 ; make ajaxchat optional and configurable. For reasons we've discussed repeatedly the ajax chat will not be removed from core as XMPP chat does not provide decentralised access control compatible with nomadic identity. 2016-04-03 16:41:40 -07:00
redmatrix
9abd95fad3 static App 2016-03-31 16:06:03 -07:00
redmatrix
1cd3b41825 deprecate $a->get_baseurl() 2016-03-30 22:13:24 -07:00
redmatrix
256cd6baac work on implementing account/channel move (as opposed to clone) 2016-03-09 00:46:17 -08:00
Mario Vavti
be27fb5644 we have got a button for events in the nav. no need for it in the tabs if we are local. 2016-02-25 13:40:15 +01:00
redmatrix
c95d7c69eb issue #216 - calendar sharing 2016-02-24 18:54:52 -08:00
redmatrix
d3bec0b2f9 honour poco_rating_enable in item_photo_menu 2016-01-19 15:30:17 -08:00
redmatrix
24bffd4418 Separate item_photo_menu() into links which deal with the post and those which deal with the author. We should probably also make this info available to themes so they could for instance provide a visual separator. 2016-01-19 15:15:34 -08:00
redmatrix
9fb7a12849 incorrect obj_type on several items 2015-12-11 02:52:43 -08:00
Mario Vavti
c7cbd41c16 first iteration on the event item 2015-11-26 12:26:27 +01:00
redmatrix
301072a86c issue #85, community tags and file tags lost during edits. This required splitting off communitytags as a separate tag type and is not backward compatible. Community tags on older posts or those federated from redmatrix clones will not be preserved during edits. 2015-11-20 00:15:48 -08:00
redmatrix
a44795e6c3 change action label from 'stop following' to 'unfollow thread' 2015-11-19 17:27:07 -08:00
Mario Vavti
7c4d9519c8 whitespace 2015-11-17 23:08:35 +01:00
Mario Vavti
6fa0807550 more css fixes 2015-11-17 23:01:24 +01:00
Mario Vavti
868a0d8a90 missing closing " for src attribute 2015-11-17 13:45:00 +01:00
redmatrix
888bf76e4b allow pdl content 2015-11-12 17:47:38 -08:00
redmatrix
fba2603304 add avatars to likes/dislikes/etc. 2015-11-09 15:58:19 -08:00
redmatrix
2c299a9f37 implement unfollow thread 2015-11-03 14:59:14 -08:00
Mario Vavti
f8b767ed32 fix photo item for search_item.tpl and a minor css fix 2015-10-30 18:46:16 +01:00
redmatrix
917d0ced4a new feature: delayed posting 2015-10-25 16:54:18 -07:00
Mario Vavti
391b98f72c fix webpages 2015-10-15 20:57:05 +02:00
Mario Vavti
ca35db76b8 wrong variable 2015-10-14 23:07:49 +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
c34d8286a3 change matrix to grid, begin webfinger optimisation 2015-09-16 21:27:58 -07:00
redmatrix
db58b62235 don't auto-open the editor in forum mode. Save the forum selection text until we open it. 2015-09-09 19:54:16 -07:00
redmatrix
54c88dfae9 Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	include/diaspora.php
2015-08-26 20:22:50 -07:00
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