Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-24 03:15:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
14921 commits 7 branches 31 tags 160 MiB
Commit graph

5200 commits

Author SHA1 Message Date
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
redmatrix
6466774b6e PRIVACY: possible privacy leakage under a defined set of circumstances 2015-05-20 18:46:23 -07:00
Mario Vavti
578d21120a make design elements translateable 2015-05-20 08:34:40 +02:00
redmatrix
e68a00d381 more db structure 2015-05-19 22:43:24 -07:00
redmatrix
507dfb9f85 add rot47 to the mix. This shouldn't affect the speed to any measurable degree. 2015-05-19 21:51:48 -07:00
redmatrix
c78869e437 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	view/nl/messages.po
	view/nl/strings.php
 2015-05-19 17:36:11 -07:00
Mario Vavti
3471e98989 remove dbg code 2015-05-19 21:09:35 +02:00
Mario Vavti
5641d81f03 be verbose about what type of element (block, layout, webpage) is beeing installed 2015-05-19 21:07:43 +02:00
redmatrix
77e2ef45f0 mail_obscure - AES-256 is way too slow, simplify. Ideally a substitution cipher would be adequate for our requirements. 2015-05-19 02:16:12 -07:00
redmatrix
c11b1f8b0d vsprintf error 2015-05-18 22:07:38 -07:00
redmatrix
e521da05da consensus items not working correctly and make the collections widget abide by the corresponding feature setting. This needs to be backported as it is borken in redmatrix. Also provide the ability to change the number of most recent expanded comments to conversations on a site-wide basis, increase it to 3 by default. We may also want this as a personal setting. 2015-05-18 21:32:55 -07:00
redmatrix
da7abbb089 bring the new photo schema into play 2015-05-18 19:43:53 -07:00
redmatrix
4c319a98a8 fix some merge errors 2015-05-18 17:20:59 -07:00
redmatrix
2dd0e7f6bd Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	view/nl/messages.po
	view/nl/strings.php
 2015-05-18 15:58:13 -07:00
Mario Vavti
9b1e540880 if block title contains $content but $content title is empty do not show an empty <h3> tag 2015-05-18 22:29:13 +02:00
Mario Vavti
9b64301e0c remove dbg code 2015-05-18 22:19:08 +02:00
Mario Vavti
4e3583ab45 allow block title to contain $content title 2015-05-18 22:18:01 +02:00
redmatrix
7c7a5cba8f Merge branch 'master' into tres 2015-05-17 19:49:36 -07:00
redmatrix
76558df966 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	include/bb2diaspora.php
	include/diaspora.php
	include/enotify.php
	mod/admin.php
	mod/cloud.php
	mod/dav.php
	mod/home.php
	mod/invite.php
	mod/like.php
	mod/mitem.php
	mod/p.php
	mod/pubsites.php
	mod/setup.php
	mod/siteinfo.php
	util/messages.po
 2015-05-17 19:48:57 -07:00
