Mario Vavti
|
e5f3296c6b
|
use text-muted on site location
|
2017-11-08 09:11:17 +01:00 |
|
Mario
|
9d584fc720
|
truncate nav-app-link if appropriate
|
2017-11-08 08:57:30 +01:00 |
|
zotlabs
|
92e0c502f7
|
make most recent cloud_tiles setting for local channels persistent across logins
|
2017-11-07 19:34:00 -08:00 |
|
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 |
|
Mario Vavti
|
1bb6dfc9a0
|
move style out of template
|
2017-11-07 10:58:15 +01:00 |
|
Mario Vavti
|
549866c090
|
add location info to the navbar
|
2017-11-07 10:43:13 +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
|
5e47b767ea
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2017-11-06 21:55:58 -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 |
|
zotlabs
|
11a7a08b9d
|
bring back tabindex to submit comments
|
2017-11-06 17:08:48 -08:00 |
|
Mario Vavti
|
d16bbfb224
|
update es-es help.html
|
2017-11-06 12:28:12 +01:00 |
|
git-marijus
|
48959d5606
|
Merge pull request #900 from anaqreon/dev
Add Manuel's Spanish translations for context help
|
2017-11-06 11:36:47 +01:00 |
|
Mario Vavti
|
94e548b07a
|
lets try this in the wild for a while
|
2017-11-06 11:25:49 +01:00 |
|
Mario Vavti
|
9cd715bbbf
|
fix unable to mark all messages read
|
2017-11-06 09:34:20 +01:00 |
|
zotlabs
|
04d66ba7f4
|
attach.php minor cleanup and doc
|
2017-11-06 00:17:46 -08: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 |
|
zotlabs
|
0e1c628066
|
fix can_comment_on_post() after recent code cleanup (a required array parameter was missing)
|
2017-11-04 18:34:38 -07:00 |
|
zotlabs
|
65bc146afa
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2017-11-04 18:18:56 -07:00 |
|
zotlabs
|
7ef641e256
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2017-11-04 18:18:10 -07:00 |
|
zotlabs
|
9630d2ef2c
|
Merge branch 'dev_merge'
|
2017-11-04 18:17:39 -07:00 |
|
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 |
|