redmatrix
|
45bd81fe8c
|
missed the xchan_mail_query
|
2015-10-15 21:38:16 -07:00 |
|
redmatrix
|
3f7ee613fc
|
mail sync debugging
|
2015-10-15 20:40:24 -07:00 |
|
redmatrix
|
93f061f78a
|
mail sync/migrate continued; also abstract delivery loop to make it re-usable, change refresh_all to use delivery loop.
|
2015-10-15 18:52:04 -07:00 |
|
redmatrix
|
7517c76ae4
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
install/update.php
|
2015-10-15 16:02:37 -07:00 |
|
redmatrix
|
bf5a1f662a
|
generate all (non-square) photo scales - even if the original photo is smaller than the scale target sizes.
|
2015-10-15 14:18:40 -07:00 |
|
Mario Vavti
|
391b98f72c
|
fix webpages
|
2015-10-15 20:57:05 +02:00 |
|
Mario Vavti
|
d40a087ec2
|
really fix label name
|
2015-10-15 16:07:13 +02:00 |
|
Mario Vavti
|
138c14d43f
|
wrong logic
|
2015-10-15 15:48:13 +02:00 |
|
Mario Vavti
|
dc6a594277
|
fix label name
|
2015-10-15 15:41:08 +02:00 |
|
Mario Vavti
|
73082a338b
|
(re)add default image-size 320px - it is good for gallery preview. this size has the suffix -3 now
|
2015-10-15 12:56:22 +02:00 |
|
Mario Vavti
|
2413968021
|
double up default photo sizes - even the mos simple camera can now do images > 1024px
|
2015-10-15 11:20:56 +02:00 |
|
Mario Vavti
|
44b542814a
|
if photo deleted from /cloud or /dav also delete from /photos
|
2015-10-15 10:29:39 +02:00 |
|
Mario Vavti
|
2848f5dab4
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2015-10-15 09:36:51 +02:00 |
|
redmatrix
|
0563ce93a1
|
change name of matrix app
|
2015-10-14 18:03:05 -07:00 |
|
redmatrix
|
c8e3ea955d
|
more mail sync work
|
2015-10-14 17:49:35 -07:00 |
|
redmatrix
|
b33a9a71f6
|
more work on import & sync of private mail and conversations
|
2015-10-14 17:40:50 -07:00 |
|
redmatrix
|
8af3dc140e
|
issue #87 - photos not getting deleted from mod_photo when deleted in DAV or cloud
|
2015-10-14 15:08:07 -07:00 |
|
redmatrix
|
de697a4267
|
issue #86 - like/dislike in photos not working
|
2015-10-14 14:16:16 -07:00 |
|
Mario Vavti
|
ca35db76b8
|
wrong variable
|
2015-10-14 23:07:49 +02:00 |
|
Mario Vavti
|
b6eded1119
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2015-10-14 22:57:03 +02:00 |
|
Mario Vavti
|
c8d8ae89d7
|
remove $item from $prep_arr - we probably do not need it
|
2015-10-14 22:46:40 +02:00 |
|
redmatrix
|
b2d949ce9a
|
issue #82 - args not defined (should be arr)
|
2015-10-14 13:25:58 -07:00 |
|
Mario Vavti
|
f12ebffa39
|
really check for large photos feature
|
2015-10-14 22:24:13 +02:00 |
|
redmatrix
|
9b4d32b68c
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-10-14 13:19:52 -07:00 |
|
redmatrix
|
f4e708a02f
|
port of mail encoding
|
2015-10-14 13:19:28 -07:00 |
|
Mario Vavti
|
b4e83b6537
|
allow photo-items to appear full width if large photos feature is enabled. in prepare_body() split off mentions, tags, categories folders and attachments from body for easier theming. some other little fixes.
|
2015-10-14 22:14:19 +02:00 |
|
redmatrix
|
c7637a0c53
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-10-14 13:13:12 -07:00 |
|
redmatrix
|
732c6134dd
|
support for mail sync
|
2015-10-14 13:11:24 -07:00 |
|
redmatrix
|
d616099de6
|
Merge pull request #80 from git-marijus/master
fix /channel not updating after posting comment
|
2015-10-14 18:19:32 +11:00 |
|
redmatrix
|
edeba4ca34
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/api.php
|
2015-10-13 16:19:25 -07:00 |
|
redmatrix
|
7e03f612b3
|
file migration - continued
|
2015-10-13 16:16:51 -07:00 |
|
redmatrix
|
578f1b8ece
|
api extenesions for file migration
|
2015-10-13 16:15:34 -07:00 |
|
Mario Vavti
|
e2a15d0ec9
|
fix photo visibility switch on photo upload
|
2015-10-13 14:05:27 +02:00 |
|
redmatrix
|
136e5fdf95
|
port of file detail api call
|
2015-10-12 23:39:55 -07:00 |
|
redmatrix
|
75fe9f9cc4
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-10-12 23:37:35 -07:00 |
|
redmatrix
|
73dad85867
|
file detail api call (will not work for huge files)
|
2015-10-12 23:36:26 -07:00 |
|
redmatrix
|
91895c52ca
|
missing underscore
|
2015-10-12 19:54:01 -07:00 |
|
redmatrix
|
fc28af8518
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/attach.php
|
2015-10-12 19:52:21 -07:00 |
|
redmatrix
|
3545626950
|
attach_list_files had some problems - wasn't used until now apparently
|
2015-10-12 19:49:06 -07:00 |
|
redmatrix
|
6a7079a594
|
small change to allow a person with sufficient privileges the ability to import a file into their cloud storage from elsewhere in the server filesystem - without nuking it in the process.
|
2015-10-12 18:55:02 -07:00 |
|
redmatrix
|
c76da2e77d
|
functions to update urls in items when doing migrations
|
2015-10-06 20:30:49 -07:00 |
|
Mario Vavti
|
26b97722c6
|
remove check mail - it just reloads the page. we get a notification in the panel if we get new mail
|
2015-10-04 13:43:16 +02:00 |
|
jeroenpraat
|
ab59e41e1a
|
Red:Notify > Hubzilla:Notify
|
2015-10-03 15:51:12 +02:00 |
|
redmatrix
|
6171d164d7
|
need full path to deliver_hooks.php
|
2015-10-02 04:51:57 -07:00 |
|
redmatrix
|
982ff8733f
|
one more change
|
2015-10-01 19:54:28 -07:00 |
|
redmatrix
|
ebe374d572
|
notification changes to support testdrive
|
2015-10-01 19:49:06 -07:00 |
|
redmatrix
|
dd45e7b4eb
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-10-01 17:30:15 -07:00 |
|
redmatrix
|
63eb0e3a38
|
allow additional uses for xtags
|
2015-10-01 17:28:03 -07:00 |
|
redmatrix
|
986244eeea
|
issue #63 - missing table fields in db query
|
2015-09-30 21:38:21 -07:00 |
|
redmatrix
|
9bdb7bef5d
|
add delivery reports to mail (not backported to redmatrix)
|
2015-09-30 19:27:53 -07:00 |
|
redmatrix
|
54e7d5d260
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/zot.php
view/de/messages.po
view/de/strings.php
|
2015-09-30 16:31:06 -07:00 |
|
redmatrix
|
5265c190d4
|
document the issue with cloned delivery to self vs normal delivery to self
|
2015-09-30 16:27:24 -07:00 |
|
redmatrix
|
4b7c052ed8
|
undo self deliver check
|
2015-09-30 12:59:13 -07:00 |
|
redmatrix
|
fd290882fd
|
undo self-deliver check
|
2015-09-30 12:57:02 -07:00 |
|
redmatrix
|
e769fbaffb
|
another error from the db logs
|
2015-09-29 22:56:29 -07:00 |
|
redmatrix
|
5721f9f3a9
|
wrong table column names
|
2015-09-29 22:51:06 -07:00 |
|
redmatrix
|
cca9f2392e
|
queue cleanup, and report issues
|
2015-09-29 22:11:10 -07:00 |
|
redmatrix
|
928fa44154
|
more work on the notifier
|
2015-09-29 21:08:12 -07:00 |
|
redmatrix
|
a795f03c48
|
improve the sys channel location repair to check key issues and re-installs and/or site moves
|
2015-09-29 17:21:14 -07:00 |
|
redmatrix
|
8f7b869c08
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-09-29 16:56:50 -07:00 |
|
redmatrix
|
c5294f994e
|
check and repair sys channel locations (hublocs) in zot-finger if they are messed up
|
2015-09-29 16:55:51 -07:00 |
|
Mario Vavti
|
2a2da48d18
|
fix typo in 0b1cd826b0
|
2015-09-29 11:56:43 +02:00 |
|
Mario Vavti
|
0b1cd826b0
|
do not store a recalled mail if we can not find the original mid
|
2015-09-29 11:48:41 +02:00 |
|
redmatrix
|
8d5556764c
|
add one more level of parentheses to ensure operator precedence is correctly evaluated
|
2015-09-28 20:03:11 -07:00 |
|
redmatrix
|
f965209eee
|
check public scopes against visitor in item_permissions_sql()
|
2015-09-28 19:45:57 -07:00 |
|
redmatrix
|
5c526995d8
|
resolve conflicts
|
2015-09-28 19:07:31 -07:00 |
|
redmatrix
|
50ee82e8bd
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-09-28 19:06:10 -07:00 |
|
redmatrix
|
8a3c909c74
|
ignore self delivery in process_delivery
|
2015-09-28 19:05:45 -07:00 |
|
redmatrix
|
3a8e1e0484
|
process_delivery: ignore self
|
2015-09-28 19:04:36 -07:00 |
|
redmatrix
|
3b53cd56ef
|
Merge branch 'deadsite'
|
2015-09-28 17:15:34 -07:00 |
|
redmatrix
|
30e88a4f6b
|
typo
|
2015-09-28 17:15:04 -07:00 |
|
redmatrix
|
e5f47cd14b
|
create site records for all queued sites and check for death
|
2015-09-28 17:13:11 -07:00 |
|
Mario Vavti
|
b97102da01
|
private mail: bring additional inbox/outbox views and ajaxify single message drop
|
2015-09-28 17:40:38 +02:00 |
|
redmatrix
|
dbeae16dc1
|
add site_type to queries, first few - several more to go.
|
2015-09-28 04:21:29 -07:00 |
|
redmatrix
|
ed876a9c52
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/zot.php
|
2015-09-27 18:03:40 -07:00 |
|
redmatrix
|
67fe8fc4a7
|
well there's one problem...
|
2015-09-27 18:00:37 -07:00 |
|
redmatrix
|
55b530f0fd
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/zot.php
util/messages.po
|
2015-09-27 17:00:41 -07:00 |
|
redmatrix
|
aae51a9b23
|
add some safety checks on the sending side of sync
|
2015-09-27 16:47:25 -07:00 |
|
redmatrix
|
cd2b811555
|
move string files to hmessages.po and hstrings.php for hubzilla to avoid endless merge conflicts.
|
2015-09-26 23:44:30 -07:00 |
|
redmatrix
|
9ab335626c
|
import_xchan_photo: check the return headers to ensure it's an image content-type of some form as imagick chucks a wobbly if you try to initialise an image with an html error page.
|
2015-09-26 13:25:34 -07:00 |
|
redmatrix
|
8aec437c23
|
remove redundant code
|
2015-09-24 23:02:41 -07:00 |
|
redmatrix
|
98f656cfcb
|
delivery optimisations
|
2015-09-24 22:51:47 -07:00 |
|
redmatrix
|
2c665e5e4c
|
add Diaspora (actually any external service which uses the queue) to delivery reports
|
2015-09-24 17:41:05 -07:00 |
|
redmatrix
|
2fe3d16bbe
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-09-24 16:58:32 -07:00 |
|
redmatrix
|
2844f276b9
|
Document the additional content export options
|
2015-09-24 16:57:17 -07:00 |
|
Mario Vavti
|
b9723aa85b
|
some heavy private mail restructuring - work in progress
|
2015-09-24 14:07:44 +02:00 |
|
redmatrix
|
b553ffd55d
|
timezone tweaks
|
2015-09-23 20:59:19 -07:00 |
|
redmatrix
|
e45958b967
|
add plugin hooks to channel sync/import/export
|
2015-09-23 18:27:04 -07:00 |
|
redmatrix
|
7734bbfe4d
|
problems with extended item import and signatures
|
2015-09-22 22:30:09 -07:00 |
|
redmatrix
|
d35c5bcb2f
|
merge issue
|
2015-09-22 19:16:13 -07:00 |
|
redmatrix
|
c699d3a17a
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-09-22 19:14:21 -07:00 |
|
redmatrix
|
d16ac62a51
|
don't send sync packets to deleted hubloc locations
|
2015-09-22 19:13:10 -07:00 |
|
redmatrix
|
15feeb7bfe
|
inverted logic syncing deleted hublocs
|
2015-09-22 18:40:03 -07:00 |
|
redmatrix
|
02ecc93998
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-09-22 16:50:55 -07:00 |
|
redmatrix
|
34291d5938
|
add names to delivery report for sync delivery
|
2015-09-22 16:50:08 -07:00 |
|
redmatrix
|
e726adc27b
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-09-22 16:45:14 -07:00 |
|
redmatrix
|
642f460dca
|
report the channel sync
|
2015-09-22 16:43:36 -07:00 |
|
redmatrix
|
1d7d9818fa
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/items.php
include/zot.php
|
2015-09-22 16:26:28 -07:00 |
|
redmatrix
|
c2dcc68803
|
backport item sync
|
2015-09-22 16:19:08 -07:00 |
|
redmatrix
|
7dd61c05dc
|
allow self delivery until we figure out why clone sync of posted items isn't doing it's thing
|
2015-09-22 04:39:36 -07:00 |
|