aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update Poke.phpMax Kostikov2018-09-281-1/+1
|
* Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2018-09-284-15/+64
|\
| * move display settings upMario Vavti2018-09-281-5/+6
| |
| * settings for channel homeMario Vavti2018-09-283-10/+58
| |
* | nav_channel_select should be off by defaultMario2018-09-281-1/+1
|/
* add transaction, commit and rollback to update 1221Mario2018-09-281-0/+5
|
* Merge branch 'patch-10' into 'dev'Mario2018-09-2825-118/+137
|\ | | | | | | | | rename groups and group_members tables for MySQL 8 compatibility See merge request hubzilla/core!1290
| * Update zot.phpMax Kostikov2018-09-281-1/+1
| |
| * Update Group.phpMax Kostikov2018-09-280-0/+0
| |
| * Update security.phpMax Kostikov2018-09-281-1/+1
| |
| * Update Group.phpMax Kostikov2018-09-280-0/+0
| |
| * Update zot.phpMax Kostikov2018-09-281-14/+14
| |
| * Update group.phpMax Kostikov2018-09-281-21/+21
| |
| * Update Import.phpMax Kostikov2018-09-281-1/+1
| |
| * Update Group.phpMax Kostikov2018-09-281-21/+21
| |
| * Update Libsync.phpMax Kostikov2018-09-281-13/+13
| |
| * Update Acl.phpMax Kostikov2018-09-281-7/+7
| |
| * Update Connections.phpMax Kostikov2018-09-281-1/+1
| |
| * Update Contactgroup.phpMax Kostikov2018-09-281-1/+1
| |
| * Update Group.phpMax Kostikov2018-09-281-5/+5
| |
| * Update Lockview.phpMax Kostikov2018-09-281-2/+2
| |
| * Update Network.phpMax Kostikov2018-09-281-1/+1
| |
| * Update Channel.phpMax Kostikov2018-09-281-2/+2
| |
| * Update Activity_filter.phpMax Kostikov2018-09-281-1/+1
| |
| * Update boot.phpMax Kostikov2018-09-281-1/+1
| |
| * Update acl_selectors.phpMax Kostikov2018-09-271-1/+1
| |
| * Update api_zot.phpMax Kostikov2018-09-271-4/+4
| |
| * Update channel.phpMax Kostikov2018-09-271-5/+5
| |
| * Update connections.phpMax Kostikov2018-09-271-2/+2
| |
| * Update items.phpMax Kostikov2018-09-271-1/+1
| |
| * Update security.phpMax Kostikov2018-09-271-1/+1
| |
| * Update text.phpMax Kostikov2018-09-271-1/+1
| |
| * Update xchan.phpMax Kostikov2018-09-271-1/+1
| |
| * Update schema_mysql.sqlMax Kostikov2018-09-271-3/+2
| |
| * Update schema_postgres.sqlMax Kostikov2018-09-271-9/+9
| |
| * rename groups and group_members tables for MySQL 8 compatibilityMax Kostikov2018-09-271-0/+20
| |
* | Merge branch 'channel-limits' into 'dev'M. Dent2018-09-282-20/+26
|\ \ | | | | | | | | | | | | Hide form when at or over service_class['limit_identities'] See merge request hubzilla/core!1292
| * | Hide form when at or over service_class['limit_identities']M.Dent2018-09-272-20/+26
| |/
* | Merge branch 'patch-9' into 'dev'M. Dent2018-09-281-2/+17
|\ \ | | | | | | | | | | | | Add translation for new apps See merge request hubzilla/core!1289
| * | Add translation for new appsMax Kostikov2018-09-271-2/+17
| | |
* | | Merge branch 'patch-8' into 'dev'M. Dent2018-09-281-1/+1
|\ \ \ | |_|/ |/| | | | | | | | Missprint in Oauth.php fixed See merge request hubzilla/core!1288
| * | Missprint in Oauth.php fixedMax Kostikov2018-09-271-1/+1
| |/
* / more checksMario2018-09-271-5/+14
|/
* Merge branch 'dev' into 'dev'M. Dent2018-09-271-0/+1
|\ | | | | | | | | Translate system app names See merge request hubzilla/core!1286
| * Translate system app namesM.Dent2018-09-271-0/+1
| |
* | bump versionMario Vavti2018-09-271-1/+1
| |
* | implement conversation tools (settings/conversation), remove additional ↵Mario Vavti2018-09-2713-120/+169
| | | | | | | | features from the settings menu and get rid of skill levels
* | tokens: add css file and fix argc and argv valuesMario Vavti2018-09-263-20/+19
| |
* | guest access appMario Vavti2018-09-266-37/+38
| |
* | permcats appMario Vavti2018-09-269-35/+41
|/