Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 17:35:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
14733 commits 7 branches 30 tags 160 MiB
Commit graph

5126 commits

Author SHA1 Message Date
redmatrix
7688bf3f21 support ical priority 2015-08-20 22:24:33 -07:00
redmatrix
49c4aa1a54 cleanup of task widget - make jquery workflow a bit smoother 2015-08-20 20:40:42 -07:00
redmatrix
afbbc9cd72 more work on tasks 2015-08-20 18:43:01 -07:00
redmatrix
a322254f2a do ical export before checking logged in channel 2015-08-20 04:51:03 -07:00
redmatrix
fd7b668a16 add carriage return to newlines for exported events (rfc2445:4.1) 2015-08-20 02:07:51 -07:00
redmatrix
5786fd2221 extra encoding on mail titles 2015-08-20 01:12:35 -07:00
redmatrix
419b4ecfde use consistent terminology 2015-08-19 21:17:24 -07:00
redmatrix
69920fb717 fix photo location 2015-08-19 19:17:17 -07:00
redmatrix
8d66fbccfa Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/api.php
 2015-08-19 16:54:12 -07:00
redmatrix
a4caaefd32 event integration improvements 2015-08-19 16:50:32 -07:00
redmatrix
c96f121d41 add photo_detail api call 2015-08-18 22:14:16 -07:00
redmatrix
4e3d295c90 import and export tasks (calendar todo items) 2015-08-18 19:06:50 -07:00
redmatrix
9763c46b7e Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/identity.php
 2015-08-17 22:23:23 -07:00
redmatrix
f682325924 provide ability to export by month as well as by year 2015-08-17 22:20:10 -07:00
redmatrix
ea331b043c Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-08-17 21:41:14 -07:00
redmatrix
1a4a921528 provide module for importing yearly content dumps 2015-08-17 21:40:40 -07:00
redmatrix
1982fc807f add item_id to yearly dump files 2015-08-17 21:38:43 -07:00
redmatrix
18bc12c21c Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/zot.php
	util/messages.po
 2015-08-14 22:24:15 -07:00
Alexandre Hannud Abdo
73b30de9cb Properly fix which perms get checked for comments, Mike's solution 2015-08-14 12:21:05 -03:00
redmatrix
d140620008 add item validation function 2015-08-13 19:35:57 -07:00
redmatrix
50a1e0c618 attach_store needs a lot of documenting to understand what's going on and how it got to be this way. Here's the bird's eye view. 2015-08-13 17:11:59 -07:00
redmatrix
ef73880459 reverting 36b5f6ac 2015-08-12 22:48:08 -07:00
redmatrix
0b7365e2db revert 36b5f6ac 2015-08-12 22:37:24 -07:00
redmatrix
2d9d4dfeb3 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	doc/history.md
	mod/import.php
 2015-08-11 22:35:36 -07:00
redmatrix
0e8991fec2 more consistent output on forum widget 2015-08-11 22:23:20 -07:00
redmatrix
b651604e8b remove the forum limit 2015-08-11 20:58:03 -07:00
redmatrix
1932e72603 arghh 2015-08-11 20:25:52 -07:00
redmatrix
be4eb4eeb8 typo 2015-08-11 20:25:02 -07:00
redmatrix
89fa36ce2a wrong cid 2015-08-11 20:24:06 -07:00
redmatrix
80df97e734 don't show '0' results, like notifications 2015-08-11 20:18:34 -07:00
redmatrix
8dd7fab38d order by name 2015-08-11 20:16:17 -07:00
redmatrix
400d5790f3 make sure we only get forums attached to the channel 2015-08-11 19:58:31 -07:00
redmatrix
c8e83d6edc set font-weight back to normal on forums widget 2015-08-11 19:27:22 -07:00
redmatrix
c8b8c6cb14 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/items.php
	util/messages.po
	view/nl/messages.po
	view/nl/strings.php
 2015-08-11 19:24:31 -07:00
