git-marijus
|
1f47f4ff96
|
Merge pull request #897 from HaakonME/dev
Added mode to Portfolio widget
|
2017-10-30 10:38:17 +01:00 |
|
Haakon Meland Eriksen
|
1dc3253d4a
|
Added mode to Portfolio widget
|
2017-10-29 16:41:49 +01:00 |
|
Haakon Meland Eriksen
|
feebe7d4c6
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2017-10-29 13:24:41 +01:00 |
|
git-marijus
|
9ce817bb6e
|
Merge pull request #894 from mjfriaza/dev
Spanish translation revised again.
|
2017-10-29 11:50:20 +01:00 |
|
Manuel Jiménez Friaza
|
1cf90dd14d
|
Spanish translation revised again.
|
2017-10-28 12:54:57 +02:00 |
|
Haakon Meland Eriksen
|
f2efa8c753
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2017-10-27 05:58:10 +02:00 |
|
git-marijus
|
859195d07a
|
Merge pull request #888 from anaqreon/card-context
Context help for cards
|
2017-10-25 13:33:58 +02:00 |
|
Andrew Manning
|
a782c9944c
|
Context help for cards
|
2017-10-24 21:41:49 -04:00 |
|
Haakon Meland Eriksen
|
39055c919c
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2017-10-24 20:44:25 +02: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 |
|
git-marijus
|
c489f734db
|
Merge pull request #882 from HaakonME/dev
Portfolio widget - CSS update
|
2017-10-24 18:22:35 +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 |
|
Haakon Meland Eriksen
|
280baf7c82
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2017-10-24 17:56:20 +02:00 |
|
zotlabs
|
2aff3a1a05
|
not sure when but the hcard went missing in webfinger
|
2017-10-23 21:19:40 -07:00 |
|
Haakon Meland Eriksen
|
c99962106d
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2017-10-24 06:03:09 +02:00 |
|
zotlabs
|
52c1f79f2e
|
acl encoding issues
|
2017-10-23 17:52:17 -07:00 |
|
zotlabs
|
e67ff5c122
|
hubzilla issue #885
|
2017-10-23 12:35:46 -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 |
|
Klaus Weidenbach
|
9090bfd1c3
|
Update composer autoload cache.
|
2017-10-23 01:10:53 +02:00 |
|
Mario Vavti
|
b58bf75f21
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2017-10-22 21:44:37 +02:00 |
|
Mario Vavti
|
189a15fe37
|
Merge remote-tracking branch 'mike/master' into dev
|
2017-10-22 21:44:20 +02:00 |
|
zotlabs
|
c7d9a5ac91
|
wrong key
|
2017-10-22 12:35:17 -07:00 |
|
git-marijus
|
8aa4af372d
|
Merge pull request #880 from mjfriaza/dev
Updated the Spanish translation
|
2017-10-22 21:14:03 +02:00 |
|
git-marijus
|
d5e90d678a
|
Merge pull request #881 from phellmes/dev
Update DE translation strings (also for 2.8RC)
|
2017-10-22 21:13:49 +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 |
|
Haakon Meland Eriksen
|
f648809856
|
Portfolio widget - CSS update
|
2017-10-22 19:52:08 +02:00 |
|
phellmes
|
687114b407
|
Update DE translation strings
|
2017-10-21 13:52:53 +02:00 |
|
Manuel Jiménez Friaza
|
40f805c94a
|
Fixed the Spanish translation
|
2017-10-21 13:01:46 +02:00 |
|
Mario Vavti
|
c80f4feb62
|
Merge remote-tracking branch 'mike/master' into dev
|
2017-10-20 10:08:57 +02:00 |
|
git-marijus
|
2d06e86b5b
|
Merge pull request #879 from redmatrix/anaqreon-patch-1
Display different info message if using invite code
|
2017-10-20 10:04:03 +02:00 |
|
zotlabs
|
400441d56b
|
register workflow was getting over-ridden in include/security
|
2017-10-19 18:48:11 -07:00 |
|
zotlabs
|
7d92e9026e
|
typo
|
2017-10-19 18:48:01 -07:00 |
|
Andrew Manning
|
42416aad22
|
Display different info message if using invite code
|
2017-10-19 21:09:12 -04:00 |
|
zotlabs
|
9d51318c53
|
table structure for pseudo or proxy channels (pchan)
|
2017-10-19 17:24:11 -07:00 |
|
Mario Vavti
|
52183f8bf8
|
changelog
|
2017-10-20 00:09:54 +02:00 |
|
Mario Vavti
|
c2714262b3
|
strings
|
2017-10-19 12:07:42 +02:00 |
|
Mario Vavti
|
a58f386831
|
version
|
2017-10-19 11:50:52 +02:00 |
|
Mario Vavti
|
f3c374b6ff
|
redirect to be moderated items to /moderate and change the conv link to partent mid in /modrate
|
2017-10-19 11:20:09 +02:00 |
|
Mario Vavti
|
21b2c0afa3
|
fix issue #837 - w2w posts not removed in contact_remove()
|
2017-10-19 10:21:47 +02:00 |
|
Mario Vavti
|
ca4c725d57
|
remove redundant js
|
2017-10-18 12:28:56 +02:00 |
|
Mario Vavti
|
fe1aa90304
|
streamline the notifications js and change notification icon to exclamation-triangle if we have personal notifications
|
2017-10-18 11:38:45 +02:00 |
|
Mario Vavti
|
64a49eb54a
|
update notifications if a notification area remains open
|
2017-10-18 00:25:00 +02:00 |
|
zotlabs
|
b106b53d05
|
don't translate 'guest:' since it is part of a url
|
2017-10-16 23:01:00 -07:00 |
|
zotlabs
|
a791809a84
|
ensure guests hve a unique (non-existent) url so that network discovery on remote servers doesn't come up mis-attributing the token. Future work should probably provide an actual page at this location describing it as a guest account of 'xyz'.
|
2017-10-16 22:31:38 -07:00 |
|
zotlabs
|
71c3a0a197
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2017-10-16 18:20:42 -07:00 |
|
zotlabs
|
18279234fd
|
mod_register - don't re-use the password, force them to type it in twice each time unless their browser saves passwords.
|
2017-10-16 15:55:41 -07:00 |
|