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

7911 Commits

Author SHA1 Message Date
redmatrix e062c4e6b5 another tactic to deal with orphan hublocs from re-installs, or at least allow the descendant channel to survive 2015-09-11 14:30:07 -07:00
Michael Meer 755edd2110 ensure that living sites are marked as alive 2015-09-11 14:06:37 +02:00
redmatrix 4abfd4053a sync likes 2015-09-10 19:18:12 -07:00
redmatrix 00b480527a provide remote delivery report at logger_debug level 2015-09-10 17:53:06 -07:00
redmatrix 922d2165b3 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/zot.php
 2015-09-10 16:51:22 -07:00
redmatrix 50e32c3d8a zot_refresh: always try the hubloc pointed to by xchan_addr first 2015-09-10 16:48:08 -07:00
redmatrix 2d94a038a5 ensure connections have a name 2015-09-10 01:21:18 -07:00
redmatrix db58b62235 don't auto-open the editor in forum mode. Save the forum selection text until we open it. 2015-09-09 19:54:16 -07:00
redmatrix 43e064749c major changes to "forum mode" on the network/matrix page 2015-09-09 18:50:15 -07:00
redmatrix 4af339da63 slight hack to improve public forum detection in the forum widget 2015-09-09 18:18:27 -07:00
redmatrix 0a051ff2cd preserve code blocks on item import if channel has code rights. When importing the channel itself, 
turn code access off unless this is the admin.
 2015-09-08 22:46:34 -07:00
redmatrix d702133ded move mod_admin to Comanche finally 2015-09-08 20:48:35 -07:00
redmatrix f13a8f725c export TERM_FILE when mirroring 2015-09-08 19:14:29 -07:00
redmatrix e6690c818d export TERM_FILE when mirroring 2015-09-08 19:13:43 -07:00
redmatrix f0847e6f32 debugging menu sync 2015-09-08 18:40:56 -07:00
redmatrix 50d7554ccd add sync packets for menus 2015-09-08 18:40:19 -07:00
redmatrix b28d3015fe Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/identity.php
 2015-09-08 17:53:43 -07:00
redmatrix 75d521d42a menu import and sync 2015-09-08 17:52:39 -07:00
redmatrix 1ebaacfd5e menu export 2015-09-08 17:50:24 -07:00
redmatrix c6bdf7e891 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-07 22:55:42 -07:00
redmatrix 11e19a06b7 export events 2015-09-07 22:54:43 -07:00
redmatrix 650e98b2a9 work on event sync 2015-09-07 21:01:49 -07:00
redmatrix 508969a183 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-07 20:29:13 -07:00
redmatrix c39e3613a8 create event sync packets 2015-09-07 20:28:02 -07:00
redmatrix 4eec9a2fba Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/items.php
	view/it/messages.po
	view/it/strings.php
 2015-09-07 18:20:47 -07:00
redmatrix 6d1b64065a consolidate import_items/sync_items 2015-09-07 18:14:30 -07:00
Habeas Codice 6711ceb662 fix postgres zotfeed 2015-09-07 16:28:42 -07:00
redmatrix 2f52b6c164 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	util/messages.po
 2015-09-07 04:06:27 -07:00
redmatrix 1b09c64856 PRIVACY: item_private seems to have been removed from permissions_sql checking with an observer. 2015-09-07 03:59:38 -07:00
redmatrix 55ab968edf make js_upload work with hubzilla. It still needs a rewrite. 2015-09-05 17:35:00 -07:00
jeroenpraat fc804751a2 Fix for PHP Fatal error: Function name must be a string in /var/www/hubzilla/include/items.php on line 3325 
Please review if this is correct?
 2015-09-04 12:39:47 +02:00
redmatrix d79e81a069 import and sync chatrooms 2015-09-03 18:44:40 -07:00
redmatrix f7d9523c7d export chatrooms 2015-09-03 18:43:44 -07:00
redmatrix d93e1c84ac Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/identity.php
 2015-09-03 17:28:51 -07:00
redmatrix 2a7ff3018b channel export - don't include linked resource items (photos, events). These items will need to be provided with those objects so that they can be re-linked. 2015-09-03 17:21:20 -07:00
redmatrix f3cb17ac3b app sync 2015-09-02 23:09:51 -07:00
redmatrix 669e111118 add timestamps for syncing apps 2015-09-02 21:07:24 -07:00
redmatrix 837b9224cc Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	doc/credits.bb
	mod/thing.php
 2015-09-02 20:33:58 -07:00
redmatrix c22da3da1c start to modularise the clone import and sync functions 2015-09-02 20:12:40 -07:00
redmatrix d9a67d64b1 Update the credits 2015-09-02 18:04:22 -07:00
redmatrix 2a26c898ca protect from sql injection 2015-09-02 15:52:54 -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 9328edfdcd obscure mail subject in conversation structure 2015-09-01 22:59:06 -07:00
redmatrix 23213a91ed Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-01 22:27:00 -07:00
redmatrix 184c544a24 export apps 2015-09-01 22:26:21 -07: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 c5578d7964 match the redmatrix output format for objects (which is the hubzilla table format) 2015-09-01 21:08:02 -07:00
redmatrix 95cf1aafa0 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-01 21:04:57 -07:00
redmatrix f72a3113f5 add the baseurl so we can easily relocate objects 2015-09-01 21:03:55 -07:00