 zotlabs
|
bf580fcc06
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2017-05-23 16:14:41 -07:00 |
|
 Mario Vavti
|
31d9208172
|
bump version
|
2017-05-23 21:53:34 +02:00 |
|
|
zotlabsandMario Vavti
|
508ea9153c
|
this looks like a slightly cleaner solution to the unicode dl issue
|
2017-05-23 21:52:35 +02:00 |
|
|
zotlabsandMario Vavti
|
6ff16e2651
|
hubzilla issue #777
|
2017-05-23 21:52:21 +02:00 |
|
|
zotlabsandMario Vavti
|
da682717ab
|
wiki auto language select to match webpages implementation
|
2017-05-23 21:51:17 +02:00 |
|
|
zotlabsandMario Vavti
|
647b5d098f
|
apporder style improvement and add to nav menu, also add language awareness to webpages
|
2017-05-23 21:50:38 +02:00 |
|
|
zotlabsandMario Vavti
|
3a9e5f0f98
|
schema fixes
|
2017-05-23 21:48:58 +02:00 |
|
|
zotlabsandMario Vavti
|
50c9aec436
|
some issues with the app order template logic
|
2017-05-23 21:44:57 +02:00 |
|
|
zotlabsandMario Vavti
|
ec7ecc285e
|
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-23 21:44:25 +02:00 |
|
 git-marijusandGitHub
|
dea0d07b9a
|
Merge pull request #794 from dawnbreak/dev
Replace Mardownify library with html-to-markdown library.
|
2017-05-23 21:39:47 +02:00 |
|
|
zotlabs
|
357e7af6ad
|
add 'apps' app
|
2017-05-23 01:18:34 -07:00 |
|
|
zotlabs
|
53057830e0
|
wiki auto language select to match webpages implementation
|
2017-05-22 20:18:47 -07:00 |
|
|
zotlabs
|
7ae0317b6a
|
apporder style improvement and add to nav menu, also add language awareness to webpages
|
2017-05-22 17:07:34 -07:00 |
|
 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 |
|
|
zotlabsandMario Vavti
|
e32e616031
|
resolve merge conflict
|
2017-05-20 22:57:38 +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
|
3fad69e5ca
|
some styling for system notifications
|
2017-05-18 14:57:10 +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 |
|
|
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 |
|
|
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 |
|
|
Mario Vavti
|
18ee1ba589
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2017-05-12 10:04:00 +02:00 |
|
|
git-marijusandGitHub
|
795b39250f
|
Merge pull request #770 from zotlabs/mast496
consolidate and simplify the generation of activitystreams persons, a…
|
2017-05-12 10:02:33 +02:00 |
|
|
git-marijusandGitHub
|
ae89f1b3b3
|
Merge pull request #771 from zotlabs/filesync
issue #769
|
2017-05-12 10:02:12 +02:00 |
|