aboutsummaryrefslogtreecommitdiffstats
path: root/include/Import
Commit message (Collapse)AuthorAgeFilesLines
* menu import and syncredmatrix2015-09-081-1/+4
|
* item flag fixes discovered after a few mergesredmatrix2015-06-231-4/+0
|
* Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-211-0/+146
|\ | | | | | | | | | | Conflicts: include/items.php util/messages.po
| * some diaspora import issues uncovered during dry-run testsredmatrix2015-06-211-6/+4
| |
| * ensure the photo driver is includedredmatrix2015-06-201-0/+1
| |
| * import_diaspora - incorrect method for importing channel photo, and add ↵redmatrix2015-06-201-20/+42
| | | | | | | | duplicate reddress detection/correction
| * wrong logicredmatrix2015-06-191-1/+1
| |
| * import_diaspora - a few more atypical settingsredmatrix2015-06-191-3/+19
| |
| * import_diaspora: add all the friendsredmatrix2015-06-191-4/+13
| |
| * very early attempt diaspora import from diaspora export file. Currently the ↵redmatrix2015-06-191-0/+100
| | | | | | | | 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.
* | Merge branch 'master' into tresredmatrix2015-05-142-3/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | convert ITEM_WALL from bitfield to standaloneredmatrix2015-05-061-2/+4
| | |
| * | first pass name changeredmatrix2015-05-052-3/+3
| |/
* | Merge branch 'master' into tresfriendica2015-04-231-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
| * Change logic of "don't create a status post for this photo upload" and turn ↵friendica2015-03-101-1/+1
| | | | | | | | it into a bona-fide on/off toggle. This takes up one more vertical line, but we have it to spare, and the single button (while concise visually) provided no feedback of the current state, or indicate whether a second click toggled it. Some addons use this setting so addons will need to be pulled when this is pulled in order to remain in sync.
* | slow progress removing bitfields on item tablefriendica2015-01-211-2/+6
|/
* Some Doxygen comments and small cleanups.Klaus Weidenbach2014-12-072-27/+13
|
* provide example import scriptfriendica2014-11-032-0/+376