redmatrix
44dcbeaaa4 forum widget 2015-08-11 19:22:14 -07:00
redmatrix
0c23843b61 untested forum widget 2015-08-11 17:39:29 -07:00
Alexandre Hannud Abdo
36b5f6acfe Require comment perms only for own posts, allow senders to deliver comments using stream perms. 2015-08-10 18:20:18 -03:00
redmatrix
58c9f516b3 private mail isues 2015-08-09 01:18:36 -07:00
redmatrix
8ce4814835 convert diaspora_signature to json for storage 2015-08-08 15:19:50 -07:00
redmatrix
2656aeaf9c ensure diaspora_signature is converted to json before we store it. 2015-08-08 15:18:34 -07:00
redmatrix
7e43da43a1 more file permissions inheritance work 2015-08-06 17:42:53 -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
880dec5a4e don't throw errors or do the wrong thing if photos have no album (placed on your dav rootdir) 2015-08-05 22:07:51 -07:00
redmatrix
dfb8a1b2d4 photo album is decided in dav or attach modules now - don't set it in photos_upload 2015-08-05 21:42:00 -07:00
redmatrix
cb8f0a0e0f uploaded photo from dav (file put, not dav create) not showing in photo album 2015-08-05 20:54:32 -07:00
redmatrix
03a833f2f8 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	view/nl/messages.po
	view/nl/strings.php
 2015-08-05 16:13:42 -07:00
redmatrix
6413ba3230 connection filter fixes 2015-08-05 16:12:05 -07:00
redmatrix
ea63f3312f personal oembed black/white list 2015-08-04 20:07:55 -07:00
redmatrix
5344431fc0 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-08-04 16:02:12 -07:00
redmatrix
a61fc00fa4 unobscure item before applying connection filter 2015-08-04 15:59:18 -07:00
redmatrix
f594a7776c Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	view/it/messages.po
	view/it/strings.php
 2015-08-03 21:17:00 -07:00
redmatrix
6826b4ad32 these were some really difficult bugs to find 2015-08-03 21:13:17 -07:00
redmatrix
b737e224b1 more work separating Diaspora from core 2015-08-03 16:52:51 -07:00
redmatrix
db70c76494 diaspora_meta getting double json encoded 2015-08-02 23:05:15 -07:00
redmatrix
9f5dfe797b begin moving diaspora to plugin 2015-08-02 17:38:34 -07:00
redmatrix
c1a953f960 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	util/messages.po
 2015-07-31 15:45:13 -07:00
redmatrix
6f9771768d event parse cleanup 2015-07-30 22:49:43 -07:00
redmatrix
acc9a8e43b escape $ in events 2015-07-30 22:29:10 -07:00
redmatrix
1d218784d1 undefined function 2015-07-30 20:37:32 -07:00
redmatrix
f45cb8cf1f minor - add all the newly supported table columns 2015-07-30 20:04:02 -07:00
redmatrix
4035c6f161 incorrect photo permissions when uploaded via /cloud; issue #21 2015-07-30 19:50:06 -07:00
redmatrix
fd947c205b make /cloud work again after all the shuffling this morning 2015-07-30 18:34:30 -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
1097cd2583 minor cleanup 2015-07-29 19:01:25 -07:00
redmatrix
b1ceb33ae0 Merge branch 'vobject' 
Conflicts:
	include/event.php
 2015-07-29 18:59:28 -07:00
redmatrix
00fa2e2fe8 convert ics import to sabre/vobject 2015-07-29 18:57:52 -07:00
redmatrix
df41ce9536 incorrect function name 2015-07-29 17:04:50 -07:00
redmatrix
845024e1e7 add connection filter to non-zot posts 2015-07-29 17:04:17 -07:00
redmatrix
e3f605e242 PRIVACY: imported events 2015-07-29 16:30:00 -07:00
redmatrix
4c83e9b6b4 initial work on using sabre as a vcalendar parser 2015-07-28 21:55:28 -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
3269d4632f Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	util/messages.po
 2015-07-27 18:01:20 -07:00