redmatrix
ac3b886cc4 missing $ 2015-05-17 19:00:17 -07:00
redmatrix
f985c08d12 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-05-17 18:19:49 -07:00
redmatrix
3b859aa9ef Implement permission checking for OAuth clients using the xperm table. Currently 'all' permissions are applied to OAuth clients which gives them the same rights as the channel owner and full access to API functions as the channel owner. However, individual permissions can now be created. These mirror the permission names from the normal permission table (although it isn't required that they do so). Lack of an xp_perm entry for the specified permission and lack of an 'all' override indicates permission denied. 2015-05-17 18:14:50 -07:00
redmatrix
7233967ad5 Merge pull request #322 from dawnbreak/master 
Add functions to parse and get some values from php.ini.
 2015-05-18 09:41:53 +10:00
redmatrix
1cca24dfdc Merge pull request #323 from dawnbreak/docu 
Add some more documentation to attach_store()
 2015-05-18 09:41:32 +10:00
redmatrix
a7071b17c0 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-05-17 16:35:17 -07:00
redmatrix
91d7b0f7eb more work isolating the projectname from core. 2015-05-17 16:28:16 -07:00
Klaus Weidenbach
6757e86e85 Add some more documentation to attach_store() 2015-05-17 01:24:47 +02:00
Klaus Weidenbach
e2980e871f Add functions to parse and get some values from php.ini. 
Get upload limits from php.ini. These functions will be used for checking
against upload limits and to give information in the frontend.
Wasn't sure in which file to put these functions, so I created a new
one include/environment.php.
 2015-05-16 11:25:32 +02:00
Mario Vavti
70fa00c014 allow a block to contain $content 2015-05-15 22:20:45 +02:00
redmatrix
a6cb90c81c Merge branch 'master' into tres 
Conflicts:
	include/Import/refimport.php
	include/activities.php
	include/attach.php
	include/event.php
	include/externals.php
	include/identity.php
	include/items.php
	include/notifier.php
	include/photos.php
	include/taxonomy.php
	include/zot.php
	mod/channel.php
	mod/connedit.php
	mod/events.php
	mod/item.php
	mod/like.php
	mod/manage.php
	mod/mood.php
	mod/ping.php
	mod/poke.php
	mod/subthread.php
	mod/tagger.php
	mod/thing.php
 2015-05-14 18:02:29 -07:00
redmatrix
475dc7b686 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	boot.php
	include/api.php
	include/enotify.php
 2015-05-13 17:07:12 -07:00
redmatrix
d6f98e6511 product was a bad string to use because we may require it for e-commerce, and RED_PLATFORM is equally problematic for other reasons. 2015-05-13 16:01:00 -07:00
redmatrix
018e702281 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	mod/mitem.php
	view/nl/strings.php
 2015-05-12 19:00:54 -07:00
redmatrix
1e0e812440 provide a method for loading site/custom widgets 2015-05-12 18:11:54 -07:00
redmatrix
1970670596 replace project name with $product or $Product in strings to avoid merge issues across different project names. Currently a place-holder. The strings themselves have not yet been modified. 2015-05-12 17:06:47 -07:00
redmatrix
f2a0dac653 fix a couple of miscellaneous errors which showed up in the logs 2015-05-11 22:57:12 -07:00
redmatrix
0a644a2f41 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	mod/mitem.php
	view/de/messages.po
	view/de/strings.php
 2015-05-10 13:26:44 -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
redmatrix
37a63365f1 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-05-07 16:44:28 -07: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
redmatrix
90591bcbc9 missed one... 2015-05-06 22:56:08 -07:00
redmatrix
d01206af5a forgot to save 2015-05-06 21:43:52 -07:00
redmatrix
e85593e970 Hopefully this will make item_cache the default 2015-05-06 21:43:15 -07:00
redmatrix
25b599a4bd convert ITEM_WALL from bitfield to standalone 2015-05-06 21:03:33 -07:00
redmatrix
75b8bfc07a Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-05-06 18:39:12 -07:00
redmatrix
f17c1f9694 no need to obscure the diaspora signature if we're not obscuring the posts 2015-05-06 18:38:30 -07: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
redmatrix
c9ec4f46b6 for hubzilla we won't be obscuring items, only private mail, this will allow us to search and cache private posts 2015-05-05 18:36:05 -07:00
redmatrix
5b5f0666f9 second pass name change 2015-05-05 03:59:51 -07:00
redmatrix
a3c37f1458 first pass name change 2015-05-05 03:56:10 -07:00
Mario Vavti
ad7a629b96 remove obsolete linebreak 2015-05-04 15:04:21 +02:00
friendica
b467dc4f00 Merge branch 'master' into tres 2015-05-01 13:19:19 -07: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
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
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
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
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
friendica
972780c3ce whitespace 2015-03-09 16:28:06 -07:00
friendica
26a414fe4b make network page default options work more or less universally instead of just from the navbar, and fix some saved-search weirdness related to the delete-term icon 2015-03-09 16:27:12 -07:00
friendica
e7d3244276 Allow site to over-ride directory options. Bugger off. 2015-03-09 15:16:52 -07:00
Alexandre Hannud Abdo
904596c7da Fix missing value in insert for default closeness 2015-03-09 03:07:48 -03:00
friendica
b5683bfac4 change default affinity (abook_closeness) to 80 for all new connections going forward (was 99). This way it can be adjusted down later without requiring you to change all your existing connections upward (since your existing connections are likely all sitting at 99 at the moment). The default setting is also configurable with a pconfig system.new_abook_closeness 2015-03-08 14:11:38 -07:00
friendica
480dac1af2 add reddress to profile - but all is not as it seems. Copy to clipboard is blocked because it isn't really a reddress and won't work if you copy it and try and use it somewhere. We should really convert the symbol back to '@' on copy and allow it to be copied, but this isn't as easy as it sounds and is left as an exercise for the community. If we just allow it to be copied we'll get a lot of bugs that making friends doesn't work. It does, but that isn't a legitimate reddress and even if we made allowances for it, Diaspora and Friendica and other webfinger based services wouldn't and would just say it can't be found or it's an illegal address. So if we block copy we'll just get bugs that it can't be copied. Eventually somebody will see this checkin and take it on themselves to figure out how to fix the address when copied to clipboard and then allow it to be copied. And there will be joy. 2015-03-07 23:35:56 -08:00
friendica
53e908d7b7 when fixing "naked links" make sure not to double link double urls as seen in archive.org - which has the complete unescaped target url, scheme and all, as part of its own. 2015-03-06 20:45:26 -08:00
friendica
f6da235a7d major cleanup of directory options 2015-03-05 23:31:01 -08:00
friendica
22391a2437 straighten out some directory stuff, which required some Comanche structural changes 2015-03-05 18:24:49 -08:00
RedMatrix
202f3c5dc1 Merge pull request #918 from dawnbreak/master 
RedDAV: fix renaming files.
 2015-03-06 10:26:04 +11:00
Klaus
2b45bf1908 RedDAV: fix renaming files. 
How can no one have spot this bug yet?!? Is no one using WebDAV?
Took me 2 days to figure out it was not my RedDAV rewrite, but that this should have never worked. :-!
 2015-03-06 00:21:32 +01:00
friendica
2ea162136e the link icon on comments now calls the link parsing tool (just like the main editor window). Eventually the link specific icons (image, link, audio, video) will all be handled by inserting a link using the link icon (here and in the main editor window) and the separate buttons will go away. We also need to tie this to oembed so that there's one place to insert a link - no matter what kind of link it is, and we'll try to find the best way to render that as content. Similarly upload will upload content, no matter what kind of content; and we'll likewise try and figure out the best way to present whatever content was uploaded (img, file, audio, video, whatever). 2015-03-04 20:00:54 -08:00
friendica
76eb0a7e56 Deprecate the "wall uploads" photo album. Photo uploads (from any source) with no album specified will go now into an album based on YYYY-MM. 2015-03-04 18:55:17 -08:00
friendica
ad3b4da3ff missing comma 2015-03-04 18:23:54 -08:00
friendica
1d5d80808c don't re-use $x 2015-03-04 18:11:47 -08:00
friendica
011ccd57f6 add queue priority 2015-03-04 17:56:07 -08:00
friendica
410f3335a9 parse_url: if url returns an image/audio/video file instead of a webpage, return the bbcode for the appropriate content type. This results in two web fetches of the url in question, but the first one is just a HEAD. This way we won't try and download and parse an entire video. TODO: img's are checked to see if they should be zid-ified, but audio/video currently are not. 2015-03-04 15:17:39 -08:00
friendica
64e7c8b20f notes on what's needed to fix the queueing algorithms. 2015-03-04 01:26:02 -08:00
friendica
6d92ac7e58 enable sql_extra on pdl_selector 2015-03-03 16:00:24 -08:00
friendica
c551ca430b Merge https://github.com/friendica/red into pending_merge 2015-03-03 15:56:19 -08:00
friendica
99e4d2362c I'm going to use the site_update timestamp to indicate whenever we successfully connect with a site. This way we can mark hubs dead on non-directory servers; but we have to wait before implementing this until we have a history of site_update being updated. 2015-03-03 15:54:38 -08:00
friendica
85f79990af don't let a zot-finger bring a dead hub back to life unless it's the site we're currently talking to. 2015-03-03 15:22:24 -08:00
Klaus Weidenbach
0d601563d0 Some cleanups and documentation. 
Fixed some wrong variable names.
Initialized some variables before using them.
Removed some checks for STATUSNET_PRIVACY_COMPATIBILITY in
include/security.php as it does not seem to be defined anywhere.
 2015-03-04 00:15:24 +01:00
friendica
e6eee5ba92 tagcloud tweaks 2015-03-02 11:09:38 -08:00
zottel
e4a2e353d8 make public delivery to contacts or any connections work again 
$hash wasn't defined in this case
 2015-03-02 11:05:03 +01:00
friendica
7d0783c4dd increase the dynamic range of the tag clouds slightly. 2015-03-01 23:50:31 -08:00
friendica
36af426538 Nag hub admins with self-signed certs to fix them. Otherwise we'll just have to start 
marking them as dead sites.
 2015-03-01 20:14:42 -08:00
friendica
d83460cd2a The never ending saga of parent = 0 bugs on Dreamhost. 2015-03-01 18:58:50 -08:00
friendica
ba7bdd79b7 queue management actions. Still needs further work such as indication of last successful connection or indication that the hub was marked offline, but these are potentially expensive queries. 2015-03-01 15:55:27 -08:00
friendica
2b44c5fc72 Fix a couple of places where we weren't checking for dead hublocs. Add a function to mark a hubloc dead. 2015-02-27 13:43:12 -08:00
friendica
4162dfe43f Merge https://github.com/friendica/red into pending_merge 2015-02-26 14:21:26 -08:00
friendica
09f80270de loop breaker 2015-02-26 14:20:43 -08:00
Habeas Codice
82bb216952 more fake null shenanigans 2015-02-26 08:23:02 -08:00
Habeas Codice
f55e210120 Revert "more fake null shenanigans" 
This reverts commit b57010e3da.
 2015-02-26 08:22:15 -08:00
Habeas Codice
b57010e3da more fake null shenanigans 2015-02-26 08:20:29 -08:00
friendica
ac3384e661 syntax - missing arg 2015-02-25 17:24:09 -08:00
friendica
b9e485be54 this may actually fix the deliver loop when deleting existing items. It's hackish but I don't see any other way out. 2015-02-25 16:51:39 -08:00
friendica
b32841e2dd Found the cause of the delete looping, and I can prevent it going forward. The issue remains what to do about comments which are already in the DB and have ITEM_ORIGIN incorrectly set. We can't exactly reset them because the "original" context has been lost. (Sorry but couldn't resist an insider pun that none of you will be able to follow anyway). Read the comments. 2015-02-25 15:27:33 -08:00
friendica
1a071ea4f0 call post_local hooks prior to storing a post that is going to be sourced. There are some fields in the actual stored item that may change when we start the second delivery chain so a few plugins may not deal with these items correctly. Since we only source public items these effects will be slight. 2015-02-25 03:16:43 -08:00
friendica
2a2cc309ce solve some (hopefully most) missing delivery issues 2015-02-25 01:39:45 -08:00
friendica
1434130264 don't send deleted items upstream - only downstream. 2015-02-24 20:21:21 -08:00
friendica
08f054130f require access token to view, query, or join directories in private realms, if the realm is so configured. 2015-02-24 16:36:27 -08:00
friendica
11df605c2e support rel=me on channel "homepage" url 2015-02-24 00:45:03 -08:00
friendica
d29de912b4 public_recips cleanup 2015-02-23 16:27:12 -08:00
friendica
fbbcc10025 apply fix from 8d03774 to z_post_url also 2015-02-23 11:33:16 -08:00
zottel
8d03774666 make redirections restriction in z_fetch_url() work 2015-02-23 14:53:10 +01:00
friendica
1383915f86 notes about private realm registrations and multiple primary directories. 2015-02-22 22:58:09 -08:00
friendica
d0e7fc76cd no longer needed 2015-02-22 20:59:24 -08:00
friendica
e1cf396feb remove the new session functions from the trunk. Don't yet know if they'll come back or not. 2015-02-22 20:58:11 -08:00
friendica
324e59b1b6 remove these functions for now. 2015-02-22 18:06:33 -08:00
friendica
0109c0fcf3 fi8x the typo 2015-02-22 17:37:57 -08:00
friendica
86aefe0e01 new session functions 2015-02-22 15:27:45 -08:00
Habeas Codice
ffd47e6b95 catch negative ages 
nix extra var
 2015-02-20 19:48:51 -08:00
