Mario Vavti
|
f707f4d49a
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-06-24 12:33:53 +02:00 |
|
Mario Vavti
|
201ba411ba
|
Reflect in directory title if we watch the local or the global directory
|
2015-06-24 12:33:37 +02:00 |
|
redmatrix
|
7975bc828f
|
typo
|
2015-06-23 16:22:21 -07:00 |
|
Mario Vavti
|
30ba2803e7
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-06-23 13:06:40 +02:00 |
|
Mario Vavti
|
b6c4601d8f
|
some work on directory
|
2015-06-23 13:06:22 +02:00 |
|
redmatrix
|
45d66657d7
|
Merge pull request #356 from solstag/signature_edit_fix
properly trims edited posts before signing so signature verification …
|
2015-06-23 14:47:59 +10:00 |
|
Alexandre Hannud Abdo
|
a189fc0872
|
properly trims edited posts before signing so signature verification works
|
2015-06-23 01:08:02 -03:00 |
|
redmatrix
|
d46f5467b3
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-06-22 16:09:36 -07:00 |
|
redmatrix
|
9879cf3c6c
|
ensure we always sign a trimmed item body.
|
2015-06-22 16:09:02 -07:00 |
|
Mario Vavti
|
a4775aab9b
|
Bring /help in line with the rest of the app
|
2015-06-22 14:02:14 +02:00 |
|
redmatrix
|
0ad71b3efa
|
import: Improve the descriptive text for this feature
|
2015-06-21 19:11:07 -07:00 |
|
redmatrix
|
68534fd5dc
|
some diaspora import issues uncovered during dry-run tests
|
2015-06-21 17:30:23 -07:00 |
|
redmatrix
|
a6b9d1595e
|
automatically gunzip Diaspora export files if we're on a *nix system
|
2015-06-19 17:18:01 -07:00 |
|
redmatrix
|
6bd90816dd
|
very early attempt diaspora import from diaspora export file. Currently the json export has to be gunzipped prior to uploading and we're net yet adding connections (which should come soon) and we can't import items until they add guids to the export file - so consider it a work in progress. This first attempt should create a channel and get your profile details setup providing there isn't a nickname conflict on the server. That will also be handled later.
|
2015-06-19 16:39:03 -07:00 |
|
redmatrix
|
25e134dd9c
|
set return url from apps page
|
2015-06-18 17:53:26 -07:00 |
|
redmatrix
|
ec54111e6b
|
Merge pull request #349 from git-marijus/master
make photo upload work for remote channels with perms
|
2015-06-17 11:14:18 +10:00 |
|
jeroenpraat
|
24befa2197
|
Small fix in siteinfo
|
2015-06-16 13:24:10 +02:00 |
|
Mario Vavti
|
93f48cd8bb
|
make photo upload work for remote channels with perms
|
2015-06-16 12:18:50 +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
|
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 |
|
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
|
20a317b5b7
|
really show login form if it is enabled
|
2015-06-10 11:58:45 +02: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
|
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 |
|
redmatrix
|
5b482c1daf
|
magic auth issues on dreamhost
|
2015-06-07 23:04:46 -07:00 |
|
redmatrix
|
9823541c4b
|
make sure these are included
|
2015-06-07 21:36:50 -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 |
|
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
|
d84f77bbc6
|
use the right webpage layout for an installed webpage if it exists
|
2015-06-04 23:04:58 +02:00 |
|
Mario Vavti
|
6277fb76dd
|
update help link
|
2015-06-02 11:09: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
|
84c085dcd7
|
bare bones ASLD
|
2015-05-31 22:16:14 -07:00 |
|
Habeas Codice
|
0df0fb4b46
|
fix unable to crop profile pic on postgres
|
2015-05-30 19:49:32 -07:00 |
|
redmatrix
|
cd3284d081
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-05-30 15:04:11 -07:00 |
|
redmatrix
|
edd228decb
|
strip images from directory text entries
|
2015-05-30 15:03:44 -07:00 |
|
Mario Vavti
|
8516b3259f
|
whitespace
|
2015-05-29 16:14:54 +02:00 |
|
Mario Vavti
|
d11d130021
|
add some yes/no labels and minor template fixes
|
2015-05-29 15:23:51 +02:00 |
|
Mario Vavti
|
b8d3280763
|
some fixes to make menu sharing work and expose it in the ui.
|
2015-05-29 13:08:01 +02:00 |
|
Mario Vavti
|
5f1ae2930b
|
show created/edited dates for menus
|
2015-05-29 11:07:57 +02:00 |
|
redmatrix
|
3c82156d63
|
untested menu element import, be aware that the menu api does not over-write on duplicate name - it just fails. We'll need to sort this out eventually. Also it was planned to offer a choice of whether to preserve links from the source site or change the baseurl to the local one. Currently we convert them all to local links.
|
2015-05-28 20:50:29 -07:00 |
|