redmatrix
0b232a610c logic issue in connection filter 2015-07-27 13:48:41 -07:00
redmatrix
85f546e691 crude but more or less functional event import from thunderbird ics files 2015-07-26 22:44:49 -07:00
redmatrix
9e6aea7382 backend code for importing events from "simple" ics calendar files. 2015-07-26 21:39:46 -07:00
redmatrix
cc5b0cde1d Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	include/diaspora.php
 2015-07-23 21:07:35 -07:00
redmatrix
bd131433b6 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-07-23 18:50:08 -07:00
redmatrix
27fa908233 patch to allow theme based widgets 2015-07-23 18:49:37 -07:00
redmatrix
c0e67db070 refresh diaspora xchan every month or so since receiving profile update messages from that network reliably are just as unlikely as receiving any other kind of message from that network reliably. The problem is that if somebody changes their profile name or photo once every few years and you miss it because of their shitty unreliable communications, your data could be stale for a long time. 2015-07-22 19:02:45 -07:00
zottel
5c52120fb4 make content filter by language work for excludes 2015-07-22 09:34:32 +02:00
redmatrix
c90f14c066 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	doc/to_do_code.bb
 2015-07-21 17:13:48 -07:00
redmatrix
3ec6a431b6 ics calendar export - commas need to be escaped 2015-07-21 17:07:16 -07:00
redmatrix
5146e6e76b Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-07-20 19:35:00 -07:00
redmatrix
d87c7ceeb0 there is no stricmp() in php, use strcasecmp() - also only detect language if we plan to use it. 2015-07-20 19:33:42 -07:00
Mario Vavti
4d45bc9da1 Fixes regarding the new default profile photo size. The default profile photos are just renamed. People which provided the originals are invited to reproduce them in the new 300 by 300 px format. 2015-07-20 21:01:11 +02:00
redmatrix
6645846ad3 allow per-connection content filter to specify a detected language to include/exclude (in addition to text, tags, and regexes) 2015-07-20 02:04:51 -07:00
redmatrix
24ec104819 silence warning about non array diaspora_meta but report it in the logs so we can find out what it actually is and why. 2015-07-19 21:18:13 -07:00
redmatrix
15b6e8faa4 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	include/identity.php
	include/widgets.php
	util/messages.po
	view/it/messages.po
	view/it/strings.php
 2015-07-19 21:08:34 -07:00
redmatrix
fd8e6f3130 typo 2015-07-19 21:04:02 -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
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
redmatrix
a7135b5ecd fix the postgres schema with all the changes to date 2015-06-29 19:58:44 -07:00
redmatrix
6e8ad5089e Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	view/nl/messages.po
	view/nl/strings.php
 2015-06-29 18:01:51 -07:00
redmatrix
0b012e2995 some prep work 2015-06-29 16:56:18 -07:00
redmatrix
63f2e9b412 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	include/zot.php
	mod/connedit.php
	util/messages.po
 2015-06-28 22:33:13 -07:00
redmatrix
de13497333 no this isn't it. well ok, it's part of it, but not the important part. it's still pretty cool. 2015-06-28 21:16:56 -07:00
redmatrix
8d84472b4c bring single instance file storage to dav and cloud uploaded photos 2015-06-27 16:36:30 -07:00
redmatrix
a3d7e8456a undo the disabling of browser_prefetch and for the time being revert the HTML cache until we can isolate all the zid and observer calls. Also get rid of youtube and vimeo bbcode tags which we should not be using any more. 2015-06-25 20:07:10 -07:00
redmatrix
70975dda4a remove all QR-code stuff from core - now in qrator addon 2015-06-25 19:05:49 -07:00
redmatrix
b06b6f798f localise event calendar 2015-06-25 18:23:48 -07:00
redmatrix
86588bdd6c more work on photos, including os_storage for the size '0' photo and numbering duplicate filenames 2015-06-23 22:46:39 -07:00
redmatrix
1a0655f34e more work on mail flags 2015-06-23 21:01:59 -07:00
redmatrix
cb76fb8b9b item flag fixes discovered after a few merges 2015-06-23 19:45:39 -07:00
redmatrix
833098e346 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	include/items.php
	mod/item.php
 2015-06-23 17:30:35 -07:00