friendica
8c71e0e861 directory interface cleanup and documentation so that debugging realms won't be stabbing in the dark. 2015-02-19 17:42:18 -08:00
friendica
8db3677546 Diaspora tag replacement was wretchedly buggy. Use our standard tag replacement calls instead. 2015-02-19 16:29:49 -08:00
friendica
fc52536ce7 diaspora: move reshare encapsulation after tag parsing, since it seriously screws up the tag parser and reshares end up with a lot of unlinked tags. 2015-02-19 15:07:41 -08:00
RedMatrix
6dfc41ac7a Merge pull request #901 from zzottel/master 
also deliver public posts to channels with channel_w_stream = PERMS_AUTHED
 2015-02-19 13:40:41 +11:00
RedMatrix
4a75d2d754 Merge pull request #900 from einervonvielen/doc_dev_beginner_corrections 
Changed bbcode [toc] and changed doc for beginning deveopers
 2015-02-19 13:40:23 +11:00
zottel
d0fe0b5d5f fix parens mismatch from last commit 2015-02-18 11:48:05 +01:00
zottel
9d745cd072 also deliver public posts to channels with channel_w_stream = PERMS_AUTHED 2015-02-18 11:44:43 +01:00
marijus
2fbb6a5ff5 do not send activity to channels with no permission to view filestorage 2015-02-18 10:41:38 +01:00
friendica
e00be4de23 The Diaspora communications policies allow comments to public posts literally from anybody. Allow this policy model by default for commenters from that network. This policy decision can be set or disabled on the addon/features settings page. 2015-02-17 19:47:36 -08:00
friendica
33e406d7fc make tag clouds honour the full permissions repertoire, not just yes/no public/private, but who are you and what tags can you see 2015-02-17 18:13:20 -08:00
friendica
3d9273afad Merge https://github.com/friendica/red into pending_merge 2015-02-16 17:01:41 -08:00
friendica
533f39debe bring back like/dislike summaries on photos 2015-02-16 17:01:13 -08:00
Habeas Codice
d9d029470f Merge branch 'master' of https://github.com/friendica/red 2015-02-16 15:13:31 -08:00
Habeas Codice
ca8e221018 normalize age data 
mysql has type tinyint(3) which probably turns into a 24-bit value, but
postgres uses 3-digit decimal as its constraint (probably what the mysql
schema was intended to do). either that or mysql silently truncates while
postgres respects the constraint. Either way, bad data gets in unchecked, now
it's checked.
 2015-02-16 15:09:43 -08:00
