Commit Graph

4887 Commits

Author SHA1 Message Date
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 ed3d9d1f80 some photo/attach permissions issues 2015-07-18 16:39:12 -07:00
redmatrix fd16de335c Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-07-16 20:21:20 -07:00
redmatrix 3c60a0c22c provide any single year of exported items 2015-07-16 20:20:42 -07:00
redmatrix ec249d465b provide a way to export a single year of items (to potentially keep from exhausting resources either on export or import) 2015-07-16 20:19:20 -07:00
redmatrix 4299ae65a4 abook clone sync - change logic to also unset existing cross-project flags besides just setting them 2015-07-16 18:07:23 -07:00
redmatrix c3dbacfb88 don't including rating stuff from cloned abooks 2015-07-16 17:53:59 -07:00
Mario Vavti 39a09eb525 fix missing div and a regression introduced in ec23a94b6d which broke tag removal for photos 2015-07-16 22:04:52 +02:00
zottel 2bd05971ab fix observer tags for now (issue #17) 2015-07-16 08:28:37 +02: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 070397ef14 make tagadelic results (including categories in wall-to-wall posts) visible to wall visitors by checking ownership rather than authorship. It is doubtful the queries will scale on redmatrix so moved forward to hubzilla tree. 2015-07-15 21:43:42 -07:00
redmatrix 964e461e09 allow plugins to provide module handlers for arbitrary modules that haven't been installed on the system. 2015-07-15 21:01:18 -07:00
redmatrix b9fd8b4614 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	include/zot.php
2015-07-15 18:41:50 -07:00
redmatrix 7db515b77c fix for empty recip array resulting from a mangled xchan 2015-07-15 18:31:37 -07:00
redmatrix 7f6e4d5f4a more clone sync issues across projects 2015-07-15 18:21:04 -07:00
redmatrix 95cf1668de Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-07-15 18:15:25 -07:00
redmatrix 59b67d52e6 clone sync fixes across red/hz 2015-07-15 18:14:19 -07:00
redmatrix 10406c6d15 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-07-14 17:17:45 -07:00
redmatrix 46aacfe64d stream_perms_xchans() set to empty quoted string when no results rather than return an empty string 2015-07-14 17:15:53 -07:00
redmatrix e8f19c1e15 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	mod/connedit.php
2015-07-14 17:10:13 -07:00
redmatrix 3687fef53c Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-07-14 16:55:58 -07:00
redmatrix a5989b0f31 coverup and ignore the illegal string offset message that some sites have been reporting. This does not fix it. A fix would be to examine the data that has been received and find out why it is mangled and trace this back to where it was mangled. 2015-07-14 16:54:16 -07:00
Mario Vavti 7f71297383 cleanup connedit 2015-07-14 12:46:40 +02:00
redmatrix 800eec5bee merge from redmatrix 2015-07-13 17:48:11 -07:00
redmatrix 6916c1076c Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-07-13 17:43:10 -07:00
zottel a07be48017 change account_default_channel if default channel is removed 2015-07-13 17:30:04 +02:00
redmatrix b7d3eb1605 Only let local logins install webpage elements 2015-07-11 16:36:58 -07:00
redmatrix a497d8ee66 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	mod/editpost.php
	util/messages.po
	view/nl/messages.po
	view/nl/strings.php
2015-07-10 14:27:41 -07:00
Mario Vavti efa55437d4 increase width of the aside area and make default profile image size 300x300 2015-07-09 13:59:16 +02:00
redmatrix 43354ab385 inconsistent naming of block item types 2015-07-08 18:05:38 -07:00
Mario Vavti e12d58a75c fix typo to make directory safe mode default to on work again 2015-07-08 21:28:36 +02:00
redmatrix 6b41074396 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-07-07 16:50:25 -07:00
redmatrix dad4ac6c89 incorrect value for hubloc_deleted in zot_get_hublocs() query 2015-07-07 16:06:34 -07:00
Mario Vavti f6cf992aee fix sorting of channel suggestions 2015-07-07 22:48:01 +02:00
Mario Vavti f67d9d59af rename function get_directory_settings => get_directory_setting and move sort options to directory title bar 2015-07-07 22:29:27 +02:00
Mario Vavti 9c577e0422 make public forums only setting sticky and simplify function to get directory settings 2015-07-07 21:41:37 +02:00
Mario Vavti cc7eaa0d05 code style correction 2015-07-07 14:52:06 +02:00
Mario Vavti b50151d7bf make directory suggest work with directory options 2015-07-07 14:46:47 +02:00
redmatrix f20933e1e0 more work on db storage of doco 2015-07-05 19:52:41 -07:00
redmatrix a74631b554 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	boot.php
	include/items.php
	util/messages.po
2015-07-03 15:03:56 -07:00
redmatrix 37c78bcf05 start doco cleanup 2015-07-03 14:56:48 -07:00
redmatrix 0b9332fde9 in hubzilla we're going to convert doco to items. define it here so that an accidental import/export doesn't chuck a wobbly. 2015-07-03 14:30:42 -07:00
redmatrix 90a31f4ad5 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	include/zot.php
2015-07-02 22:00:15 -07:00
redmatrix 1a5898bf80 sync abook entries from redmatrix
Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	include/items.php
2015-07-02 21:58:28 -07:00
redmatrix 065a50c920 a few clone sync fixes as well as some work on hubzilla clone sync back to redmatrix 2015-07-02 21:55:36 -07:00
redmatrix 8b2b92fe32 provide compatibility with redmatrix extended item export 2015-07-01 18:50:37 -07:00
redmatrix 3f38e52caf provide backward compatibility with hubzilla extended item export 2015-07-01 18:49:34 -07:00
redmatrix 86b12ea750 lots of work on clone/import from redmatrix to hubzilla (won't go back the other way) 2015-06-30 20:18:48 -07:00
redmatrix 97e8275dc2 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-06-29 22:19:44 -07:00
redmatrix 0b347ccc14 turn the connection filter into a feature. 2015-06-29 20:35:56 -07:00