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

4855 commits

Author SHA1 Message Date
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