Mario Vavti
|
0b487122f6
|
tryout: introduce loading of images before rendering content and provide some detailed logging in js-console
|
2016-02-12 11:00:50 +01:00 |
|
Haakon Meland Eriksen
|
ac4a8fde3a
|
Merge remote-tracking branch 'upstream/master'
|
2016-02-12 06:28:40 +01:00 |
|
redmatrix
|
31aaf40ade
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2016-02-11 20:37:42 -08:00 |
|
redmatrix
|
af7c7642bb
|
whitespace
|
2016-02-11 20:37:30 -08:00 |
|
redmatrix
|
d939173c0e
|
Merge pull request #278 from royalterra/master
Update boot.php Add Failback Server blablanet.es
|
2016-02-12 14:31:29 +11:00 |
|
redmatrix
|
a87efe45e0
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2016-02-11 15:25:26 -08:00 |
|
redmatrix
|
55515a25d1
|
guest photo upload failing when js_upload is in use due to non-existent acl parameters
|
2016-02-11 15:24:21 -08:00 |
|
royalterra
|
7d7a254238
|
Merge pull request #1 from royalterra/royalterra-patch-1
Update boot.php Failback Server blablanet.es
|
2016-02-11 22:35:45 +00:00 |
|
royalterra
|
564a5ea4d5
|
Update boot.php Failback Server blablanet.es
This HUB is running us fallback many months us fallback server
|
2016-02-11 22:21:03 +00:00 |
|
Mario Vavti
|
d9c59a19fb
|
update readmore.js to a more recent version
|
2016-02-11 13:51:37 +01:00 |
|
redmatrix
|
83b5adf194
|
feed dates are always UTC. This means we will need another mechanism to pass localised dates to items_fetch()
|
2016-02-10 23:05:47 -08:00 |
|
redmatrix
|
a26d1794fe
|
feed dates weren't being honoured. When that was fixed they turned out to be reversed.
|
2016-02-10 23:00:40 -08:00 |
|
redmatrix
|
06a1258a9a
|
put a sane lower time limit on content search for public feed requests
|
2016-02-10 19:29:00 -08:00 |
|
redmatrix
|
d31d3df4ea
|
hook changes to support pubsubhubbub
|
2016-02-10 19:12:28 -08:00 |
|
redmatrix
|
91801d2e2c
|
rev update
|
2016-02-10 13:55:51 -08:00 |
|
Haakon Meland Eriksen
|
95c686de6e
|
Merge remote-tracking branch 'upstream/master'
|
2016-02-09 20:30:30 +01:00 |
|
jeroenpraat
|
bcb94f8238
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2016-02-09 16:15:49 +01:00 |
|
jeroenpraat
|
1d2260b44e
|
Castellano and Nederlands string updates
|
2016-02-09 16:15:20 +01:00 |
|
git-marijus
|
81c10fc739
|
Merge pull request #276 from phellmes/invite
Invite module UI and strings update
|
2016-02-09 15:57:45 +01:00 |
|
phellmes
|
191a2fd5be
|
[invite module] remove trailing spaces from translatable strings
|
2016-02-09 14:20:26 +01:00 |
|
phellmes
|
97be144913
|
[invite module] update UI template
|
2016-02-09 14:07:54 +01:00 |
|
Haakon Meland Eriksen
|
8c99228c8a
|
Merge remote-tracking branch 'upstream/master'
|
2016-02-09 06:03:43 +01:00 |
|
redmatrix
|
f984502499
|
need to re-arrange a few things for a short vcard
|
2016-02-08 19:33:25 -08:00 |
|
redmatrix
|
315ce6d880
|
lots more zcard tweaks
|
2016-02-08 18:16:42 -08:00 |
|
redmatrix
|
3da8f9b13c
|
duplicated lines in en config file
|
2016-02-08 14:51:03 -08:00 |
|
redmatrix
|
a14b87baf2
|
make yet another recommended security header optional - this time because of piwik. Personally I think if you want to track people you really don't understand this project and its history, but whatever....
|
2016-02-08 14:48:11 -08:00 |
|
redmatrix
|
90fd23e0cd
|
try that patch again
|
2016-02-08 14:19:49 -08:00 |
|
redmatrix
|
d96e985be0
|
Revert "sort out the well-known acme-challenge mess - at least on apache"
This reverts commit be99c7fe12 .
|
2016-02-08 14:06:44 -08:00 |
|
redmatrix
|
c8788204a9
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2016-02-08 13:58:25 -08:00 |
|
redmatrix
|
be99c7fe12
|
sort out the well-known acme-challenge mess - at least on apache
|
2016-02-08 13:57:40 -08:00 |
|
Mario Vavti
|
48963f62f9
|
avoid collapsing only above the viewport
|
2016-02-08 22:19:38 +01:00 |
|
redmatrix
|
00ae6bdac6
|
a few tweaks to uno settings page to allow a default ACL to be created
|
2016-02-07 21:06:17 -08:00 |
|
redmatrix
|
a606173e07
|
change register workflow if uno is set
|
2016-02-07 20:11:08 -08:00 |
|
redmatrix
|
d8e6fd5df0
|
provide get_server_role() to abstract different roles and capabilities
|
2016-02-07 18:11:10 -08:00 |
|
redmatrix
|
ec950de205
|
block public was still referenced in admin/site template
|
2016-02-07 15:44:42 -08:00 |
|
redmatrix
|
62e7fa6a23
|
update UI template for 'mood' module
|
2016-02-07 15:38:54 -08:00 |
|
Haakon Meland Eriksen
|
2935c5fe1a
|
Merge remote-tracking branch 'upstream/master'
|
2016-02-06 12:57:25 +01:00 |
|
redmatrix
|
021584d782
|
fix uno import by disabling for now
|
2016-02-05 23:45:16 -08:00 |
|
redmatrix
|
a5c111ef4f
|
uno stuff
|
2016-02-05 23:13:33 -08:00 |
|
redmatrix
|
7868e47643
|
more uno groundwork
|
2016-02-05 13:32:15 -08:00 |
|
redmatrix
|
b4e3cd000f
|
rev update
|
2016-02-05 00:06:35 -08:00 |
|
redmatrix
|
9c3568800c
|
remove blackout setting now that the keepout plugin performs the same tasks (plus a lot more)
|
2016-02-04 23:59:09 -08:00 |
|
redmatrix
|
9cf105f8ea
|
initial uno config
|
2016-02-04 23:58:31 -08:00 |
|
redmatrix
|
a8456782b5
|
will probably need this to make it work
|
2016-02-04 22:39:56 -08:00 |
|
Haakon Meland Eriksen
|
2afdba48f0
|
Merge remote-tracking branch 'upstream/master'
|
2016-02-05 06:28:52 +01:00 |
|
redmatrix
|
4250895243
|
make strict transport security header optional
|
2016-02-04 20:38:22 -08:00 |
|
redmatrix
|
bfeb89075f
|
comment buttons hook
|
2016-02-04 19:06:11 -08:00 |
|
redmatrix
|
721f61a71d
|
update docs
|
2016-02-04 18:38:36 -08:00 |
|
redmatrix
|
a6e5d26aea
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2016-02-04 18:36:36 -08:00 |
|
redmatrix
|
d586f64e40
|
update the poke page layout and UI
|
2016-02-04 18:35:40 -08:00 |
|