redmatrix
9879cf3c6c ensure we always sign a trimmed item body. 2015-06-22 16:09:02 -07:00
redmatrix
0d8fcbe48d discovered a couple of loose ends in the per-member enable diaspora setting 2015-06-22 15:03:47 -07:00
redmatrix
ae6612025d Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	include/items.php
	util/messages.po
 2015-06-21 20:51:07 -07:00
redmatrix
68534fd5dc some diaspora import issues uncovered during dry-run tests 2015-06-21 17:30:23 -07:00
redmatrix
e1caf77480 Merge pull request #352 from solstag/store_update_fix 
Make item_store_update only affect the data we requested
 2015-06-21 10:07:58 +10:00
redmatrix
9dfb8a3401 ensure the photo driver is included 2015-06-20 16:24:10 -07:00
redmatrix
dd950baa82 import_diaspora - incorrect method for importing channel photo, and add duplicate reddress detection/correction 2015-06-20 16:21:25 -07:00
Alexandre Hannud Abdo
ec23a94b6d Make item_store_update only affect the data we requested 2015-06-20 02:21:25 -03:00
redmatrix
ddbaabd62d wrong logic 2015-06-19 18:08:10 -07:00
redmatrix
94e7a425e6 import_diaspora - a few more atypical settings 2015-06-19 18:06:55 -07:00
redmatrix
e85d2c4b90 import_diaspora: add all the friends 2015-06-19 17:07:31 -07:00
redmatrix
0a9d3b4025 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-06-19 16:44:16 -07:00
redmatrix
6bd90816dd very early attempt diaspora import from diaspora export file. Currently the json export has to be gunzipped prior to uploading and we're net yet adding connections (which should come soon) and we can't import items until they add guids to the export file - so consider it a work in progress. This first attempt should create a channel and get your profile details setup providing there isn't a nickname conflict on the server. That will also be handled later. 2015-06-19 16:39:03 -07:00
Mario Vavti
de84f48e2f bring some more generic-content-wrappers and fix some of them 2015-06-19 12:44:11 +02:00
redmatrix
33c9d8e06b all file attachments are now stored natively, still have photos-0 to store natively 2015-06-18 22:12:26 -07:00
redmatrix
6aa159e2ac Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-06-18 19:15:01 -07:00
redmatrix
7e59580812 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-06-18 16:36:47 -07:00
redmatrix
1a9c059062 issues with markdownify and escaped HTML 2015-06-18 16:35:40 -07:00
redmatrix
2963be60e5 more photos work 2015-06-17 18:26:56 -07:00
redmatrix
6ab20eb1b5 lots of work on merging photo and file albums/folders 2015-06-17 17:44:31 -07:00
redmatrix
c6c17182e5 attach_mkdirp - implement force option to return success if dir exists 2015-06-17 01:18:55 -07:00
redmatrix
4ecee713d5 recursive mkdir (ala mkdir -p) for file and photo storage 2015-06-16 22:58:26 -07:00
redmatrix
39309ad45c start work on photo directories 2015-06-16 19:05:09 -07:00
redmatrix
65661b7ec3 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	mod/photos.php
	mod/siteinfo.php
 2015-06-16 18:43:03 -07:00
redmatrix
d84b3cfc3c remove file/attachments when their associated photos are removed 2015-06-16 17:50:15 -07:00
Mario Vavti
40ee0d41dc fix deleting of album for remote channel 2015-06-16 12:54:29 +02:00
redmatrix
bc72d3fd26 move profile photos to new methods 2015-06-15 23:37:51 -07:00
redmatrix
bdedda7c6b fix attachment permissions when they also contain an image. 2015-06-15 20:43:49 -07:00
redmatrix
2adc7a51ad photo upload: pass in the contact_allow and resource_id via include/attach.php 2015-06-15 19:52:17 -07:00
redmatrix
859a2ac8ef DB changes for some channel flags 2015-06-15 17:28:52 -07:00
redmatrix
be0459a98b convert the abook fields 2015-06-14 21:08:00 -07:00
redmatrix
f0b255b1a9 more file/photo merge work 2015-06-14 17:28:51 -07:00
redmatrix
9642728e7d first cut at merging files and photos, not yet well integrated but they are integrated 2015-06-14 16:50:24 -07:00
redmatrix
b7be79c5e7 isolate the os_storage flag 2015-06-13 15:57:28 -07:00
redmatrix
3f0009ccd7 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	util/messages.po
 2015-06-13 15:02:51 -07:00
