redmatrix
|
be0459a98b
|
convert the abook fields
|
2015-06-14 21:08:00 -07:00 |
|
redmatrix
|
f0b255b1a9
|
more file/photo merge work
|
2015-06-14 17:28:51 -07:00 |
|
redmatrix
|
9642728e7d
|
first cut at merging files and photos, not yet well integrated but they are integrated
|
2015-06-14 16:50:24 -07:00 |
|
redmatrix
|
23f7f60bf7
|
make new os_storage flag work
|
2015-06-14 15:59:11 -07:00 |
|
redmatrix
|
187a7a56c2
|
version update
|
2015-06-14 15:57:45 -07:00 |
|
redmatrix
|
b7be79c5e7
|
isolate the os_storage flag
|
2015-06-13 15:57:28 -07:00 |
|
redmatrix
|
3f0009ccd7
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
util/messages.po
|
2015-06-13 15:02:51 -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
|
e838647e3a
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-06-11 22:48:01 -07:00 |
|
redmatrix
|
6562820175
|
make cloud work again
|
2015-06-11 22:47:45 -07:00 |
|
redmatrix
|
485b19958e
|
don't provide a connect button on the sys channel profile sidebar
|
2015-06-11 22:46:37 -07:00 |
|
redmatrix
|
41085ae03f
|
start on the DAV/photos merger
|
2015-06-11 22:32:08 -07:00 |
|
redmatrix
|
5733491ac8
|
more work on items
and
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
include/items.php
view/it/messages.po
view/it/strings.php
|
2015-06-11 17:56:56 -07:00 |
|
redmatrix
|
8812f183a2
|
the hubzilla version of this function
|
2015-06-11 16:11:59 -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
|
b2c5020af7
|
diaspora disallowed by default
|
2015-06-10 18:51:39 -07:00 |
|
redmatrix
|
bc1b7afc85
|
start to partition the dav
|
2015-06-10 18:11:15 -07:00 |
|
redmatrix
|
a14d2de1f0
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-06-10 17:58:02 -07: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
|
ca870dbf31
|
more work on item table optimisation
|
2015-06-10 16:59:04 -07:00 |
|
redmatrix
|
2128d5a256
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-06-10 15:47:23 -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
|
eb6a1f8387
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-06-09 19:39:21 -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
|
03357481f7
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
install/schema_mysql.sql
mod/home.php
mod/page.php
view/nl/messages.po
view/nl/strings.php
|
2015-06-09 16:52:00 -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 |
|