Mario Vavti
|
07b628b667
|
Merge remote-tracking branch 'mike/master' into dev
|
2017-12-18 12:43:31 +01:00 |
|
git-marijus
|
fcb3674ce4
|
Merge pull request #932 from dawnbreak/dev
Update classmap caches and add phpunit/dbunit.
|
2017-12-18 10:32:50 +01:00 |
|
zotlabs
|
ad487ec9f7
|
since api_zot (doc page) is now referenced from the project webpage, include a mention of the twitter/statusnet API plugin since that enables some degree of compatibility with dozens of third-party apps out of the box.
|
2017-12-17 14:26:33 -08:00 |
|
Klaus Weidenbach
|
7cfe4c0f01
|
Update classmap caches and add phpunit/dbunit.
In preparation for DB unit tests add phpunit/dbunit and update dev
libraries.
Update autoload classmap caches.
|
2017-12-17 22:47:51 +01:00 |
|
git-marijus
|
77ffc385ab
|
Merge pull request #930 from mjfriaza/dev
Updated Spanish translation.
|
2017-12-17 11:12:45 +01:00 |
|
Mario Vavti
|
78146d6417
|
merge red master into dev
|
2017-12-17 09:49:10 +01:00 |
|
zotlabs
|
59779f2a0e
|
reverse the logic so we zidify by default
|
2017-12-16 15:14:28 -08:00 |
|
zotlabs
|
b1e191ce21
|
don't zidify all permalinks, only zot permalinks
|
2017-12-16 15:10:43 -08:00 |
|
Mario Vavti
|
7181cf9012
|
silence PHP7.2 warning
|
2017-12-16 20:33:07 +01:00 |
|
Mario Vavti
|
d304821977
|
fix undefined constant warning
|
2017-12-16 20:30:42 +01:00 |
|
Manuel Jiménez Friaza
|
55f3198c9c
|
Updated Spanish translation.
|
2017-12-16 10:55:46 +01:00 |
|
Mario Vavti
|
a3d39b223d
|
Merge remote-tracking branch 'mike/master' into dev
|
2017-12-15 08:51:39 +01:00 |
|
Mario Vavti
|
5c5fc0a62f
|
only use effective uid if we deal with sys channel content
|
2017-12-15 08:51:05 +01:00 |
|
Mario Vavti
|
26b92c8564
|
fix another PHP7.2 warningg
|
2017-12-14 22:41:11 +01:00 |
|
zotlabs
|
f965d9dc9e
|
wrong constant name
|
2017-12-14 13:38:56 -08:00 |
|
zotlabs
|
538845cbf5
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2017-12-14 13:33:20 -08:00 |
|
zotlabs
|
684b572aa8
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2017-12-14 13:32:58 -08:00 |
|
zotlabs
|
869126259b
|
hubzilla issue #928
|
2017-12-14 13:30:31 -08:00 |
|
Mario Vavti
|
a61c72b3b2
|
fix some more PHP7.2 warnings
|
2017-12-14 22:10:56 +01:00 |
|
Mario Vavti
|
a07b5ba4dd
|
make remote homelink link to the home host and not to the home channel
|
2017-12-14 21:48:30 +01:00 |
|
Mario Vavti
|
412f177c56
|
bump version
|
2017-12-14 10:24:16 +01:00 |
|
Mario Vavti
|
fbc2bb02b4
|
strings and version bump
|
2017-12-13 13:25:27 +01:00 |
|
Mario Vavti
|
861bd15c72
|
fix issue with long filenames in mod cloud
|
2017-12-13 12:34:14 +01:00 |
|
Mario Vavti
|
b8fcfc7698
|
Merge remote-tracking branch 'mike/master' into dev
|
2017-12-13 11:38:42 +01:00 |
|
zotlabs
|
494ce9b872
|
hubzilla #475 continued - show photos in root folder. Part of Andrew's fix for this wasn't in my repository and hopefully won't conflict; as it appears to have been lost somewhere. It also needed a small change to the folder permissions check.
|
2017-12-12 14:18:34 -08:00 |
|
zotlabs
|
a984cd2b27
|
hubzilla issue #475, item 3
|
2017-12-12 13:50:25 -08:00 |
|
zotlabs
|
215d615fc3
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2017-12-12 11:54:26 -08:00 |
|
Mario Vavti
|
7a7bfd9de7
|
Revert "try as best we can to keep the directory table (cloud list mode) inside the containing div. It looks pretty bad when you have a long filename."
This reverts commit 4d7acdd44d.
|
2017-12-12 11:10:12 +01:00 |
|
Mario Vavti
|
d0956eb39d
|
Merge remote-tracking branch 'mike/master' into dev
|
2017-12-12 10:37:04 +01:00 |
|
zotlabs
|
4d7acdd44d
|
try as best we can to keep the directory table (cloud list mode) inside the containing div. It looks pretty bad when you have a long filename.
|
2017-12-11 15:47:54 -08:00 |
|
Mario Vavti
|
5b1ef760a0
|
notification: slight animation for loading... and do not remove public stream items on click (we can not mark them read)
|
2017-12-11 16:50:25 +01:00 |
|
zotlabs
|
4859e6e11a
|
sql compliance issue
|
2017-12-10 19:43:54 -08:00 |
|
zotlabs
|
c2990964f0
|
regression in channel sources delivery
|
2017-12-10 18:38:50 -08:00 |
|
zotlabs
|
d4bb6c17d1
|
auto promote beginner (techlevel 0) accounts to level 1 after they show signs of active participation.
|
2017-12-10 16:41:03 -08:00 |
|
zotlabs
|
fca1a7506e
|
go back to including the photo thumbnail data in the export file. We have the ability to fetch each thumbnail directly if there is a problem with resource consumption, but this is the most efficient way to deal with it and most sites should be able to handle the memory consumption of our thumbnail data. The original full scale photo is a different issue; these can exhaust memory even before base64.
|
2017-12-10 15:54:40 -08:00 |
|
zotlabs
|
27bc5fa4b0
|
improvements to file import/export
|
2017-12-10 15:25:44 -08:00 |
|
zotlabs
|
ad6cb63e07
|
xlink_rating_text default value
|
2017-12-09 12:56:11 -08:00 |
|
zotlabs
|
adec67d5fa
|
hubzilla-addons issues #73
|
2017-12-09 12:49:28 -08:00 |
|
zotlabs
|
85b7c90637
|
strip acct: from OWA auth to API endpoints
|
2017-12-07 18:56:26 -08:00 |
|
zotlabs
|
e9ae51cfbc
|
fix loading of theme-specific widgets
|
2017-12-07 14:34:51 -08:00 |
|
zotlabs
|
979c05b24d
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2017-12-07 11:49:25 -08:00 |
|
git-marijus
|
3dac1a8d4a
|
Merge pull request #924 from dentm42/bugfix-pr922
Fix 'unable to add pages with spaces' (pr 922)
|
2017-12-07 13:24:09 +01:00 |
|
zotlabs
|
d326e7a75c
|
hubzilla issue #680, implement IMoveTarget and recursive file/directory move/rename
|
2017-12-06 16:07:40 -08:00 |
|
zotlabs
|
4c08d7c480
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2017-12-06 14:30:00 -08:00 |
|
zotlabs
|
e5653945d3
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2017-12-06 14:29:36 -08:00 |
|
zotlabs
|
ffaab27e77
|
synchronise an attach_move operation to clones
|
2017-12-06 14:20:17 -08:00 |
|
M.Dent
|
9ba72a06b3
|
Fix 'unable to add pages with spaces' (pr 922)
|
2017-12-06 07:51:34 -05:00 |
|
Mario Vavti
|
a604236d89
|
missed a spot while resolving merge conflict
|
2017-12-06 12:40:27 +01:00 |
|
Mario Vavti
|
5024fe3e2d
|
Merge branch 'dentm42-wiki-create-missing' into dev
|
2017-12-06 09:13:49 +01:00 |
|
Mario Vavti
|
44cb68a356
|
resolve merge conflict
|
2017-12-06 09:12:28 +01:00 |
|