redmatrix
e838647e3a Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-06-11 22:48:01 -07:00
redmatrix
6562820175 make cloud work again 2015-06-11 22:47:45 -07:00
redmatrix
485b19958e don't provide a connect button on the sys channel profile sidebar 2015-06-11 22:46:37 -07:00
redmatrix
41085ae03f start on the DAV/photos merger 2015-06-11 22:32:08 -07:00
redmatrix
5733491ac8 more work on items 
and

Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	include/items.php
	view/it/messages.po
	view/it/strings.php
 2015-06-11 17:56:56 -07:00
redmatrix
8812f183a2 the hubzilla version of this function 2015-06-11 16:11:59 -07:00
redmatrix
dc7de12991 hubzilla compatibility function 2015-06-11 15:52:37 -07:00
redmatrix
b2c5020af7 diaspora disallowed by default 2015-06-10 18:51:39 -07:00
redmatrix
ca870dbf31 more work on item table optimisation 2015-06-10 16:59:04 -07:00
redmatrix
2128d5a256 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-06-10 15:47:23 -07:00
redmatrix
29d9d38d7f retire old Friendica RINO encryption functions 2015-06-09 22:24:24 -07:00
redmatrix
eb6a1f8387 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-06-09 19:39:21 -07:00
redmatrix
d08c43d80c toggle diaspora protocol on a per-channel level in addition to the existing per site setting. Default is enabled if the site setting is enabled. 2015-06-09 18:50:11 -07:00
redmatrix
03357481f7 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	install/schema_mysql.sql
	mod/home.php
	mod/page.php
	view/nl/messages.po
	view/nl/strings.php
 2015-06-09 16:52:00 -07:00
redmatrix
39f0e6fe62 add site_dead flag to prevent delivery to dead sites. Allow sys channel webpages to be viewed even if site is configured "block public". 2015-06-08 16:55:17 -07:00
redmatrix
7cbc504874 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-06-02 17:47:47 -07:00
redmatrix
b2fde73952 asjld work 2015-06-02 17:46:22 -07:00
redmatrix
c1e139a550 error in directory bbcode image filter 2015-05-31 22:22:37 -07:00
redmatrix
84c085dcd7 bare bones ASLD 2015-05-31 22:16:14 -07:00
redmatrix
f3b95f591a Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-05-31 19:26:00 -07:00
redmatrix
5cc5e0fafd some basic background work for activitystreams-json-ld-2.0 conversions 2015-05-31 18:35:35 -07:00
redmatrix
cd3284d081 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-05-30 15:04:11 -07:00
redmatrix
edd228decb strip images from directory text entries 2015-05-30 15:03:44 -07:00
Mario Vavti
5040506184 should not redefine $var in the function call 2015-05-29 17:59:31 +02:00
Mario Vavti
2514af6524 fix menu render for menu item edit - menu preview 2015-05-29 17:51:50 +02:00
Mario Vavti
b8d3280763 some fixes to make menu sharing work and expose it in the ui. 2015-05-29 13:08:01 +02:00
redmatrix
3a9139f76e there was a reason we included that file 2015-05-28 22:06:22 -07:00
redmatrix
9ff988e3d7 parse error 2015-05-28 21:27:48 -07:00
redmatrix
07203c1de3 another case of committing with unsaved changes in a second window 2015-05-28 20:54:57 -07:00
redmatrix
8fe3daab21 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	install/schema_mysql.sql
	mod/impel.php
	view/pt-br/messages.po
	view/pt-br/strings.php
 2015-05-28 19:06:31 -07:00
