Commit Graph

1632 Commits

Author SHA1 Message Date
M. Dent
ff20370d0b Status editor hook 2018-09-29 20:22:27 +02:00
Mario Vavti
cc9ca8bbff do not unset $_GET[search] and adjust activity_order widget 2018-09-29 18:38:19 +02:00
Mario Vavti
5906d6cce3 improve network search 2018-09-29 18:00:14 +02:00
Mario Vavti
8265dac9c0 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2018-09-29 16:00:54 +02:00
Mario Vavti
6eeac03a0e appman: query terms also by uid to prevent double entries 2018-09-29 16:00:34 +02:00
M. Dent
5f992ffe15 Remove servicelevel logic 2018-09-29 00:17:55 +02:00
Max Kostikov
c45a9504e7 Update Group.php 2018-09-28 19:52:11 +02:00
Max Kostikov
403ead44f9 Update Wiki.php 2018-09-28 19:50:45 +02:00
Max Kostikov
9b0d123217 Update Webpages.php 2018-09-28 19:50:29 +02:00
Max Kostikov
8e673a6cdf Update Tokens.php 2018-09-28 19:50:15 +02:00
Max Kostikov
6d3c1fb7fc Update Sources.php 2018-09-28 19:49:56 +02:00
Max Kostikov
01043fa790 Update Poke.php 2018-09-28 19:49:42 +02:00
Max Kostikov
23d5e15f0f Update Permcats.php 2018-09-28 19:49:20 +02:00
Max Kostikov
5500473387 Update Pdledit.php 2018-09-28 19:49:02 +02:00
Max Kostikov
c8399e8104 Update Oauth2.php 2018-09-28 19:48:44 +02:00
Max Kostikov
423e1422ef Update Oauth.php 2018-09-28 19:48:25 +02:00
Max Kostikov
c34c0c6718 Update Notes.php 2018-09-28 19:48:09 +02:00
Max Kostikov
e3e96e59d2 Update Mood.php 2018-09-28 19:47:52 +02:00
Max Kostikov
accb211280 Update Lang.php 2018-09-28 19:47:37 +02:00
Max Kostikov
f07a4667b6 Update Invite.php 2018-09-28 19:47:20 +02:00
Max Kostikov
cb768ea23f Update Connect.php 2018-09-28 19:46:36 +02:00
Max Kostikov
b3249c10c2 Update Chat.php 2018-09-28 19:46:20 +02:00
Max Kostikov
c6fce5de24 Update Cdav.php 2018-09-28 19:46:04 +02:00
Max Kostikov
5c8e1169cd Update Cards.php 2018-09-28 19:45:11 +02:00
Max Kostikov
5f7d83bd4d Update Articles.php 2018-09-28 19:44:10 +02:00
Max Kostikov
52916bfcec Merge branch 'patch-11' into 'dev'
add translations

See merge request Kostikov/core!21
2018-09-28 16:04:29 +02:00
Max Kostikov
cb2646154a Merge branch 'patch-12' into 'dev'
Update Oauth2.php

See merge request Kostikov/core!20
2018-09-28 16:03:44 +02:00
Max Kostikov
61a7c4fb33 Merge branch 'patch-13' into 'dev'
Update Pdledit.php

See merge request Kostikov/core!19
2018-09-28 16:03:05 +02:00
Max Kostikov
3a3abc8087 Merge branch 'patch-14' into 'dev'
Update Permcats.php

See merge request Kostikov/core!18
2018-09-28 16:02:33 +02:00
Max Kostikov
e9b60cfb26 Merge branch 'patch-15' into 'dev'
Update Poke.php

See merge request Kostikov/core!17
2018-09-28 16:01:49 +02:00
Max Kostikov
eea9e2c1d0 Merge branch 'patch-16' into 'dev'
Update Sources.php

See merge request Kostikov/core!16
2018-09-28 16:01:05 +02:00
Max Kostikov
171d129ad1 Merge branch 'patch-17' into 'dev'
Update Tokens.php

See merge request Kostikov/core!15
2018-09-28 16:00:32 +02:00
Max Kostikov
0154c5d74e Merge branch 'patch-18' into 'dev'
Update Webpages.php

See merge request Kostikov/core!14
2018-09-28 15:59:48 +02:00
Max Kostikov
9032a656fa Merge branch 'patch-19' into 'dev'
Update Wiki.php

See merge request Kostikov/core!13
2018-09-28 15:58:55 +02:00
Max Kostikov
fda57a93a5 Merge branch 'patch-20' into 'dev'
Update Articles.php

See merge request Kostikov/core!12
2018-09-28 15:58:05 +02:00
Max Kostikov
4ad208668a Merge branch 'patch-21' into 'dev'
Update Cards.php

See merge request Kostikov/core!11
2018-09-28 15:57:29 +02:00
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
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