Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 18:55:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
13695 commits 7 branches 30 tags 160 MiB
Commit graph

13695 commits

This branch
This branch
All branches
Author SHA1 Message Date
redmatrix
94e7a425e6 import_diaspora - a few more atypical settings 2015-06-19 18:06:55 -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
e85d2c4b90 import_diaspora: add all the friends 2015-06-19 17:07:31 -07:00
redmatrix
0a9d3b4025 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-06-19 16:44:16 -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
Mario Vavti
8b563951ff more generic-content-wrapper and some css fixes 2015-06-19 15:49:06 +02:00
Mario Vavti
1432b1e83f cloud.tpl 2015-06-19 12:45:18 +02:00
Mario Vavti
de84f48e2f bring some more generic-content-wrappers and fix some of them 2015-06-19 12:44:11 +02:00
redmatrix
25e134dd9c set return url from apps page 2015-06-18 17:53:26 -07:00
redmatrix
7e59580812 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-06-18 16:36:47 -07:00
redmatrix
1a9c059062 issues with markdownify and escaped HTML 2015-06-18 16:35:40 -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
40ee0d41dc fix deleting of album for remote channel 2015-06-16 12:54:29 +02:00
Mario Vavti
93f48cd8bb make photo upload work for remote channels with perms 2015-06-16 12:18:50 +02:00
Mario Vavti
e0779e32b4 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-06-15 21:48:07 +02:00
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