Commit graph

21218 commits

Author SHA1 Message Date
Mario Vavti
ade11568f9 update mysql schema 2018-03-11 13:53:53 +01:00
Manuel Jiménez Friaza
ec12b78ddf Spanish translation: added el before artículo, which is the correct construction. 2018-03-11 13:07:11 +01:00
zotlabs
08d2adddf5 remove debugging 2018-03-10 13:21:22 -08:00
zotlabs
a417389934 trim expects error ... in admin/site 2018-03-10 13:20:20 -08:00
Andrew Manning
aa6f7481a0 Fixed access_token request bug and returned oauth2-server-php library to unmodified state. 2018-03-10 15:43:13 -05:00
Mario Vavti
cd21519de3 do not use trim on array 2018-03-10 21:21:44 +01:00
Andrew Manning
a4de63ca92 Merge branch 'dev' into oauth2 2018-03-10 15:10:09 -05:00
Mario Vavti
78040330b6 update changelog 2018-03-09 11:06:05 +01:00
git-marijus
4fdad3b8af
Merge pull request #994 from Reylak/dev
RedBasic theme dark schema update
2018-03-09 09:21:52 +01:00
Mario Vavti
9c02c66ed3 remove redundant comma 2018-03-09 09:17:57 +01:00
Mario Vavti
d82bf2b921 Merge remote-tracking branch 'mike/master' into dev 2018-03-09 09:04:14 +01:00
zotlabs
3ee35b83c2 notifications-btn-1 does not actually require the text-white class and this is known to cause issues on dark themes 2018-03-08 14:23:34 -08:00
Mathieu "Matbac" Bacou
500b141341 Uniformize title input with other input fields
Add rounded corners to mimic categories input field and main text area.
2018-03-08 21:12:33 +01:00
Mathieu "Matbac" Bacou
f9cca2422a Remove useless background spec for category field 2018-03-08 21:02:51 +01:00
Mathieu "Matbac" Bacou
76a8006003 Fix background of tags field 2018-03-08 20:56:23 +01:00
Mathieu "Thrar" Bacou
7ac70e1f23 Fix code background in wiki pages
Fix needed after commit c444e40c01
2018-03-08 20:14:44 +01:00
Mario
a0a1246efb use dbunescbin() for cover photos 2018-03-08 10:52:49 +01:00
Mario
2105cfd433 fix syntax error in postgres update 2018-03-08 10:27:43 +01:00
Mario Vavti
f3a753bda6 Merge remote-tracking branch 'mike/master' into dev 2018-03-08 08:55:25 +01:00
zotlabs
1700aedbed remove extraneous logging 2018-03-07 17:29:01 -08:00
zotlabs
48b1042347 hashtag autocomplete 2018-03-07 16:59:55 -08:00
zotlabs
a454aad124 federated polls: GNU-Social requires us to preserve the original order of the poll answers for use in making a vote, unlike diaspora (which selects by guid) and activitypub (which selects by non-localisable text). 2018-03-07 15:39:14 -08:00
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
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
da9fe27db1 update changelog 2018-03-06 11:15:47 +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
c462d2f15e add pdl file for mod moderate 2018-03-05 23:03:58 +01:00
Mario Vavti
bae2af09a0 fix javascript error if there are no notifications 2018-03-05 22:59:05 +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
Mario Vavti
a0e390c6c8 Merge remote-tracking branch 'mike/master' into dev 2018-03-05 08:54:46 +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
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