Habeas Codice
972fc91e12 remove superfluous non-boolean boolean 2015-02-16 15:08:53 -08:00
friendica
b4f639239f mopping up the public site ratings 2015-02-16 11:09:12 -08:00
friendica
1c4b919980 force site_url to be lowercase when stored. Otherwise rating hubs on postgres could get real messy. 2015-02-15 23:45:22 -08:00
friendica
a5f7df4667 issue #860, replace br html element with linefeed between table rows 2015-02-15 19:15:55 -08:00
Einer von Vielen
6ed8fb30b8 Changed bb code [toc] to make it more flexible 
This usage is know closer to the original usage of
http://ndabas.github.io/toc/

Changed:
- jquery.toc.js: Do not check for empty headings
- bbcode.php: Added processing of [toc] with parameters
- main.js: Use the default params for jquery.toc.js
- bbcode.html: Added more help for [toc] and corrected some html
 2015-02-14 20:33:51 +01:00
friendica
59828593c1 some ratings fixes 2015-02-13 14:25:04 -08:00
friendica
46eda6e723 Merge https://github.com/friendica/red into pending_merge 2015-02-13 13:05:14 -08:00
friendica
7bb2e25ea0 missing param 2015-02-13 13:04:31 -08:00
RedMatrix
39b7faca9a Merge pull request #897 from solstag/tagfix 
Fixes tag delivery regex for when multiple tags are present
 2015-02-13 20:28:07 +11:00
