Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge branch 'patch-26' into 'dev' | Max Kostikov | 2018-09-28 | 1 | -1/+1 | |
|\ \ | | | | | | | | | | | | | Update Invite.php See merge request Kostikov/core!6 | |||||
| * | | Update Invite.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 | |
| |/ | ||||||
* | | Merge branch 'patch-27' into 'dev' | Max Kostikov | 2018-09-28 | 1 | -1/+1 | |
|\ \ | | | | | | | | | | | | | Update Lang.php See merge request Kostikov/core!5 | |||||
| * | | Update Lang.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 | |
| |/ | ||||||
* | | Merge branch 'patch-28' into 'dev' | Max Kostikov | 2018-09-28 | 1 | -1/+1 | |
|\ \ | | | | | | | | | | | | | Update Mood.php See merge request Kostikov/core!4 | |||||
| * | | Update Mood.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 | |
| |/ | ||||||
* | | Merge branch 'patch-29' into 'dev' | Max Kostikov | 2018-09-28 | 719 | -3187/+62139 | |
|\ \ | | | | | | | | | | | | | Patch 29 See merge request Kostikov/core!3 | |||||
| * | | Update Notes.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 | |
| |/ | ||||||
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario | 2018-09-28 | 4 | -15/+64 | |
| |\ | ||||||
| | * | move display settings up | Mario Vavti | 2018-09-28 | 1 | -5/+6 | |
| | | | ||||||
| | * | settings for channel home | Mario Vavti | 2018-09-28 | 3 | -10/+58 | |
| | | | ||||||
| * | | nav_channel_select should be off by default | Mario | 2018-09-28 | 1 | -1/+1 | |
| |/ | ||||||
| * | add transaction, commit and rollback to update 1221 | Mario | 2018-09-28 | 1 | -0/+5 | |
| | | ||||||
| * | Merge branch 'patch-10' into 'dev' | Mario | 2018-09-28 | 25 | -118/+137 | |
| |\ | | | | | | | | | | | | | rename groups and group_members tables for MySQL 8 compatibility See merge request hubzilla/core!1290 | |||||
| | * | Update zot.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 | |
| | | | ||||||
| | * | Update Group.php | Max Kostikov | 2018-09-28 | 0 | -0/+0 | |
| | | | ||||||
| | * | Update security.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 | |
| | | | ||||||
| | * | Update Group.php | Max Kostikov | 2018-09-28 | 0 | -0/+0 | |
| | | | ||||||
| | * | Update zot.php | Max Kostikov | 2018-09-28 | 1 | -14/+14 | |
| | | | ||||||
| | * | Update group.php | Max Kostikov | 2018-09-28 | 1 | -21/+21 | |
| | | | ||||||
| | * | Update Import.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 | |
| | | | ||||||
| | * | Update Group.php | Max Kostikov | 2018-09-28 | 1 | -21/+21 | |
| | | | ||||||
| | * | Update Libsync.php | Max Kostikov | 2018-09-28 | 1 | -13/+13 | |
| | | | ||||||
| | * | Update Acl.php | Max Kostikov | 2018-09-28 | 1 | -7/+7 | |
| | | | ||||||
| | * | Update Connections.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 | |
| | | | ||||||
| | * | Update Contactgroup.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 | |
| | | | ||||||
| | * | Update Group.php | Max Kostikov | 2018-09-28 | 1 | -5/+5 | |
| | | | ||||||
| | * | Update Lockview.php | Max Kostikov | 2018-09-28 | 1 | -2/+2 | |
| | | | ||||||
| | * | Update Network.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 | |
| | | | ||||||
| | * | Update Channel.php | Max Kostikov | 2018-09-28 | 1 | -2/+2 | |
| | | | ||||||
| | * | Update Activity_filter.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 | |
| | | | ||||||
| | * | Update boot.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 | |
| | | | ||||||
| | * | Update acl_selectors.php | Max Kostikov | 2018-09-27 | 1 | -1/+1 | |
| | | | ||||||
| | * | Update api_zot.php | Max Kostikov | 2018-09-27 | 1 | -4/+4 | |
| | | | ||||||
| | * | Update channel.php | Max Kostikov | 2018-09-27 | 1 | -5/+5 | |
| | | | ||||||
| | * | Update connections.php | Max Kostikov | 2018-09-27 | 1 | -2/+2 | |
| | | | ||||||
| | * | Update items.php | Max Kostikov | 2018-09-27 | 1 | -1/+1 | |
| | | | ||||||
| | * | Update security.php | Max Kostikov | 2018-09-27 | 1 | -1/+1 | |
| | | | ||||||
| | * | Update text.php | Max Kostikov | 2018-09-27 | 1 | -1/+1 | |
| | | | ||||||
| | * | Update xchan.php | Max Kostikov | 2018-09-27 | 1 | -1/+1 | |
| | | | ||||||
| | * | Update schema_mysql.sql | Max Kostikov | 2018-09-27 | 1 | -3/+2 | |
| | | | ||||||
| | * | Update schema_postgres.sql | Max Kostikov | 2018-09-27 | 1 | -9/+9 | |
| | | | ||||||
| | * | rename groups and group_members tables for MySQL 8 compatibility | Max Kostikov | 2018-09-27 | 1 | -0/+20 | |
| | | | ||||||
| * | | Merge branch 'channel-limits' into 'dev' | M. Dent | 2018-09-28 | 2 | -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.Dent | 2018-09-27 | 2 | -20/+26 | |
| | |/ | ||||||
| * | | Merge branch 'patch-9' into 'dev' | M. Dent | 2018-09-28 | 1 | -2/+17 | |
| |\ \ | | | | | | | | | | | | | | | | | Add translation for new apps See merge request hubzilla/core!1289 | |||||
| | * | | Add translation for new apps | Max Kostikov | 2018-09-27 | 1 | -2/+17 | |
| | | | | ||||||
| * | | | Merge branch 'patch-8' into 'dev' | M. Dent | 2018-09-28 | 1 | -1/+1 | |
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | Missprint in Oauth.php fixed See merge request hubzilla/core!1288 | |||||
| | * | | Missprint in Oauth.php fixed | Max Kostikov | 2018-09-27 | 1 | -1/+1 | |
| | |/ | ||||||
| * / | more checks | Mario | 2018-09-27 | 1 | -5/+14 | |
| |/ |