aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev'zotlabs2018-09-174-1/+149
|\
| * Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-09-171-0/+3
| |\
| | * 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-171-0/+128
| |/ /
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-09-172-2/+56
| |\ \
| * | | 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-1621-174/+317
|\|
| * 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
| * remove network_tabs() which has been deprecated and replaced by activity_{ord...Mario Vavti2018-09-133-10/+6
| * move chat from feature to appsMario Vavti2018-09-133-33/+42
| * remove profile_tabs() which has been deprecated and replaced by channel_apps()Mario Vavti2018-09-137-13/+3
| * mpre feature to app transitionMario Vavti2018-09-125-100/+137
| * include item.title in /network and /channel searchMario Vavti2018-09-112-2/+4
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-09-107-33/+58
|\|
| * move cards from features to appsMario Vavti2018-09-102-22/+31
| * missing textMario Vavti2018-09-071-1/+1
| * provide a noscript_content switch for mod channel and displayMario Vavti2018-09-072-7/+22
| * install bootstrap via composerMario Vavti2018-09-071-2/+2
| * apps: change page title to available/installed, display install action label ...Mario Vavti2018-09-072-2/+3
* | important hyperdrive componentzotlabs2018-09-091-0/+47
|/
* move str_replace inside if clauseMario Vavti2018-09-051-1/+1
* Merge branch 'fix-authorcomment-fix' into 'dev'Mario2018-09-051-5/+7
|\
| * Corrected resubmit of fixes to Authors unable to comment on posts they author...M.Dent2018-09-041-5/+7
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-09-051-7/+5
|\|
| * Revert "Fix: Authors unable to comment on posts they authored when under owne...Mario Vavti2018-09-031-7/+5
* | instead of not displaying the cover-photo at all after first page load, load ...Mario Vavti2018-09-051-2/+4
|/
* Merge branch 'add-delivery-status-info' into 'dev'Mario2018-09-021-5/+7
|\
| * Fix: Authors unable to comment on posts they authored when under owned by oth...M.Dent2018-09-011-5/+7
* | fix undefined constant warningMario Vavti2018-09-011-1/+1
* | do not count sys channel in totalsMario Vavti2018-09-011-1/+1
* | update 1218: missing default value for pgMario Vavti2018-08-311-2/+2
* | db update to get rid of bogus activitypub xchans which got created due to a b...Mario Vavti2018-08-291-0/+26
|/
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-08-291-0/+2
|\
| * redirect stdout/stderr on cron commandzotlabs2018-08-281-0/+2
| * Revert "Change main router request variable from 'q' to 'req'. This is necess...zotlabs2018-08-266-7/+7
| * Change main router request variable from 'q' to 'req'. This is necessary to i...zotlabs2018-08-266-7/+7
* | remove distinct from network query again until performance issue is resolved ...Mario Vavti2018-08-271-2/+2
* | Merge branch 'extend-convitems-dropdown' into 'dev'Mario2018-08-272-2/+7
|\ \
| * | Add hook to extend conv_item cog dropdown menuM.Dent2018-08-261-0/+5
| * | Get full page of itemsM.Dent2018-08-231-2/+2
* | | Update Wiki_page_history.phpMax Kostikov2018-08-251-3/+3
* | | Update Wiki.phpMax Kostikov2018-08-251-2/+2