 Klaus Weidenbach
|
547df2219a
|
Replace Mardownify library with html-to-markdown library.
|
2017-05-23 00:32:11 +02:00 |
|
 zotlabs
|
1c8c7479b8
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2017-05-22 03:51:58 -07:00 |
|
|
zotlabs
|
36a960adec
|
schema fixes
|
2017-05-22 00:57:56 -07:00 |
|
|
zotlabs
|
07ee4984cb
|
some issues with the app order template logic
|
2017-05-21 22:42:22 -07:00 |
|
|
zotlabs
|
e4448423fb
|
apporder module and all the associated backend stuff to make it work; probably needs a bit of UI cleanup and a link to it from somewhere
|
2017-05-21 22:23:36 -07:00 |
|
 Mario Vavti
|
50e9d02458
|
bump version
|
2017-05-20 23:04:18 +02:00 |
|
|
Mario Vavti
|
45233dd53c
|
2.4RC1.1
|
2017-05-20 23:03:06 +02:00 |
|
|
zotlabsandMario Vavti
|
1a9fdc565c
|
resolve merge conflict
|
2017-05-20 22:59:12 +02:00 |
|
|
zotlabsandMario Vavti
|
e32e616031
|
resolve merge conflict
|
2017-05-20 22:57:38 +02:00 |
|
|
Mario Vavti
|
b14fb1759d
|
2.4RC1
|
2017-05-20 22:24:54 +02:00 |
|
|
zotlabsandMario Vavti
|
abd757d356
|
always wonder about people who say "do as I say, not as I do..."
|
2017-05-20 22:22:17 +02:00 |
|
|
zotlabsandMario Vavti
|
28645b492e
|
one file hadn't yet been saved when doing pull request
|
2017-05-20 22:21:34 +02:00 |
|
|
zotlabsandMario Vavti
|
3919c8f79f
|
abook_not_here flag created to indicate singleton connections which are connected to this channel but not on this hub. abook_instance enumerates which hubs the connections is valid, but we ultimately need something more efficiently searchable to decide what operations are supported w/r/t this connection in the context of this hub. This flag is ignored during sync to clones although the code to set it correctly during channel creation, import, and sync has not yet been implemented.
|
2017-05-20 22:21:22 +02:00 |
|
|
zotlabsandMario Vavti
|
803be11bbc
|
Do not yet understand why on postgres, app['plugin'] gets set to 3 linefeeds but this prevents it from rendering
|
2017-05-20 22:07:11 +02:00 |
|
|
Mario Vavti
|
335de94343
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2017-05-19 10:48:23 +02:00 |
|
|
Mario Vavti
|
b62463107c
|
smileybutton fixes
|
2017-05-19 10:48:04 +02:00 |
|
|
Mario Vavti
|
93ce1661af
|
smileybutton fixes
|
2017-05-19 10:47:33 +02:00 |
|
|
Mario Vavti
|
f59ed38a38
|
some styling for system notifications
|
2017-05-19 09:30:30 +02:00 |
|
|
Mario Vavti
|
3fad69e5ca
|
some styling for system notifications
|
2017-05-18 14:57:10 +02:00 |
|
|
Mario Vavti
|
005db13c45
|
silence php warning during install
|
2017-05-17 11:27:32 +02:00 |
|
|
Mario Vavti
|
d7ddafb39f
|
css first aid for mod setup
|
2017-05-17 11:27:14 +02:00 |
|
|
Mario Vavti
|
3fe7bf27de
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2017-05-17 11:25:33 +02:00 |
|
|
Mario Vavti
|
4b718929df
|
css first aid for mod setup
|
2017-05-17 11:25:14 +02:00 |
|
|
Mario Vavti
|
a44c908147
|
silence php warning during install
|
2017-05-17 11:24:27 +02:00 |
|
 rootandMario Vavti
|
1bf37305a8
|
Implemented switch statement logic in Comanche layout parser.
|
2017-05-17 10:08:34 +02:00 |
|
 git-marijusandGitHub
