Commit Graph
24059 Commits
Author SHA1 Message Date
mrjiveandGitHub 790660e612 Merge pull request #18 from redmatrix/dev
Dev
2018-03-13 10:59:21 +01:00
mrjive 2bcfa0c126 small work on connections page 2018-03-13 02:57:08 -07:00
Mario Vavti e02029ecc6 bump version 2018-03-13 09:46:11 +01:00
Manuel Jiménez FriazaandMario Vavti 09e143dc1f Spanish translation: added el before artículo, which is the correct construction. 3.2.1 2018-03-13 09:38:03 +01:00
git-marijusandGitHub 53c1d3775c Merge pull request #997 from mjfriaza/dev
Spanish translation: added "el" before "artículo", which is the correct construction
2018-03-13 09:37:16 +01:00
zotlabsandMario Vavti 62ad32cf2e obscure permission issue with custom permissions when using the highly discouraged advisory privacy modes 2018-03-13 09:08:32 +01:00
Mario Vavti 150e238b02 Merge remote-tracking branch 'mike/master' into dev 2018-03-13 09:05:40 +01:00
zotlabs ab1d47b36f unicode/emoji usernames. Warning: experimental feature, unstable, untested, disabled by default, use at your own risk, may not federate to other platforms and protocols. May not clone correctly. Bug reports which neglect to include detailed roubleshooting information and patches/pull requests will be ignored. 2018-03-12 20:54:55 -07:00
Andrew Manning dcd658f12e Merge branch 'dev' into oauth2 2018-03-12 19:50:25 -04:00
zotlabs 34399b8b47 obscure permission issue with custom permissions when using the highly discouraged advisory privacy modes 2018-03-12 15:47:33 -07:00
Mario Vavti 092c1c8c4c add extra firstpage check 2018-03-12 09:54:15 +01:00
Mario Vavti b265a55b81 Merge remote-tracking branch 'mike/master' into dev 2018-03-12 09:37:29 +01:00
zotlabs 717ae54868 Setup - .htconfig.php write access is now required for automated installation. [String change - leave in dev for the next release] 2018-03-11 16:42:46 -07:00
Mario Vavti ade11568f9 update mysql schema 2018-03-11 13:53:53 +01:00
Mario Vavti 98541beee3 update mysql schema 2018-03-11 13:53:15 +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 ff2935e70c do not use trim on array 2018-03-10 21:22:21 +01: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 4baf5eab16 Merge branch '3.2RC' 3.2 2018-03-09 11:12:18 +01:00
Mario Vavti 7361af85b5 bump version 2018-03-09 11:07:40 +01:00
Mario Vavti 8ce644af28 update changelog 2018-03-09 11:06:28 +01:00
Mario Vavti 78040330b6 update changelog 2018-03-09 11:06:05 +01:00
zotlabsandMario Vavti 3f88a7619f notifications-btn-1 does not actually require the text-white class and this is known to cause issues on dark themes 2018-03-09 09:35:55 +01:00
Mathieu "Matbac" BacouandMario Vavti 056ec81a71 Uniformize title input with other input fields
Add rounded corners to mimic categories input field and main text area.
2018-03-09 09:24:47 +01:00
Mathieu "Matbac" BacouandMario Vavti bc40651bc2 Remove useless background spec for category field 2018-03-09 09:24:35 +01:00
Mathieu "Matbac" BacouandMario Vavti 442b510b23 Fix background of tags field 2018-03-09 09:24:25 +01:00
Mathieu "Thrar" BacouandMario Vavti 4db112e28e Fix code background in wiki pages
Fix needed after commit c444e40c01
2018-03-09 09:24:14 +01:00
git-marijusandGitHub 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 8705882e6e use dbunescbin() for cover photos 2018-03-08 10:50:03 +01:00
Mario 2105cfd433 fix syntax error in postgres update 2018-03-08 10:27:43 +01:00
Mario 16f9e7bd40 fix syntax error in postgres update 2018-03-08 10:20:40 +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
zotlabsandMario Vavti c8afde6f87 process follow from article menu in the background, do not reload page - hubzilla issue #987 2018-03-07 21:41:48 +01:00
Mario Vavti 726576363c RC3 2018-03-07 21:17:07 +01:00
Mario Vavti d2ffe29343 we need the javascript in the template since strings are involved 2018-03-07 21:15:15 +01:00