Commit Graph

1744 Commits

Author SHA1 Message Date
Max Kostikov d3e6d6b6a6 Merge branch 'patch-24' into 'dev'
Update Connect.php

See merge request Kostikov/core!8
2018-09-28 15:55:41 +02:00
Max Kostikov 82de0862a1 Merge branch 'patch-25' into 'dev'
Update Group.php

See merge request Kostikov/core!7
2018-09-28 15:54:45 +02:00
Max Kostikov 1969537fd7 Merge branch 'patch-26' into 'dev'
Update Invite.php

See merge request Kostikov/core!6
2018-09-28 15:54:08 +02:00
Max Kostikov 973afe042a Merge branch 'patch-27' into 'dev'
Update Lang.php

See merge request Kostikov/core!5
2018-09-28 15:53:14 +02:00
Max Kostikov 99ceb1691b Merge branch 'patch-28' into 'dev'
Update Mood.php

See merge request Kostikov/core!4
2018-09-28 15:52:28 +02:00
Max Kostikov c13d7e29ef Update Notes.php 2018-09-28 15:35:39 +02:00
Max Kostikov 58d9ca1bfd Update Mood.php 2018-09-28 15:35:14 +02:00
Max Kostikov e2115e8ea5 Update Lang.php 2018-09-28 15:34:45 +02:00
Max Kostikov ba417894ed Update Invite.php 2018-09-28 15:34:20 +02:00
Max Kostikov a237248388 Update Group.php 2018-09-28 15:33:50 +02:00
Max Kostikov 7fd332f8cf Update Connect.php 2018-09-28 15:33:17 +02:00
Max Kostikov 2811d6ae53 Update Chat.php 2018-09-28 15:32:27 +02:00
Max Kostikov d8c6d93c6e Update Cdav.php 2018-09-28 15:31:22 +02:00
Max Kostikov 134529a09d Update Cards.php 2018-09-28 15:30:30 +02:00
Max Kostikov 24c7bb600e Update Articles.php 2018-09-28 15:30:03 +02:00
Max Kostikov 90e9948dbe Update Wiki.php 2018-09-28 15:29:33 +02:00
Max Kostikov db006b911a Update Webpages.php 2018-09-28 15:28:57 +02:00
Max Kostikov eb2c2b9400 Update Tokens.php 2018-09-28 15:27:54 +02:00
Max Kostikov 86fc5b5ed8 Update Sources.php 2018-09-28 15:27:16 +02:00
Max Kostikov f7e9454697 Update Poke.php 2018-09-28 15:26:46 +02:00
Max Kostikov 02a16050d9 Update Permcats.php 2018-09-28 15:26:09 +02:00
Max Kostikov 598fe91464 Update Pdledit.php 2018-09-28 15:25:38 +02:00
Max Kostikov 21272735ae Update Oauth2.php 2018-09-28 15:24:45 +02:00
Max Kostikov 52fea09c53 add translations 2018-09-28 15:23:38 +02:00
Mario Vavti 20285d076b settings for channel home 2018-09-28 11:29:05 +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
Max Kostikov 5d6c8fd807 Update Import.php 2018-09-28 00:28:15 +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 56fdc4f3fe Missprint in Oauth.php fixed 2018-09-27 20:26:47 +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
Mario Vavti 1353c291e9 add check for local_channel() 2018-09-26 16:32:06 +02:00
Mario Vavti 9af1b62bee change wording 2018-09-26 16:26:36 +02:00
Mario Vavti d7ec36e3da wrong app name 2018-09-26 16:23:12 +02:00
Mario Vavti aab97adb23 oauth and oauth2 apps manager 2018-09-26 16:22:34 +02:00
Mario Vavti 9bc76b4259 appification of the pdl editor and move advanced_theming to theme settings where it belongs 2018-09-26 15:02:20 +02:00
Mario Vavti 9948bb3f2a appification of privacy groups 2018-09-25 12:59:53 +02:00
Mario Vavti 9bb0f1d18e move advanced_theming switch to settings/display for now 2018-09-25 12:02:00 +02:00
Mario Vavti 39866b7463 move start_menu switch to settings/display for now 2018-09-25 11:37:22 +02:00
Mario Vavti 4c58a5cef2 premium channel app 2018-09-25 10:06:24 +02:00