Commit Graph

22205 Commits

Author SHA1 Message Date
Max Kostikov
2811d6ae53 Update Chat.php 2018-09-28 15:32:27 +02:00
Mario
27fef98a39 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2018-09-28 13:05:44 +02:00
Mario
41108fc4d3 nav_channel_select should be off by default 2018-09-28 11:46:17 +02:00
Mario Vavti
d7a20821c3 move display settings up 2018-09-28 11:32:00 +02:00
Mario Vavti
20285d076b settings for channel home 2018-09-28 11:29:05 +02:00
Mario
44bb070203 add transaction, commit and rollback to update 1221 2018-09-28 09:55:10 +02:00
Mario
9e87219aea Merge branch 'patch-10' into 'dev'
rename groups and group_members tables for MySQL 8 compatibility

See merge request hubzilla/core!1290
2018-09-28 09:41:21 +02:00
M. Dent
1b7e220de7 Merge branch 'channel-limits' into 'dev'
Hide form when at or over service_class['limit_identities']

See merge request hubzilla/core!1292
2018-09-28 04:46:48 +02:00
M.Dent
fe8b723622 Hide form when at or over service_class['limit_identities'] 2018-09-27 22:43:36 -04:00
M. Dent
1e85c40c42 Merge branch 'patch-9' into 'dev'
Add translation for new apps

See merge request hubzilla/core!1289
2018-09-28 04:15:28 +02:00
M. Dent
f72464a240 Merge branch 'patch-8' into 'dev'
Missprint in Oauth.php fixed

See merge request hubzilla/core!1288
2018-09-28 04:14:51 +02:00
Max Kostikov
65785ead69 Update zot.php 2018-09-28 01:05:03 +02:00
Max Kostikov
c550100a55 Update Group.php 2018-09-28 00:52:49 +02:00
Max Kostikov
2836bce8fe Update security.php 2018-09-28 00:51:21 +02:00
Max Kostikov
7f95d47721 Update Group.php 2018-09-28 00:49:32 +02:00
Max Kostikov
51c0045be4 Update zot.php 2018-09-28 00:38:36 +02:00
Max Kostikov
abfbfd9e9b Update group.php 2018-09-28 00:33:52 +02:00
Max Kostikov
5d6c8fd807 Update Import.php 2018-09-28 00:28:15 +02:00
Max Kostikov
f4799b2ddb Update Group.php 2018-09-28 00:26:01 +02:00
Max Kostikov
9afa6cc245 Update Libsync.php 2018-09-28 00:20:03 +02:00
Max Kostikov
25e8d70786 Update Acl.php 2018-09-28 00:14:21 +02:00
Max Kostikov
978e45911f Update Connections.php 2018-09-28 00:12:00 +02:00
Max Kostikov
da7bce3470 Update Contactgroup.php 2018-09-28 00:11:03 +02:00
Max Kostikov
4efa5cfa75 Update Group.php 2018-09-28 00:10:20 +02:00
Max Kostikov
444ae51a3e Update Lockview.php 2018-09-28 00:06:26 +02:00
Max Kostikov
07f82e4a14 Update Network.php 2018-09-28 00:05:43 +02:00
Max Kostikov
3379f6f793 Update Channel.php 2018-09-28 00:02:58 +02:00
Max Kostikov
80b47734a7 Update Activity_filter.php 2018-09-28 00:01:39 +02:00
Max Kostikov
69d46538ce Update boot.php 2018-09-28 00:00:38 +02:00
Max Kostikov
208d38207e Update acl_selectors.php 2018-09-27 23:59:45 +02:00
Max Kostikov
ffe80c66d7 Update api_zot.php 2018-09-27 23:58:49 +02:00
Max Kostikov
bfa672f42c Update channel.php 2018-09-27 23:56:54 +02:00
Max Kostikov
9f89f3190a Update connections.php 2018-09-27 23:55:20 +02:00
Max Kostikov
71931b423c Update items.php 2018-09-27 23:53:51 +02:00
Max Kostikov
b54aabc958 Update security.php 2018-09-27 23:52:46 +02:00
Max Kostikov
a45fe72eb9 Update text.php 2018-09-27 23:50:26 +02:00
Max Kostikov
62d64631b5 Update xchan.php 2018-09-27 23:49:41 +02:00
Max Kostikov
11945ce7bc Update schema_mysql.sql 2018-09-27 23:48:25 +02:00
Max Kostikov
bb3d908bcf Update schema_postgres.sql 2018-09-27 23:46:58 +02:00
Max Kostikov
98b3946fca rename groups and group_members tables for MySQL 8 compatibility 2018-09-27 23:42:11 +02:00
Mario
c15de3b68b more checks 2018-09-27 22:45:43 +02:00
Max Kostikov
78ed1ae446 Add translation for new apps 2018-09-27 21:57:27 +02:00
Max Kostikov
56fdc4f3fe Missprint in Oauth.php fixed 2018-09-27 20:26:47 +02:00
M. Dent
f17261020d Merge branch 'dev' into 'dev'
Translate system app names

See merge request hubzilla/core!1286
2018-09-27 19:38:39 +02:00
M.Dent
6f98ca68af Translate system app names 2018-09-27 13:37:15 -04:00
Mario Vavti
269538fdc7 bump version 2018-09-27 14:57:22 +02:00
Mario Vavti
6b23c3e179 implement conversation tools (settings/conversation), remove additional features from the settings menu and get rid of skill levels 2018-09-27 14:56:47 +02:00
Mario Vavti
bdf6289b32 tokens: add css file and fix argc and argv values 2018-09-26 22:32:06 +02:00
Mario Vavti
e3c04b1fd0 guest access app 2018-09-26 22:24:36 +02:00
Mario Vavti
a7948d7bfe permcats app 2018-09-26 22:02:50 +02:00