redmatrix
0f09a4499b add menu_created, menu_edited fields to DB 2015-05-28 16:59:56 -07:00
redmatrix
12c17f1265 menu encoding for sharing/exchange 2015-05-27 21:09:21 -07:00
redmatrix
b381ec5734 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	mod/impel.php
 2015-05-27 19:27:38 -07:00
redmatrix
11301d51a5 some high-level stuff we may need for shareable menus. Also make the client register function do the right thing even though I refuse to make it work. If **you** want service federation with things like pumpio and openid connect, it's time for **you** to put your own skin in the game and quit treating project volunteers like excrement just because you can't get up off your lazy buttocks. 2015-05-27 17:30:36 -07:00
redmatrix
5a889558aa Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-05-27 16:02:16 -07:00
redmatrix
3ecc9efd8d fix for forked thread on diaspora 2015-05-27 16:01:51 -07:00
Mario Vavti
33a7f76ebc Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-05-27 15:26:12 +02:00
Mario Vavti
3d79d4f577 define some custom attributes and html5 elements for htmlpurifier 2015-05-27 15:25:45 +02:00
Mario Vavti
5ccc9e1b8d make it possible to include menus in blocks - this will only work in html blocks of course 2015-05-27 15:21:30 +02:00
redmatrix
3fdf1ac458 revert for now 2015-05-27 01:49:47 -07:00
redmatrix
07e8fe1b1c Comments need to have some kind of routing instructions. 2015-05-26 21:00:27 -07:00
jeroenpraat
ae69bf54a6 Update api.php 
one comma to much
 2015-05-26 22:20:45 +02:00
redmatrix
06eae98e53 placeholder for dynamic rego 2015-05-25 22:50:36 -07:00
redmatrix
9e6e41c6cb slow but forward progress on dynamic client registration 2015-05-25 21:31:23 -07:00
redmatrix
9a0264f5d2 some work on issue #329 2015-05-25 19:17:35 -07:00
redmatrix
851f2f64df Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	index.php
	mod/setup.php
 2015-05-24 15:50:05 -07:00
Habeas Codice
1354616787 one more 2015-05-24 09:30:31 -07:00
Habeas Codice
b15a68f05d avoid db compatibility issues 2015-05-24 09:26:12 -07:00
Mario Vavti
57d520e69f logic has changed - this is not needed anymore 2015-05-24 15:09:30 +02:00
Mario Vavti
125cd5e32b should not call prepare text here anymore 2015-05-24 14:57:01 +02:00
Klaus
1ce3d01bb8 Merge pull request #332 from solstag/zotfeedcleanup 
Import security only when necessary, use correct variable in log
 2015-05-24 03:12:25 +02:00
redmatrix
7f9e4d6add federation problem from diaspora comments relayed through red channels due to typo 2015-05-23 15:24:16 -07:00
redmatrix
11861949bb add channel_id to local_dir_update hook 2015-05-23 15:19:50 -07:00
redmatrix
45259fed14 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-05-23 15:10:18 -07:00
redmatrix
ee14657863 add local_dir_update hook 2015-05-23 15:07:24 -07:00
Mario Vavti
f575ef551d use $a->data instead of $a->page for $content and ad another library for use with webpages - foundation 2015-05-23 22:19:02 +02:00
Alexandre Hannud Abdo
760f17b173 Import security only when necessary, use correct variable in log 
Just some cleanup, seemed like the intent of previous changes was so
 2015-05-22 10:27:17 -03:00
redmatrix
5795e2a58b more migration of page types 2015-05-21 22:17:17 -07:00
redmatrix
3763f74a10 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	include/items.php
	include/text.php
	mod/item.php
	view/nl/messages.po
 2015-05-20 20:49:06 -07:00
redmatrix
c10a4ca9c7 re-arrange the html cache a bit 2015-05-20 20:28:16 -07:00
redmatrix
62df06b3d6 cloning abook entries was broken in several ways if the target xchan wasn't available on the clone site. This should make it less broken. 2015-05-20 20:20:35 -07:00
redmatrix
0826c5fd96 don't allow item_id to update without a valid post id 2015-05-20 19:18:32 -07:00
redmatrix
c55d13a836 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-05-20 18:48:05 -07:00