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 |
|
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 |
|
redmatrix
|
ec1dcb8f2e
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
util/messages.po
|
2015-06-06 17:31:22 -07: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 |
|
jeroenpraat
|
f51cfa6960
|
More schemas in new format
|
2015-06-05 21:15:21 +02:00 |
|
Mario Vavti
|
d84f77bbc6
|
use the right webpage layout for an installed webpage if it exists
|
2015-06-04 23:04:58 +02:00 |
|
Mario Vavti
|
33a122aaa8
|
some doco on webpage blocks
|
2015-06-04 22:27:55 +02:00 |
|
jeroenpraat
|
6e336d680d
|
Schemas: should be ok now.
|
2015-06-03 22:53:48 +02:00 |
|
jeroenpraat
|
03361acce5
|
2 more schemas in new format
|
2015-06-03 15:45:50 +02:00 |
|
jeroenpraat
|
83d42710df
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-06-03 13:58:18 +02:00 |
|
jeroenpraat
|
76d7278c0a
|
empty php schema back
|
2015-06-03 13:57:10 +02:00 |
|
redmatrix
|
7cbc504874
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-06-02 17:47:47 -07:00 |
|
redmatrix
|
86ff31f500
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-06-02 17:46:47 -07:00 |
|
redmatrix
|
b2fde73952
|
asjld work
|
2015-06-02 17:46:22 -07:00 |
|
jeroenpraat
|
89fbd5c0f6
|
First schema completely to the new format. git-marijus: Can you please quickly check if I'm doing it right?
|
2015-06-02 23:22:12 +02:00 |
|
Mario Vavti
|
6277fb76dd
|
update help link
|
2015-06-02 11:09:57 +02:00 |
|
Mario Vavti
|
12408ba181
|
update comanche doco
|
2015-06-02 10:59:57 +02:00 |
|
redmatrix
|
e3606ec56f
|
move the photo and attachment permission syncing past the tag replacement so that attachments get the correct permissions when private mentions are used.
|
2015-06-01 16:26:12 -07:00 |
|
redmatrix
|
c1e139a550
|
error in directory bbcode image filter
|
2015-05-31 22:22:37 -07:00 |
|