Commit Graph

22434 Commits

Author SHA1 Message Date
Max Kostikov
23edb51ba4 Merge branch 'patch-22' into 'dev'
Update Cdav.php

See merge request Kostikov/core!10
2018-09-28 15:56:55 +02:00
Max Kostikov
adf10296f1 Merge branch 'patch-23' into 'dev'
Update Chat.php

See merge request Kostikov/core!9
2018-09-28 15:56:17 +02:00
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
4a904fa3a8 Merge branch 'patch-29' into 'dev'
Patch 29

See merge request Kostikov/core!3
2018-09-28 15:46:14 +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
d9ccd24b02 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2018-09-28 13:08:04 +02:00
Mario
27fef98a39 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2018-09-28 13:05:44 +02:00
Mario Vavti
c6db644c42 Merge remote-tracking branch 'mike/master' into dev 2018-09-28 12:46:36 +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