redmatrix
|
f0a33c00bc
|
separate permission_update notification into permission_create and permission_update, since some networks send out a notification for duplicate share requests even if connected.
|
2015-10-18 20:13:12 -07:00 |
|
redmatrix
|
9b3662e5ad
|
issues with "the Register" feed
|
2015-10-18 16:29:09 -07:00 |
|
redmatrix
|
76d41fc250
|
re-organise the protocol disabled logic
|
2015-10-18 15:49:52 -07:00 |
|
redmatrix
|
4b984f9819
|
filter delivery reports
|
2015-10-17 13:26:55 -07:00 |
|
redmatrix
|
e8882a5167
|
remove one more Friendica table reference from the API
|
2015-10-16 15:24:48 -07:00 |
|
Mario Vavti
|
b7408fa39e
|
we now provide images for all suffixes (0-3) -> simplify photo item body creation and provide width x height for any size
|
2015-10-16 16:27:51 +02:00 |
|
redmatrix
|
c07f694a07
|
another try at issue #89 - rotating photos
|
2015-10-16 04:21:40 -07:00 |
|
redmatrix
|
550cab41fb
|
missing xchan_mail_query
|
2015-10-15 21:39:33 -07:00 |
|
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 |
|
redmatrix
|
1c1155513a
|
add one more test
|
2015-09-22 04:28:05 -07:00 |
|
redmatrix
|
f84151e1fe
|
fix foreach warning
|
2015-09-22 04:24:54 -07:00 |
|
redmatrix
|
2869ccfe39
|
delivery reports - crude but mostly functional at least for zot deliveries
|
2015-09-22 04:04:51 -07:00 |
|
redmatrix
|
0b1b11ea53
|
heavy lifting for delivery reports
|
2015-09-22 02:32:04 -07:00 |
|
redmatrix
|
146ff6f703
|
more progress on delivery reports. Store the remote results from zot sites locally.
|
2015-09-21 22:30:28 -07:00 |
|
redmatrix
|
9baaa6fa56
|
issue #51
|
2015-09-21 20:05:54 -07:00 |
|
redmatrix
|
d2565d0f61
|
looks like chat has been neglected a bit recently
|
2015-09-20 21:37:18 -07:00 |
|
redmatrix
|
4fde0bf62e
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/zot.php
|
2015-09-20 20:58:55 -07:00 |
|
redmatrix
|
a679081993
|
new delivery report format
|
2015-09-20 20:21:54 -07:00 |
|
redmatrix
|
177292de13
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/zot.php
|
2015-09-20 18:10:25 -07:00 |
|
redmatrix
|
efcb4abfd0
|
improve on the last attempt
|
2015-09-20 18:08:06 -07:00 |
|
redmatrix
|
1501d1c570
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/zot.php
|
2015-09-20 18:03:41 -07:00 |
|
redmatrix
|
59a56ac77f
|
catch the timestamp also
|
2015-09-20 17:47:41 -07:00 |
|
redmatrix
|
35f09f4f74
|
remove system flags from channel import packet
|
2015-09-20 17:45:23 -07:00 |
|
redmatrix
|
b240c15014
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/zot.php
|
2015-09-20 16:55:24 -07:00 |
|
redmatrix
|
9de8df496a
|
we need the xchan record also
|
2015-09-20 16:52:21 -07:00 |
|
redmatrix
|
996cd7e2ab
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-09-20 00:28:22 -07:00 |
|
redmatrix
|
77df590f65
|
initial checkin delivery report class
|
2015-09-20 00:27:25 -07:00 |
|
redmatrix
|
ce064188c6
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/zot.php
|
2015-09-19 22:48:22 -07:00 |
|
redmatrix
|
5d6f59a598
|
clone new connections
|
2015-09-19 22:46:59 -07:00 |
|
redmatrix
|
f4a4cf1402
|
clone new connection requests
|
2015-09-19 15:36:07 -07:00 |
|
redmatrix
|
63146821d7
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-09-18 23:02:49 -07:00 |
|
redmatrix
|
9ed8eac8c6
|
include site identitfier on redmatrix delivery reports also
|
2015-09-18 23:02:03 -07:00 |
|
redmatrix
|
43251ed8ce
|
add reporting site to delivery report
|
2015-09-18 22:00:33 -07:00 |
|
redmatrix
|
fdd4c1b9d1
|
more work on surviving hub re-installs
|
2015-09-18 14:31:29 -07:00 |
|
redmatrix
|
f2fefb91d5
|
change photo permissions when attach permissions are changed through mod/filestorage, and fix lockview for photos.
|
2015-09-18 01:53:04 -07:00 |
|
redmatrix
|
cc95c3e9c8
|
start hooking in the new webfinger/zot merged discovery
|
2015-09-17 18:36:19 -07:00 |
|
redmatrix
|
f0a7a6a1e2
|
consolidate zotfinger and webfinger
|
2015-09-17 17:51:31 -07:00 |
|
redmatrix
|
c34d8286a3
|
change matrix to grid, begin webfinger optimisation
|
2015-09-16 21:27:58 -07:00 |
|
redmatrix
|
fae43010c5
|
nit
|
2015-09-14 21:35:41 -07:00 |
|
redmatrix
|
021c81cb62
|
don't deliver to dead hubs
|
2015-09-14 20:43:39 -07:00 |
|
redmatrix
|
97b990c9bf
|
site checking stuff
|
2015-09-14 19:16:25 -07:00 |
|
redmatrix
|
8fb4f37670
|
remove xchan_instance_url - it needs to be an abook field, not an xchan field
|
2015-09-14 16:05:58 -07:00 |
|
redmatrix
|
fd708b28b8
|
ping site function (taken from admin/hubloc)
|
2015-09-13 22:48:18 -07:00 |
|
redmatrix
|
df0fa9883c
|
check for empty word after trim
|
2015-09-12 14:37:55 -07:00 |
|
redmatrix
|
692e117c8a
|
Merge pull request #38 from MicMee/master
ensure that living sites are marked as alive
|
2015-09-12 08:25:27 +10:00 |
|
redmatrix
|
d96ca61f2b
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-09-11 14:57:26 -07:00 |
|
redmatrix
|
fc58b8cc0d
|
log the remote message if there was one
|
2015-09-11 14:56:31 -07:00 |
|
redmatrix
|
45e1f93e56
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
util/messages.po
|
2015-09-11 14:33:07 -07:00 |
|
redmatrix
|
e062c4e6b5
|
another tactic to deal with orphan hublocs from re-installs, or at least allow the descendant channel to survive
|
2015-09-11 14:30:07 -07:00 |
|
Michael Meer
|
755edd2110
|
ensure that living sites are marked as alive
|
2015-09-11 14:06:37 +02:00 |
|
redmatrix
|
4abfd4053a
|
sync likes
|
2015-09-10 19:18:12 -07:00 |
|
redmatrix
|
00b480527a
|
provide remote delivery report at logger_debug level
|
2015-09-10 17:53:06 -07:00 |
|
redmatrix
|
922d2165b3
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/zot.php
|
2015-09-10 16:51:22 -07:00 |
|
redmatrix
|
50e32c3d8a
|
zot_refresh: always try the hubloc pointed to by xchan_addr first
|
2015-09-10 16:48:08 -07:00 |
|
redmatrix
|
2d94a038a5
|
ensure connections have a name
|
2015-09-10 01:21:18 -07:00 |
|
redmatrix
|
db58b62235
|
don't auto-open the editor in forum mode. Save the forum selection text until we open it.
|
2015-09-09 19:54:16 -07:00 |
|
redmatrix
|
43e064749c
|
major changes to "forum mode" on the network/matrix page
|
2015-09-09 18:50:15 -07:00 |
|
redmatrix
|
4af339da63
|
slight hack to improve public forum detection in the forum widget
|
2015-09-09 18:18:27 -07:00 |
|
redmatrix
|
0a051ff2cd
|
preserve code blocks on item import if channel has code rights. When importing the channel itself,
turn code access off unless this is the admin.
|
2015-09-08 22:46:34 -07:00 |
|
redmatrix
|
d702133ded
|
move mod_admin to Comanche finally
|
2015-09-08 20:48:35 -07:00 |
|
redmatrix
|
f13a8f725c
|
export TERM_FILE when mirroring
|
2015-09-08 19:14:29 -07:00 |
|
redmatrix
|
e6690c818d
|
export TERM_FILE when mirroring
|
2015-09-08 19:13:43 -07:00 |
|
redmatrix
|
f0847e6f32
|
debugging menu sync
|
2015-09-08 18:40:56 -07:00 |
|
redmatrix
|
50d7554ccd
|
add sync packets for menus
|
2015-09-08 18:40:19 -07:00 |
|
redmatrix
|
b28d3015fe
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/identity.php
|
2015-09-08 17:53:43 -07:00 |
|
redmatrix
|
75d521d42a
|
menu import and sync
|
2015-09-08 17:52:39 -07:00 |
|
redmatrix
|
1ebaacfd5e
|
menu export
|
2015-09-08 17:50:24 -07:00 |
|
redmatrix
|
c6bdf7e891
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-09-07 22:55:42 -07:00 |
|
redmatrix
|
11e19a06b7
|
export events
|
2015-09-07 22:54:43 -07:00 |
|
redmatrix
|
650e98b2a9
|
work on event sync
|
2015-09-07 21:01:49 -07:00 |
|
redmatrix
|
508969a183
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-09-07 20:29:13 -07:00 |
|
redmatrix
|
c39e3613a8
|
create event sync packets
|
2015-09-07 20:28:02 -07:00 |
|
redmatrix
|
4eec9a2fba
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/items.php
view/it/messages.po
view/it/strings.php
|
2015-09-07 18:20:47 -07:00 |
|
redmatrix
|
6d1b64065a
|
consolidate import_items/sync_items
|
2015-09-07 18:14:30 -07:00 |
|
Habeas Codice
|
6711ceb662
|
fix postgres zotfeed
|
2015-09-07 16:28:42 -07:00 |
|
redmatrix
|
2f52b6c164
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
util/messages.po
|
2015-09-07 04:06:27 -07:00 |
|
redmatrix
|
1b09c64856
|
PRIVACY: item_private seems to have been removed from permissions_sql checking with an observer.
|
2015-09-07 03:59:38 -07:00 |
|
redmatrix
|
55ab968edf
|
make js_upload work with hubzilla. It still needs a rewrite.
|
2015-09-05 17:35:00 -07:00 |
|
jeroenpraat
|
fc804751a2
|
Fix for PHP Fatal error: Function name must be a string in /var/www/hubzilla/include/items.php on line 3325
Please review if this is correct?
|
2015-09-04 12:39:47 +02:00 |
|
redmatrix
|
d79e81a069
|
import and sync chatrooms
|
2015-09-03 18:44:40 -07:00 |
|
redmatrix
|
f7d9523c7d
|
export chatrooms
|
2015-09-03 18:43:44 -07:00 |
|
redmatrix
|
d93e1c84ac
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/identity.php
|
2015-09-03 17:28:51 -07:00 |
|
redmatrix
|
2a7ff3018b
|
channel export - don't include linked resource items (photos, events). These items will need to be provided with those objects so that they can be re-linked.
|
2015-09-03 17:21:20 -07:00 |
|
redmatrix
|
f3cb17ac3b
|
app sync
|
2015-09-02 23:09:51 -07:00 |
|
redmatrix
|
669e111118
|
add timestamps for syncing apps
|
2015-09-02 21:07:24 -07:00 |
|
redmatrix
|
837b9224cc
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
doc/credits.bb
mod/thing.php
|
2015-09-02 20:33:58 -07:00 |
|
redmatrix
|
c22da3da1c
|
start to modularise the clone import and sync functions
|
2015-09-02 20:12:40 -07:00 |
|
redmatrix
|
d9a67d64b1
|
Update the credits
|
2015-09-02 18:04:22 -07:00 |
|
redmatrix
|
2a26c898ca
|
protect from sql injection
|
2015-09-02 15:52:54 -07:00 |
|
redmatrix
|
69fc10d5ad
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/zot.php
|
2015-09-02 15:49:50 -07:00 |
|
zottel
|
441946b9d3
|
really fix post filtering
|
2015-09-02 15:49:07 +02:00 |
|
redmatrix
|
9328edfdcd
|
obscure mail subject in conversation structure
|
2015-09-01 22:59:06 -07:00 |
|
redmatrix
|
23213a91ed
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-09-01 22:27:00 -07:00 |
|
redmatrix
|
184c544a24
|
export apps
|
2015-09-01 22:26:21 -07:00 |
|
redmatrix
|
6cc60ba477
|
initial work on obj import, rename import_profile_photo to import_xchan_photo to more accurately state its purpose.
|
2015-09-01 22:03:10 -07:00 |
|
redmatrix
|
c5578d7964
|
match the redmatrix output format for objects (which is the hubzilla table format)
|
2015-09-01 21:08:02 -07:00 |
|
redmatrix
|
95cf1aafa0
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-09-01 21:04:57 -07:00 |
|
redmatrix
|
f72a3113f5
|
add the baseurl so we can easily relocate objects
|
2015-09-01 21:03:55 -07:00 |
|
redmatrix
|
3c29b46c42
|
use different obj export output format for hubzilla compatibility
|
2015-09-01 20:57:53 -07:00 |
|
redmatrix
|
515f3bf111
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/identity.php
install/update.php
|
2015-09-01 17:08:59 -07:00 |
|
redmatrix
|
3852b5ce7f
|
separate objs/things from taxonomy
|
2015-09-01 17:06:58 -07:00 |
|
redmatrix
|
1447499776
|
don't log the mundane - especially at normal levels.
|
2015-08-31 22:41:48 -07:00 |
|
redmatrix
|
69dc1b03c3
|
typo in sql
|
2015-08-31 21:01:47 -07:00 |
|
redmatrix
|
d7089ab471
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/identity.php
install/update.php
util/messages.po
view/nl/messages.po
|
2015-08-31 21:00:28 -07:00 |
|
redmatrix
|
039f56f390
|
mostly doc tweaks, some import/export work
|
2015-08-31 20:58:05 -07:00 |
|
redmatrix
|
d7cf7316be
|
change the likes db structure to make it more easily importable/exportable
|
2015-08-31 20:55:25 -07:00 |
|
redmatrix
|
5fe9021375
|
rename 'register_account' hook to 'create_identity'.
|
2015-08-31 16:26:29 -07:00 |
|
redmatrix
|
c0cb21a07c
|
unclosed link tags
|
2015-08-30 23:01:39 -07:00 |
|
redmatrix
|
c865f17dc0
|
schedule a doco update once weekly
|
2015-08-30 22:46:00 -07:00 |
|
redmatrix
|
e23f86faa9
|
more work on doco search
|
2015-08-30 22:39:33 -07:00 |
|
redmatrix
|
a42b236587
|
more AccessList stuff - this time it's mod-item, which is a biggie
|
2015-08-28 14:21:49 -07:00 |
|
redmatrix
|
d05fd9632e
|
now we get to the heavy lifting with AccessList stuff
|
2015-08-27 23:04:17 -07:00 |
|
redmatrix
|
ca0bc2bb7b
|
more work on AccessList integration
|
2015-08-27 22:20:30 -07:00 |
|
redmatrix
|
3fbb955cf2
|
start conversion to AccessList object
|
2015-08-27 21:22:59 -07:00 |
|
redmatrix
|
04b4897dd8
|
First attempt to turn access control into an object class. The access control manipulation is getting too complex and this will help keep it manageable and reduce a lot of code duplication.
|
2015-08-27 18:55:30 -07:00 |
|
redmatrix
|
7b28c42693
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-08-26 23:00:59 -07:00 |
|
redmatrix
|
58ffa31e91
|
redphotos updates
|
2015-08-26 23:00:33 -07:00 |
|
redmatrix
|
0b5bad4aa7
|
use extended export format for items in api photo_detail
|
2015-08-26 22:58:53 -07:00 |
|
redmatrix
|
2bce61d18b
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-08-26 22:14:19 -07:00 |
|
redmatrix
|
9cebd24987
|
change attach_store to allow a predefined item to accompany a photo
|
2015-08-26 22:13:20 -07:00 |
|
redmatrix
|
0d2c90cc2e
|
add item info to photo detail in api
|
2015-08-26 22:11:50 -07:00 |
|
redmatrix
|
54c88dfae9
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/diaspora.php
|
2015-08-26 20:22:50 -07:00 |
|
redmatrix
|
d1c23477df
|
support likes on comments with diaspora owner by sending as activity
|
2015-08-26 20:20:41 -07:00 |
|
redmatrix
|
8fb1356623
|
required for future work
|
2015-08-26 17:49:57 -07:00 |
|
redmatrix
|
5fa2aa6d48
|
lots of stuff that was needed for successful photo import from red
|
2015-08-24 20:58:12 -07:00 |
|
redmatrix
|
0edac8810b
|
don't try to optimise the session table. Just let it fragment and let the DB worry about it.
|
2015-08-24 16:05:51 -07:00 |
|
redmatrix
|
d256e8e9f2
|
edited event showing bad signature and null_date for edit timestamp
|
2015-08-24 01:46:54 -07:00 |
|
redmatrix
|
250d286f1d
|
remove orphan mod_connections editing code (now done in mod/connedit)
|
2015-08-24 01:28:13 -07:00 |
|
redmatrix
|
eac9c8a7e6
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/zot.php
install/update.php
util/messages.po
|
2015-08-23 20:23:55 -07:00 |
|
redmatrix
|
a67213627c
|
provide a comment_policy of "network: diaspora" to handle their special case public-posts-are-commentable-by-anybody permission without breaking any other permissions.
|
2015-08-23 18:48:33 -07:00 |
|
redmatrix
|
b1f091e4d7
|
issues with abook sync between hubzilla and red
|
2015-08-23 17:40:47 -07:00 |
|
redmatrix
|
8cd583fd8c
|
sync abook flags in memory after altering them
|
2015-08-23 17:36:00 -07:00 |
|
redmatrix
|
bf190be5b4
|
issues encountered with hubzilla DB changes, zot_refresh and item_drop and hub sync
|
2015-08-23 13:27:34 -07:00 |
|
redmatrix
|
7688bf3f21
|
support ical priority
|
2015-08-20 22:24:33 -07:00 |
|
redmatrix
|
49c4aa1a54
|
cleanup of task widget - make jquery workflow a bit smoother
|
2015-08-20 20:40:42 -07:00 |
|
redmatrix
|
afbbc9cd72
|
more work on tasks
|
2015-08-20 18:43:01 -07:00 |
|
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 |
|
redmatrix
|
db70c76494
|
diaspora_meta getting double json encoded
|
2015-08-02 23:05:15 -07:00 |
|
redmatrix
|
9f5dfe797b
|
begin moving diaspora to plugin
|
2015-08-02 17:38:34 -07:00 |
|
redmatrix
|
c1a953f960
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
util/messages.po
|
2015-07-31 15:45:13 -07:00 |
|
redmatrix
|
6f9771768d
|
event parse cleanup
|
2015-07-30 22:49:43 -07:00 |
|
redmatrix
|
acc9a8e43b
|
escape $ in events
|
2015-07-30 22:29:10 -07:00 |
|
redmatrix
|
1d218784d1
|
undefined function
|
2015-07-30 20:37:32 -07:00 |
|
redmatrix
|
f45cb8cf1f
|
minor - add all the newly supported table columns
|
2015-07-30 20:04:02 -07:00 |
|
redmatrix
|
4035c6f161
|
incorrect photo permissions when uploaded via /cloud; issue #21
|
2015-07-30 19:50:06 -07:00 |
|
redmatrix
|
fd947c205b
|
make /cloud work again after all the shuffling this morning
|
2015-07-30 18:34:30 -07:00 |
|
redmatrix
|
d5a40cac25
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
several dav fixes
Conflicts:
include/items.php
|
2015-07-30 17:11:16 -07:00 |
|
redmatrix
|
1097cd2583
|
minor cleanup
|
2015-07-29 19:01:25 -07:00 |
|
redmatrix
|
b1ceb33ae0
|
Merge branch 'vobject'
Conflicts:
include/event.php
|
2015-07-29 18:59:28 -07:00 |
|
redmatrix
|
00fa2e2fe8
|
convert ics import to sabre/vobject
|
2015-07-29 18:57:52 -07:00 |
|
redmatrix
|
df41ce9536
|
incorrect function name
|
2015-07-29 17:04:50 -07:00 |
|
redmatrix
|
845024e1e7
|
add connection filter to non-zot posts
|
2015-07-29 17:04:17 -07:00 |
|