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
|
59a9f6bf02
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2017-10-23 22:29:29 -07:00 |
|
zotlabs
|
2aff3a1a05
|
not sure when but the hcard went missing in webfinger
|
2017-10-23 21:19:40 -07:00 |
|
zotlabs
|
25988ddefa
|
not sure when but the hcard went missing in webfinger
|
2017-10-23 21:03:18 -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
|
c49eec71f0
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2017-10-22 19:32:08 -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 |
|
zotlabs
|
cdb1bc9be6
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2017-10-19 16:27:24 -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 |
|
zotlabs
|
656ec585b2
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2017-10-17 21:24:07 -07: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
|
9497c6c0f7
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2017-10-16 18:20:17 -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 |
|
zotlabs
|
4dd05dc4e8
|
regression in zot site info after zot6 work
|
2017-10-16 15:23:17 -07:00 |
|
zotlabs
|
cf7481da53
|
regression in zot site info after zot6 work
|
2017-10-16 15:20:45 -07:00 |
|
Felix Wolfsteller
|
b8a9390f49
|
fix typos in comment
|
2017-10-16 21:33:14 +02:00 |
|
zotlabs
|
a33562144b
|
documentation updates. I've been sitting on these for quite some time waiting for the current documentation work to complete; but if I leave this any longer I may forget the changes that I need to make. The last time there was a major documentation update all my intervening changes were lost, so hopefully I won't lose these and have to do them over again.
|
2017-10-15 17:39:14 -07:00 |
|
zotlabs
|
9b94ad2ffe
|
was unable to make the modal login dialog work on the channel page with a cover photo. So for mod_channel, send login to the login page instead of the modal popup.
|
2017-10-14 01:17:47 -07:00 |
|