aboutsummaryrefslogtreecommitdiffstats
path: root/include/Import/refimport.php
Commit message (Collapse)AuthorAgeFilesLines
* remove unused prototype importer template and obsolete reflection cms importerzotlabs2018-01-241-284/+0
|
* consolidate hubloc storagezotlabs2017-01-301-1/+0
|
* item flag fixes discovered after a few mergesredmatrix2015-06-231-4/+0
|
* Merge branch 'master' into tresredmatrix2015-05-141-1/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-051-1/+1
| |
* | 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-071-2/+0
|
* provide example import scriptfriendica2014-11-031-0/+282