zotlabs
|
6e9d5a03c2
|
developer certificate of origin
|
2017-11-04 18:15:55 -07:00 |
|
Andrew Manning
|
839c154869
|
Update help.html
|
2017-11-04 06:56:50 -04:00 |
|
Mario Vavti
|
6995d54a3c
|
fix wrong variable in sprintf resulting in php warning
|
2017-11-04 10:48:24 +01:00 |
|
git-marijus
|
d31df715fb
|
Merge pull request #883 from dawnbreak/docu
💡 Improving Doxygen documentation.
|
2017-11-04 10:25:27 +01:00 |
|
git-marijus
|
26fa091aa2
|
Merge branch 'dev' into docu
|
2017-11-04 10:24:54 +01:00 |
|
git-marijus
|
cfbeb1655d
|
Merge branch 'dev' into docu
|
2017-11-04 10:22:58 +01:00 |
|
git-marijus
|
39c194c5c3
|
Merge pull request #891 from dawnbreak/langlibs
Langlibs updates
|
2017-11-04 10:18:34 +01:00 |
|
Mario Vavti
|
9dfb471c0b
|
Merge remote-tracking branch 'mike/master' into dev
|
2017-11-04 10:11:48 +01:00 |
|
zotlabs
|
f51a7225c8
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2017-11-03 19:18:55 -07:00 |
|
zotlabs
|
1d903655af
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2017-11-03 19:18:35 -07:00 |
|
zotlabs
|
9abb061e71
|
provide short localised summary for likes that will end up in displayed notifications
|
2017-11-03 16:47:05 -07:00 |
|
zotlabs
|
d450fc61c4
|
more search work
|
2017-11-03 15:08:56 -07:00 |
|
Mario Vavti
|
a899ce1c22
|
Merge remote-tracking branch 'mike/master' into dev
|
2017-11-03 23:08:04 +01:00 |
|
Klaus Weidenbach
|
1a737be2b4
|
💡 Improving Doxygen documentation.
Fix some Doxygen parsing errors.
Improve hooks documentation.
|
2017-11-03 23:04:27 +01:00 |
|
zotlabs
|
fae9c23637
|
imagedata not set correctly if large photo AND imagick is not installed
|
2017-11-03 14:20:49 -07:00 |
|
zotlabs
|
1159dd59ed
|
fix cloud redirects with owt tokens
|
2017-11-03 14:07:00 -07:00 |
|
Mario Vavti
|
0ce7358f0f
|
update item_normal() to not include ACTIVITY_OBJ_FILE obj_type
|
2017-11-03 13:49:58 +01:00 |
|
Mario Vavti
|
41749f5eda
|
Merge remote-tracking branch 'mike/master' into dev
|
2017-11-03 10:48:00 +01:00 |
|
Mario Vavti
|
1567b7b383
|
set $module_format to html to not break updates. it will be set to something else later if appropriate
|
2017-11-03 10:04:25 +01:00 |
|
zotlabs
|
e70bd0054c
|
hubzilla issue #896
|
2017-11-02 18:25:34 -07:00 |
|
zotlabs
|
b450b6a435
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2017-11-02 17:32:03 -07:00 |
|
zotlabs
|
0403738981
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2017-11-02 17:31:49 -07:00 |
|
zotlabs
|
0d7062ffdf
|
more queue work
|
2017-11-02 15:43:14 -07:00 |
|
Mario Vavti
|
8f59b2d3e0
|
Merge remote-tracking branch 'mike/master' into dev
|
2017-11-02 12:36:05 +01:00 |
|
zotlabs
|
1b290f573a
|
put deferred queue logic every place we create a delivery process (except for protocol 'friend requests' which aren't likely to swamp the delivery system). Remove it from the queue_delivery function which was too late to do anything.
|
2017-11-02 03:13:30 -07:00 |
|
Andrew Manning
|
b77169f1d8
|
Add Manuel's Spanish translations for context help
|
2017-11-02 05:58:08 -04:00 |
|
Mario Vavti
|
00d8783e45
|
Merge remote-tracking branch 'mike/master' into dev
|
2017-11-02 08:53:31 +01:00 |
|
Mario Vavti
|
cdaf5f3fc0
|
fix issues with diaspora xchans
|
2017-11-02 08:44:46 +01:00 |
|
zotlabs
|
bdf50a824e
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2017-11-01 22:34:54 -07:00 |
|
zotlabs
|
f23c8e7597
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2017-11-01 22:34:31 -07:00 |
|
zotlabs
|
52657b6215
|
don't perform zot_refresh on dead sites unless $force is set
|
2017-11-01 19:24:29 -07:00 |
|
zotlabs
|
28cd2759d7
|
do not send message_list responses to dead sites (this delivery method bypassed the notifier)
|
2017-11-01 17:50:57 -07:00 |
|
Mario Vavti
|
11cdc36bcc
|
Merge remote-tracking branch 'mike/master' into dev
|
2017-11-01 12:08:59 +01:00 |
|
zotlabs
|
22d45a8d1e
|
support for netselect query
|
2017-11-01 02:53:12 -07:00 |
|
zotlabs
|
7d9d1e0cdb
|
Maria's profile photo issue, please push to master.
|
2017-11-01 02:15:40 -07:00 |
|
zotlabs
|
98b53801e0
|
provide personal config for channel_menu; the site can set an initial site-wide value but this but there isn't a corresponding admin setting currently and can only be set by manual config
|
2017-10-31 19:56:14 -07:00 |
|
zotlabs
|
bff1e215cc
|
pdledit - show original/system layout text for comparison
|
2017-10-31 18:04:01 -07:00 |
|
zotlabs
|
6efef3922b
|
add another delivery control parameter (force queue threshold)
|
2017-10-31 15:41:44 -07:00 |
|
zotlabs
|
caec565de5
|
bring back sitesearch widget in mod_search because some screen modes don't have search in the navbar and there is no other way to enter text - hubzilla issue #898
|
2017-10-31 12:18:16 -07:00 |
|
zotlabs
|
16a2bfa95b
|
move tile styles to theme instead of template file
|
2017-10-30 21:00:17 -07:00 |
|
zotlabs
|
60da235efb
|
use 1) personal setting, 2) site setting, 3) default false - for system.channel_menu
|
2017-10-30 20:43:24 -07:00 |
|
zotlabs
|
71e0e55b0b
|
provide a 'tile' view (view only) mode to mod_cloud
|
2017-10-30 18:49:18 -07:00 |
|
Mario Vavti
|
b28ff509b1
|
Merge remote-tracking branch 'mike/master' into dev
|
2017-10-30 10:42:51 +01:00 |
|
git-marijus
|
1f47f4ff96
|
Merge pull request #897 from HaakonME/dev
Added mode to Portfolio widget
|
2017-10-30 10:38:17 +01:00 |
|
zotlabs
|
4fef29e61c
|
memory overflow trying to delete a connection with a very high noise to signal ratio
|
2017-10-29 22:21:52 -07:00 |
|
zotlabs
|
56c3d5dbcb
|
add some documentation about shareable widgets
|
2017-10-29 22:00:03 -07:00 |
|
zotlabs
|
ceed0f7a1b
|
allow plugin class widgets, fix sql error in page module
|
2017-10-29 19:52:00 -07:00 |
|
zotlabs
|
906d91d4d1
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2017-10-29 16:35:31 -07:00 |
|
zotlabs
|
e539a9e7bd
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2017-10-29 16:35:15 -07:00 |
|
Klaus Weidenbach
|
1be98d7b7f
|
✅ Some more work on unit tests.
Some small improvements for coverage report.
Add more functions from include/text.php
Update composer dev libraries for phpunit.
|
2017-10-29 22:00:55 +01:00 |
|