aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | provide editor settingsMario Vavti2018-09-213-8/+11
* | | provide a return path from settings pagesMario Vavti2018-09-217-3/+13
* | | compare strpos() result against falseMario Vavti2018-09-211-1/+2
* | | add missing checkMario Vavti2018-09-211-1/+1
* | | Merge branch 'patch-5' into 'dev'Mario2018-09-217-16/+24
|\ \ \
| * | | Update admin_account_edit.tplMax Kostikov2018-09-211-1/+1
| * | | Update admin_account_edit.tplMax Kostikov2018-09-211-1/+1
| * | | Update admin_accounts.tplMax Kostikov2018-09-211-4/+4
| * | | Update admin_channels.tplMax Kostikov2018-09-211-3/+3
| * | | Update admin_logs.tplMax Kostikov2018-09-211-2/+4
| * | | Update admin_profiles.tplMax Kostikov2018-09-211-1/+1
| * | | Update admin_security.tplMax Kostikov2018-09-211-1/+1
| * | | Update admin_site.tplMax Kostikov2018-09-211-4/+10
* | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-09-217-15/+28
|\ \ \ \
| * | | | Merge branch 'patch-5' into 'dev'Mario2018-09-217-15/+28
| |\| | |
| | * | | Update admin_account_edit.tplMax Kostikov2018-09-201-1/+1
| | * | | Update admin_security.tplMax Kostikov2018-09-201-2/+2
| | * | | Update admin_profiles.tplMax Kostikov2018-09-201-1/+1
| | * | | Update admin_site.tplMax Kostikov2018-09-201-4/+6
| | * | | Update admin_accounts.tplMax Kostikov2018-09-201-5/+12
| | * | | Update admin_channels.tplMax Kostikov2018-09-201-1/+5
| | * | | Update admin_logs.tplMax Kostikov2018-09-201-1/+1
* | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-09-214-6/+8
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | don't double encodezotlabs2018-09-202-2/+2
| * | | remove bbcode from event hovertipzotlabs2018-09-202-3/+4
| * | | Merge branch 'dev'zotlabs2018-09-2018-56/+258
| |\| |
| * | | bookmarks fail to synczotlabs2018-09-202-3/+4
* | | | fix position of nav settings iconMario Vavti2018-09-212-2/+6
* | | | fix typoMario Vavti2018-09-211-1/+1
* | | | fix can not enter text in notes widgetMario Vavti2018-09-211-1/+2
| |/ / |/| |
* | | remove connection filter from network settingsMario Vavti2018-09-201-8/+0
* | | move connection filtering setting from network to connections, provide a link...Mario Vavti2018-09-208-26/+113
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-09-207-7/+115
|\ \ \
| * \ \ Merge branch 'preempt-hooks' into 'dev'Mario2018-09-203-0/+22
| |\ \ \
| | * | | Add structure to permit_hookM.Dent (DM42.Net)2018-09-191-0/+7
| | * | | add hook: permit_hookM.Dent (DM42.Net)2018-09-193-7/+22
| * | | | Merge branch 'hook-docs' into 'dev'Mario2018-09-205-7/+93
| |\ \ \ \
| | * | | | Document new hooksM.Dent (DM42.Net)2018-09-195-7/+93
| | |/ / /
* | / / / deal with the ability to provide settings url in apd files in include/nav.phpMario Vavti2018-09-201-1/+8
|/ / / /
* | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-09-201-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | fix setupzotlabs2018-09-191-1/+1
* | | allow a second url in apd files for settings, hide pin and star buttons in ed...Mario Vavti2018-09-193-13/+22
* | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-09-196-16/+41
|\| |
| * | 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