Commit Graph

1656 Commits

Author SHA1 Message Date
Mario Vavti
e0568f33e8 the root cause for doubled entries is fixed now 2018-10-08 11:25:49 +02:00
Mario Vavti
a00aae702d Merge remote-tracking branch 'mike/master' into dev 2018-10-08 11:05:53 +02:00
zotlabs
69584f541d hubzilla core issue #1278 - page update always reloads if noscript content is enabled 2018-10-07 22:12:49 -07:00
Mario Vavti
66cf085272 move profile assign selector to profile settings and personal menu selector to channel_home settings and get rid of misc channel settings section. 2018-10-06 20:29:32 +02:00
Mario Vavti
96277372d5 rename grid to network (for consistency) and activity to stream (as seen in osada) because it makes much more sense. 2018-10-06 16:40:30 +02:00
Mario Vavti
b8991750c5 pubstream app 2018-10-06 16:08:15 +02:00
Mario Vavti
18726737d0 randprof app 2018-10-06 15:27:46 +02:00
Mario Vavti
6a297a8f3d remote diagnostics app 2018-10-06 15:21:22 +02:00
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