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

436 Commits

Author SHA1 Message Date
redmatrix 75d521d42a menu import and sync 2015-09-08 17:52:39 -07:00
redmatrix 650e98b2a9 work on event sync 2015-09-07 21:01:49 -07:00
redmatrix 6d1b64065a consolidate import_items/sync_items 2015-09-07 18:14:30 -07:00
redmatrix d79e81a069 import and sync chatrooms 2015-09-03 18:44:40 -07:00
redmatrix f3cb17ac3b app sync 2015-09-02 23:09:51 -07:00
redmatrix c22da3da1c start to modularise the clone import and sync functions 2015-09-02 20:12:40 -07:00
redmatrix 69fc10d5ad Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/zot.php
 2015-09-02 15:49:50 -07:00
zottel 441946b9d3 really fix post filtering 2015-09-02 15:49:07 +02:00
redmatrix 6cc60ba477 initial work on obj import, rename import_profile_photo to import_xchan_photo to more accurately state its purpose. 2015-09-01 22:03:10 -07:00
redmatrix eac9c8a7e6 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/zot.php
	install/update.php
	util/messages.po
 2015-08-23 20:23:55 -07:00
redmatrix b1f091e4d7 issues with abook sync between hubzilla and red 2015-08-23 17:40:47 -07:00
redmatrix bf190be5b4 issues encountered with hubzilla DB changes, zot_refresh and item_drop and hub sync 2015-08-23 13:27:34 -07:00
redmatrix a4caaefd32 event integration improvements 2015-08-19 16:50:32 -07:00
redmatrix 18bc12c21c Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/zot.php
	util/messages.po
 2015-08-14 22:24:15 -07:00
Alexandre Hannud Abdo 73b30de9cb Properly fix which perms get checked for comments, Mike's solution 2015-08-14 12:21:05 -03:00
redmatrix d140620008 add item validation function 2015-08-13 19:35:57 -07:00
redmatrix ef73880459 reverting 36b5f6ac 2015-08-12 22:48:08 -07:00
redmatrix 0b7365e2db revert 36b5f6ac 2015-08-12 22:37:24 -07:00
redmatrix 2d9d4dfeb3 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	doc/history.md
	mod/import.php
 2015-08-11 22:35:36 -07:00
Alexandre Hannud Abdo 36b5f6acfe Require comment perms only for own posts, allow senders to deliver comments using stream perms. 2015-08-10 18:20:18 -03:00
redmatrix cc5b0cde1d Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	include/diaspora.php
 2015-07-23 21:07:35 -07:00
redmatrix 27fa908233 patch to allow theme based widgets 2015-07-23 18:49:37 -07:00
redmatrix fd8e6f3130 typo 2015-07-19 21:04:02 -07:00
redmatrix 4299ae65a4 abook clone sync - change logic to also unset existing cross-project flags besides just setting them 2015-07-16 18:07:23 -07:00
redmatrix c3dbacfb88 don't including rating stuff from cloned abooks 2015-07-16 17:53:59 -07:00
redmatrix b9fd8b4614 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	include/zot.php
 2015-07-15 18:41:50 -07:00
redmatrix 7db515b77c fix for empty recip array resulting from a mangled xchan 2015-07-15 18:31:37 -07:00
redmatrix 7f6e4d5f4a more clone sync issues across projects 2015-07-15 18:21:04 -07:00
redmatrix 95cf1668de Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-07-15 18:15:25 -07:00
redmatrix 59b67d52e6 clone sync fixes across red/hz 2015-07-15 18:14:19 -07:00
redmatrix e8f19c1e15 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	mod/connedit.php
 2015-07-14 17:10:13 -07:00
redmatrix a5989b0f31 coverup and ignore the illegal string offset message that some sites have been reporting. This does not fix it. A fix would be to examine the data that has been received and find out why it is mangled and trace this back to where it was mangled. 2015-07-14 16:54:16 -07:00
redmatrix dad4ac6c89 incorrect value for hubloc_deleted in zot_get_hublocs() query 2015-07-07 16:06:34 -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 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 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 b381ec5734 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	mod/impel.php
 2015-05-27 19:27:38 -07:00
redmatrix 9a0264f5d2 some work on issue #329 2015-05-25 19:17:35 -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 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 25b599a4bd convert ITEM_WALL from bitfield to standalone 2015-05-06 21:03:33 -07:00
redmatrix a3c37f1458 first pass name change 2015-05-05 03:56:10 -07:00