Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | static App | redmatrix | 2016-03-31 | 1 | -4/+4 |
| | |||||
* | deprecate $a->get_baseurl() | redmatrix | 2016-03-30 | 1 | -3/+3 |
| | |||||
* | handle UNO move channel operation | redmatrix | 2016-03-09 | 1 | -11/+9 |
| | |||||
* | abconfig | redmatrix | 2016-02-29 | 1 | -0/+15 |
| | |||||
* | Provide Zotlabs\Project and System class for querying details about the ↵ | redmatrix | 2016-02-18 | 1 | -1/+1 |
| | | | | project/version info. Move these out of /boot.php | ||||
* | provide get_server_role() to abstract different roles and capabilities | redmatrix | 2016-02-07 | 1 | -1/+1 |
| | |||||
* | fix uno import by disabling for now | redmatrix | 2016-02-05 | 1 | -0/+9 |
| | |||||
* | bring back the ability to ignore a pending connection request without ↵ | redmatrix | 2016-01-26 | 1 | -1/+1 |
| | | | | deleting it and without always having it in your face and without jumping through hoops. | ||||
* | Pass in account_id. Required for bulk identity importer. | ken restivo | 2015-11-18 | 1 | -1/+1 |
| | |||||
* | Use provided account_id instead of user's logged in account_id. Necessary ↵ | ken restivo | 2015-11-18 | 1 | -3/+3 |
| | | | | for bulk importer. | ||||
* | Bust out import_account() into a separate function to allow importing ↵ | ken restivo | 2015-11-10 | 1 | -3/+13 |
| | | | | accounts by proxy, i.e. for admins to import a channel on behalf of a user. | ||||
* | more work on import & sync of private mail and conversations | redmatrix | 2015-10-14 | 1 | -0/+6 |
| | |||||
* | add plugin hooks to channel sync/import/export | redmatrix | 2015-09-23 | 1 | -0/+2 |
| | |||||
* | sync likes | redmatrix | 2015-09-10 | 1 | -0/+3 |
| | |||||
* | menu import and sync | redmatrix | 2015-09-08 | 1 | -0/+3 |
| | |||||
* | work on event sync | redmatrix | 2015-09-07 | 1 | -0/+7 |
| | |||||
* | consolidate import_items/sync_items | redmatrix | 2015-09-07 | 1 | -50/+4 |
| | |||||
* | import and sync chatrooms | redmatrix | 2015-09-03 | 1 | -0/+3 |
| | |||||
* | profile import error #34 | redmatrix | 2015-09-03 | 1 | -3/+2 |
| | |||||
* | start to modularise the clone import and sync functions | redmatrix | 2015-09-02 | 1 | -204/+30 |
| | |||||
* | import apps | redmatrix | 2015-09-01 | 1 | -0/+23 |
| | |||||
* | initial work on obj import, rename import_profile_photo to ↵ | redmatrix | 2015-09-01 | 1 | -16/+29 |
| | | | | import_xchan_photo to more accurately state its purpose. | ||||
* | this is a bit harder than anticipated. | redmatrix | 2015-08-31 | 1 | -14/+15 |
| | |||||
* | mostly doc tweaks, some import/export work | redmatrix | 2015-08-31 | 1 | -2/+19 |
| | |||||
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-26 | 1 | -1/+0 |
|\ | | | | | | | | | Conflicts: mod/import.php | ||||
| * | syntax error in last checkin | redmatrix | 2015-08-26 | 1 | -4/+4 |
| | | |||||
| * | import fixes | redmatrix | 2015-08-26 | 1 | -1/+33 |
| | | |||||
* | | import fixes | redmatrix | 2015-08-26 | 1 | -2/+15 |
| | | |||||
* | | resolve conflict | redmatrix | 2015-08-11 | 1 | -56/+6 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-11 | 1 | -0/+51 |
|\| | | | | | | | | | | | Conflicts: doc/history.md mod/import.php | ||||
| * | convert abook_flags from hubzilla during cloning | redmatrix | 2015-08-10 | 1 | -4/+30 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-14 | 1 | -0/+1 |
|\| | | | | | | | | | Conflicts: mod/import.php | ||||
| * | fix import of group members | redmatrix | 2015-07-14 | 1 | -1/+1 |
| | | |||||
* | | group fixes to import | redmatrix | 2015-07-14 | 1 | -4/+14 |
| | | |||||
* | | more stuff to resume failed imports | redmatrix | 2015-07-14 | 1 | -1/+13 |
| | | |||||
* | | log the import progress | redmatrix | 2015-07-14 | 1 | -3/+9 |
| | | |||||
* | | provide resumable imports if things go wrong | redmatrix | 2015-07-14 | 1 | -285/+329 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-14 | 1 | -0/+1 |
|\| | | | | | | | | | Conflicts: mod/connedit.php | ||||
* | | cleanup of import to allow cross-product import going one way. Note - ↵ | redmatrix | 2015-06-30 | 1 | -9/+4 |
| | | | | | | | | items/content are not yet importable | ||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-30 | 1 | -0/+14 |
|\| | |||||
| * | warn if export data file is from an incompatible project or if the DB ↵ | redmatrix | 2015-06-29 | 1 | -0/+14 |
| | | | | | | | | 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. | ||||
* | | lots of work on clone/import from redmatrix to hubzilla (won't go back the ↵ | redmatrix | 2015-06-30 | 1 | -15/+61 |
| | | | | | | | | other way) | ||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-21 | 1 | -4/+20 |
|\| | | | | | | | | | | | Conflicts: include/items.php util/messages.po | ||||
| * | import: Improve the descriptive text for this feature | redmatrix | 2015-06-21 | 1 | -2/+2 |
| | | |||||
| * | some diaspora import issues uncovered during dry-run tests | redmatrix | 2015-06-21 | 1 | -6/+6 |
| | | |||||
| * | automatically gunzip Diaspora export files if we're on a *nix system | redmatrix | 2015-06-19 | 1 | -0/+9 |
| | | |||||
| * | very early attempt diaspora import from diaspora export file. Currently the ↵ | redmatrix | 2015-06-19 | 1 | -1/+8 |
| | | | | | | | | 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. | ||||
* | | convert the abook fields | redmatrix | 2015-06-14 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into tres | friendica | 2015-04-23 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | title missing sending to diaspora (which doesn't support titles but let's ↵ | friendica | 2015-02-09 | 1 | -1/+1 |
| | | | | | | | | not go there). |