harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,120 Commits 6 Branches 36 Tags
91bbfcf554d190c1956d16c652ceefb95a18735a
Commit Graph

846 Commits

Author SHA1 Message Date
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 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 db70c76494 diaspora_meta getting double json encoded 2015-08-02 23:05:15 -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 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 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 cc5b0cde1d Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	include/diaspora.php
 2015-07-23 21:07:35 -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 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
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 3c60a0c22c provide any single year of exported items 2015-07-16 20:20:42 -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
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 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 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 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 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 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
Alexandre Hannud Abdo ec23a94b6d Make item_store_update only affect the data we requested 2015-06-20 02:21:25 -03:00
redmatrix be0459a98b convert the abook fields 2015-06-14 21:08:00 -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 ca870dbf31 more work on item table optimisation 2015-06-10 16:59:04 -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 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 3a9139f76e there was a reason we included that file 2015-05-28 22:06:22 -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