aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* regression: double linebreaks in viewsrc outputzotlabs2018-10-031-1/+1
* do not propagate channel deletion for an already deleted channel.zotlabs2018-10-021-0/+6
* hubzilla core issue #1276zotlabs2018-09-281-1/+1
* jsonld signature issue (library is using sha1, spec requires sha256)zotlabs2018-09-261-5/+5
* minor cleanupMario2018-09-232-4/+0
* use different settings for cal_first_day in events and cdav/calendar. This is...Mario2018-09-233-4/+4
* settings for events and cdav calendarMario2018-09-2310-28/+186
* provide settings for mod photo and make it slightly simpler to create new mod...Mario2018-09-237-45/+75
* keep the features in the central array but sort them by module nameMario2018-09-236-376/+160
* this should be off by defaultMario2018-09-221-1/+1
* add files and settings for channel managerMario2018-09-223-1/+128
* introduce profile settings and provide a way for modules without an app to st...Mario2018-09-222-6/+14
* another try to fix Fix PHP Warning: DOMDocument::loadHTML(): htmlParseEntityR...Mario Vavti2018-09-221-1/+4
* Revert "Fix PHP Warning: DOMDocument::loadHTML(): htmlParseEntityRef: no nam...Mario2018-09-221-2/+0
* Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-09-224-4/+35
|\
| * Merge branch 'page-meta-properties' into 'dev'Mario2018-09-224-4/+35
| |\
| | * Page meta propertiesM. Dent2018-09-224-4/+35
| |/
* / appification of sourcesMario Vavti2018-09-223-16/+21
|/
* rge remote-tracking branch 'mike/master' into devMario Vavti2018-09-221-2/+2
|\
| * doc cleanupzotlabs2018-09-211-2/+2
* | add fileMario Vavti2018-09-211-0/+120
* | opacity for jot settings/reset buttonsMario Vavti2018-09-211-0/+1
* | 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