aboutsummaryrefslogtreecommitdiffstats
path: root/include/identity.php
Commit message (Collapse)AuthorAgeFilesLines
* more mail sync workredmatrix2015-10-141-8/+6
|
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-141-0/+25
|\
| * support for mail syncredmatrix2015-10-141-0/+25
| |
| * export TERM_FILE when mirroringredmatrix2015-09-081-0/+1
| |
* | add plugin hooks to channel sync/import/exportredmatrix2015-09-231-0/+4
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-081-1/+10
|\| | | | | | | | | Conflicts: include/identity.php
| * menu exportredmatrix2015-09-081-1/+11
| |
* | menu import and syncredmatrix2015-09-081-0/+11
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-071-0/+19
|\|
| * export eventsredmatrix2015-09-071-0/+19
| |
| * export chatroomsredmatrix2015-09-031-0/+6
| |
* | import and sync chatroomsredmatrix2015-09-031-1/+6
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-031-5/+7
|\| | | | | | | | | Conflicts: include/identity.php
| * channel export - don't include linked resource items (photos, events). These ↵redmatrix2015-09-031-2/+4
| | | | | | | | items will need to be provided with those objects so that they can be re-linked.
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-011-0/+7
|\|
| * export appsredmatrix2015-09-011-0/+7
| |
* | match the redmatrix output format for objects (which is the hubzilla table ↵redmatrix2015-09-011-6/+2
| | | | | | | | format)
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-011-1/+9
|\|
| * add the baseurl so we can easily relocate objectsredmatrix2015-09-011-1/+2
| |
| * use different obj export output format for hubzilla compatibilityredmatrix2015-09-011-1/+8
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-011-1/+0
|\| | | | | | | | | | | Conflicts: include/identity.php install/update.php
| * typo in sqlredmatrix2015-08-311-1/+1
| |
* | don't log the mundane - especially at normal levels.redmatrix2015-08-311-2/+3
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-311-0/+1
|\| | | | | | | | | | | | | | | Conflicts: include/identity.php install/update.php util/messages.po view/nl/messages.po
| * change the likes db structure to make it more easily importable/exportableredmatrix2015-08-311-1/+1
| |
* | mostly doc tweaks, some import/export workredmatrix2015-08-311-1/+1
| |
* | rename 'register_account' hook to 'create_identity'.redmatrix2015-08-311-1/+1
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-171-4/+16
|\| | | | | | | | | Conflicts: include/identity.php
| * provide ability to export by month as well as by yearredmatrix2015-08-171-3/+14
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-171-0/+12
|\|
| * add item_id to yearly dump filesredmatrix2015-08-171-0/+12
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-211-2/+2
|\| | | | | | | | | Conflicts: doc/to_do_code.bb
| * Fixes regarding the new default profile photo size. The default profile ↵Mario Vavti2015-07-201-2/+2
| | | | | | | | photos are just renamed. People which provided the originals are invited to reproduce them in the new 300 by 300 px format.
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-191-1/+0
|\| | | | | | | | | | | | | | | | | Conflicts: include/identity.php include/widgets.php util/messages.po view/it/messages.po view/it/strings.php
| * provide a way to export a single year of items (to potentially keep from ↵redmatrix2015-07-161-1/+30
| | | | | | | | exhausting resources either on export or import)
* | provide any single year of exported itemsredmatrix2015-07-161-2/+35
| |
* | lots of work on clone/import from redmatrix to hubzilla (won't go back the ↵redmatrix2015-06-301-3/+2
| | | | | | | | other way)
* | lots of work on merging photo and file albums/foldersredmatrix2015-06-171-0/+5
| |
* | DB changes for some channel flagsredmatrix2015-06-151-24/+17
| |
* | convert the abook fieldsredmatrix2015-06-141-5/+4
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-111-0/+4
|\|
| * don't provide a connect button on the sys channel profile sidebarredmatrix2015-06-111-0/+4
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-271-2/+3
|\| | | | | | | | | Conflicts: mod/impel.php
| * some work on issue #329redmatrix2015-05-251-2/+3
| |
* | Merge branch 'master' into tresredmatrix2015-05-141-3/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-131-1/+1
| |\| | | | | | | | | | | | | | | | | | | Conflicts: boot.php include/api.php include/enotify.php
| | * product was a bad string to use because we may require it for e-commerce, ↵redmatrix2015-05-131-1/+1
| | | | | | | | | | | | and RED_PLATFORM is equally problematic for other reasons.
| * | convert ITEM_WALL from bitfield to standaloneredmatrix2015-05-061-2/+1
| | |
| * | second pass name changeredmatrix2015-05-051-2/+2
| |/
* | Merge branch 'master' into tresfriendica2015-04-231-233/+207
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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