redmatrix
|
7099e09a5c
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-09-14 19:17:36 -07:00 |
|
redmatrix
|
97b990c9bf
|
site checking stuff
|
2015-09-14 19:16:25 -07:00 |
|
redmatrix
|
db3d99f7c7
|
Merge pull request #41 from redmatrix/display_load_average
Display load average on the siteinfo page
|
2015-09-15 10:53:05 +10:00 |
|
redmatrix
|
8fb4f37670
|
remove xchan_instance_url - it needs to be an abook field, not an xchan field
|
2015-09-14 16:05:58 -07:00 |
|
jeroenpraat
|
dfd4115f7a
|
Update siteinfo.tpl
|
2015-09-14 16:45:15 +02:00 |
|
jeroenpraat
|
e58ad35fb0
|
Update siteinfo.php
|
2015-09-14 16:42:32 +02:00 |
|
jeroenpraat
|
31db5078c1
|
Small update Spanish strings
|
2015-09-14 16:36:06 +02:00 |
|
Mario Vavti
|
40c78d23e6
|
quick fix for choklet bannertwo
|
2015-09-14 09:27:15 +02:00 |
|
Mario Vavti
|
ec1d6d537e
|
quick fix for choklet bannertwo
|
2015-09-14 09:20:08 +02:00 |
|
zottel
|
06bfd2b502
|
Merge remote-tracking branch 'upstream/master'
|
2015-09-14 08:55:46 +02:00 |
|
redmatrix
|
fd708b28b8
|
ping site function (taken from admin/hubloc)
|
2015-09-13 22:48:18 -07:00 |
|
redmatrix
|
03e3281beb
|
mod_locs - put the primary into a (non-functioning) button for visual consistency.
|
2015-09-13 20:15:33 -07:00 |
|
redmatrix
|
f247b9ce20
|
update
|
2015-09-13 20:03:16 -07:00 |
|
redmatrix
|
67909b55fc
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-09-13 19:05:15 -07:00 |
|
redmatrix
|
43ba690eda
|
profile photo change activities
|
2015-09-13 19:04:46 -07:00 |
|
Mario Vavti
|
3425267368
|
fix banner for full flavour
|
2015-09-13 16:16:03 +02:00 |
|
Mario Vavti
|
0c3d9af333
|
hopefully fix banner for choklet flavour
|
2015-09-13 14:56:44 +02:00 |
|
redmatrix
|
67c2b309d1
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-09-12 14:38:26 -07:00 |
|
redmatrix
|
df0fa9883c
|
check for empty word after trim
|
2015-09-12 14:37:55 -07:00 |
|
Mario Vavti
|
9821a39549
|
an attempt to fix the banner mess
|
2015-09-12 11:36:19 +02:00 |
|
redmatrix
|
692e117c8a
|
Merge pull request #38 from MicMee/master
ensure that living sites are marked as alive
|
2015-09-12 08:25:27 +10:00 |
|
redmatrix
|
d96ca61f2b
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-09-11 14:57:26 -07:00 |
|
redmatrix
|
fc58b8cc0d
|
log the remote message if there was one
|
2015-09-11 14:56:31 -07:00 |
|
redmatrix
|
c8503daf5a
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-09-11 14:33:36 -07:00 |
|
redmatrix
|
45e1f93e56
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
util/messages.po
|
2015-09-11 14:33:07 -07:00 |
|
redmatrix
|
77807d439e
|
minor change on invite
|
2015-09-11 14:32:18 -07:00 |
|
redmatrix
|
e062c4e6b5
|
another tactic to deal with orphan hublocs from re-installs, or at least allow the descendant channel to survive
|
2015-09-11 14:30:07 -07:00 |
|
Michael Meer
|
755edd2110
|
ensure that living sites are marked as alive
|
2015-09-11 14:06:37 +02:00 |
|
Mario Vavti
|
f51124397f
|
center page content by default - css file
|
2015-09-11 11:56:56 +02:00 |
|
Mario Vavti
|
e42111545b
|
center page content by default
|
2015-09-11 11:54:35 +02:00 |
|
Mario Vavti
|
5112b4b963
|
css fix
|
2015-09-11 09:26:24 +02:00 |
|
zottel
|
99c5c7ab28
|
Merge remote-tracking branch 'upstream/master'
|
2015-09-11 08:15:19 +02:00 |
|
Haakon Meland Eriksen
|
edb1473f13
|
Merge remote-tracking branch 'upstream/master'
|
2015-09-11 06:42:11 +02:00 |
|
redmatrix
|
f2171173fe
|
separate the links
|
2015-09-10 19:35:26 -07:00 |
|
redmatrix
|
7f30863df2
|
forum mode - use linked avatar and name for title instead of "Channel: xxxxx" or "Forum: xxxx"
|
2015-09-10 19:31:42 -07:00 |
|
redmatrix
|
a6a2c02b6a
|
duplicated code
|
2015-09-10 19:21:32 -07:00 |
|
redmatrix
|
d3ee99d677
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
mod/like.php
|
2015-09-10 19:20:21 -07:00 |
|
redmatrix
|
4abfd4053a
|
sync likes
|
2015-09-10 19:18:12 -07:00 |
|
redmatrix
|
05e0ed5173
|
export likes to clones
|
2015-09-10 19:17:20 -07:00 |
|
redmatrix
|
00b480527a
|
provide remote delivery report at logger_debug level
|
2015-09-10 17:53:06 -07:00 |
|
redmatrix
|
e4231efd20
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-09-10 16:51:53 -07:00 |
|
redmatrix
|
922d2165b3
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/zot.php
|
2015-09-10 16:51:22 -07:00 |
|
redmatrix
|
9cee52c668
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-09-10 16:49:09 -07:00 |
|
redmatrix
|
50e32c3d8a
|
zot_refresh: always try the hubloc pointed to by xchan_addr first
|
2015-09-10 16:48:08 -07:00 |
|
Mario Vavti
|
5e576bff63
|
fix radius setting
|
2015-09-10 22:22:51 +02:00 |
|
Mario Vavti
|
e1338f5a7f
|
make redmatrix focus scheme default for hubzilla
|
2015-09-10 22:19:51 +02:00 |
|
jeroenpraat
|
672143d3a2
|
update Spanish strings
|
2015-09-10 13:18:24 +02:00 |
|
redmatrix
|
2d94a038a5
|
ensure connections have a name
|
2015-09-10 01:21:18 -07:00 |
|
zottel
|
174d55cf3d
|
Merge remote-tracking branch 'upstream/master'
|
2015-09-10 08:32:33 +02:00 |
|
redmatrix
|
f2889d24e6
|
decentralise likes of things so they can be cloned
|
2015-09-09 22:03:23 -07:00 |
|