Commit graph

14644 commits

Author SHA1 Message Date
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
f472071f6f Merge pull request #66 from HaakonME/master
Updated Norwegian strings for Hubzilla , optional OpenShift deploy and cron
2015-10-02 09:59:44 +10:00
redmatrix
7b695aa684 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-10-01 16:56:38 -07:00
redmatrix
de4b5978c3 update cert authorities 2015-10-01 16:55:15 -07:00
Haakon Meland Eriksen
f23f8f7f5d Small fix to deploy 2015-10-01 22:08:38 +02:00
Haakon Meland Eriksen
f64acadd58 Small fix to deploy 2015-10-01 22:03:12 +02:00
Haakon Meland Eriksen
68ea1d0289 Changed deploy script - removed hot_deploy and changed poller to every 10 minutes rather than 5 minutes. 2015-10-01 21:59:12 +02:00
Haakon Meland Eriksen
1574043a9e Updated Norwegian strings for Hubzilla 2015-10-01 17:51:31 +02:00
Haakon Meland Eriksen
a2a5580e68 Updated Norwegian string for Hubzilla 2015-10-01 17:46:31 +02:00
Haakon Meland Eriksen
2696cf9b9e Merge remote-tracking branch 'upstream/master' 2015-10-01 17:31:22 +02:00
Wave
d9f962ee6f Merge pull request #65 from tuscanhobbit/master
More updates on Italian translation from transifex
2015-10-01 17:31:00 +02:00
Paolo Tacconi
7468d8a000 More updates on Italian translation from transifex 2015-10-01 17:29:04 +02:00
Wave
270bb4e2d9 Merge pull request #64 from tuscanhobbit/master
First Hubzilla Italian localization
2015-10-01 17:12:31 +02:00
Paolo Tacconi
d3d9b06eb7 First Hubzilla Italian localization 2015-10-01 17:11:36 +02:00
redmatrix
e7131bc8f8 this is an even better fix for issue #61 2015-09-30 22:10:26 -07:00
redmatrix
1df1c15e48 issue #61 - provide un-useable icons as placeholders for location setting options on deleted hublocs 2015-09-30 21:59:33 -07:00
redmatrix
986244eeea issue #63 - missing table fields in db query 2015-09-30 21:38:21 -07:00
redmatrix
526bc36b40 update the opensearch template 2015-09-30 19:31:25 -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
b62e7e7d8b Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-30 12:57:43 -07:00
redmatrix
fd290882fd undo self-deliver check 2015-09-30 12:57:02 -07:00
zzottel
09015f8924 Merge pull request #394 from zzottel/master
update German strings
2015-09-30 15:42:10 +02:00
zottel
b5f382f0ea update German strings 2015-09-30 14:05:10 +02:00
zzottel
ccd13dd643 Merge pull request #62 from zzottel/master
update German strings
2015-09-30 14:03:12 +02:00
zottel
d66715648a update German strings 2015-09-30 14:01:21 +02:00
Haakon Meland Eriksen
e07ff7d3fb Merge remote-tracking branch 'upstream/master' 2015-09-30 12:21:36 +02:00
zottel
0d60789f69 Merge remote-tracking branch 'upstream/master' 2015-09-30 08:45:13 +02: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
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
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