redmatrix
|
50a1e0c618
|
attach_store needs a lot of documenting to understand what's going on and how it got to be this way. Here's the bird's eye view.
|
2015-08-13 17:11:59 -07:00 |
|
redmatrix
|
ef73880459
|
reverting 36b5f6ac
|
2015-08-12 22:48:08 -07:00 |
|
redmatrix
|
98f3242e73
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-08-12 22:38:08 -07:00 |
|
redmatrix
|
0b7365e2db
|
revert 36b5f6ac
|
2015-08-12 22:37:24 -07:00 |
|
redmatrix
|
f88dc84091
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
view/es/htconfig.tpl
view/es/update_fail_eml.tpl
|
2015-08-12 20:36:32 -07:00 |
|
jeroenpraat
|
3099562a21
|
Some corrections of Spanish strings.
|
2015-08-12 20:52:46 +02:00 |
|
jeroenpraat
|
588d22974c
|
And Catalan!
|
2015-08-12 15:16:56 +02:00 |
|
jeroenpraat
|
4c2bbe3c41
|
Thanks to Manuel. Updated Spanish to 100 procent.
|
2015-08-12 15:11:04 +02:00 |
|
redmatrix
|
b634c08d0e
|
resolve conflict
|
2015-08-11 22:41:27 -07:00 |
|
redmatrix
|
2d9d4dfeb3
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
doc/history.md
mod/import.php
|
2015-08-11 22:35:36 -07:00 |
|
redmatrix
|
d882b3274b
|
doc fixes
|
2015-08-11 22:32:53 -07:00 |
|
redmatrix
|
1aa48ddfaa
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-08-11 22:32:33 -07:00 |
|
redmatrix
|
ad02d5589d
|
Merge pull request #383 from solstag/commentpermgood
Require comment perms only for own posts, allow senders to deliver co…
|
2015-08-12 15:31:36 +10:00 |
|
redmatrix
|
0e8991fec2
|
more consistent output on forum widget
|
2015-08-11 22:23:20 -07:00 |
|
redmatrix
|
b651604e8b
|
remove the forum limit
|
2015-08-11 20:58:03 -07:00 |
|
redmatrix
|
1932e72603
|
arghh
|
2015-08-11 20:25:52 -07:00 |
|
redmatrix
|
be4eb4eeb8
|
typo
|
2015-08-11 20:25:02 -07:00 |
|
redmatrix
|
89fa36ce2a
|
wrong cid
|
2015-08-11 20:24:06 -07:00 |
|
redmatrix
|
80df97e734
|
don't show '0' results, like notifications
|
2015-08-11 20:18:34 -07:00 |
|
redmatrix
|
8dd7fab38d
|
order by name
|
2015-08-11 20:16:17 -07:00 |
|
redmatrix
|
400d5790f3
|
make sure we only get forums attached to the channel
|
2015-08-11 19:58:31 -07:00 |
|
redmatrix
|
c8e83d6edc
|
set font-weight back to normal on forums widget
|
2015-08-11 19:27:22 -07:00 |
|
redmatrix
|
c8b8c6cb14
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/items.php
util/messages.po
view/nl/messages.po
view/nl/strings.php
|
2015-08-11 19:24:31 -07:00 |
|
redmatrix
|
44dcbeaaa4
|
forum widget
|
2015-08-11 19:22:14 -07:00 |
|
redmatrix
|
0c23843b61
|
untested forum widget
|
2015-08-11 17:39:29 -07:00 |
|
redmatrix
|
0a34b96e11
|
bring back colour to abook_self in acl
|
2015-08-11 01:16:04 -07:00 |
|
redmatrix
|
f30d2b489a
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-08-10 16:17:06 -07:00 |
|
redmatrix
|
81c740178d
|
convert abook_flags from hubzilla during cloning
|
2015-08-10 16:16:26 -07:00 |
|
Alexandre Hannud Abdo
|
36b5f6acfe
|
Require comment perms only for own posts, allow senders to deliver comments using stream perms.
|
2015-08-10 18:20:18 -03:00 |
|
jeroenpraat
|
eae88b0815
|
Update Dutch strings
|
2015-08-09 15:56:02 +02:00 |
|
redmatrix
|
58c9f516b3
|
private mail isues
|
2015-08-09 01:18:36 -07:00 |
|
redmatrix
|
8ce4814835
|
convert diaspora_signature to json for storage
|
2015-08-08 15:19:50 -07:00 |
|
redmatrix
|
2656aeaf9c
|
ensure diaspora_signature is converted to json before we store it.
|
2015-08-08 15:18:34 -07:00 |
|
redmatrix
|
bf3ea2cd47
|
update
|
2015-08-07 14:20:18 -07:00 |
|
redmatrix
|
bd03603f58
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-08-06 21:08:33 -07:00 |
|
redmatrix
|
ec5d91d8cf
|
closing tags
|
2015-08-06 21:07:25 -07:00 |
|
redmatrix
|
7e43da43a1
|
more file permissions inheritance work
|
2015-08-06 17:42:53 -07:00 |
|
redmatrix
|
91bbfcf554
|
photo permission inheritance. We want to use the folder permissions unless specific permissions have been set to over-ride them. If nothing is set, use the channel default. We may have to mess with his further in the case of somebody trying to create a public photo directory when their normal permissions are set to private. Kind of a chicken/egg problem because the folder permissions will be empty.
|
2015-08-06 17:09:09 -07:00 |
|
Haakon Meland Eriksen
|
07cd0c870f
|
Merge remote-tracking branch 'upstream/master'
|
2015-08-06 23:57:28 +02:00 |
|
redmatrix
|
1b0cb9388c
|
prohibit some photo album edit operations until we figure out how to sync them with dav
|
2015-08-05 22:35:42 -07:00 |
|
redmatrix
|
880dec5a4e
|
don't throw errors or do the wrong thing if photos have no album (placed on your dav rootdir)
|
2015-08-05 22:07:51 -07:00 |
|
redmatrix
|
dfb8a1b2d4
|
photo album is decided in dav or attach modules now - don't set it in photos_upload
|
2015-08-05 21:42:00 -07:00 |
|
redmatrix
|
cb8f0a0e0f
|
uploaded photo from dav (file put, not dav create) not showing in photo album
|
2015-08-05 20:54:32 -07:00 |
|
redmatrix
|
03a833f2f8
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
view/nl/messages.po
view/nl/strings.php
|
2015-08-05 16:13:42 -07:00 |
|
redmatrix
|
efa589300a
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-08-05 16:12:30 -07:00 |
|
redmatrix
|
6413ba3230
|
connection filter fixes
|
2015-08-05 16:12:05 -07:00 |
|
jeroenpraat
|
510cb5df86
|
Update Dutch strings
|
2015-08-05 22:31:40 +02:00 |
|
redmatrix
|
ea63f3312f
|
personal oembed black/white list
|
2015-08-04 20:07:55 -07:00 |
|
redmatrix
|
5344431fc0
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-08-04 16:02:12 -07:00 |
|
redmatrix
|
a61fc00fa4
|
unobscure item before applying connection filter
|
2015-08-04 15:59:18 -07:00 |
|