Mario Vavti
|
7e3aac6d18
|
update spin.js
|
2015-06-15 21:47:29 +02:00 |
|
jeroenpraat
|
caf0cd3dbb
|
Update Dutch language strings
|
2015-06-15 16:41:03 +02:00 |
|
Mario Vavti
|
905cd1da5b
|
do not allow/show acl button on photo edit if not owner
|
2015-06-15 13:04:16 +02:00 |
|
redmatrix
|
187a7a56c2
|
version update
|
2015-06-14 15:57:45 -07:00 |
|
redmatrix
|
8c4c0246f0
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-06-13 15:00:51 -07:00 |
|
redmatrix
|
d01fbe521f
|
weekly string update
|
2015-06-13 15:00:22 -07:00 |
|
redmatrix
|
50e87dd1e1
|
Merge pull request #348 from unary/nginxconfig
nginx config change from Thomas
|
2015-06-13 17:56:00 +10:00 |
|
Michael Johnston
|
053d4547fe
|
nginx config change from Thomas
|
2015-06-13 00:24:11 -04:00 |
|
redmatrix
|
485b19958e
|
don't provide a connect button on the sys channel profile sidebar
|
2015-06-11 22:46:37 -07:00 |
|
redmatrix
|
bc8840eab5
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-06-11 15:53:06 -07:00 |
|
redmatrix
|
dc7de12991
|
hubzilla compatibility function
|
2015-06-11 15:52:37 -07:00 |
|
Paolo T
|
aac9d60f2d
|
Merge pull request #347 from tuscanhobbit/dev
updated italian strings
|
2015-06-11 15:54:35 +02:00 |
|
Paolo Tacconi
|
98b0cfb413
|
updated italian strings
|
2015-06-11 15:47:15 +02:00 |
|
Mario Vavti
|
8c4b337918
|
set width for region_3 only if center page content is set
|
2015-06-11 13:07:45 +02:00 |
|
Mario Vavti
|
c8fe408a62
|
fix rendering of affinity slider
|
2015-06-11 11:35:21 +02:00 |
|
redmatrix
|
04551ac32b
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-06-10 17:45:04 -07:00 |
|
redmatrix
|
9a5d9fb8c5
|
put block_public back where it is needed, which is in mod_public and not mod_home
|
2015-06-10 17:44:04 -07:00 |
|
redmatrix
|
52ddbd1add
|
Merge pull request #346 from solstag/fixattachperms
correctly fix attachment permissions from private mentions
|
2015-06-11 06:27:24 +10:00 |
|
Alexandre Hannud Abdo
|
a31fdd3fbb
|
correctly fix attachment permissions from private mentions
by postponing code that removes the attachment tag from the body
|
2015-06-10 15:37:10 -03:00 |
|
Mario Vavti
|
edd2d1e8d4
|
show login without checking for block_public, local or remote channel
|
2015-06-10 13:24:16 +02:00 |
|
Mario Vavti
|
50ac9378e3
|
assign right aside the same width as we have in left aside but hide it on small and xs screens. make aside width a variablee for easier handling.
|
2015-06-10 13:08:17 +02:00 |
|
Mario Vavti
|
20a317b5b7
|
really show login form if it is enabled
|
2015-06-10 11:58:45 +02:00 |
|
redmatrix
|
29d9d38d7f
|
retire old Friendica RINO encryption functions
|
2015-06-09 22:24:24 -07:00 |
|
redmatrix
|
9592f7f3e6
|
put mirror_frontpage setting into admin/site
|
2015-06-09 19:37:12 -07:00 |
|
redmatrix
|
d08c43d80c
|
toggle diaspora protocol on a per-channel level in addition to the existing per site setting. Default is enabled if the site setting is enabled.
|
2015-06-09 18:50:11 -07:00 |
|
redmatrix
|
faa7f97c25
|
s/broder/border/
|
2015-06-09 16:52:53 -07:00 |
|
redmatrix
|
805e2a28ee
|
add nomadic identities as webfinger aliases
|
2015-06-09 16:29:51 -07:00 |
|
redmatrix
|
54b61f817d
|
provide a mechanism for loading the frontpage without redirecting.
|
2015-06-08 21:19:05 -07:00 |
|
redmatrix
|
91249c4bfa
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-06-08 16:57:49 -07:00 |
|
redmatrix
|
507e10fa45
|
remove debugging
|
2015-06-08 16:57:30 -07:00 |
|
redmatrix
|
39f0e6fe62
|
add site_dead flag to prevent delivery to dead sites. Allow sys channel webpages to be viewed even if site is configured "block public".
|
2015-06-08 16:55:17 -07:00 |
|
Mario Vavti
|
a6cedf0953
|
css regression fixes
|
2015-06-08 19:27:16 +02:00 |
|
redmatrix
|
5b482c1daf
|
magic auth issues on dreamhost
|
2015-06-07 23:04:46 -07:00 |
|
redmatrix
|
10e88a3e45
|
Merge branch 'frontpage'
|
2015-06-07 21:38:11 -07:00 |
|
redmatrix
|
9823541c4b
|
make sure these are included
|
2015-06-07 21:36:50 -07:00 |
|
redmatrix
|
77314bfa1c
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-06-07 18:59:48 -07:00 |
|
redmatrix
|
3c5a5a9ebf
|
more frontpage tweaks
|
2015-06-07 18:59:14 -07:00 |
|
redmatrix
|
60cfea5d1f
|
reverse logic of homepage login setting
|
2015-06-07 18:27:05 -07:00 |
|
redmatrix
|
0537ff1e4a
|
frontpage tweaks
|
2015-06-07 18:15:26 -07:00 |
|
redmatrix
|
65bea5e02c
|
frontpage changes
|
2015-06-07 16:19:59 -07:00 |
|
redmatrix
|
04c4ad9448
|
version update
|
2015-06-07 15:15:24 -07:00 |
|
jeroenpraat
|
fd73ffe291
|
Upd NL
|
2015-06-07 16:39:00 +02:00 |
|
Mario Vavti
|
f5e439236c
|
missing comma
|
2015-06-06 20:23:00 +02:00 |
|
jeroenpraat
|
93237f8d0a
|
Added translatable strings to the Display Settings page and refreshed util/messages.po.
|
2015-06-06 19:49:30 +02:00 |
|
Mario Vavti
|
2c52be8780
|
css fixes
|
2015-06-06 17:05:38 +02:00 |
|
Mario Vavti
|
d60c2b1621
|
whitespace
|
2015-06-06 15:51:15 +02:00 |
|
Mario Vavti
|
1d80c33207
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-06-06 15:06:48 +02:00 |
|
Mario Vavti
|
dff402293f
|
some cleanup after scheme transition
|
2015-06-06 15:06:27 +02:00 |
|
redmatrix
|
3fc5b854cb
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-06-06 00:06:44 -07:00 |
|
redmatrix
|
b832444dc2
|
string/version update
|
2015-06-06 00:06:26 -07:00 |
|