Commit Graph

22057 Commits

Author SHA1 Message Date
Mario Vavti
17c102ebe1 we need the javascript in the template since strings are involved 2018-03-07 21:11:57 +01:00
Mario Vavti
d6812cf75e more bootstrap accordion fixes 2018-03-07 20:47:18 +01:00
Mario Vavti
04f7f99fc3 we do not support separate mobile themes anymore 2018-03-07 20:29:37 +01:00
zotlabs
46a4208b3d don't add pending connections to the default privacy group until accepted 2018-03-07 08:59:29 +01:00
zotlabs
f0f58dade8 federated polls: add poll_author which will be necessary for Diaspora federation 2018-03-06 15:31:45 -08:00
zotlabs
b282e45a02 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-03-06 15:23:05 -08:00
zotlabs
0a876e1518 don't add pending connections to the default privacy group until accepted 2018-03-06 11:39:49 -08:00
Mario Vavti
1d3d713c1c update changelog 2018-03-06 11:16:16 +01:00
Mario Vavti
da9fe27db1 update changelog 2018-03-06 11:15:47 +01:00
Andrew Manning
f91db3ee8e Improve rendering of Readme files in plugin settings 2018-03-06 09:00:33 +01:00
git-marijus
c7351c0922
Merge pull request #991 from anaqreon/dev
Improve rendering of Readme files in plugin settings
2018-03-06 08:49:06 +01:00
Andrew Manning
99247d0c59 Improve rendering of Readme files in plugin settings 2018-03-05 20:42:06 -05:00
Andrew Manning
9b13db1c48 Merge branch 'dev' into oauth2 2018-03-05 20:06:47 -05:00
Mario Vavti
ed79621c76 RC2 2018-03-05 23:06:27 +01:00
Mario Vavti
afdde44061 add pdl file for mod moderate 2018-03-05 23:04:35 +01:00
Mario Vavti
c462d2f15e add pdl file for mod moderate 2018-03-05 23:03:58 +01:00
Mario Vavti
c304361c9b fix javascript error if there are no notifications 2018-03-05 22:59:51 +01:00
Mario Vavti
bae2af09a0 fix javascript error if there are no notifications 2018-03-05 22:59:05 +01:00
Mario Vavti
12ca4caa4a update redbasic theme screenshot 2018-03-05 22:40:23 +01:00
Mario Vavti
a0e0b82067 update redbasic theme screenshot 2018-03-05 22:39:27 +01:00
mrjive
9fb65e10bd Partial italina translationhmessages.po hstrings.php 2018-03-05 05:37:15 -08:00
zotlabs
f02314dfd8 fix some issues with friend suggestions on standalone sites with no 'suggestme' volunteers. This wrongly pulled up a site directory suggesting everybody on the site. While a better outcome than finding nobody, this does not fit with our ethical design goals. If there are no friends of friends, we will only suggest those who volunteer to be on the default suggestion list. Also do not attempt to load poco data from dead sites. 2018-03-05 08:57:47 +01:00
zotlabs
af46c192bf bugfix: unable to reset profile fields to defaults in admin/profs by emptying the textarea 2018-03-05 08:57:35 +01:00
zotlabs
77a8a2b9ac restrict mail messages to max_import_size 2018-03-05 08:57:23 +01:00
Mario Vavti
a0e390c6c8 Merge remote-tracking branch 'mike/master' into dev 2018-03-05 08:54:46 +01:00
phellmes
09b6888526 Update DE translation strings 2018-03-05 08:54:19 +01:00
git-marijus
fd7d3f9286
Merge pull request #989 from phellmes/dev
Update DE translation strings (for 3.2RC)
2018-03-05 08:53:03 +01:00
zotlabs
59a2057fa0 fix some issues with friend suggestions on standalone sites with no 'suggestme' volunteers. This wrongly pulled up a site directory suggesting everybody on the site. While a better outcome than finding nobody, this does not fit with our ethical design goals. If there are no friends of friends, we will only suggest those who volunteer to be on the default suggestion list. Also do not attempt to load poco data from dead sites. 2018-03-04 17:40:38 -08:00
zotlabs
be6619d9c0 bugfix: unable to reset profile fields to defaults in admin/profs by emptying the textarea 2018-03-04 15:29:10 -08:00
phellmes
bb7457f43c Update DE translation strings 2018-03-05 00:24:41 +01:00
zotlabs
14f701f7fc restrict mail messages to max_import_size 2018-03-04 14:30:09 -08:00
Andrew Manning
058f7277b5 Merge branch 'dev' into oauth2 2018-03-04 06:45:07 -05:00
zotlabs
5d18996362 add dummy f= arg to suggestion urls, use directory version of suggest for newmember link instead of the suggest module as the UI is prettier. 2018-03-04 09:49:13 +01:00
zotlabs
ad3f61a215 sigh - missed two strings 2018-03-04 09:49:11 +01:00
zotlabs
1eab488754 There was no pdl for mod_thing; add one because it's only a link away from profile creation and remains on that page until you go elsewhere and new members may need help to find their way out 2018-03-04 09:46:17 +01:00
zotlabs
471c3c4d06 add dummy f= arg to suggestion urls, use directory version of suggest for newmember link instead of the suggest module as the UI is prettier. 2018-03-03 15:54:13 -08:00
zotlabs
ca1022675c There was no pdl for mod_thing; add one because it's only a link away from profile creation and remains on that page until you go elsewhere and new members may need help to find their way out 2018-03-03 15:19:39 -08:00
zotlabs
c3920116f2 more work on federated polls 2018-03-03 13:52:55 -08:00
zotlabs
26e0fd624a Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-03-02 20:08:01 -08:00
zotlabs
4c69c56797 string change "Channel added" -> "Connection added" 2018-03-02 14:09:59 -08:00
zotlabs
df03805579 process follow from article menu in the background, do not reload page - hubzilla issue #987 2018-03-02 13:15:28 -08:00
zotlabs
b38ce967f3 sort settings/featured 2018-03-02 12:41:50 -08:00
zotlabs
dbe73cdcbe add icon to any addon settings blocks which don't already have one 2018-03-02 12:04:23 -08:00
git-marijus
2f0ebdeade
Merge pull request #985 from mjfriaza/dev
Updated Spanish translation (hmessages.po/php and register_verify_member.tpl).
2018-03-02 20:46:34 +01:00
git-marijus
98e3e7ff9b
Merge pull request #986 from mjfriaza/3.2RC
Updated Spanish translation (hmessages.po/php and register_verify_member.tpl).
2018-03-02 20:46:18 +01:00
zotlabs
226aad357d add federation property to webfinger 2018-03-02 20:40:45 +01:00
Mario Vavti
7c5f1e814b Merge remote-tracking branch 'mike/master' into dev 2018-03-02 20:25:17 +01:00
Manuel Jiménez Friaza
49a236345f New strings for Spanish translation. 2018-03-02 18:32:01 +01:00
Manuel Jiménez Friaza
840cea680c New strings for Spanish translation. 2018-03-02 18:28:42 +01:00
Mario Vavti
83365840af update DB update 1205 to mitigate
ERROR 1069 (42000): Too many keys specified; max 64 keys allowed
2018-03-02 13:10:44 +01:00