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-marijus
|
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-marijus
|
47a080d79c
|
Merge pull request #782 from dawnbreak/QA_testing
👷✅ Documentation Permissions.php.
|
2017-05-17 10:04:52 +02:00 |
|
git-marijus
|
66a8e5ddbb
|
Merge pull request #780 from zotlabs/docbug
no bug reporting info in docs
|
2017-05-17 10:03:07 +02:00 |
|
git-marijus
|
8c39ed61a9
|
Merge pull request #778 from beardyunixer/dev
Update nginx
|
2017-05-17 10:02:35 +02:00 |
|
git-marijus
|
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-marijus
|
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
|
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 |
|
Klaus Weidenbach
|
d056b13e14
|
👷✅ 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 |
|
zotlabs
|
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
|
c4b247e75e
|
no bug reporting info in docs
|
2017-05-15 20:38:27 -07:00 |
|
Thomas Willingham
|
226fcac72e
|
Update nginx
|
2017-05-15 10:55:33 +01: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
|
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-marijus
|
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-marijus
|
ae89f1b3b3
|
Merge pull request #771 from zotlabs/filesync
issue #769
|
2017-05-12 10:02:12 +02:00 |
|
zotlabs
|
c2bd7d1e56
|
issue #769
|
2017-05-11 18:32:34 -07:00 |
|
zotlabs
|
e501289a55
|
consolidate and simplify the generation of activitystreams persons, add a couple more fields hoping eventually Mastodon will accept legal follow activities without choking on them. Requires an update of plugins also.
|
2017-05-11 17:39:26 -07:00 |
|
Mario Vavti
|
1ebc9de1e6
|
Empty ACL should not result in no ACL when uploading a file
|
2017-05-11 13:31:36 +02:00 |
|
git-marijus
|
f34b060e23
|
Merge pull request #767 from zotlabs/realm_ac
send directory realm_token for navbar autocomplete searches - if conf…
|
2017-05-11 10:41:57 +02:00 |
|
zotlabs
|
1077686bda
|
send directory realm_token for navbar autocomplete searches - if configured
|
2017-05-10 17:02:56 -07:00 |
|
Mario Vavti
|
582d075c45
|
missing clearfix
|
2017-05-10 17:39:49 +02:00 |
|
git-marijus
|
76a8711570
|
Merge pull request #766 from phellmes/dev
Update DE translation strings (also for 2.4RC)
|
2017-05-10 14:52:41 +02:00 |
|
zotlabs
|
60204becf4
|
don't allow html in plugin comment blocks
|
2017-05-10 14:49:32 +02:00 |
|
zotlabs
|
032216153f
|
use correct data type
|
2017-05-10 14:49:07 +02:00 |
|
zotlabs
|
dac4447e33
|
zot protocol doco updates
|
2017-05-10 14:48:49 +02:00 |
|
zotlabs
|
fa94c0a65b
|
handle mastodon urls in markdown/bbcode conversion
|
2017-05-10 14:48:04 +02:00 |
|
phellmes
|
96cc6a916d
|
Update DE translation strings
|
2017-05-09 16:00:02 +02:00 |
|
Mario Vavti
|
6c0e0b3eae
|
make all label bold
|
2017-05-09 10:25:12 +02:00 |
|
git-marijus
|
9a0400c93a
|
Merge pull request #763 from anaqreon/dev
Implemented switch statement logic in Comanche layout parser.
|
2017-05-09 10:16:11 +02:00 |
|
git-marijus
|
13b5eb0ad8
|
Merge pull request #762 from mjfriaza/dev
Updated the Spanish translation
|
2017-05-09 10:07:51 +02:00 |
|
root
|
0be74c6551
|
Implemented switch statement logic in Comanche layout parser.
|
2017-05-08 20:55:31 -04:00 |
|
Manuel Jiménez Friaza
|
6fe6e1596f
|
Updated the Spanish translation
|
2017-05-08 13:12:26 +02:00 |
|
zotlabs
|
40c8549cf5
|
get rid of edit activities
|
2017-05-08 11:12:09 +02:00 |
|
zotlabs
|
a7ea370ec3
|
cover photo was unintentionally disabled when block_public in effect
|
2017-05-08 11:11:50 +02:00 |
|
git-marijus
|
bd3708870d
|
Merge pull request #756 from dawnbreak/QA_testing
👷✅🐛 Import table structure in TravisCI.
|
2017-05-07 15:06:45 +02:00 |
|
git-marijus
|
2aa699d03e
|
Merge pull request #761 from anaqreon/dev
Mail subject bug fix
|
2017-05-07 15:05:50 +02:00 |
|
Andrew Manning
|
1d20b2603a
|
Mail subject bug fix
|
2017-05-07 08:52:26 -04:00 |
|
Klaus Weidenbach
|
f162508ad1
|
👷✅🐛 Import table structure in TravisCI.
Fix a syntax error in schema_postres.sql which was discovered while
working on this.
|
2017-05-06 01:07:15 +02:00 |
|
Mario Vavti
|
3ccefa20e8
|
collapse sysapps if viewing a remote channel
|
2017-05-05 16:33:28 +02:00 |
|
Mario Vavti
|
dcc8a94d07
|
css hack to make remote channel menu header look in line with the rest if in collapsed state
|
2017-05-05 14:40:35 +02:00 |
|
Mario Vavti
|
5dd501e0ea
|
css fix
|
2017-05-05 12:58:27 +02:00 |
|
git-marijus
|
3d1df8337e
|
Merge pull request #751 from dawnbreak/docu
💡 Add Doxygen fix for @var member variable documentation.
|
2017-05-05 12:33:58 +02:00 |
|
git-marijus
|
f08001a5a6
|
Merge pull request #753 from zotlabs/mdauto
markdown autolinks - hubzilla bug #752
|
2017-05-05 12:33:39 +02:00 |
|
zotlabs
|
ecbba93784
|
markdown autolinks - hubzilla bug #752
|
2017-05-05 02:28:38 -07:00 |
|
zotlabs
|
e308c3d34a
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2017-05-04 19:20:29 -07:00 |
|