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

87 Commits

Author SHA1 Message Date
redmatrix 1b83d88fe6 remove references to ref_session_write - can't use 2016-04-11 13:03:34 -07:00
redmatrix 9abd95fad3 static App 2016-03-31 16:06:03 -07:00
redmatrix 1cd3b41825 deprecate $a->get_baseurl() 2016-03-30 22:13:24 -07:00
redmatrix 7732532964 handle UNO move channel operation 2016-03-09 15:56:51 -08:00
redmatrix be2b7c0b5f abconfig 2016-02-29 19:31:52 -08:00
redmatrix 342fda94e4 Provide Zotlabs\Project and System class for querying details about the project/version info. Move these out of /boot.php 2016-02-18 15:24:58 -08:00
redmatrix d8e6fd5df0 provide get_server_role() to abstract different roles and capabilities 2016-02-07 18:11:10 -08:00
redmatrix 021584d782 fix uno import by disabling for now 2016-02-05 23:45:16 -08:00
redmatrix 9b08051703 bring back the ability to ignore a pending connection request without deleting it and without always having it in your face and without jumping through hoops. 2016-01-26 16:57:36 -08:00
ken restivo 312cc415ce Pass in account_id. Required for bulk identity importer. 2015-11-18 00:26:18 -08:00
ken restivo 1f2a408be0 Use provided account_id instead of user's logged in account_id. Necessary for bulk importer. 2015-11-18 00:03:59 -08:00
ken restivo 10ccdbacba Bust out import_account() into a separate function to allow importing accounts by proxy, i.e. for admins to import a channel on behalf of a user. 2015-11-10 23:07:28 -08:00
redmatrix b33a9a71f6 more work on import & sync of private mail and conversations 2015-10-14 17:40:50 -07:00
redmatrix e45958b967 add plugin hooks to channel sync/import/export 2015-09-23 18:27:04 -07:00
redmatrix 4abfd4053a sync likes 2015-09-10 19:18:12 -07:00
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 c83da012ff profile import error #34 2015-09-03 16:19:59 -07:00
redmatrix c22da3da1c start to modularise the clone import and sync functions 2015-09-02 20:12:40 -07:00
redmatrix d105f324af import apps 2015-09-01 22:27:09 -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 417da13353 this is a bit harder than anticipated. 2015-08-31 21:12:37 -07:00
redmatrix 039f56f390 mostly doc tweaks, some import/export work 2015-08-31 20:58:05 -07:00
redmatrix d2fec56456 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	mod/import.php
 2015-08-26 16:00:13 -07:00
redmatrix bd2d99aced import fixes 2015-08-26 15:56:32 -07:00
redmatrix 71308fe8c1 syntax error in last checkin 2015-08-26 13:50:51 -07:00
redmatrix da649e397e import fixes 2015-08-26 13:49:07 -07:00
redmatrix b634c08d0e resolve conflict 2015-08-11 22:41:27 -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
redmatrix 81c740178d convert abook_flags from hubzilla during cloning 2015-08-10 16:16:26 -07:00
redmatrix 0d1a541e88 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	mod/import.php
 2015-07-14 22:40:22 -07:00
redmatrix 9b15dbde1c group fixes to import 2015-07-14 22:38:04 -07:00
redmatrix 5487b22dd7 fix import of group members 2015-07-14 22:19:21 -07:00
redmatrix 89fbfd2bf8 more stuff to resume failed imports 2015-07-14 22:04:07 -07:00
redmatrix a87e318403 log the import progress 2015-07-14 21:30:13 -07:00
redmatrix caaf7192ff provide resumable imports if things go wrong 2015-07-14 21:02:54 -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 d5c085a3c6 cleanup of import to allow cross-product import going one way. Note - items/content are not yet importable 2015-06-30 20:21:09 -07:00
redmatrix 1e3dffc29d Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-06-30 20:19:50 -07:00
redmatrix 86b12ea750 lots of work on clone/import from redmatrix to hubzilla (won't go back the other way) 2015-06-30 20:18:48 -07:00
redmatrix 22cb09f537 warn if export data file is from an incompatible project or if the DB version differs significantly from the current DB. This is to avoid people cloning a hubzilla channel back to red and potentially stuffing up the works. Hopefully we can migrate upwards someday. Downwards is always going to be an issue. 2015-06-29 22:37:18 -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
redmatrix 0ad71b3efa import: Improve the descriptive text for this feature 2015-06-21 19:11:07 -07:00
redmatrix 68534fd5dc some diaspora import issues uncovered during dry-run tests 2015-06-21 17:30:23 -07:00
redmatrix a6b9d1595e automatically gunzip Diaspora export files if we're on a *nix system 2015-06-19 17:18:01 -07:00
redmatrix 6bd90816dd very early attempt diaspora import from diaspora export file. Currently the json export has to be gunzipped prior to uploading and we're net yet adding connections (which should come soon) and we can't import items until they add guids to the export file - so consider it a work in progress. This first attempt should create a channel and get your profile details setup providing there isn't a nickname conflict on the server. That will also be handled later. 2015-06-19 16:39:03 -07:00
redmatrix be0459a98b convert the abook fields 2015-06-14 21:08:00 -07:00
friendica 6679734135 Merge branch 'master' into tres 
Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css
 2015-04-23 19:49:41 -07:00