Alexandre Hannud Abdo
8696795ce6 Fixes tag delivery regex for when multiple tags are present 
Previous regex would cause matches to span several tags
when present, thus never recognizing the mention.
 2015-02-13 07:10:29 -02:00
marijus
fb198b8a05 item_unseen update 2015-02-13 10:01:26 +01:00
friendica
4b513d3322 issue #896 2015-02-12 19:22:07 -08:00
friendica
da2349bb6a provide relief to sites that are severely impacted by the slow ITEM_UNSEEN searches. This does not incorporate any other flag optimisations as that will require a major DB update and possibly involve significant downtime. This is just to bite off a little chunk now and provide some much needed relief. 2015-02-12 17:45:25 -08:00
Alexandre Hannud Abdo
6ec44793b3 Dot not trim body in order to avoid issues with signature checks 2015-02-12 05:44:24 -02:00
friendica
2b2fa5a973 issue #843 2015-02-11 20:38:06 -08:00
friendica
78b8754856 Merge https://github.com/friendica/red into pending_merge 2015-02-11 16:12:47 -08:00
friendica
c62d605608 well that was certainly fun. And the reason why likes and other acitivity deletions weren't propagating. Hopefully this is the last reason and there aren't more lurking further down the chain. 2015-02-11 16:11:21 -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
583af02f71 fix permissions 2015-02-10 20:43:04 -08:00
friendica
149a588b11 ensure we have permission before displaying buttons 2015-02-10 20:21:54 -08:00
friendica
79223b6b3d item voting tools 2015-02-10 19:10:18 -08:00
friendica
79da33dafd improvements in duplicate like detection, especially w/r/t event participation 2015-02-10 17:49:46 -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
55c3c54ef6 apply max_import_size to Diaspora posts 2015-02-09 19:54:48 -08:00
friendica
0f494a5a2a Merge https://github.com/friendica/red into pending_merge 2015-02-09 16:00:03 -08:00
friendica
0e74ebc6a9 title missing sending to diaspora (which doesn't support titles but let's not go there). 2015-02-09 15:12:15 -08:00
marijus
e2aa0a273c improve sql query 2015-02-09 21:46:22 +01:00
friendica
d473c3c500 fix for service_plink() after observing it in the wild 2015-02-09 00:43:38 -08:00
friendica
08b757a22c Merge branch 'master' into tres 
Conflicts:
	mod/events.php
	view/css/mod_events.css
 2015-02-08 20:57:37 -08:00
