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 |
|
jeroenpraat
|
34f52e47eb
|
Hooray! Dutch language complete again.
|
2015-09-29 22:22:02 +02:00 |
|
zottel
|
f950d27b3d
|
Merge remote-tracking branch 'upstream/master'
|
2015-09-29 12:40:24 +02: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 |
|
mrjive
|
11c1573b55
|
Merge pull request #5 from redmatrix/master
updating from original codebase
|
2015-09-29 08:01:51 +02:00 |
|
redmatrix
|
b3525b8657
|
remove debugging
|
2015-09-28 20:04:44 -07: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
|
6368b09337
|
a clear is needed after floating
|
2015-09-28 21:51:04 +02: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
|
edbcba6f11
|
schema support for additional site types
|
2015-09-28 04:15:21 -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
|
3a2c3ea8fa
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-09-27 16:47:58 -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
|
15d1a6c937
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-09-26 13:28:24 -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 |
|
Mario Vavti
|
451db7dd98
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2015-09-25 23:26:47 +02:00 |
|
Mario Vavti
|
d6293730fc
|
private mail: some work on conversations view
|
2015-09-25 23:26:28 +02:00 |
|
zottel
|
8e410f14b1
|
Merge remote-tracking branch 'upstream/master'
|
2015-09-25 22:25:35 +02:00 |
|
jeroenpraat
|
49000dadda
|
Another Spanish update
|
2015-09-25 21:25:42 +02:00 |
|
jeroenpraat
|
9bde18492a
|
As a result of the logo vote: replaced favicon, remade alternative hubzilla avatar and uploaded 6 logo variants. Originals courtesy of Iko.
|
2015-09-25 21:17:48 +02:00 |
|
Haakon Meland Eriksen
|
b22fa9f7f4
|
Merge remote-tracking branch 'upstream/master'
|
2015-09-25 17:52:58 +02:00 |
|
zottel
|
a7b2d23e9b
|
Merge remote-tracking branch 'upstream/master'
|
2015-09-25 11:19:42 +02:00 |
|
redmatrix
|
ba94f824b9
|
deliveries per process ui for setting
|
2015-09-25 01:31:58 -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
|
e558ddae3f
|
clean up the delivery reports to make them manageable, more approachable, and translateable
|
2015-09-24 18:19:33 -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 |
|
Haakon Meland Eriksen
|
414b5ea6f3
|
Merge remote-tracking branch 'upstream/master'
|
2015-09-24 23:32:18 +02:00 |
|
redmatrix
|
c42dcd5ac9
|
Merge pull request #55 from git-marijus/master
some heavy private mail restructuring - work in progress
|
2015-09-25 06:37:38 +10:00 |
|
Mario Vavti
|
b9723aa85b
|
some heavy private mail restructuring - work in progress
|
2015-09-24 14:07:44 +02:00 |
|
zottel
|
03fb13e749
|
Merge remote-tracking branch 'upstream/master'
|
2015-09-24 12:50:27 +02:00 |
|
redmatrix
|
e04f04ef0f
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
install/update.php
|
2015-09-23 22:33:48 -07:00 |
|
redmatrix
|
0f3c2c4b24
|
add vdata field for caldav
|
2015-09-23 22:32:46 -07:00 |
|
redmatrix
|
8a94a4938f
|
dummy update
|
2015-09-23 22:31:49 -07:00 |
|