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 |
|
redmatrix
|
a0900ba052
|
Merge pull request #274 from mrjive/master
Small adding in search result page in /help
|
2016-02-05 11:11:36 +11:00 |
|
redmatrix
|
40b00ab362
|
add system black/white list for embeds ahead of personal config
|
2016-02-04 16:09:36 -08:00 |
|
redmatrix
|
18208fab84
|
poke basic config setting
|
2016-02-04 11:58:56 -08:00 |
|
Haakon Meland Eriksen
|
8f810a3dcf
|
Merge remote-tracking branch 'upstream/master'
|
2016-02-04 06:01:15 +01:00 |
|
redmatrix
|
c598bbb8a9
|
Merge branch 'embedsec'
|
2016-02-03 20:33:34 -08:00 |
|
redmatrix
|
e6f388d869
|
finish moving block_public to the new security page
|
2016-02-03 20:32:26 -08:00 |
|
redmatrix
|
24e2eedd0f
|
don't implement the default embed whitelist just yet
|
2016-02-03 20:29:46 -08:00 |
|
redmatrix
|
c75f76f740
|
heavy lifting on admin security page
|
2016-02-03 20:24:46 -08:00 |
|
redmatrix
|
006efbd906
|
change view_storage from perms_public to perms_specific in the social_private role
|
2016-02-03 15:44:36 -08:00 |
|
redmatrix
|
28386d7471
|
admin security page for configuring white and black lists and other security options.
|
2016-02-03 15:23:24 -08:00 |
|
mrjive
|
f9545dc359
|
Added section-title-wrapper and section-conent-wrapper to search result page in /help
|
2016-02-03 14:02:34 -08:00 |
|
mrjive
|
e527a52f6a
|
Merge pull request #21 from redmatrix/master
updating from original codebase
|
2016-02-03 22:46:54 +01:00 |
|
redmatrix
|
a7ed50ecd4
|
more zcard tweaks
|
2016-02-02 19:39:47 -08:00 |
|
redmatrix
|
06dcaaa821
|
some zcard cleanup - still eneds a lot more work
|
2016-02-02 17:14:07 -08:00 |
|
Haakon Meland Eriksen
|
36ac48779c
|
Merge remote-tracking branch 'upstream/master'
|
2016-02-02 17:51:34 +01:00 |
|
Wave
|
88669fa033
|
Merge pull request #271 from wave72/master
Updated Italian strings
|
2016-02-02 16:59:03 +01:00 |
|
Paolo Tacconi
|
225aa28a1b
|
Updated Italian strings
|
2016-02-02 16:52:25 +01:00 |
|
Mario Vavti
|
f1245206ce
|
change aside width to reflect recent widget style changes
|
2016-02-02 12:40:40 +01:00 |
|
redmatrix
|
7f453949a1
|
minor tweaks
|
2016-02-01 23:09:45 -08:00 |
|
redmatrix
|
38f385f67d
|
slight formatting improvements
|
2016-02-01 21:23:47 -08:00 |
|
redmatrix
|
5f5342c0d3
|
adjust for folks that still have 175px profile photos
|
2016-02-01 21:21:22 -08:00 |
|
redmatrix
|
15e003f030
|
missing template
|
2016-02-01 21:14:36 -08:00 |
|
redmatrix
|
5edbc00865
|
profile embeds (still needs a bit of work)
|
2016-02-01 21:09:50 -08:00 |
|
redmatrix
|
723a49ccee
|
add photos to the profile "likes this" dropdowns
|
2016-02-01 17:42:53 -08:00 |
|
redmatrix
|
ff487a0271
|
more oembed provider work - channel articles
|
2016-02-01 14:52:08 -08:00 |
|
mrjive
|
337735094b
|
Merge pull request #20 from redmatrix/master
updating from original codebase
|
2016-02-01 11:25:07 +01:00 |
|
redmatrix
|
01b5b13475
|
oep for the photo top page
|
2016-01-31 20:44:54 -08:00 |
|
redmatrix
|
fd9f792f90
|
add album embed (embed the most recent photo with link to album)
|
2016-01-31 20:05:47 -08:00 |
|