|
ed4d589077
|
Merge pull request #783 from zotlabs/app_order
provide mechanism to arbitrarily sort the nav tray apps, currently th…
|
2017-05-17 10:06:14 +02:00 |
|
|
git-marijusandGitHub
|
47a080d79c
|
Merge pull request #782 from dawnbreak/QA_testing
:construction_worker:✅ Documentation Permissions.php.
|
2017-05-17 10:04:52 +02:00 |
|
|
git-marijusandGitHub
|
66a8e5ddbb
|
Merge pull request #780 from zotlabs/docbug
no bug reporting info in docs
|
2017-05-17 10:03:07 +02:00 |
|
|
git-marijusandGitHub
|
8c39ed61a9
|
Merge pull request #778 from beardyunixer/dev
Update nginx
|
2017-05-17 10:02:35 +02:00 |
|
|
git-marijusandGitHub
|
a12d403981
|
Merge pull request #774 from zotlabs/pgapps
Do not yet understand why on postgres, app['plugin'] gets set to 3 li…
|
2017-05-17 09:57:50 +02:00 |
|
|
git-marijusandGitHub
|
ccf0274d13
|
Merge pull request #775 from zotlabs/pgstuff
always wonder about people who say "do as I say, not as I do..."
|
2017-05-17 09:57:32 +02:00 |
|
|
zotlabs
|
21103f8bc4
|
provide mechanism to arbitrarily sort the nav tray apps, currently the preferred order list needs to be manually created
|
2017-05-16 23:00:28 -07:00 |
|
|
zotlabs
|
a1ba44db72
|
provide mechanism to arbitrarily sort the nav tray apps, currently the preferred order list needs to be manually created
|
2017-05-16 22:57:34 -07:00 |
|
|
zotlabs
|
3c22a7b482
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2017-05-16 17:51:00 -07:00 |
|
|
Klaus Weidenbach
|
d056b13e14
|
:construction_worker:✅ Documentation Permissions.php.
Also add some phpunit tests for this class, but there are some problems
yet with mocking static functions.
|
2017-05-17 01:46:31 +02:00 |
|
|
Mario Vavti
|
7a39ccf7bb
|
regenerate optimized autoload files
|
2017-05-16 19:03:37 +02:00 |
|
|
zotlabsandMario Vavti
|
3be90c2e45
|
include attach.php here (boot.php) instead of each file that uses it. Eventually this needs to move to an autoloader.
|
2017-05-16 18:45:48 +02:00 |
|
|
zotlabsandMario Vavti
|
60caecffdd
|
include attach.php here (boot.php) instead of each file that uses it. Eventually this needs to move to an autoloader.
|
2017-05-16 18:45:33 +02:00 |
|
|
zotlabs
|
df3eb562f0
|
danger - do not use 'char(n)' with postgres it creates a thing called a bpchar which is different than a normal text field in subtle ways.
|
2017-05-15 22:58:13 -07:00 |
|
|
zotlabs
|
c4b247e75e
|
no bug reporting info in docs
|
2017-05-15 20:38:27 -07:00 |
|
|
zotlabs
|
d9fdd0ce36
|
no bug reporting info in docs
|
2017-05-15 20:37:29 -07:00 |
|
 Thomas Willingham
|
226fcac72e
|
Update nginx
|
2017-05-15 10:55:33 +01:00 |
|
|
zotlabs
|
5c8a911c93
|
this looks like a slightly cleaner solution to the unicode dl issue
|
2017-05-14 21:04:34 -07:00 |
|
|
zotlabs
|
2cc1844d97
|
hubzilla issue #777
|
2017-05-14 20:51:15 -07:00 |
|
|
zotlabs
|
3916d5c567
|
always wonder about people who say "do as I say, not as I do..."
|
2017-05-14 18:37:36 -07:00 |
|
|
zotlabs
|
ef51c1c2b2
|
Do not yet understand why on postgres, app['plugin'] gets set to 3 linefeeds but this prevents it from rendering
|
2017-05-14 18:17:54 -07:00 |
|
|
zotlabs
|
f637faf0d2
|
Do not yet understand why on postgres, app['plugin'] gets set to 3 linefeeds but this prevents it from rendering
|
2017-05-14 18:02:22 -07:00 |
|
|
zotlabsandMario Vavti
|
d010f4fcae
|
issue #769
|
2017-05-12 10:16:58 +02:00 |
|
|
Mario Vavti
|
d5e436d15b
|
Empty ACL should not result in no ACL when uploading a file
|
2017-05-12 10:16:12 +02:00 |
|
|
Mario Vavti
|
18ee1ba589
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2017-05-12 10:04:00 +02:00 |
|