friendica
64191de5e7 generate the correct service permalink 2015-02-08 18:31:51 -08:00
friendica
7edab47658 get_rel_link broken - also weekly doc updates 2015-02-06 02:07:10 -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
abcc70722c event form cleanup backported from trinidad - still need to style the checkboxes 2015-02-05 19:37:55 -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
fe8a08a474 over-ride permissions for sys channel delivery from diaspora 2015-02-05 17:29:35 -08:00
friendica
153719a20a another issue with diaspora postings to sys channel - sys has no connections, hence no abook records. 2015-02-05 16:13:26 -08:00
friendica
b1eebaaedb Merge https://github.com/friendica/red into pending_merge 2015-02-05 15:29:36 -08:00
friendica
331c72b3be author profile photo in reshare wasn't linked 2015-02-05 14:46:08 -08:00
marijus
1abb17c880 typo 2015-02-05 21:46:46 +01:00
marijus
1d5321798a forgot to remove some debug stuff 2015-02-05 21:31:05 +01:00
marijus
be0e6ed6d7 make file activity respect parent dir permissions work 2015-02-05 21:16:21 +01:00
Habeas Codice
9ed23f9081 Merge branch 'master' of https://github.com/friendica/red 2015-02-05 09:15:39 -08:00
Habeas Codice
88488fdfbb escape dates 2015-02-05 09:15:26 -08:00
friendica
646a874390 diaspora public posts not delivering to sys channel if there were no other subscribers 2015-02-04 20:28:36 -08:00
friendica
5a0ccbfcf3 forgot to add the self exclusion 2015-02-04 18:31:12 -08:00
friendica
24355430a8 allow anybody to view ratings - including oneself. Only allow authenticated folks to edit them. 2015-02-04 18:26:59 -08:00
friendica
6e84dbe493 add 'view ratings' to the widget. It's actually two stacked widgets rather than a widget with two entries. That's the only way we can keep the theming consistent with the rconnect button. 2015-02-04 18:18:04 -08:00
friendica
24b198a50c honour the rating enable setting (which we really do need to rename since it isn't poco any more) 2015-02-04 17:34:53 -08:00
friendica
561bab4ece remote rating and addition of rate-me to channel profile sidebar 2015-02-04 17:32:29 -08:00
friendica
98c05ae911 Merge https://github.com/friendica/red into pending_merge 2015-02-04 15:51:57 -08:00
friendica
3988948516 first cut at rating widget. The flaw is that it is limited because it requires local_channel() (formerly local_user()). We need to extend this to take you home like rpost does if you're logged in as remote_channel() - and/or we need zot to send the rating message to the source channel and target in addition to the directories. 2015-02-04 15:48:39 -08:00
marijus
e5849f9432 not quite there yet but getting closer a little 2015-02-04 22:55:22 +01:00
friendica
0cc29af6d0 order ratings friends first 2015-02-03 22:55:01 -08:00
friendica
4ead2cd79d final cleanup on ratings feature 2015-02-03 21:19:29 -08:00