redmatrix
|
c8e3ea955d
|
more mail sync work
|
2015-10-14 17:49:35 -07:00 |
|
redmatrix
|
c7637a0c53
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-10-14 13:13:12 -07:00 |
|
redmatrix
|
732c6134dd
|
support for mail sync
|
2015-10-14 13:11:24 -07:00 |
|
redmatrix
|
e45958b967
|
add plugin hooks to channel sync/import/export
|
2015-09-23 18:27:04 -07:00 |
|
redmatrix
|
e6690c818d
|
export TERM_FILE when mirroring
|
2015-09-08 19:13:43 -07:00 |
|
redmatrix
|
b28d3015fe
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/identity.php
|
2015-09-08 17:53:43 -07:00 |
|
redmatrix
|
75d521d42a
|
menu import and sync
|
2015-09-08 17:52:39 -07:00 |
|
redmatrix
|
1ebaacfd5e
|
menu export
|
2015-09-08 17:50:24 -07:00 |
|
redmatrix
|
c6bdf7e891
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-09-07 22:55:42 -07:00 |
|
redmatrix
|
11e19a06b7
|
export events
|
2015-09-07 22:54:43 -07:00 |
|
redmatrix
|
d79e81a069
|
import and sync chatrooms
|
2015-09-03 18:44:40 -07:00 |
|
redmatrix
|
f7d9523c7d
|
export chatrooms
|
2015-09-03 18:43:44 -07:00 |
|
redmatrix
|
d93e1c84ac
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/identity.php
|
2015-09-03 17:28:51 -07:00 |
|
redmatrix
|
2a7ff3018b
|
channel export - don't include linked resource items (photos, events). These items will need to be provided with those objects so that they can be re-linked.
|
2015-09-03 17:21:20 -07:00 |
|
redmatrix
|
23213a91ed
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-09-01 22:27:00 -07:00 |
|
redmatrix
|
184c544a24
|
export apps
|
2015-09-01 22:26:21 -07:00 |
|
redmatrix
|
c5578d7964
|
match the redmatrix output format for objects (which is the hubzilla table format)
|
2015-09-01 21:08:02 -07:00 |
|
redmatrix
|
95cf1aafa0
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-09-01 21:04:57 -07:00 |
|
redmatrix
|
f72a3113f5
|
add the baseurl so we can easily relocate objects
|
2015-09-01 21:03:55 -07:00 |
|
redmatrix
|
3c29b46c42
|
use different obj export output format for hubzilla compatibility
|
2015-09-01 20:57:53 -07:00 |
|
redmatrix
|
515f3bf111
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/identity.php
install/update.php
|
2015-09-01 17:08:59 -07:00 |
|
redmatrix
|
1447499776
|
don't log the mundane - especially at normal levels.
|
2015-08-31 22:41:48 -07:00 |
|
redmatrix
|
69dc1b03c3
|
typo in sql
|
2015-08-31 21:01:47 -07:00 |
|
redmatrix
|
d7089ab471
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/identity.php
install/update.php
util/messages.po
view/nl/messages.po
|
2015-08-31 21:00:28 -07:00 |
|
redmatrix
|
039f56f390
|
mostly doc tweaks, some import/export work
|
2015-08-31 20:58:05 -07:00 |
|
redmatrix
|
d7cf7316be
|
change the likes db structure to make it more easily importable/exportable
|
2015-08-31 20:55:25 -07:00 |
|
redmatrix
|
5fe9021375
|
rename 'register_account' hook to 'create_identity'.
|
2015-08-31 16:26:29 -07:00 |
|
redmatrix
|
9763c46b7e
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/identity.php
|
2015-08-17 22:23:23 -07:00 |
|
redmatrix
|
f682325924
|
provide ability to export by month as well as by year
|
2015-08-17 22:20:10 -07:00 |
|
redmatrix
|
ea331b043c
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-08-17 21:41:14 -07:00 |
|
redmatrix
|
1982fc807f
|
add item_id to yearly dump files
|
2015-08-17 21:38:43 -07:00 |
|
redmatrix
|
c90f14c066
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
doc/to_do_code.bb
|
2015-07-21 17:13:48 -07:00 |
|
Mario Vavti
|
4d45bc9da1
|
Fixes regarding the new default profile photo size. The default profile photos are just renamed. People which provided the originals are invited to reproduce them in the new 300 by 300 px format.
|
2015-07-20 21:01:11 +02:00 |
|
redmatrix
|
15b6e8faa4
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
include/identity.php
include/widgets.php
util/messages.po
view/it/messages.po
view/it/strings.php
|
2015-07-19 21:08:34 -07:00 |
|
redmatrix
|
3c60a0c22c
|
provide any single year of exported items
|
2015-07-16 20:20:42 -07:00 |
|
redmatrix
|
ec249d465b
|
provide a way to export a single year of items (to potentially keep from exhausting resources either on export or import)
|
2015-07-16 20:19:20 -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
|
6ab20eb1b5
|
lots of work on merging photo and file albums/folders
|
2015-06-17 17:44:31 -07:00 |
|
redmatrix
|
859a2ac8ef
|
DB changes for some channel flags
|
2015-06-15 17:28:52 -07:00 |
|
redmatrix
|
be0459a98b
|
convert the abook fields
|
2015-06-14 21:08:00 -07:00 |
|
redmatrix
|
e838647e3a
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-06-11 22:48:01 -07:00 |
|
redmatrix
|
485b19958e
|
don't provide a connect button on the sys channel profile sidebar
|
2015-06-11 22:46:37 -07:00 |
|
redmatrix
|
b381ec5734
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
mod/impel.php
|
2015-05-27 19:27:38 -07:00 |
|
redmatrix
|
9a0264f5d2
|
some work on issue #329
|
2015-05-25 19:17:35 -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
|
475dc7b686
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
boot.php
include/api.php
include/enotify.php
|
2015-05-13 17:07:12 -07:00 |
|
redmatrix
|
d6f98e6511
|
product was a bad string to use because we may require it for e-commerce, and RED_PLATFORM is equally problematic for other reasons.
|
2015-05-13 16:01:00 -07:00 |
|
redmatrix
|
25b599a4bd
|
convert ITEM_WALL from bitfield to standalone
|
2015-05-06 21:03:33 -07:00 |
|
redmatrix
|
5b5f0666f9
|
second pass name change
|
2015-05-05 03:59:51 -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 |
|