zotlabs
6f3493bb3c
db issues
2017-03-12 15:50:47 -07:00
zotlabs
4c526c7d3d
Merge branch 'dev' into red
2017-03-11 18:02:59 -08:00
zotlabs
4a24a8de43
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2017-03-11 18:02:38 -08:00
jeroenpraat
b8ad22f525
Login-box css-fix for Bluegrid scheme
2017-03-11 21:09:42 +01:00
git-marijus and GitHub
ee03391293
Merge pull request #693 from anaqreon/dev
...
Take me home instead of get me home
2017-03-11 10:58:03 +01:00
zotlabs
30503d6533
strings
2017-03-10 12:45:40 -08:00
zotlabs
bbb83bea38
strings
2017-03-10 12:44:57 -08:00
zotlabs
1a49f0d164
one role.
2017-03-09 18:54:10 -08:00
Andrew Manning
a2371d56fd
Take me home instead of get me home
2017-03-09 20:43:16 -05:00
zotlabs
c93db2cd21
more cleanup
2017-03-09 14:31:54 -08:00
zotlabs
15d422db80
Merge branch 'dspr' into red
2017-03-09 14:17:14 -08:00
zotlabs
b6477cd38b
go back to where the problem started
2017-03-09 11:51:21 -08:00
zotlabs
403f4c1a6b
Monday is a proper name and should be capitalised (except in private conversation amongst unix geeks).
2017-03-08 19:23:11 -08:00
zotlabs
15ab331b6b
move all the diaspora content hacks to the diaspora plugin
2017-03-08 17:35:19 -08:00
zotlabs
9ca53fdc5d
DCV stuff
2017-03-07 17:44:19 -08:00
Mario Vavti
8e3a026276
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
2017-03-07 12:08:43 +01:00
jeroenpraat and Mario Vavti
b5ddd08630
Big 2.2 string update Dutch
2017-03-07 12:08:16 +01:00
zotlabs
a037590ce3
allow post_activity_item to be passed an empty ACL without resetting to channel default
2017-03-06 21:01:17 -08:00
zotlabs
a18e8e1ede
add public_policy to the nwiki container also. This should not affect the recent bug as presented, but is being added for consistency.
2017-03-06 17:59:34 -08:00
zotlabs
595cb13d8f
correct fix for wiki anonymous read issue (items_permissions_sql checks item.public_policy which was set for posts, not wikis)
2017-03-06 15:33:10 -08:00
Mario Vavti
9e44b07275
allow unauthenticated access to public wiki pages
2017-03-06 22:32:05 +01:00
Mario Vavti
99e681c09f
do not collapse long nsfw content
2017-03-06 11:52:07 +01:00
zotlabs
4f5e9d77b2
remove include/probe.php which has never completed development and has never been used
2017-03-05 20:45:21 -08:00
zotlabs
98ccdf65fb
Merge branch 'dev' into red
2017-03-05 16:32:53 -08:00
zotlabs
4c0c153b8f
move emoji emoticons (not reactions) to plugin
2017-03-05 16:18:09 -08:00
zotlabs
c533c62c64
some event work
2017-03-05 14:47:20 -08:00
zotlabs
384db9d10d
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2017-03-05 11:02:19 -08:00
zotlabs and GitHub
5d8b0acc16
Merge pull request #689 from mjfriaza/dev
...
Translated the last strings into Spanish version
2017-03-05 19:25:41 +11:00
Manuel Jiménez Friaza
3d23f4ec77
Translated the last strings into Spanish version
2017-03-05 08:50:53 +01:00
zotlabs and GitHub
215bd07f0b
Merge pull request #688 from dawnbreak/markdown
...
⬆️ 🔨 Upgrade Markdownify library.
2017-03-05 18:22:37 +11:00
Klaus Weidenbach
6c79e0c077
⬆️ 🔨 Upgrade Markdownify library.
...
The current version 2.0.0 (alpha) throws deprecated warning with
PHP7.1 and PHPUnit.
Upgrade the HTML to Markdown converter for PHP to the current
Markdownify 2.2.1.
Used composer to manage this library.
2017-03-05 01:14:15 +01:00
zotlabs
b2ea61ea3e
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2017-03-04 11:57:20 -08:00
zotlabs
47d2467e24
minor feed issue
2017-03-04 11:56:59 -08:00
Mario Vavti
8e1716065e
update changelog
2017-03-04 17:04:04 +01:00
Mario Vavti
eaefb36212
we need item edited for wiki page history, not item created
2017-03-04 16:56:52 +01:00
zotlabs
a2f6f48daf
string update
2017-03-03 14:01:50 -08:00
Mario Vavti
608e679d33
fix badge position for narrow navbar
2017-03-03 10:04:11 +01:00
zotlabs
155844f142
reverse sort order
2017-03-02 23:02:44 -08:00
zotlabs
cee9a20e85
activity widget - turns out the owner is not relevant.
2017-03-02 18:10:23 -08:00
zotlabs
70ca4a7fea
document the activity widget
2017-03-02 17:39:57 -08:00
zotlabs
7445f1881e
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2017-03-02 17:36:14 -08:00
zotlabs
e58dc726c5
activity widget - like the forum widget but represents unseen activity by author. Still experimental until it can be tested with diaspora xchans, which may require additional urlencoding.
2017-03-02 17:32:43 -08:00
Mario Vavti
6bf6462a37
provide info if there are no sche,es available
2017-03-02 12:51:31 +01:00
Mario Vavti
dd8a3d845e
reset schema value after we empty and repopulate it. second half of fix for #624
2017-03-02 11:36:35 +01:00
Mario Vavti
66fc1dcf33
reset schema value after we empty and repopulate it. first half of fix for #624
2017-03-02 11:03:33 +01:00
Mario Vavti
816f4907e3
setting top position of contextual-help in schemes does not work with narrow navbar setting. schema css is always called last.
2017-03-02 10:12:00 +01:00
zotlabs
d7e24b2494
make system.expire_delivery_reports default setting consistent (10 days)
2017-03-01 20:05:52 -08:00
Mario Vavti
d4a957ca16
add title to connect button
2017-03-01 11:39:26 +01:00
Mario Vavti
e08e6c182c
minor template fixes
2017-03-01 11:37:02 +01:00
zotlabs
1ca0b85196
cleaner integration between the headers and session options of z_fetch_url()
2017-02-28 16:32:24 -08:00
zotlabs
jeroenpraat
git-marijusandGitHub
Andrew Manning
Manuel Jiménez Friaza
Klaus Weidenbach