redmatrix
|
a322254f2a
|
do ical export before checking logged in channel
|
2015-08-20 04:51:03 -07:00 |
|
redmatrix
|
fd7b668a16
|
add carriage return to newlines for exported events (rfc2445:4.1)
|
2015-08-20 02:07:51 -07:00 |
|
redmatrix
|
5786fd2221
|
extra encoding on mail titles
|
2015-08-20 01:12:35 -07:00 |
|
redmatrix
|
419b4ecfde
|
use consistent terminology
|
2015-08-19 21:17:24 -07:00 |
|
redmatrix
|
69920fb717
|
fix photo location
|
2015-08-19 19:17:17 -07:00 |
|
redmatrix
|
8d66fbccfa
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/api.php
|
2015-08-19 16:54:12 -07:00 |
|
redmatrix
|
a4caaefd32
|
event integration improvements
|
2015-08-19 16:50:32 -07:00 |
|
redmatrix
|
c96f121d41
|
add photo_detail api call
|
2015-08-18 22:14:16 -07:00 |
|
redmatrix
|
4e3d295c90
|
import and export tasks (calendar todo items)
|
2015-08-18 19:06:50 -07:00 |
|
redmatrix
|
9763c46b7e
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/identity.php
|
2015-08-17 22:23:23 -07:00 |
|
redmatrix
|
f682325924
|
provide ability to export by month as well as by year
|
2015-08-17 22:20:10 -07:00 |
|
redmatrix
|
ea331b043c
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-08-17 21:41:14 -07:00 |
|
redmatrix
|
1a4a921528
|
provide module for importing yearly content dumps
|
2015-08-17 21:40:40 -07:00 |
|
redmatrix
|
1982fc807f
|
add item_id to yearly dump files
|
2015-08-17 21:38:43 -07:00 |
|
redmatrix
|
18bc12c21c
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/zot.php
util/messages.po
|
2015-08-14 22:24:15 -07:00 |
|
Alexandre Hannud Abdo
|
73b30de9cb
|
Properly fix which perms get checked for comments, Mike's solution
|
2015-08-14 12:21:05 -03:00 |
|
redmatrix
|
d140620008
|
add item validation function
|
2015-08-13 19:35:57 -07:00 |
|
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
|
0b7365e2db
|
revert 36b5f6ac
|
2015-08-12 22:37:24 -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
|
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 |
|
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 |
|
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
|
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 |
|
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
|
6413ba3230
|
connection filter fixes
|
2015-08-05 16:12:05 -07: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 |
|
redmatrix
|
f594a7776c
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
view/it/messages.po
view/it/strings.php
|
2015-08-03 21:17:00 -07:00 |
|
redmatrix
|
6826b4ad32
|
these were some really difficult bugs to find
|
2015-08-03 21:13:17 -07:00 |
|
redmatrix
|
b737e224b1
|
more work separating Diaspora from core
|
2015-08-03 16:52:51 -07:00 |
|