Commit graph

4710 commits

Author SHA1 Message Date
redmatrix
f2a0dac653 fix a couple of miscellaneous errors which showed up in the logs 2015-05-11 22:57:12 -07:00
redmatrix
2cb8b19972 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-05-10 13:18:04 -07:00
redmatrix
3140650b8f rev update 2015-05-10 13:17:41 -07:00
Mario Vavti
70e5bf04e1 uid > channel id to make submenus visible for observers 2015-05-10 21:52:48 +02:00
Mario Vavti
616338c17e provide ability to create submenus 2015-05-10 15:00:18 +02:00
Mario Vavti
cd8ecb8649 provide wrap variable for comanche menus 2015-05-07 23:02:14 +02:00
Mario Vavti
4f235de3c5 provide a possibility to include js/css libs 2015-05-07 13:26:14 +02:00
Mario Vavti
8ca10dcbab adjust icon size 2015-05-07 10:35:22 +02:00
Mario Vavti
9391f6f905 allow blocks to have custom classes and add a new template called zen which gives you an empty page to work with 2015-05-06 10:53:26 +02:00
redmatrix
245080a6d7 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-05-05 19:24:35 -07:00
redmatrix
f559c91b7a turn consensus items into diaspora polls for that network 2015-05-05 19:23:21 -07:00
Mario Vavti
ad7a629b96 remove obsolete linebreak 2015-05-04 15:04:21 +02:00
friendica
e4fe068ed5 more performance work 2015-04-30 18:16:54 -07:00
friendica
9fc87d43c9 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-04-30 17:53:47 -07:00
friendica
097002910e just a test, please do not try to implement this as there are severe security issues 2015-04-30 17:52:34 -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
friendica
e01873b4cf Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-04-24 15:01:59 -07:00
friendica
268307b534 zotfeed issues 2015-04-24 15:01:37 -07:00
Mario Vavti
cc3c1107bd add widget class to blocks again by default. we have the wrap variable now to remove the div wrapper if necessary. 2015-04-24 22:41:56 +02:00
Mario Vavti
b7f6cceaea provide block titles in blocklist 2015-04-24 22:37:22 +02:00
friendica
b3ac1cd993 mod/branchtopic - move an off-topic comment to its own thread as a fresh wall-to-wall post and the same delivery permissions as its parent. No adjustments are made for complex delivery chains. 2015-04-24 00:56:06 -07:00
friendica
41343b32c5 block unfederated posts from zot_feed 2015-04-23 21:45:42 -07:00
friendica
5ac177391b disconnect 2015-04-23 21:13:59 -07:00
Mario Vavti
9e490d022b fix webpage perms 2015-04-22 12:00:15 +02:00
friendica
2cef6c3ac5 use PERMS_SPECIFIC for anything that hasn't been specified. This way there's nothing that's "only yourself", and let's you add additional permissions at will rather than be forced to accept the defaults or turn on custom permissions just to give a friend delegation rights or the ability to post photos. 2015-04-21 21:41:39 -07:00
friendica
6bc2766d79 issue #162 2015-04-20 20:49:55 -07:00
friendica
53339d19a3 issue #176, sender copy of item not obscured if using private mention 2015-04-20 20:14:07 -07:00
friendica
3eeea9d8f0 force event obj_type on update 2015-04-20 17:02:45 -07:00
friendica
9cc8b44579 issue #157, provide default directory sort order 2015-04-19 23:04:14 -07:00
friendica
4383564777 doco updates 2015-04-19 21:39:45 -07:00
friendica
d5f4a19a77 add favorites/create and destroy to api 2015-04-19 20:37:24 -07:00
friendica
f315c55d32 api performance enhancer 2015-04-19 18:57:12 -07:00
friendica
185ce2da69 assorted fixes to api direct messages 2015-04-19 18:14:17 -07:00
friendica
6511d5ee2c some api cleanup 2015-04-19 17:39:17 -07:00
friendica
82f2765f7b Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-04-19 13:41:38 -07:00
friendica
01efda6850 api - unobscure mail 2015-04-19 13:41:12 -07:00
Mario Vavti
71117628bc attach an id to menues, allow $menu_title to be empty, if no custom menu class is provided use default redbasic classes 2015-04-19 15:22:50 +02:00
Mario Vavti
dd5b97639e Introduce wrap variable in comanche blocks (if set to none the block will not be wrapped in a div), fix menu item permissions (it was not possible to set them visible for everybody) and a typo 2015-04-19 13:25:05 +02:00
friendica
0883512e30 log this since we may need it to track down failures 2015-04-18 17:40:44 -07:00
friendica
0ce8572fef remove failed experiment 2015-04-17 23:04:58 -07:00
friendica
e1b9053563 add last post to api/account/verify_credentials 2015-04-17 20:22:10 -07: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
friendica
32f79374b0 don't show directory keywords widget if globaldir setting is off 2015-04-15 22:07:20 -07:00
Mario Vavti
834044b15b title=>name 2015-04-15 09:20:27 +02:00
friendica
9942dec09c match parens 2015-04-14 20:52:07 -07:00
friendica
32acb7f6e1 post_activity_item incorrectly setting the obj_type when a valid type was specified 2015-04-14 20:50:38 -07:00
Mario Vavti
2001ad94bd dont suggest anything here it explains itself 2015-04-14 11:59:49 +02:00
Mario Vavti
bf2a97147e some more on webpages 2015-04-14 11:50:21 +02:00
Mario Vavti
22c3202f22 remove widget class from webpage blocks and make titles h2 to match the rest of the matrix 2015-04-13 16:17:10 +02:00
Mario Vavti
70b109702e make dropItem more universal and move delete up in the dropdown menu 2015-04-12 14:30:33 +02:00
Mario Vavti
962fdf08c0 make fs deletion of directories work 2015-04-12 13:58:04 +02:00
Mario Vavti
7c8b9397ae reverse file activity logic 2015-04-12 13:13:22 +02:00
Mario Vavti
8138373973 move style to style.css 2015-04-10 14:14:19 +02:00
Mario Vavti
5457b417f8 make r# work better with different font sizes 2015-04-10 14:01:40 +02:00
friendica
d9807e34e5 don't warn folks about the webaddress observer tag. We need it in constructed urls. 2015-04-09 22:35:04 -07:00
friendica
8f22b927b1 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-04-09 19:52:19 -07:00
friendica
3fd2e4b716 program the affinity slider labels 2015-04-09 19:51:58 -07:00
Klaus Weidenbach
fdd6508019 Some documentation and whitespaces at line endings. 2015-04-10 00:28:23 +02:00
Mario Vavti
7e7678364b make jRange behave again 2015-04-09 10:53:37 +02:00
friendica
4fd80304a5 that didn't work out well - let's do this instead 2015-04-08 23:20:28 -07:00
friendica
4289c8adb2 fix selector when sys channel active 2015-04-08 23:12:39 -07:00
friendica
7bec4b313a system channel always has allow_code privileges 2015-04-08 23:05:36 -07:00
friendica
37afc81847 update features, allow sys account page deletion 2015-04-08 17:54:52 -07:00
Klaus Weidenbach
f03a937c4e Renamed some functions to match other names in bbcode.php.
Some documentation.
Removed unused variables.
Removed empty spaces at line endings.
2015-04-07 22:47:36 +02:00
Habeas Codice
dbb3cda9a6 missed one 2015-04-07 05:45:24 -07:00
Habeas Codice
1162af4c0d "PHP Strict Standards: Only variables should be passed by reference" 2015-04-07 05:42:47 -07:00
friendica
3c05af6553 make open tag work correctly for multiple invocations in the same text 2015-04-06 21:26:40 -07:00
friendica
3a3563a4b1 commit 59828593c broke some important poco stuff, looks like the cat might have climbed over the keyboard and deleted something that wasn't intended to be deleted. 2015-04-06 19:00:13 -07:00
Klaus Weidenbach
754ac2cff7 Fix Design Tool navigation for sys channel.
Fix creating menu for sys channel.
2015-04-06 23:52:13 +02:00
jeroenpraat
c2517eca56 Update/fix Dutch and removing an ugly space 2015-04-02 02:23:26 +02:00
friendica
41e7552225 open bbcode tag 2015-04-01 12:30:03 -07:00
friendica
6199af6a79 revert iconic change to collection list widget 2015-04-01 01:07:38 -07:00
friendica
6f78d7a85d fix regdir 2015-03-31 21:06:48 -07:00
friendica
c98de44528 more logging for onepoll 2015-03-31 20:01:37 -07:00
friendica
cff7696e98 change "create new collection" to iconic, document the account table 2015-03-30 00:51:03 -07:00
friendica
c29d3fc08a mod_connections ajax failure see http://stackoverflow.com/questions/14347611/jquery-client-side-template-syntax-error-unrecognized-expression 2015-03-29 18:42:05 -07:00
friendica
f01757f0c2 move some lesser used features to plugins 2015-03-29 16:44:26 -07:00
friendica
b546f8d702 Merge https://github.com/friendica/red into pending_merge 2015-03-29 16:05:24 -07:00
friendica
505e5e90b2 fix os_mkdir 2015-03-29 16:05:08 -07:00
RedMatrix
9ae9aedb15 Merge pull request #944 from dawnbreak/docu
Correcting reported Doxygen syntax warnings.
2015-03-30 10:04:15 +11: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
Klaus Weidenbach
42c820029e Fixed two wrong variable usages in event.php.
I just checked the code, not the functionality.
2015-03-29 21:16:21 +02:00
friendica
76a6739b93 remove bogus grouping from fix for #938 2015-03-28 18:47:28 -07:00
friendica
1e4490079b issue #938 2015-03-28 18:45:58 -07:00
friendica
0aba609ad4 issue #941 2015-03-28 14:53:00 -07:00
friendica
47292c612c provide ways to over-ride the datetime pickers 2015-03-26 18:03:39 -07:00
friendica
b6d4f01ba9 Merge https://github.com/friendica/red into pending_merge 2015-03-25 15:33:50 -07:00
friendica
e33da588bd comanche: move 'webpage' declaration to the first parser pass so it is set when content loads. 2015-03-25 15:32:49 -07:00
Mario Vavti
49005101c7 make postgresql happy 2015-03-25 11:03:37 +01:00
friendica
022305fe83 also allow service classes to set post expiration. These take priority over the site default. 2015-03-24 20:38:53 -07:00
friendica
63b8020969 more work on expiration, make system limits useful - even in retrospect 2015-03-24 17:09:42 -07:00
friendica
1f427e0e5b make the log message reflect what's really happening 2015-03-24 16:30:14 -07:00
friendica
3d60008842 provide a site-wide expiration policy without loopholes - still need work to reduce the impact of expiration queries. 2015-03-24 15:53:55 -07:00
friendica
abf642be7f Merge https://github.com/friendica/red into pending_merge 2015-03-24 12:41:37 -07:00
friendica
00b3c4c881 sql errors on postgres with yestderday's optimisation 2015-03-24 12:40:55 -07:00
Mario Vavti
c21a21be3e we only need item mid. some documentation. 2015-03-24 11:38:54 +01:00
Mario Vavti
1821b099df this query can take quite a while if there were many updates but it has not been called for a long time (eg nobody called mod sharedwithme). might be a good idea to have this in the poller to clean up on a regular basis and call it once more in mod sharedwithme. what do you think? 2015-03-24 10:56:02 +01:00
friendica
c024668cf2 catche edge case of tag "@abcdef +1", which tags the first entry in your abook, regardless of abcdef. This holds true for other similar patterns as well. 2015-03-24 02:36:45 -07:00
friendica
c2acab21d4 improve performance of the zotfeed queries 2015-03-23 19:56:10 -07:00
friendica
d32f63df82 explicitly unset delegate session vars on logout 2015-03-23 17:51:43 -07:00
friendica
f2127d4ba7 limit notification detail queries for items and events 2015-03-23 15:36:17 -07:00
friendica
62b2fa6ac7 operation snakebite, cont. 2015-03-22 20:30:23 -07:00
friendica
ccef9e5636 put a lower time limit on time travellers 2015-03-22 18:23:37 -07:00
RedMatrix
e72c3e3e05 Merge pull request #935 from dawnbreak/master
Two possible bugfixes in bb2diaspora.php.
2015-03-23 05:34:30 +11:00
Mario Vavti
e345d6793d move the maintenance part to include/sharedwithme.php 2015-03-22 16:29:57 +01:00
Mario Vavti
47c055e7f3 do not override item_private here anymore 2015-03-22 14:24:07 +01:00
Klaus Weidenbach
96239b3648 Two possible bugfixes in bb2diaspora.php.
I have found two suspicious parts and tried to correct them. I have no
diaspora enabled hubs and I am also not sure what influence these two
changes will have:
$unset($item['author']) ==> unset($item['author']);
if(cnt) ==> if($cnt)
Before merging can someone with diaspora contacts test this.
2015-03-22 14:19:00 +01:00
friendica
b298bc8834 Merge https://github.com/friendica/red into pending_merge 2015-03-21 16:47:46 -07:00
friendica
a2e3ca6fd8 add loadtime search to channel and fix it for home. display and search need further investigation 2015-03-21 16:46:28 -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
Klaus Weidenbach
daed7fbead Bugfix und variable initialization.
Fixed a wrong perm_is_allowed() parameter, commented some other places
where we use variables that are not set and should not work.
2015-03-21 22:28:07 +01:00
friendica
85dd08427c change permission roles for things like channel admin to make them more easily manually settable from the connections edit page. 2015-03-20 18:50:45 -07:00
Mario Vavti
ead45292e1 some tabs title statuseditor restructuring 2015-03-21 00:06:18 +01:00
Mario Vavti
264b43db05 some cleanup 2015-03-20 17:46:13 +01:00
Mario Vavti
6698d7b03a possible improvement regarding deletion 2015-03-20 17:37:01 +01:00
friendica
2010d6a332 Explicitly force link for 'All Collections' on the network page to gid=0 so it can be used with a default page over-ride for gid. 2015-03-19 16:22:08 -07:00
friendica
b1fd6c53a5 tweaks to directory registrations which don't seem to be happening, also downgrade any directory that claims to be a primary directory for RED_GLOBAL. 2015-03-19 15:56:30 -07:00
friendica
24ebaaf0f7 ratenotif: loop oddity 2015-03-19 15:24:09 -07:00
friendica
63683734a2 make the channel item query match recent changes to network item query (and some slightly older changes in display item query), and allow '@' in linkified urls. 2015-03-18 19:06:05 -07:00
friendica
5a7e35fbf8 Change wording on the photo location feature. When photos are merged with DAV storage we won't be stripping metadata by default. 2015-03-18 17:36:06 -07:00
friendica
6b3afb5eec get the correct hemisphere for geotagged photos 2015-03-17 00:53:24 -07:00
friendica
fab8209ebd turn photo location mapping into a feature 2015-03-17 00:33:43 -07:00
friendica
7af012b1f9 The random bad signatures are because something somewhere is trimming the body text. It could be any one of hundreds of functions that touch the message body. We really want to trim the body text, so I'm putting back all the trim statements - in mod/item and item_store and item_store_update. The last fix for random bad sigs noted that one of the trims wasn't there, so the others were removed. The correct fix is for all the trims to be there. We will probably have a few (quite a few) bad sigs during the transition back to trimmed text but this should nail it for anybody on recent code and with new content. 2015-03-17 00:13:47 -07:00
friendica
bc22df9057 display a map for photos if allowed. Note: there is a bug in that if the map div starts with display:none one needs to reload the frame or zoom in or they end up at minimum resolution. Still trying to sort this out. 2015-03-16 22:06:03 -07:00
friendica
7c194c37b8 started to add the ability to geotag photos (default will be disabled) but my phone isn't outputting the GPS tags even after being explicitly enabled so I'll have to wait until I've got a device that I can reliably test against. 2015-03-16 20:08:05 -07:00
friendica
178b768e3c openid cleanup 2015-03-16 17:08:50 -07:00
friendica
f660b7523b also update the api to match 2015-03-16 15:35:46 -07: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
Klaus Weidenbach
864116805b Documentation and remove duplicate code.
Add a bit Doxygen documentation and remove some duplicate code from
account.php.
2015-03-16 00:20:14 +01:00
friendica
b76cdf82d2 create terms for Diaspora mention tags - which in Diaspora are handled differently than other tag links and have to be done separately; they aren't processed by linkify_tags which handles all of our other tag processing. Also move the abook_channel clause in mod_network to the join statement. This works fine in mysql and achievies the desired result. I hope postgres can handle an expression as a join clause. 2015-03-13 19:24:17 -07:00
RedMatrix
f823e2e2ed Merge pull request #928 from dawnbreak/docu
Some documentation, fix chatroom service class lookup.
2015-03-14 10:43:22 +11:00
Klaus Weidenbach
80816a7195 Some documentation, fix chatroom service class lookup.
Add some Doxygen documentation and fixing a service class lookup for
chatroom_create().
2015-03-14 00:10:06 +01:00
friendica
f458c29a2b invoke tgroup_check() on diaspora posts/comments in case the recipient is a forum with channel_w_stream permissions restricted. 2015-03-13 14:48:44 -07:00
Klaus Weidenbach
124b17dcf4 Some cleanups.
Fixed dbesc_identifier(), but it is not used yet.
Corrected some other variable names and variable initialization before
using them.
2015-03-13 00:36:32 +01: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
RedMatrix
48f99c9a60 Merge pull request #925 from unary/fixinsert
add missing %d for abook_closeness
2015-03-12 12:14:28 +11:00
friendica
d80088f6f6 make embeds bookmarkable 2015-03-11 18:12:04 -07:00
friendica
1b3fee05e6 turn parse_url into the definitive url attaching mechanism 2015-03-11 18:04:43 -07:00
Michael Johnston
4e98a70e66 add missing %d for abook_closeness 2015-03-11 20:56:40 -04:00
friendica
35fc14d6ab don't relay diaspora comments to sys channel 2015-03-11 15:11:57 -07:00
friendica
0014cf4ff2 skip trying to come up with an intelligent way to decide what photos should get a status post - leave it manual. 2015-03-11 00:21:57 -07:00
friendica
65ffd209d4 allow urls using the zot: or zots: URL schemes to exist without getting filtered away. 2015-03-10 19:43:15 -07:00
friendica
b0a78e5288 Merge https://github.com/friendica/red into pending_merge 2015-03-10 15:48:42 -07:00
friendica
5b35f1e6c4 Change logic of "don't create a status post for this photo upload" and turn it into a bona-fide on/off toggle. This takes up one more vertical line, but we have it to spare, and the single button (while concise visually) provided no feedback of the current state, or indicate whether a second click toggled it. Some addons use this setting so addons will need to be pulled when this is pulled in order to remain in sync. 2015-03-10 15:43:15 -07:00
Klaus Weidenbach
09d0401edb Fix SQL query for removing orphan hooks.
initialize some variables before using them.
commented out some unused variables.
2015-03-10 23:20:05 +01: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
54a9fb1774 diaspora's spammy permission model seems to have leaked through our firehose. Don't let it. 2015-03-10 12:22:22 -07:00
friendica
0134a41015 more work on queue optimisations 2015-03-09 19:57:35 -07:00