harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,925 Commits 6 Branches 36 Tags
dad4ac6c899805fd6311fc9c47a41b6edb265f12
Commit Graph

4800 Commits

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