aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-09-221-2/+13
|\
| * Page meta propertiesM. Dent2018-09-221-2/+13
| |
* | appification of sourcesMario Vavti2018-09-222-16/+15
|/
* add fileMario Vavti2018-09-211-0/+120
|
* provide a return path from settings pagesMario Vavti2018-09-213-1/+6
|
* compare strpos() result against falseMario Vavti2018-09-211-1/+2
|
* don't double encodezotlabs2018-09-202-2/+2
|
* remove bbcode from event hovertipzotlabs2018-09-202-3/+4
|
* Merge branch 'dev'zotlabs2018-09-204-42/+85
|\
| * remove connection filter from network settingsMario Vavti2018-09-201-8/+0
| |
| * move connection filtering setting from network to connections, provide a ↵Mario Vavti2018-09-203-21/+65
| | | | | | | | link to settings in the navbar if present for a module and some code optimisation
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-09-201-1/+1
| |\
| * | allow a second url in apd files for settings, hide pin and star buttons in ↵Mario Vavti2018-09-191-11/+19
| | | | | | | | | | | | edit mode and use strpos() instead of strstr() in some places
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-09-192-5/+5
| |\ \
| * | | remove superfluous commaMario Vavti2018-09-171-1/+1
| | | |
| * | | remove unused variableMario Vavti2018-09-171-1/+0
| | | |
| * | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-09-171-4/+4
| |\ \ \
* | | | | bookmarks fail to synczotlabs2018-09-201-1/+1
| |_|_|/ |/| | |
* | | | fix setupzotlabs2018-09-191-1/+1
| |_|/ |/| |
* | | 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_list See merge request hubzilla/core!1276
| | | * | 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 ↵Mario Vavti2018-09-151-5/+47
| | | | | | | | the webinterface you will need to enable those apps to make things work again
| * remove network_tabs() which has been deprecated and replaced by ↵Mario Vavti2018-09-133-10/+6
| | | | | | | | activity_{order, filters} widgets
| * 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
| | | | | | | | in button and use different icons for installable and updateable apps
* | 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 authored… See merge request hubzilla/core!1269
| * Corrected resubmit of fixes to Authors unable to comment on posts they ↵M.Dent2018-09-041-5/+7
| | | | | | | | authored when owned by others.