Mario Vavti
|
b5d4acf10a
|
Merge remote-tracking branch 'mike/master' into dev
|
2017-11-07 12:20:11 +01:00 |
|
Mario Vavti
|
47fbdda409
|
rename channel app events to calendar and add nav_set_selected() to /cal
|
2017-11-07 11:22:11 +01:00 |
|
zotlabs
|
7b69dc574b
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2017-11-06 21:56:16 -08:00 |
|
zotlabs
|
5376a734d4
|
.htignore update
|
2017-11-06 21:55:36 -08:00 |
|
zotlabs
|
3f1a4b6559
|
second half of issue #893 - move channel default permissions to its own module so we can apply different page/widget layouts than for connedit; the relevant functionality is abandoned on mod_connedit but still intact. Trying a slightly different look/behaviour for inherited settings and the associated checkboxes. This may need a bit more tweaking but overall looks a lot cleaner.
|
2017-11-06 20:13:14 -08:00 |
|
Mario Vavti
|
9cd715bbbf
|
fix unable to mark all messages read
|
2017-11-06 09:34:20 +01:00 |
|
zotlabs
|
7efcb3c75f
|
allow cloud filenames to include ampersands without messing up auth tokens (zid, owt, and zat, and the constant placeholder 'f=')
|
2017-11-05 19:47:44 -08:00 |
|
zotlabs
|
359bfb76f6
|
common connections on suggestion page showing wildly different results than remote profile, and is consistently off by one
|
2017-11-05 16:29:01 -08:00 |
|
git-marijus
|
cfbeb1655d
|
Merge branch 'dev' into docu
|
2017-11-04 10:22:58 +01:00 |
|
Mario Vavti
|
9dfb471c0b
|
Merge remote-tracking branch 'mike/master' into dev
|
2017-11-04 10:11:48 +01: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
|
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
|
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 |
|
Mario Vavti
|
cdaf5f3fc0
|
fix issues with diaspora xchans
|
2017-11-02 08:44:46 +01: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
|
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 |
|
zotlabs
|
ceed0f7a1b
|
allow plugin class widgets, fix sql error in page module
|
2017-10-29 19:52:00 -07:00 |
|
Haakon Meland Eriksen
|
1dc3253d4a
|
Added mode to Portfolio widget
|
2017-10-29 16:41:49 +01:00 |
|
zotlabs
|
fe2a937cf2
|
fix "unstar"
|
2017-10-28 15:24:37 -07:00 |
|
zotlabs
|
e5cfb8a0cd
|
encrypt the owa token
|
2017-10-26 15:23:04 -07:00 |
|
zotlabs
|
4a3149d1ba
|
hubzilla issue #890, separate the pdl preview feature from the mod_page webpage query so that the webpage will always win if a webpage and pdl have the same name.
|
2017-10-25 22:33:03 -07:00 |
|
Mario Vavti
|
325cbfcdb3
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2017-10-24 18:30:00 +02:00 |
|
git-marijus
|
69e7a7594a
|
Merge pull request #884 from dawnbreak/dev
Update composer autoload cache.
|
2017-10-24 18:28:42 +02:00 |
|
Mario Vavti
|
60a54e9aac
|
comment out statistics link in mod pubsites until we have something functional again
|
2017-10-24 18:21:19 +02:00 |
|
zotlabs
|
2aff3a1a05
|
not sure when but the hcard went missing in webfinger
|
2017-10-23 21:19:40 -07:00 |
|
zotlabs
|
52c1f79f2e
|
acl encoding issues
|
2017-10-23 17:52:17 -07:00 |
|
zotlabs
|
37b7b2f1a8
|
mod_display: provide alternate serialisations (starting with atom)
|
2017-10-22 21:44:39 -07:00 |
|
zotlabs
|
fd5764e166
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2017-10-22 19:32:31 -07:00 |
|
zotlabs
|
812d904c98
|
bring back the markdown post feature (after investing some effort to make it work)
|
2017-10-22 18:23:37 -07:00 |
|
Klaus Weidenbach
|
a4fdf3fbbb
|
We call Theme:url() statically, make it also static.
|
2017-10-23 01:34:37 +02:00 |
|
Mario Vavti
|
0061ac8584
|
do not show seen notifys in notifications - show them in mod notifications instead. Update notifications count also on notifications updates
|
2017-10-22 21:01:58 +02:00 |
|
Mario Vavti
|
c80f4feb62
|
Merge remote-tracking branch 'mike/master' into dev
|
2017-10-20 10:08:57 +02:00 |
|
zotlabs
|
400441d56b
|
register workflow was getting over-ridden in include/security
|
2017-10-19 18:48:11 -07:00 |
|
Andrew Manning
|
42416aad22
|
Display different info message if using invite code
|
2017-10-19 21:09:12 -04:00 |
|