Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-21 05:35:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
14031 commits 7 branches 30 tags 160 MiB
Commit graph

14031 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mario Vavti
c1e0987b88 do not show default in scheme selection dropdown. default.php and default.css should be symlinks. adjust doco accordingly. 2015-06-21 17:53:44 +02:00
redmatrix
e1caf77480 Merge pull request #352 from solstag/store_update_fix 
Make item_store_update only affect the data we requested
 2015-06-21 10:07:58 +10:00
redmatrix
9dfb8a3401 ensure the photo driver is included 2015-06-20 16:24:10 -07:00
redmatrix
dd950baa82 import_diaspora - incorrect method for importing channel photo, and add duplicate reddress detection/correction 2015-06-20 16:21:25 -07:00
Alexandre Hannud Abdo
ec23a94b6d Make item_store_update only affect the data we requested 2015-06-20 02:21:25 -03:00
redmatrix
ddbaabd62d wrong logic 2015-06-19 18:08:10 -07:00
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
33c9d8e06b all file attachments are now stored natively, still have photos-0 to store natively 2015-06-18 22:12:26 -07:00
redmatrix
6aa159e2ac Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-06-18 19:15:01 -07: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
2963be60e5 more photos work 2015-06-17 18:26:56 -07:00
redmatrix
6ab20eb1b5 lots of work on merging photo and file albums/folders 2015-06-17 17:44:31 -07:00
redmatrix
c6c17182e5 attach_mkdirp - implement force option to return success if dir exists 2015-06-17 01:18:55 -07:00
redmatrix
4ecee713d5 recursive mkdir (ala mkdir -p) for file and photo storage 2015-06-16 22:58:26 -07:00
redmatrix
39309ad45c start work on photo directories 2015-06-16 19:05:09 -07:00
redmatrix
65661b7ec3 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	mod/photos.php
	mod/siteinfo.php
 2015-06-16 18:43:03 -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
redmatrix
d84b3cfc3c remove file/attachments when their associated photos are removed 2015-06-16 17:50:15 -07: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
redmatrix
bc72d3fd26 move profile photos to new methods 2015-06-15 23:37:51 -07:00
redmatrix
bdedda7c6b fix attachment permissions when they also contain an image. 2015-06-15 20:43:49 -07:00
redmatrix
2adc7a51ad photo upload: pass in the contact_allow and resource_id via include/attach.php 2015-06-15 19:52:17 -07:00
redmatrix
8c7472c6c3 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	view/nl/messages.po
	view/nl/strings.php
 2015-06-15 17:30:08 -07:00
redmatrix
859a2ac8ef DB changes for some channel flags 2015-06-15 17:28:52 -07: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
91d92fe6fc un-maintainable - let it go. 2015-06-14 22:29:25 -07:00
redmatrix
d2178e43f6 sql errors after last major edit adventure 2015-06-14 21:19:13 -07:00
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