Mario Vavti
|
3f57609b75
|
merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2018-10-06 15:00:40 +02:00 |
|
Mario Vavti
|
a522a66715
|
bookmarks: change wording
|
2018-10-06 14:50:17 +02:00 |
|
Mario Vavti
|
c2c891723f
|
bookmark app
|
2018-10-06 14:48:12 +02:00 |
|
Max Kostikov
|
ebb4811a75
|
Respect new table names on import
|
2018-10-06 14:06:24 +02:00 |
|
Mario Vavti
|
69659e9bd5
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-10-05 11:40:50 +02:00 |
|
zotlabs
|
3a0a611f15
|
Merge branch 'dev'
|
2018-10-04 19:20:10 -07:00 |
|
Mario Vavti
|
1eaf6df842
|
fix issues with bs accordions
|
2018-10-04 22:21:20 +02:00 |
|
Mario Vavti
|
9fe9137c96
|
fix displaying of perm cats selector
|
2018-10-04 22:01:34 +02:00 |
|
Mario Vavti
|
363fc5c72b
|
whitespace
|
2018-10-04 21:49:00 +02:00 |
|
Mario Vavti
|
d4af745fc8
|
move *_divmore_height setting to the module extra_settings, and fix issue where feature settings were not synced if rpath was provided
|
2018-10-04 21:38:39 +02:00 |
|
Mario Vavti
|
6e03104e3e
|
move *_list_mode to features
|
2018-10-04 20:48:22 +02:00 |
|
Mario Vavti
|
c00dc6120d
|
defperm app
|
2018-10-04 13:26:45 +02:00 |
|
Mario Vavti
|
d0605e8d5f
|
uexport app
|
2018-10-04 11:50:38 +02:00 |
|
zotlabs
|
d33c331abd
|
regression: double linebreaks in viewsrc output
|
2018-10-03 21:18:23 -07:00 |
|
Mario Vavti
|
08a287dea1
|
do not default to channel_startpage if startpage app is not installed
|
2018-10-01 12:38:04 +02:00 |
|
Mario Vavti
|
7dadf387e5
|
indicate locked features
|
2018-10-01 11:01:56 +02:00 |
|
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 |
|
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 |
|