zotlabs
|
f4aca35a88
|
move diaspora account import to the diaspora plugin
|
2017-01-31 16:01:47 -08:00 |
|
zotlabs
|
7b065365e0
|
consolidate hubloc storage
|
2017-01-30 15:01:22 -08:00 |
|
zotlabs
|
e46e3027fa
|
rename diaspora2bb() to markdown_to_bb() to reflect that is has a more generic use
|
2016-10-16 16:48:33 -07:00 |
|
Klaus Weidenbach
|
7b41839ea8
|
[TASK] Update Doxyfile and fix Doxygen errors.
Updated Doxyfile to include new folders.
Add a list for @hooks tags.
Fixed some parsing problems for Doxygen.
|
2016-10-13 11:27:23 +02:00 |
|
redmatrix
|
80f2ba640e
|
code cleanup
|
2016-05-24 20:49:23 -07:00 |
|
redmatrix
|
9abd95fad3
|
static App
|
2016-03-31 16:06:03 -07:00 |
|
redmatrix
|
75d521d42a
|
menu import and sync
|
2015-09-08 17:52:39 -07:00 |
|
redmatrix
|
cb76fb8b9b
|
item flag fixes discovered after a few merges
|
2015-06-23 19:45:39 -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
|
68534fd5dc
|
some diaspora import issues uncovered during dry-run tests
|
2015-06-21 17:30:23 -07:00 |
|
redmatrix
|
9dfb8a3401
|
ensure the photo driver is included
|
2015-06-20 16:24:10 -07:00 |
|
redmatrix
|
dd950baa82
|
import_diaspora - incorrect method for importing channel photo, and add duplicate reddress detection/correction
|
2015-06-20 16:21:25 -07:00 |
|
redmatrix
|
ddbaabd62d
|
wrong logic
|
2015-06-19 18:08:10 -07:00 |
|
redmatrix
|
94e7a425e6
|
import_diaspora - a few more atypical settings
|
2015-06-19 18:06:55 -07:00 |
|
redmatrix
|
e85d2c4b90
|
import_diaspora: add all the friends
|
2015-06-19 17:07:31 -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
|
a6cb90c81c
|
Merge branch 'master' into tres
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
|
2015-05-14 18:02:29 -07:00 |
|
redmatrix
|
25b599a4bd
|
convert ITEM_WALL from bitfield to standalone
|
2015-05-06 21:03:33 -07:00 |
|
redmatrix
|
a3c37f1458
|
first pass name change
|
2015-05-05 03:56:10 -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 |
|
friendica
|
5b35f1e6c4
|
Change logic of "don't create a status post for this photo upload" and turn 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.
|
2015-03-10 15:43:15 -07:00 |
|
friendica
|
29436081a8
|
slow progress removing bitfields on item table
|
2015-01-21 16:06:25 -08:00 |
|
Klaus Weidenbach
|
63646a1440
|
Some Doxygen comments and small cleanups.
|
2014-12-07 19:27:14 +01:00 |
|
friendica
|
ac858f4bd4
|
provide example import script
|
2014-11-03 01:06:02 -08:00 |
|