aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix setupzotlabs2018-09-191-1/+1
* this was neededzotlabs2018-09-181-1/+1
* missing autocomplete (e.g. mentions) in mod_photos commentszotlabs2018-09-181-2/+3
* Merge branch 'dev'zotlabs2018-09-1710-12/+210
|\
| * Merge branch 'patch-3' into 'dev'Mario2018-09-173-10/+34
| |\
| | * Update zot.phpMax Kostikov2018-09-171-1/+1
| | * Update message.phpMax Kostikov2018-09-171-1/+1
| | * Update msglib.phpMax Kostikov2018-09-171-6/+6
| | * Update msglib.phpMax Kostikov2018-09-161-10/+6
| | * use common msg_drop functionMax Kostikov2018-09-151-25/+3
| | * Use common msg_drop functionMax Kostikov2018-09-151-25/+3
| | * formattingMax Kostikov2018-09-151-24/+21
| | * Create msglib.phpMax Kostikov2018-09-151-0/+35
| | * Add new fileMax Kostikov2018-09-151-0/+0
| | * unification with zot.php code for future reuseMax Kostikov2018-09-151-2/+2
| | * formattingMax Kostikov2018-09-151-1/+1
| | * Save combined view on calling first message in threadMax Kostikov2018-09-151-0/+20
| | * less data in selectMax Kostikov2018-09-151-1/+1
| | * formattingMax Kostikov2018-09-141-3/+3
| | * Save combined view while deleting first message in threadMax Kostikov2018-09-141-0/+20
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-09-173-1/+15
| |\ \
| | * \ Merge branch 'trap-template-errors' into 'dev'Mario2018-09-171-1/+7
| | |\ \
| | | * | Catch errors in template rendering. Output a generic error and log problem.M.Dent2018-09-141-1/+7
| | * | | Merge branch 'delete-attach-hook' into 'dev'Mario2018-09-171-0/+5
| | |\ \ \
| | | * | | Add attach_delete hookM.Dent (DM42.Net)2018-09-151-0/+5
| | * | | | Merge branch 'app-list-hook' into 'dev'Mario2018-09-171-0/+3
| | |\ \ \ \
| | | * | | | Add hook to allow addons to filter the list returned by app_listM.Dent2018-09-161-0/+3
| * | | | | | seperate settings for mod networkMario Vavti2018-09-172-0/+143
| |/ / / / /
| * | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-09-178-13/+98
| |\ \ \ \ \
| * | | | | | prepare submodule to interact with routeMario Vavti2018-09-172-1/+18
| | |/ / / / | |/| | | |
* | | | | | fix listeners table create and expire federation had a syntax errorzotlabs2018-09-172-5/+5
* | | | | | pdo install check requires namespacingzotlabs2018-09-171-4/+4
| |/ / / / |/| | | |
* | | | | Some improvements to setup checks: image library and pdo supportzotlabs2018-09-161-2/+9
* | | | | Merge branch 'dev'zotlabs2018-09-1641-580/+371
|\| | | |
| * | | | appification of the lang moduleMario Vavti2018-09-161-2/+17
| |/ / /
| * | | appify pokeMario Vavti2018-09-151-2/+19
| * | | appify moodMario Vavti2018-09-152-3/+24
| * | | appify inviteMario Vavti2018-09-152-5/+19
| * | | appify cdav stuff. WARNING: if you use caldav or carddav from a client or the...Mario Vavti2018-09-151-5/+47
| | |/ | |/|
| * | Merge branch 'patch-2' into 'dev'Mario2018-09-141-1/+1
| |\ \
| | * | php2po.php unify quote/unquoteMax Kostikov2018-09-131-1/+1
| |/ /
| * | css issuesMario Vavti2018-09-134-4/+4
| * | add activity_filter and activity_order .bb filesMario Vavti2018-09-132-0/+2
| * | remove network_tabs() which has been deprecated and replaced by activity_{ord...Mario Vavti2018-09-136-127/+12
| * | move chat from feature to appsMario Vavti2018-09-136-47/+46
| * | remove profile_tabs() which has been deprecated and replaced by channel_apps()Mario Vavti2018-09-1312-219/+5
| * | Merge branch 'patch-1' into 'dev'Mario2018-09-121-1/+1
| |\ \
| | * | Update network.phpMax Kostikov2018-09-101-1/+1
| * | | more feature to app transitionMario Vavti2018-09-124-36/+32
| * | | Fix PHP Warning: DOMDocument::loadHTML(): htmlParseEntityRef: no name in EntityMario Vavti2018-09-121-0/+2